Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

  • Benedikt Kleinmeier's avatar
    Merged branch 'master' into add_event_handling, but removed event handling in... · 443af4b3
    Benedikt Kleinmeier authored
    Merged branch 'master' into add_event_handling, but removed event handling in "OptimalStepsModel.java" to avoid merge conflicts.
    
    # Conflicts:
    #	.gitlab-ci.yml
    #	VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
    #	VadereSimulator/src/org/vadere/simulator/control/Simulation.java
    #	VadereSimulator/src/org/vadere/simulator/models/osm/OptimalStepsModel.java
    443af4b3
rimea_14_select_route_pso.scenario.orig 7.16 KB