Commits · 17ed1c4a0237e60bb3f5975003d1b64222ae8f1f · vadere / vadere

08 Oct, 2019 8 commits
- Deleted non-working scenario... · 17ed1c4a
  Benedikt Kleinmeier authored Oct 08, 2019
```
Deleted non-working scenario "TestSpeedInAreaProcessor-SpeedByTrajectory.scenario" (does not work anymore after merging with master)
```
  17ed1c4a
- Use new footstep processors in three salient behavior scenarios to avoid exceptions · 1e36f32b
  Benedikt Kleinmeier authored Oct 08, 2019
  
  1e36f32b
- In "JsonMigrationAssistant", use log level "debug" instead of "info" to avoid spamming stdout · c561b066
  Benedikt Kleinmeier authored Oct 08, 2019
  
  c561b066
- Fixed processor names in two salient behavior names to avoid exceptions · 60068778
  Benedikt Kleinmeier authored Oct 08, 2019
```
But three scenarios still throw exceptions:
- 11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled:
  ClassCastException: TimestepPedestrianIdKey cannot be cast to EventtimePedestrianIdKey
- TestSpeedInAreaProcessor-SpeedByTrajectory:
  ClassCastException: FootStepProcessor cannot be cast to class FootStepProcessor
- TestSpeedInAreaProcessor-SpeedByWidth:
  ClassCastException: FootStepProcessor cannot be cast to class FootStepProcessor and PedestrianVelocityDefaultProcessor are in unnamed module of loader 'app'
```
  60068778
- Added "TargetChanger" settings to "SettingsDialog" · c2732128
  Benedikt Kleinmeier authored Oct 08, 2019
  
  c2732128
- Merge branch 'master' into tukl_cooperation · 2674ea01
  Benedikt Kleinmeier authored Oct 08, 2019
  
  2674ea01
- Merge branch 'dev/PostVisUpdate' into 'master' · 696a81f4
  Daniel Lehmberg authored Oct 08, 2019
```
Use FootStepProcessor in Postviz and as default trajectory output processor

Closes #253

See merge request !85
```
  696a81f4
- Use FootStepProcessor in Postviz and as default trajectory output processor · 5bf355a9
  Daniel Lehmberg authored Oct 08, 2019
  
  5bf355a9
04 Oct, 2019 8 commits
- Implemented "TargetChangerController" and cleaned up "Simulation" · 72a1c7d9
  Benedikt Kleinmeier authored Oct 04, 2019
  
  72a1c7d9
- Added rendering and de-/serialization of "TargetChanger" objects · 2e03dd86
  Benedikt Kleinmeier authored Oct 04, 2019
  
  2e03dd86
- Added "TargetChanger" to "SettingsDialog" and fixed bug in postvisualization's "SettingsDialog" · 9118b7db
  Benedikt Kleinmeier authored Oct 04, 2019
```
VadereGui/src/org/vadere/gui/postvisualization/view/SettingsDialog.java:
- This class placed Bene's criteria coloring pane and the "colorize by
  evacuation" checkbox time at the wrong position. Parent class "SettingsDialog"
  offers two getters now to retrieve the correct position for both elements.
```
  9118b7db
- In "SettingsDialog" fixed "Color by Target Id" (but configured color is still ignored in renderer) · 5d187757
  Benedikt Kleinmeier authored Oct 03, 2019
  
  5d187757
- Refactored "SettingsDialog". · 811a4369
  Benedikt Kleinmeier authored Oct 02, 2019
```
- Extracted methods so that "initComponents()" gets shorter and more readable.
- Added helper method "createCellsWithSeparators()" to avoid using the error-prone "FormLayout" mini language.
- Populate target ids dynamically from "model" instead of statically from config file.
  Therefore, removed also key "SettingsDialog.maxNumberOfTargets" from "VadereConfig".
```
  811a4369
- Added new scenario element "TargetChanger" ("TargetChangerController" and... · b86cc079
  Benedikt Kleinmeier authored Oct 01, 2019
```
Added new scenario element "TargetChanger" ("TargetChangerController" and "SettingsDialog" must be still adapted)
```
  b86cc079
- Implemented "PedestrianOSM.clone()" and use it in "TargetPedestrian" · c2f57685
  Benedikt Kleinmeier authored Sep 30, 2019
  
  c2f57685
- Tested class "TargetPedestrian" successfully in class "Simulation" · a0a21e07
  Benedikt Kleinmeier authored Sep 27, 2019
```
Watch out: A small workaround was necessary in "TargetPedestrian"
to enable cloning of "PedestrianOSM" objects.
```
  a0a21e07
03 Oct, 2019 2 commits

In "SettingsDialog" fixed "Color by Target Id" (but configured color is still ignored in renderer) · 50f028be
Benedikt Kleinmeier authored Oct 03, 2019

50f028be

Benedikt Kleinmeier authored Oct 02, 2019

- Extracted methods so that "initComponents()" gets shorter and more readable.
- Added helper method "createCellsWithSeparators()" to avoid using the error-prone "FormLayout" mini language.
- Populate target ids dynamically from "model" instead of statically from config file.
  Therefore, removed also key "SettingsDialog.maxNumberOfTargets" from "VadereConfig".

3943b0c5

19 Sep, 2019 1 commit
- Migrated scenarios in "TestSalientBehavior" to version 1.4 to avoid CI failures · 1ad1b76f
  Benedikt Kleinmeier authored Sep 19, 2019
  
  1ad1b76f
18 Sep, 2019 2 commits

Merge branch 'master' into salient_behavior · 9390cc10

Benedikt Kleinmeier authored Sep 18, 2019

# 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/models/osm/OSMBehaviorController.java

9390cc10

Added "calculateAngleBetweenTargetGradients()" to "OSMBehaviorController" · 1dfbd58b
Benedikt Kleinmeier authored Aug 02, 2019

1dfbd58b

17 Sep, 2019 4 commits

Merge branch... · 77cb5e47

Daniel Lehmberg authored Sep 17, 2019

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

potential bugfix with correct times · e85918c7
Daniel Lehmberg authored Sep 17, 2019

e85918c7
resolve merge conflicts · 1fa7f5ed
Daniel Lehmberg authored Sep 17, 2019

1fa7f5ed

Merge remote-tracking branch 'origin/master' into... · 831a0ba3

Daniel Lehmberg authored Sep 17, 2019

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

16 Sep, 2019 1 commit
- Merge branch 'rename_last_footsteps' into 'master' · 7132c1ef
  Benedikt Kleinmeier authored Sep 16, 2019
```
Rename class "LastFootSteps" to "FootstepHistory"

See merge request !84
```
  7132c1ef
05 Sep, 2019 7 commits
- Updated "CHANGELOG.md" for version v1.4 · 2022c4b4
  Benedikt Kleinmeier authored Sep 05, 2019
  
  2022c4b4
- Updated scenario files under "TestSalientBehavior" to version 1.4 · f632c388
  Benedikt Kleinmeier authored Sep 05, 2019
  
  f632c388
- Improved "JsonTransformationV1_3ToV1_4" to rename "footStepsToStore" also... · f81b790a
  Benedikt Kleinmeier authored Sep 05, 2019
```
Improved "JsonTransformationV1_3ToV1_4" to rename "footStepsToStore" also under "attributesCar" node
```
  f81b790a
- Migrated ALL scenario files to version 1.4 · fb5b5929
  Benedikt Kleinmeier authored Sep 05, 2019
  
  fb5b5929
- Improved class "JsonTransformationV1_3ToV1_4" to rename also elements in "dynamicElements" array · 8521a5be
  Benedikt Kleinmeier authored Sep 05, 2019
  
  8521a5be
- Migrated unit test scenario files to avoid breaking tests · 91cae2e9
  Benedikt Kleinmeier authored Sep 05, 2019
  
  91cae2e9
- Renamed class "LastFootSteps" to "FootstepHistory" and move its usage from... · dfcaffe4
  Benedikt Kleinmeier authored Sep 05, 2019
```
Renamed class "LastFootSteps" to "FootstepHistory" and move its usage from "VTrajectory" to "Pedestrian"

Implemented also class "JsonTransformationV1_3ToV1_4" to rename field
"footStepsToStore" to "footstepHistorySize" in existing scenario files.
```
  dfcaffe4
04 Sep, 2019 5 commits
- remove unnecessary processor (was inserted for testing purposes) · c7716fab
  Daniel Lehmberg authored Sep 04, 2019
  
  c7716fab
- remove individual fields; missing fields are automatically set by... · 0e2bf79d
  Daniel Lehmberg authored Sep 04, 2019
```
remove individual fields; missing fields are automatically set by VadereConfig.java with default values
```
  0e2bf79d
- adapt Nelder mead tests that appear after bugfixes in commit... · d668add0
  Daniel Lehmberg authored Sep 04, 2019
```
adapt Nelder mead tests that appear after bugfixes in commit 65f369b8 (minor changes)
```
  d668add0
- also clone stairs in Topography · ceb5b820
  Daniel Lehmberg authored Sep 04, 2019
  
  ceb5b820
- set the correct first time of next event for the first event of an agent for... · 69444454
  Benedikt Zoennchen authored Sep 04, 2019
```
set the correct first time of next event for the first event of an agent for the sequential update scheme.
```
  69444454
03 Sep, 2019 2 commits
- fix wrong order of footsteps using SalientBehavior.COOPERATIVE for the... · b622ff52
  Benedikt Zoennchen authored Sep 03, 2019
```
fix wrong order of footsteps using SalientBehavior.COOPERATIVE for the sequential and event driven update scheme.
```
  b622ff52
- fix wrong order of footsteps using SalientBehavior.COOPERATIVE for the... · d878830d
  Benedikt Zoennchen authored Sep 03, 2019
```
fix wrong order of footsteps using SalientBehavior.COOPERATIVE for the sequential and event driven update scheme.
```
  d878830d