# Conflicts:
#	VadereSimulator/src/org/vadere/simulator/control/scenarioelements/SourceController.java
#	VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java
#	VadereSimulator/tests/org/vadere/simulator/control/TestSourceControllerUsingConstantSpawnRate.java

# Conflicts:
#	Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario
#	Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
#	Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario

Fixed "NullPointerException" in BHM by introducing new static method "TopographyHelper.otherPedestrianIsCloserToTarget()"

In "TikzGenerator", added method "drawWalkingDirectionUsingFootstepHistory()" to be able to render walking direction during online simulation

In "PedestrianBHM", handle "SelfCategory.EVADE" correctly for the very first time (but requires some refactoring)

Fixed unit test "NavigationEvasionTest" and moved BHM target helpers to new package "bhm.helpers.targetdirection"

Moved BHM navigation classes to new package "helpers.navigation" and implemented "NavigationBuilder" to instantiate model from string in scenario file

Finished very first version of evasion behavior in "PedestrianBHM" and added "BHM-Defaults-WithFloorField.scenario

Removed Strategy Layer

See merge request !144

In "EikMeshPoly.java", added print statements to be able to track progress on console for larger scenarios

Removed test scenario "TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario" (not necessary anymore because OSM is not used here)

In "TikzGenerator": Show TargetChangers above sources, fixed walking direction and added LuaLaTeX directive to allow compilation of large scenarios

In "OSMBehaviorController", removed evasion code (instead use BHM to demonstrate evasion cognition which already provides evasion methods)

Add artery support

See merge request !143

Sfm parallel

See merge request !140

Write data computed in strategy layer with data processor

See merge request !142

# Conflicts:
#	Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario
#	VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java
#	VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java