1. 06 Jun, 2020 2 commits
  2. 20 Apr, 2020 1 commit
    • Christina's avatar
      extended supermarket · 6b7e12f7
      Christina authored
      
      extended supermarket
      
      
      update scenario
      
      
      before migration (V.1.11)
      
      
      after migration to V1.12
      
      
      adapted UnitTests TargetChangerController
      
      
      adapted and extended unit tests
      
      
      fixed bug
      
      
      changed queue behavior manually
      6b7e12f7
  3. 17 Apr, 2020 1 commit
  4. 25 Feb, 2020 1 commit
    • Daniel Lehmberg's avatar
      Squashed 'Tools/SUQController/' changes from 285c69a13..f75af9422 · eed76a68
      Daniel Lehmberg authored
      f75af9422 Merge branch 'add_jvm_parameter' into 'master'
      f2106b649 Add jvm parameter
      faaf2c962 set version 2.0
      7357a144e Merge branch 'develop' into 'master'
      1d255f89c fix: errored if output_folder=None
      5210fcb45 detail gitignore
      5a95837b5 update tutorials
      9c65cd608 integrate post_changes into VariationBase
      377ce2158 change default value
      145b95628 remove models folder
      86f652d16 remove folder
      5b8ae215b remove folder
      c6c44992b Remote (2)
      f086d5c0d Remote (1)
      8421608b0 removal of remote environment folder in __exit__
      21d1815da remote (1)
      24c864027 solves #75
      a3275bb79 remote (2)
      b3d128f2a remote (1)
      3e6cb6639 Merge branch 'improve_existing' into 'develop'
      b9b4d6284 Improve existing
      f8dd4816e remove header templates
      1fa592368 order import paths
      
      git-subtree-dir: Tools/SUQController
      git-subtree-split: f75af94229264e126e21d8cbf6ee07a159c11556
      eed76a68
  5. 24 Feb, 2020 1 commit
  6. 07 Feb, 2020 1 commit
  7. 06 Feb, 2020 4 commits
  8. 25 Jan, 2020 1 commit
  9. 24 Jan, 2020 1 commit
  10. 20 Jan, 2020 1 commit
  11. 18 Jan, 2020 1 commit
  12. 17 Jan, 2020 1 commit
  13. 14 Jan, 2020 1 commit
    • Stefan Schuhbaeck's avatar
      # Conflicts: · 1caba523
      Stefan Schuhbaeck authored
      #	Tools/PythonTraciWrapper/pythontraciwrapper/__init__.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_api_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_controll_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_personapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_polygonapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_simulationapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_vadereapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/py4j_client.py
      #	Tools/PythonTraciWrapper/setup.py
      
      # Conflicts:
      #	Tools/PythonTraciWrapper/pythontraciwrapper/__init__.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_api_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_controll_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_personapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_polygonapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_simulationapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/_vadereapi_wrapper.py
      #	Tools/PythonTraciWrapper/pythontraciwrapper/py4j_client.py
      #	Tools/PythonTraciWrapper/setup.py
      
      # Conflicts:
      #	Tools/PythonTraciWrapper/setup.py
      1caba523
  14. 13 Jan, 2020 1 commit
    • Stefan Schuhbaeck's avatar
      python based TraCI client for vadere. · 34729e0f
      Stefan Schuhbaeck authored
      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
      34729e0f
  15. 17 Dec, 2019 2 commits
  16. 16 Dec, 2019 1 commit
  17. 28 Nov, 2019 1 commit
  18. 15 Nov, 2019 1 commit
  19. 13 Nov, 2019 1 commit
  20. 12 Nov, 2019 1 commit
  21. 24 Oct, 2019 4 commits
  22. 04 Sep, 2019 1 commit
  23. 31 Jul, 2019 1 commit
    • Stefan Schuhbaeck's avatar
      add osm_helper to directly manipulate the osm.xml · afd123db
      Stefan Schuhbaeck authored
      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
      afd123db
  24. 12 Jul, 2019 2 commits
  25. 10 Jul, 2019 3 commits
  26. 24 Jun, 2019 1 commit
    • Stefan Schuhbaeck's avatar
      add stand alone features from VadereManagement module: · d14b7201
      Stefan Schuhbaeck authored
      * single step mode in GUI:
        Allows the user to step through the simulation one step at a time to
        identify bugs.
      * simplify obstacles:
        Merge multiple obstacles based on the convex hull their points create.
        The merge can be undon
      * add features to open street map (osm) importer:
        1) import 'open' paths as polygons with a specified width. With this
           it is possible to create walls or subway entrance
        2) add option to include osm ids into each obstacle
      d14b7201
  27. 13 Jun, 2019 1 commit
  28. 05 Jun, 2019 1 commit
  29. 28 May, 2019 1 commit