1. 17 Sep, 2019 4 commits
    • hm-lehmberg's avatar
      Merge branch... · 77cb5e47
      hm-lehmberg authored
      Merge branch '260-change-pedestrianpositionprocessor-to-use-interpolation-of-pedestrianfootstepprocessor' into 'master'
      
      Resolve "Change PedestrianPositionProcessor to use interpolation of PedestrianFootStepProcessor"
      
      Closes #263, #262, and #260
      
      See merge request !83
      77cb5e47
    • hm-lehmberg's avatar
      potential bugfix with correct times · e85918c7
      hm-lehmberg authored
      e85918c7
    • hm-lehmberg's avatar
      resolve merge conflicts · 1fa7f5ed
      hm-lehmberg authored
      1fa7f5ed
    • hm-lehmberg's avatar
      Merge remote-tracking branch 'origin/master' into... · 831a0ba3
      hm-lehmberg authored
      Merge remote-tracking branch 'origin/master' into 260-change-pedestrianpositionprocessor-to-use-interpolation-of-pedestrianfootstepprocessor
      
      # Conflicts:
      #	VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
      #	VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario
      #	VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
      #	VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario
      #	VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario
      #	VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario
      #	VadereSimulator/src/org/vadere/simulator/control/cognition/SalientBehaviorCognition.java
      #	VadereSimulator/src/org/vadere/simulator/models/bhm/PedestrianBHM.java
      #	VadereSimulator/src/org/vadere/simulator/models/bmm/BiomechanicsModel.java
      #	VadereSimulator/src/org/vadere/simulator/models/ode/ODEModel.java
      #	VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java
      #	VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeOSM.java
      #	VadereSimulator/src/org/vadere/simulator/models/reynolds/PedestrianReynolds.java
      #	VadereState/src/org/vadere/state/scenario/Pedestrian.java
      #	VadereState/src/org/vadere/state/simulation/VTrajectory.java
      831a0ba3
  2. 16 Sep, 2019 1 commit
  3. 05 Sep, 2019 7 commits
  4. 04 Sep, 2019 5 commits
  5. 03 Sep, 2019 5 commits
  6. 02 Sep, 2019 1 commit
  7. 28 Aug, 2019 1 commit
  8. 26 Aug, 2019 1 commit
  9. 23 Aug, 2019 4 commits
  10. 22 Aug, 2019 7 commits
  11. 21 Aug, 2019 3 commits
  12. 06 Aug, 2019 1 commit