Commit 57fe7db3 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

migrate to version 1.1: include default values for new members in json

parent c2f7c07f
Pipeline #132797 passed with stages
in 133 minutes and 12 seconds
{ {
"name" : "Neues_Szenario", "name" : "Neues_Szenario",
"description" : "", "description" : "",
"release" : "0.9", "release" : "1.1",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "out1.txt", "filename" : "out1.txt",
"processors" : [ "14" ] "processors" : [ 14 ]
} ], } ],
"processors" : [ { "processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
...@@ -67,8 +66,8 @@ ...@@ -67,8 +66,8 @@
"attributes" : { "attributes" : {
"pedestrianPositionProcessorId" : 1, "pedestrianPositionProcessorId" : 1,
"scale" : 10.0, "scale" : 10.0,
"obstacleDensity" : true, "standardDeviation" : 0.7,
"standardDeviation" : 0.7 "obstacleDensity" : true
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityVoronoiProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityVoronoiProcessor",
...@@ -83,9 +82,9 @@ ...@@ -83,9 +82,9 @@
"id" : 7, "id" : 7,
"attributesType" : "org.vadere.state.attributes.processor.AttributesAreaSpeedProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaSpeedProcessor",
"attributes" : { "attributes" : {
"measurementAreaId" : 1,
"pedestrianPositionProcessorId" : 1, "pedestrianPositionProcessorId" : 1,
"pedestrianVelocityProcessorId" : 2, "pedestrianVelocityProcessorId" : 2
"measurementAreaId" : 1
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
...@@ -159,7 +158,8 @@ ...@@ -159,7 +158,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 21 "id" : 21
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -178,29 +178,31 @@ ...@@ -178,29 +178,31 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
"optimizationType" : "DISCRETE",
"varyStepDirection" : false, "varyStepDirection" : false,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625, "stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345, "stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036, "stepLengthSD" : 0.036,
"movementThreshold" : 0.0, "movementThreshold" : 0.0,
"optimizationType" : "DISCRETE", "minStepLength" : 0.4625,
"movementType" : "ARBITRARY", "minimumStepLength" : false,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : false, "dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN", "updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false, "seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact",
"submodels" : [ ], "submodels" : [ ]
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompact" : { "org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5, "pedPotentialWidth" : 0.5,
...@@ -222,7 +224,8 @@ ...@@ -222,7 +224,8 @@
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useFixedSeed" : true, "useFixedSeed" : true,
"fixedSeed" : 1, "fixedSeed" : 1,
"simulationSeed" : null "simulationSeed" : 0,
"useSalientBehavior" : false
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -245,6 +248,16 @@ ...@@ -245,6 +248,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ {
"shape" : {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -281,6 +294,7 @@ ...@@ -281,6 +294,7 @@
"startingWithRedLight" : false, "startingWithRedLight" : false,
"nextSpeed" : -1.0 "nextSpeed" : -1.0
} ], } ],
"absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : 1, "id" : 1,
"shape" : { "shape" : {
...@@ -299,8 +313,10 @@ ...@@ -299,8 +313,10 @@
"spawnAtRandomPositions" : false, "spawnAtRandomPositions" : false,
"useFreeSpaceOnly" : false, "useFreeSpaceOnly" : false,
"targetIds" : [ 1, 2 ], "targetIds" : [ 1, 2 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -308,20 +324,15 @@ ...@@ -308,20 +324,15 @@
"speedDistributionStandardDeviation" : 0.0, "speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3, "minimumSpeed" : 0.3,
"maximumSpeed" : 3.0, "maximumSpeed" : 3.0,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"dynamicElements" : [ ], "teleporter" : null,
"attributesCar" : null, "attributesCar" : null
"measurementAreas" : [ { },
"shape" : { "eventInfos" : [ ]
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : 1
} ]
}
} }
} }
\ No newline at end of file
{ {
"name" : "floor_field_navigation_test_displaced_ok", "name" : "floor_field_navigation_test_displaced_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "floor_field_navigation_test_ok", "name" : "floor_field_navigation_test_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "01_unsupported_event_exception_for_unsupported_models", "name" : "01_unsupported_event_exception_for_unsupported_models",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -85,7 +84,9 @@ ...@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
} }
}, },
...@@ -157,12 +158,17 @@ ...@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -185,22 +191,7 @@ ...@@ -185,22 +191,7 @@
"targetOrientationAngleThreshold" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : null
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
}, },
"eventInfos" : [ { "eventInfos" : [ {
"eventTimeframe" : { "eventTimeframe" : {
......
{ {
"name" : "02_bang_event_one_agent", "name" : "02_bang_event_one_agent",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -85,7 +84,9 @@ ...@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
} }
}, },
...@@ -157,12 +158,17 @@ ...@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -185,22 +191,7 @@ ...@@ -185,22 +191,7 @@
"targetOrientationAngleThreshold" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : null
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
}, },
"eventInfos" : [ { "eventInfos" : [ {
"eventTimeframe" : { "eventTimeframe" : {
......
{ {
"name" : "03_bang_event_multiple_agents", "name" : "03_bang_event_multiple_agents",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -85,7 +84,9 @@ ...@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
} }
}, },
...@@ -157,12 +158,17 @@ ...@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -191,12 +197,17 @@ ...@@ -191,12 +197,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -225,12 +236,17 @@ ...@@ -225,12 +236,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -259,12 +275,17 @@ ...@@ -259,12 +275,17 @@
"speedDistributionStandardDeviation" : 0.26, "speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
}, },
"idAsTarget" : -1, "idAsTarget" : -1,
"isChild" : false, "isChild" : false,
"isLikelyInjured" : false, "isLikelyInjured" : false,
"mostImportantEvent" : null, "mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ], "groupIds" : [ ],
"trajectory" : { "trajectory" : {
"footSteps" : [ ] "footSteps" : [ ]
...@@ -287,22 +308,7 @@ ...@@ -287,22 +308,7 @@
"targetOrientationAngleThreshold" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : null
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
}, },
"eventInfos" : [ { "eventInfos" : [ {
"eventTimeframe" : { "eventTimeframe" : {
......
{ {
"name" : "04_bang_event_one_agent_one_obstacle", "name" : "04_bang_event_one_agent_one_obstacle",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.1",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ {