GitLab

main author hm-schuegra

[misc] apply styleguide to VadereManager module
[misc] autopep vadere-lauchner.py
[pythontraciwrapper] Added second start method to Py4jClient
[pythontraciwrapper] Adding PythonTraCIWrapper to tools with git subtree
[pythontraciwrapper] Extending pythontraciwrapper
[pythontraciwrapper] Implemented _polygonapi_wrapper
[pythontraciwrapper] Implemented a basic py4j client
[pythontraciwrapper] Implemented pytraci controll commands
[pythontraciwrapper] Improving py4j client
[pythontraciwrapper] Move Py4jClient to pythontraciwrapper
[pythontraciwrapper] Removing PythonTraCIWrapper from tools
[pythontraciwrapper] Skeleton py4j TraCI Wrapper
[pythontraciwrapper] apply code formatting
[pythontraciwrapper] set version to 0.2
[pythontraciwrapper] use list in subprocess instead of string. fix for
linux.
[TraCI] Adapt new createNew such that it uses the type of the peds in
the simulation when reading the minimal attributes from JSON
[TraCI] Add new start method to client to access sendFileFromPath via
the Py4j wrapper
[TraCI] Add processors to scenario
[TraCI] Added scenarios for ReinforcementLearning
[TraCI] Allow multiple py4j clients to interact with vadere via traci,
each client having its own manager
[TraCI] Annotated some methods of polygonapi
[TraCI] Automated start of manager and entrypoint in Py4jClient just for
developement.
[TraCI] Extending personapi on python side
[TraCI] Find explanation for redundant command identifier byte in
getVersion
[TraCI] Fix bug in createTargetChanger builder
[TraCI] Fix bug in poly.getIDList
[TraCI] Fix getVersion bug
[TraCI] Fix tests
[TraCI] Implement more tests
[TraCI] Implement pers.getMaximumSpeed
[TraCI] Implement pers.getVelocity
[TraCI] Implement poly.getTopographyBounds # Conflicts: #
Tools/PythonTraCIWrapper/pythontraciwrapper/_personapi_wrapper.py
[TraCI] Implement some tests for setters, extend tests for getters by
one check
[TraCI] Implemented createWaitingArea for traci, Example command from
TestClient sim.createWaitingArea 6 0.0 3.0 1 0.5 10.0 6.0 3.0 8.0 3.0
8.0 0.5 6.0 0.5
[TraCI] Implemented getSimTime for python wrapper
[TraCI] Implemented getter and setter for nextTargetListIndex to make a
workaround Issue #285 of possible
[TraCI] Implemented getter for hasNextTarget
[TraCI] Implemented poly.getCentroid, implemented poly.getDistance with
a workaround
[TraCI] Implemented py4j-wrapper for getter and setter of
nextTargetListIndex
[TraCI] Implemented setStimulusInfo, removed add/remove WaitingArea
[TraCI] Implemented some methods of traci polygonapi
[TraCI] Implemented some tests
[TraCI] Integrated VadereAPI
[TraCI] Kill entrypoint process when python program terminates with
atexit
[TraCI] Made py4j_client take either the parsed args or the raw args
from the command line from the instantiator.
[TraCI] Make createTargetChanger take json
[TraCI] Make sendFile more flexible
[TraCI] Make sendFileFromPath public to make API more flexible
[TraCI] Make test for process_getCacheHash platform independent
[TraCI] Move argParsing to py4j_client in the pythontraciwrapper
package.
[TraCI] Parameterised port of TraCIEntryPoint
[TraCI] Refactor tests, implement new tests
[TraCI] Refactored poly.getDistance
[TraCI] Refactoring
[TraCI] Refactoring & fixing a bug in client-side of removeTargetChanger
and removeWaitingArea
[TraCI] Refactoring VadereApi
[TraCI] Removed hard-coded path and port number, inserted a check into
test of process_getCacheHash
[TraCI] Removed hard-coded paths from TraCIEntryPoint
[TraCI] Resolving some problems in the python interface
[TraCI] Test process_getCacheHash
[TraCI] WIP reimplementing Polygon Api
[TraCI] Workaround for ctr.getVersion bug
[TraCI] Working on traci controll commands for python client
[TraCI] add generic Json compound object
[TraCI] create and add TargetChangerController process_addTargetChanger
[TraCI] wrote test for getAllStimulusInfos
[ReinforcementLearning] Adding scenarios with small crowd
[ReinforcementLearning] Increase number of targets.
[ReinforcementLearning]Add scenario as demo and test case for

This reverts commit 35976b6f.

# Conflicts:
#	Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlow-SBEnabled.scenario

Stefan Schuhbaeck authored Jul 31, 2019 and Daniel Lehmberg committed Jul 31, 2019

planed features:

* simplified obstacles are configured using a .config which
defines the osm way elements which should be combined in a
convexhull. The way elements are *not* deleted, only turned of
using custom tags (e.g. edu.hm.cs.rover.simplified = 'id-of-simple-version')

* benefit: simplification can be undone easily

This is only a functional Interface

Adapted three scenario files for salient behavior (use random seed and spawnAtRandomPositions=true).

Added test scenarios "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario" and "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario"

In "PedestrianSpeedInAreaProcessor", use "PedestrianVelocityProcessor" instead of "pedestrian.getVelocity()".

Implemented "EventFactory" and use it in "TrajectoryReader" and use new output processors in "TestSalientBehavior" scenarios.

Added print statements in "OSMBehaviorController" to debug why salient behavior causes an "AssertionError" when using event-driven update scheme.

Added test scenarios for salient behavior: "03-UnidirectionalFlow-OSMSequential.scenario" and "04-CounterFlow-OSMSequential.scenario".

* add new fields to AttributeOSM
* correct typo in PedestrianDensityGaussianProcessor

Updated also two scenario files.

Added folder "VadereModelTests/TestNonWorkingFeatures/" containing non-working scenario files which should work in the long run.

Changes for v0.6:

Processors:
* remove PedestrianOverlapDistProcessor and add functionality in
  PedestrianOverlapProcessor.
* show overlap distance in PedestrianOverlapProcessor as a positive
  delta
* refactor NumberOverlapsProcessor to use PedestrianOverlapProcessor
  as dependency
* refactor MaxOverlapProcessor to use PedestrianOverlapProcessor
  as dependency

JsonTransform Tests:

To test transformation and manipulate Jackson's JsonNode representation
four new Interface are included.

* JsonNodeExplorer: Methods to travers, delete and add JsonNodes in an
  existing Json representation. Many methods will throw Exceptions if
  a path does not exist or the operation does not work. Included are
  helpers for eays path traversal (i.e. path(root, "path/to/node"))

* TestJsonNodeExplorer: This extends the JsonNodeExplorer and overwrites
  all Methods with exceptions and insted inclueds Assertions and
  Junit test to indicate an error. Thus for example the method
  pathMustExist contains an assertion test that the path exists. This
  can be used in UnitTest as assertions.

* TestJsonNodeHelper: Create JsonNode tree from text files

* TestResourceHandler: Allows to load file based resources for test
  and will create backups of test files so the test enviroment can be
  resotred if a test fails. This helps in the development process.

New Features:

* Graphical simulation result is displayed in a table view to show
  run-time and overlap information if the corresponding processors
  are loaded. The Simulation result dialog can be deactivated in
  the preferences.
* PedestrianOverlapProcessor returns two values "distance", "overlaps"
  for each overlap detected. If no overlap occurs the output is empty.
  "distance": The distance between the center of the two pedestrians
  "overlaps": The amount the two pedestrian overlap

Changes:

* New version for scenario.json (0.5):
  - remove scenario/attributesSimulation/needsBoundary as it is not
  used anymore.
  - remove attributes from processor PedestrianOverlapProcessor because
  the radius of a pedestrian can be retrieved from the topography at
  run-time. This would allow to detect overlaps of different sized
  pedestrian in the future.
* Helper interfaces for testing:
  - The TestResourceHandler interface groups all methods
  needed to retrieve backup and reset test resources between single test
  runs. All methods, except getTestDir() have default implementation
  which rely rely on relative paths on getTestDir().
  - The JsonNodeTest interface groups all methods needed to travers or
  search the Jackson JsonNode data structures. In contains methos for
  path finding and will fail the test if a path does not exist.
* Added Test for PedestrianOverlapProcessor to check if a overlap
  of (2*r - 0.001) will always be treated as an overlap. Additional
  test are  created to ensure (2*r + 0.001) with r:= pedestrian radius,
  will never create an overlap. Only between
  [2*r - 0.001 , 2*r + 0.001] different placements of pedestrian can
  produce overlaps. Example: --,  /(45 degree) , |  represent the
  distance (2*r)

  	Case A:		Case B: 	Case: C
	   O--O		  O 		  O
	   			  |			   \
	   			  O             O

  In the Case A and B no overlap is detected. In Case C an overlap
  is detected, because of rounding errors when calculating the
  distance \.
  This does not occure if the overlap is bigger than 0.001. Then in all
  three case a overlap is detected. If the distance between two
  pedestrian is 0.001 bigger than 2*r in none of the above cases an
  overlap is detected.

Changes:

* add new seed handling: By default new scenario files will be created
  with a random seed, which is written in the attribute fixedSeed.
  If the Boolean switch useFixedSeed  is set, this defined seed will
  be used within one simulation. At the start of each simulation this
  seed, or if useFixedSeed is false a newly generated one, will be used
  and persisted in the attribute simulationSeed. All generated data
  of this simulation will be written to the defined output directory
  with a copy of the current scenario file. All data generated in this
  simulation run can be reproduced with specified simulationSeed.

* new features for VaderConsole(migrate): The migrate subcommand will
  now accept a list of files or Directories (or a mix of them) to
  perform a migration or a revert. If a path is specified the
  default behavior will only migrate the selected directory without
  traversing to the directory tree. If the --recursive or -r flag is
  set, the hole sub tree of all given directories will be converted.
  Directories or directory trees will be ignored if the directory
  contains one of the following marker files:
  - DO_NOT_MIGRATE_TREE or .DO_NOT_MIGRATE_TREE
  - DO_NOT_MIGRATE or .DO_NOT_MIGRATE

* remove hard coded sc  enario files encoded as strings to allow
  testResource migration with the VadereConsole

* ignore scenario.legacy files within testResources

* add test for MigrationAssistant v0.3 to v0.4

changes:

* move groupSizeDistribution from AttributesCGM to AttributesSources
* rename standardDerivation to standardDeviation in AttributesTimeCost
* update all existing scenario files to version v0.3

This only affects scenarios which do not us group models. Due to
refactoring of the group model the group size distribution is
set by source. This allows different source to spawn different group
sizes.

update the AttributeAgents values to the values in weidmann-1993 and seitz-2016c for all model test scenarios.