2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit e9b47e53 authored by Marion Goedel's avatar Marion Goedel
Browse files

Merge branch 'master' of gitlab.lrz.de:vadere/vadere

parents 03e76933 6184e520
Pipeline #191263 passed with stages
in 135 minutes and 21 seconds
......@@ -5,6 +5,9 @@
## In Progress:
### Added
- Added a Vadere logo (a simple "V") as window and task bar icon to get rid of the lame default Java icon.
- Added "Psychology" tab in GUI which shows all psychology-related attributes of a scenario (which are stored in JSON node "attributesPsychology").
- Add `PedestrianPotentialProcessor` which writes out different potentials (TARGET (target potential), OBSTACLE (obstacle potential), PEDESTRIAN (agent potential), ALL (sum of all)) configureable via its `Attributes`. It only writes those potentials if the used main model for the simulation is a `PotentialFieldModel`.
- Add `AttributesPedestrianPositionProcessor` to the `PedestrianPositionProcessor` such that the user can disable interpolation (using the default it is enabled), making it more flexible.
- Positions can now be interpolated i.e. Agents offer two methods: `getPosition` and `getInterpolatedPosition`. `getPosition` returns the Position the model is working with and `getInterpolatedPosition` the position the agent is approximatily at. For ODE-based models both methods return the same position but for footstep based models like the OSM the position is interpolated assuming that an agent performs his current step with a constant speed. This gives more accurate positions for visualizing and computing measures like the density.
......@@ -39,6 +42,7 @@
### Changed
- The "Time" slider in the PostVis uses the resolution of the "Res." slider instead of using a fixed step size of 0.4 seconds.
- The Model (of the GUI MVC) of the Postvisualization changed to a DataFrame based structure using [Tablesaw](https://github.com/jtablesaw/tablesaw) which is based on [FastUtils](http://fastutil.di.unimi.it/).
- `FootStepProcessor` interpolates the pedestrian's foot step to obtain a more precise position.
Was previously known as `PedestrianFootStepProcessor`
......
{
"name" : "hm_stairs",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -83,8 +83,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : false,
"fixedSeed" : 1,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "01-Bang-NarrowedStreet",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -120,8 +124,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "02-Bang-GuimaraesPlatz",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -120,8 +124,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -120,8 +124,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -120,8 +124,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -108,8 +112,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -22,7 +22,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -120,8 +124,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
......@@ -102,8 +102,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"usePsychologyLayer" : false
"simulationSeed" : -5666974701049342956
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -102,8 +102,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"usePsychologyLayer" : false
"simulationSeed" : -5666974701049342956
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -102,8 +102,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"usePsychologyLayer" : false
"simulationSeed" : -5666974701049342956
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "chicken_floorfield_ok_GPU_event",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -81,8 +81,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "chicken_floorfield_ok_GPU_parallel",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -81,8 +81,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "VadereSimulation-GroupBehavior_no_groups",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -94,8 +94,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "group_OSM_1Source1Place_noGroup",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -84,8 +84,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "group_OSM_1Source2Places_noGroups",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -84,8 +84,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
TestOSMGroup
\ No newline at end of file
{
"name" : "bus_station",
"description" : "Scenario used for TGF19 contribution",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
......@@ -109,8 +109,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "groupBaseScenario.scenario",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -70,7 +70,11 @@
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor",
"attributes" : {
"interpolate" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
......@@ -273,8 +277,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"usePsychologyLayer" : false
"simulationSeed" : 1
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
{
"name" : "group_OSM_CGM_density_flow_2group",
"description" : "",
"release" : "1.6",
"release" : "1.7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -112,8 +112,14 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -8686918998450722109,
"simulationSeed" : 0,
"usePsychologyLayer" : false
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
......
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