Commit 1186e865 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'test_client_stsc' into stsc_random_position

parents 311a863c 845a15a9
......@@ -9,6 +9,31 @@
- Added new scenario element `TargetChanger`. This scenario element has an arbitrary shape and changes the target of an agent. Either to another static target or to another agent (to get a follower behavior). A `TargetChanger` has two important parameters:
* `changeTargetProbability`: This defines how many percent of the agents, who enter the area, should change their target.
* `nextTargetIsPedestrian`: If `nextTargetIsPedestrian == false`, assign a new static target. Otherwise, randomly choose a pedestrian (with given target id) to follow.
- Add Scenario Hash to info panel below of the TopographyCreator and Post-Visualisation View:
* will show if changes to the scenario will change the floorfield
* Hover over hash to see full value
* Left-Click to copy full hash to clipboard.
- TraCI commands:
* getHash: return Scenario hash for given scenario
* CompoundObject implementation to allow complex get/set commands (i.e. create pedestrian hat
random location during simulation run)
- osm2vadere converter:
* it is possible to specify a way with the tag `area-of-intrest` (AOI). If this is present and the
corresponding command line argument is given, only elements within the bounding box of the
AOI will be converted.
- Add INET environment export:
* create an INET environment xml file based on the current topography. For now only prism shapes
are possible with a fixed height of 5m.
- vadere-console `utils` subCommand:
* A miscellaneous collector of simple function operating on a single scenario file.
* -f (input file or directory depending on method m [required])
* -o (ouput file or directory depending on method m [optional])
* -m (name of method.) See subparser help for allowed functions.
* currently implementd:
* `getHash`: Hash value of given scenario. (-o option ignored)
* `binCache`: calculate binary cache (-o must be a directory. If missing it will be created)
* `txtCache`: calculate text based cache (-o must be a directory. If missing it will be created)
### Changed
......@@ -19,8 +44,22 @@ Was previously known as `PedestrianFootStepProcessor`
* Mouse Wheel Scroll: Scroll vertically.
* Shift + Mouse Wheel Scroll: Scroll horizontally.
* Use Alt key to decrease the step size while scrolling.
# v1.4 (2019-09-05)
- CachePath lookup:
The new cache lookup now allows a 'global' lookup. Previously all cache files are saved in
a `__cache__` folder relative (as sibling) to the currently running scenario file. This works
good for local testing and runs. However, if one scenario is duplicated and integrated in other
projects the same cache would be created at multiple locations. The current solution would be
to enter an absolute path as the `cacheDir` but this will break interoperatbility between
windows and linux as well as sharing scenario files with other users. CacheDir Lookup order:
1. `cacheDir` is an absolute path: Use it; and log the path to console.
2. `cacheDir` is relative and `Vadere.cache.useGlobalCacheBaseDir=false` (default):
save cache in a `__cache__` folder relative (as sibling) to the currently running scenario file
3. `cacheDir` is relative and `Vadere.cache.useGlobalCacheBaseDir=true`:
Lookup `Vadere.cache.flobalCacheBaseDir` and use this as the base path for the relative
`cacheDir` path. `Vadere.cache.flobalCacheBaseDir` defaults to `${user.home}\.cache\vadere`
## v1.4 (2019-09-05)
### Changed
......
This diff is collapsed.
{
"name" : "hm_stairs",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -84,7 +84,7 @@
"useFixedSeed" : false,
"fixedSeed" : 1,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -270,6 +270,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 1,
......@@ -1209,6 +1210,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "05_bang_event_narrowed_street",
"name" : "01-Bang-NarrowedStreet",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,17 +928,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 0.0,
"endTime" : 0.4,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : 1
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : 1,
"loudness" : 1.0
} ]
} ]
}
......
{
"name" : "06_bang_event_guimaraes_platz",
"name" : "02-Bang-GuimaraesPlatz",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -1139,6 +1139,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -1198,17 +1199,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 67.0,
"endTime" : 67.4,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : 0
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : 0,
"loudness" : 1.0
} ]
} ]
}
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,17 +928,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 92.0,
"endTime" : 92.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : -1
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : -1,
"loudness" : 1.0
} ]
} ]
}
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,6 +928,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -109,7 +109,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -807,6 +807,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -855,6 +856,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -819,6 +819,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -867,6 +868,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "chicken_floorfield_ok_GPU_event",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -82,7 +82,7 @@
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -117,6 +117,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 2,
......@@ -156,6 +157,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "chicken_floorfield_ok_GPU_parallel",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -82,7 +82,7 @@
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -117,6 +117,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 2,
......@@ -156,6 +157,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment