1. 18 Jan, 2020 4 commits
  2. 17 Jan, 2020 9 commits
  3. 16 Jan, 2020 2 commits
    • Benedikt Kleinmeier's avatar
    • Benedikt Kleinmeier's avatar
      Implemented "ThreatCognitionModel" partially and refactored "UpdateSchemeEventDriven" · b226ca8e
      Benedikt Kleinmeier authored
      Also renamed:
      - Enum value "TARGET_DISTRACTION_STRATEGY" to "TARGET_REPULSION_STRATEGY"
      - Class "TargetDistractionStrategy" to "TargetRepulsionStrategy"
      
      VadereSimulator/src/org/vadere/simulator/models/psychology/selfcategorization/locomotion/OSMBehaviorController.java:
      - Renamed "reactToBang()" to "maximizeDistanceToThreatAndIncreaseSpeed()"
        and use "pedestrian.getPerceivedThreat()" instead of "pedestrian.getMostImportantStimulus()".
      
      VadereSimulator/src/org/vadere/simulator/models/psychology/selfcategorization/locomotion/UpdateSchemeEventDriven.java:
      - Use "pedestrian.getSelfCategory()" instead of "pedestrian.getMostImportantStimulus()"
        to derive specific behavior in "update()" method.
      
      VadereState/src/org/vadere/state/psychology/PsychologyStatus.java:
      - Added member variable "perceivedThreat".
      b226ca8e
  4. 15 Jan, 2020 8 commits
  5. 14 Jan, 2020 3 commits
    • Stefan Schuhbaeck's avatar
      Merge branch 'traci_phsc_2' into 'master' · d7d7b097
      Stefan Schuhbaeck authored
      cosmetic fixes in pythontraciwrapper
      
      See merge request !108
      d7d7b097
    • 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
    • Benedikt Kleinmeier's avatar
      Copied "UpdateSchemeEventDriven" to "models/psychology" and use this... · 82de48dc
      Benedikt Kleinmeier authored
      Copied "UpdateSchemeEventDriven" to "models/psychology" and use this locomotion model in "SelfCatThreatModel"
      82de48dc
  6. 13 Jan, 2020 5 commits
    • Benedikt Kleinmeier's avatar
      09ec20fb
    • Stefan Schuhbaeck's avatar
      Merge branch 'checker_on_off' into 'master' · 298f7729
      Stefan Schuhbaeck authored
      checkbox to deactivate ScenarioChecker in GUI.
      
      See merge request !107
      298f7729
    • Stefan Schuhbaeck's avatar
      checkbox to deactivate ScenarioChecker in GUI. · f010a5cc
      Stefan Schuhbaeck authored
      Before save actions and simulation run actions the
      ScenarioChecker is still executed *once* to inform the
      user of any errors. (deault = ScenarioChecker Off)
      
      The checkbox setting is saved in the vadere config.
      f010a5cc
    • Stefan Schuhbaeck's avatar
      Merge branch 'test_client_stsc' into 'master' · 5dd1d018
      Stefan Schuhbaeck authored
      Python Based TraCI Client for Vadere
      
      See merge request !106
      5dd1d018
    • 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 m...
      34729e0f
  7. 10 Jan, 2020 1 commit
  8. 17 Dec, 2019 2 commits
  9. 16 Dec, 2019 2 commits
  10. 11 Dec, 2019 1 commit
  11. 09 Dec, 2019 1 commit
  12. 05 Dec, 2019 2 commits