Skip to content

GitLab

V
vadere

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

Commit 4138f774 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files
Options

add simulation specific scenarios to zhang-scenarios.

parent 8b8e7875
Pipeline #87554 failed with stages
      in 100 minutes and 17 seconds
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 3162 additions and 365 deletions
      Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibration.ipynb
      View file @ 4138f774
      ......@@ -68,6 +68,7 @@
      " concatFrames = pd.concat(dataFrames)\n",
      " g = sns.relplot(x=\"density\", y=\"velocity\", hue=\"scenario\", data=concatFrames,\n",
      " height=10, aspect=2)\n",
      " \n",
      "def plotFundamentalDiagramScatter(vproject, ending, sep=False, width = 10, height = 5):\n",
      " dataFrames = []\n",
      " index = 0\n",
      VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
      View file @ 4138f774
      ......@@ -2,7 +2,6 @@
      "name" : "C-050-180-180",
      "description" : "",
      "release" : "0.7",
      "commithash" : "warning: no commit hash",
      "processWriters" : {
      "files" : [ {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
      ......@@ -180,7 +179,8 @@
      "pedestrianVelocityProcessorId" : 13
      }
      } ],
      "isTimestamped" : true
      "isTimestamped" : true,
      "isWriteMetaData" : false
      },
      "scenario" : {
      "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
      ......@@ -205,23 +205,23 @@
      "org.vadere.state.attributes.models.AttributesOSM" : {
      "stepCircleResolution" : 4,
      "numberOfCircles" : 1,
      "optimizationType" : "NELDER_MEAD",
      "varyStepDirection" : true,
      "stepLengthIntercept" : 0.235,
      "stepLengthSlopeSpeed" : 0.302,
      "movementType" : "ARBITRARY",
      "stepLengthIntercept" : 0.4625,
      "stepLengthSlopeSpeed" : 0.2345,
      "stepLengthSD" : 0.0,
      "movementThreshold" : 0.0,
      "optimizationType" : "NELDER_MEAD",
      "movementType" : "ARBITRARY",
      "minStepLength" : 0.3,
      "minimumStepLength" : true,
      "maxStepDuration" : 1.7976931348623157E308,
      "dynamicStepLength" : false,
      "updateType" : "EVENT_DRIVEN",
      "seeSmallWalls" : false,
      "minimumStepLength" : true,
      "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
      "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
      "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
      "submodels" : [ ],
      "minStepLength" : "0.235",
      "maxStepDuration" : "1.7976931348623157E308"
      "submodels" : [ ]
      },
      "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
      "pedPotentialIntimateSpaceWidth" : 0.45,
      ......@@ -237,7 +237,7 @@
      "attributesSimulation" : {
      "finishTime" : 200.0,
      "simTimeStepLength" : 0.4,
      "realTimeSimTimeRatio" : 0.1,
      "realTimeSimTimeRatio" : 0.0,
      "writeSimulationData" : true,
      "visualizationEnabled" : true,
      "printFPS" : false,
      ......@@ -350,7 +350,7 @@
      "type" : "RECTANGLE"
      },
      "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
      "distributionParameters" : [ 61.0 ],
      "distributionParameters" : [ 1.0 ],
      "spawnNumber" : 61,
      "maxSpawnNumberTotal" : 61,
      "startTime" : 0.0,
      ......@@ -361,23 +361,25 @@
      "groupSizeDistribution" : [ 1.0 ],
      "dynamicElementType" : "PEDESTRIAN"
      } ],
      "dynamicElements" : [ ],
      "attributesPedestrian" : {
      "radius" : 0.195,
      "densityDependentSpeed" : false,
      "speedDistributionMean" : 1.55,
      "speedDistributionStandardDeviation" : 0.26,
      "minimumSpeed" : 0.5,
      "maximumSpeed" : 2.2,
      "minimumSpeed" : 1.37,
      "maximumSpeed" : 1.73,
      "acceleration" : 2.0
      },
      "teleporter" : null,
      "attributesCar" : {
      "id" : -1,
      "radius" : 0.195,
      "densityDependentSpeed" : false,
      "speedDistributionMean" : 1.34,
      "speedDistributionMean" : 1.55,
      "speedDistributionStandardDeviation" : 0.26,
      "minimumSpeed" : 0.3,
      "maximumSpeed" : 3.0,
      "minimumSpeed" : 1.37,
      "maximumSpeed" : 1.73,
      "acceleration" : 2.0,
      "length" : 4.5,
      "width" : 1.7,
      ......@@ -385,8 +387,8 @@
      "x" : 1.0,
      "y" : 0.0
      }
      },
      "dynamicElements" : [ ]
      }
      }
      },
      "eventInfos" : [ ]
      }
      }
      \ No newline at end of file
      VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
      View file @ 4138f774
      {
      "name" : "C-050-180-180_GNM",
      "description" : "",
      "release" : "0.6",
      "release" : "0.7",
      "processWriters" : {
      "files" : [ {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
      ......@@ -175,11 +175,29 @@
      "pedestrianVelocityProcessorId" : 13
      }
      } ],
      "isTimestamped" : true
      "isTimestamped" : true,
      "isWriteMetaData" : false
      },
      "scenario" : {
      "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
      "attributesModel" : {
      "org.vadere.state.attributes.models.AttributesFloorField" : {
      "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
      "potentialFieldResolution" : 0.1,
      "obstacleGridPenalty" : 0.1,
      "targetAttractionStrength" : 1.0,
      "timeCostAttributes" : {
      "standardDeviation" : 0.7,
      "type" : "UNIT",
      "obstacleDensityWeight" : 3.5,
      "pedestrianSameTargetDensityWeight" : 3.5,
      "pedestrianOtherTargetDensityWeight" : 3.5,
      "pedestrianWeight" : 3.5,
      "queueWidthLoading" : 1.0,
      "pedestrianDynamicWeight" : 6.0,
      "loadingType" : "CONSTANT"
      }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {
      "attributesODEIntegrator" : {
      "solverType" : "DORMAND_PRINCE_45",
      ......@@ -198,23 +216,6 @@
      "pedestrianRecognitionDistance" : 0.8,
      "obstacleBodyPotential" : 20.1,
      "obstacleRepulsionStrength" : 0.25
      },
      "org.vadere.state.attributes.models.AttributesFloorField" : {
      "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
      "potentialFieldResolution" : 0.1,
      "obstacleGridPenalty" : 0.1,
      "targetAttractionStrength" : 1.0,
      "timeCostAttributes" : {
      "standardDeviation" : 0.7,
      "type" : "UNIT",
      "obstacleDensityWeight" : 3.5,
      "pedestrianSameTargetDensityWeight" : 3.5,
      "pedestrianOtherTargetDensityWeight" : 3.5,
      "pedestrianWeight" : 3.5,
      "queueWidthLoading" : 1.0,
      "pedestrianDynamicWeight" : 6.0,
      "loadingType" : "CONSTANT"
      }
      }
      },
      "attributesSimulation" : {
      ......@@ -333,7 +334,7 @@
      "type" : "RECTANGLE"
      },
      "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
      "distributionParameters" : [ 122.0 ],
      "distributionParameters" : [ 1.0 ],
      "spawnNumber" : 122,
      "maxSpawnNumberTotal" : 12261,
      "startTime" : 0.0,
      ......@@ -371,6 +372,7 @@
      "y" : 0.0
      }
      }
      }
      },
      "eventInfos" : [ ]
      }
      }
      \ No newline at end of file
      VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_long.scenario 0 → 100644
      View file @ 4138f774
      {
      "name" : "C-050-180-180_long",
      "description" : "",
      "release" : "0.7",
      "processWriters" : {
      "files" : [ {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
      "filename" : "postvis.trajectories",
      "processors" : [ 1, 2, 5 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
      "filename" : "overlaps.csv",
      "processors" : [ 3 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
      "filename" : "overlapCount.txt",
      "processors" : [ 4 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
      "filename" : "aTimeStep.fundamentalDiagram",
      "processors" : [ 6 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
      "filename" : "bPedestrian.fundamentalDiagram",
      "processors" : [ 9 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
      "filename" : "cTimeStep.fundamentalDiagram",
      "processors" : [ 11 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
      "filename" : "dTimeStep.fundamentalDiagram",
      "processors" : [ 12 ]
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
      "filename" : "eTimeStep.fundamentalDiagram",
      "processors" : [ 14 ]
      } ],
      "processors" : [ {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
      "id" : 1
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
      "id" : 2
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
      "id" : 3
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
      "id" : 4,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
      "attributes" : {
      "pedestrianOverlapProcessorId" : 3
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
      "id" : 5
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
      "id" : 6,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramAProcessor",
      "attributes" : {
      "pedestrianLineCrossProcessorId" : 8,
      "pedestrianVelocityProcessorId" : 13,
      "deltaTime" : 10.0
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityProcessor",
      "id" : 7,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
      "attributes" : {
      "pedestrianPositionProcessorId" : 1,
      "backSteps" : 1
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
      "id" : 8,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
      "attributes" : {
      "p1" : {
      "x" : 25.0,
      "y" : 11.9
      },
      "p2" : {
      "x" : 25.0,
      "y" : 10.1
      }
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramBProcessor",
      "id" : 9,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
      "attributes" : {
      "pedestrianTrajectoryProcessorId" : 10,
      "measurementArea" : {
      "x" : 22.0,
      "y" : 10.1,
      "width" : 2.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      }
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
      "id" : 10,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
      "attributes" : {
      "p1" : {
      "x" : 0.0,
      "y" : 0.0
      },
      "p2" : {
      "x" : 1.0,
      "y" : 0.0
      }
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramCProcessor",
      "id" : 11,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
      "attributes" : {
      "measurementArea" : {
      "x" : 22.0,
      "y" : 10.1,
      "width" : 2.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      },
      "pedestrianVelocityProcessorId" : 13
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramDProcessor",
      "id" : 12,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
      "attributes" : {
      "measurementArea" : {
      "x" : 22.0,
      "y" : 10.1,
      "width" : 2.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      },
      "voronoiArea" : {
      "x" : 17.0,
      "y" : 10.1,
      "width" : 12.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      },
      "pedestrianVelocityProcessorId" : 13
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityByTrajectoryProcessor",
      "id" : 13,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityByTrajectoryProcessor",
      "attributes" : {
      "pedestrianTrajectoryProcessorId" : 10,
      "backSteps" : 1
      }
      }, {
      "type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramEProcessor",
      "id" : 14,
      "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramEProcessor",
      "attributes" : {
      "measurementArea" : {
      "x" : 22.0,
      "y" : 10.1,
      "width" : 2.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      },
      "voronoiArea" : {
      "x" : 17.0,
      "y" : 10.1,
      "width" : 12.0,
      "height" : 1.8,
      "type" : "RECTANGLE"
      },
      "pedestrianVelocityProcessorId" : 13
      }
      } ],
      "isTimestamped" : true,
      "isWriteMetaData" : false
      },
      "scenario" : {
      "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
      "attributesModel" : {
      "org.vadere.state.attributes.models.AttributesFloorField" : {
      "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
      "potentialFieldResolution" : 0.1,
      "obstacleGridPenalty" : 0.1,
      "targetAttractionStrength" : 1.0,
      "timeCostAttributes" : {
      "standardDeviation" : 0.7,
      "type" : "OBSTACLES",
      "obstacleDensityWeight" : 3.5,
      "pedestrianSameTargetDensityWeight" : 3.5,
      "pedestrianOtherTargetDensityWeight" : 3.5,
      "pedestrianWeight" : 3.5,
      "queueWidthLoading" : 1.0,
      "pedestrianDynamicWeight" : 6.0,
      "loadingType" : "CONSTANT"
      }
      },
      "org.vadere.state.attributes.models.AttributesOSM" : {
      "stepCircleResolution" : 4,
      "numberOfCircles" : 1,
      "optimizationType" : "NELDER_MEAD",
      "varyStepDirection" : true,
      "movementType" : "ARBITRARY",
      "stepLengthIntercept" : 0.4625,
      "stepLengthSlopeSpeed" : 0.2345,
      "stepLengthSD" : 0.036,
      "movementThreshold" : 0.0,
      "minStepLength" : 0.3,
      "minimumStepLength" : true,
      "maxStepDuration" : 1.7976931348623157E308,
      "dynamicStepLength" : false,
      "updateType" : "EVENT_DRIVEN",
      "seeSmallWalls" : false,
      "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
      "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
      "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
      "submodels" : [ ]
      },
      "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
      "pedPotentialIntimateSpaceWidth" : 0.45,
      "pedPotentialPersonalSpaceWidth" : 1.2,
      "pedPotentialHeight" : 50.0,
      "obstPotentialWidth" : 0.8,
      "obstPotentialHeight" : 6.0,
      "intimateSpaceFactor" : 1.2,
      "personalSpacePower" : 1,
      "intimateSpacePower" : 1
      }
      },
      "attributesSimulation" : {
      "finishTime" : 200.0,
      "simTimeStepLength" : 0.4,
      "realTimeSimTimeRatio" : 0.0,
      "writeSimulationData" : true,
      "visualizationEnabled" : true,
      "printFPS" : false,
      "digitsPerCoordinate" : 2,
      "useFixedSeed" : true,
      "fixedSeed" : 5116495530058623348,
      "simulationSeed" : 0
      },
      "topography" : {
      "attributes" : {
      "bounds" : {
      "x" : 0.0,
      "y" : 0.0,
      "width" : 50.0,
      "height" : 16.0
      },
      "boundingBoxWidth" : 0.5,
      "bounded" : true
      },
      "obstacles" : [ {
      "shape" : {
      "x" : 16.0,
      "y" : 11.25,
      "width" : 1.0,
      "height" : 4.25,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 16.0,
      "y" : 6.0,
      "width" : 1.0,
      "height" : 4.75,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 21.0,
      "y" : 11.9,
      "width" : 8.0,
      "height" : 3.6,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 21.0,
      "y" : 9.1,
      "width" : 8.0,
      "height" : 1.0,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 28.0,
      "y" : 5.0,
      "width" : 1.0,
      "height" : 5.1,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 16.0,
      "y" : 5.0,
      "width" : 13.0,
      "height" : 1.0,
      "type" : "RECTANGLE"
      },
      "id" : -1
      }, {
      "shape" : {
      "x" : 16.0,
      "y" : 0.4,
      "width" : 1.0,
      "height" : 4.6,
      "type" : "RECTANGLE"
      },
      "id" : -1
      } ],
      "stairs" : [ ],
      "targets" : [ {
      "id" : 1,
      "absorbing" : true,
      "shape" : {
      "x" : 29.0,
      "y" : 8.4,
      "width" : 2.5,
      "height" : 4.9,
      "type" : "RECTANGLE"
      },
      "waitingTime" : 0.0,
      "waitingTimeYellowPhase" : 0.0,
      "parallelWaiters" : 0,
      "individualWaiting" : true,
      "deletionDistance" : 0.1,
      "startingWithRedLight" : false,
      "nextSpeed" : -1.0
      } ],
      "sources" : [ {
      "id" : -1,
      "shape" : {
      "x" : 0.8,
      "y" : 6.4,
      "width" : 15.0,
      "height" : 8.0,
      "type" : "RECTANGLE"
      },
      "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
      "distributionParameters" : [ 1.0 ],
      "spawnNumber" : 4,
      "maxSpawnNumberTotal" : 2000,
      "startTime" : 0.0,
      "endTime" : 200.0,
      "spawnAtRandomPositions" : true,
      "useFreeSpaceOnly" : true,
      "targetIds" : [ 1 ],
      "groupSizeDistribution" : [ 1.0 ],
      "dynamicElementType" : "PEDESTRIAN"
      } ],
      "dynamicElements" : [ ],
      "attributesPedestrian" : {
      "radius" : 0.195,
      "densityDependentSpeed" : false,
      "speedDistributionMean" : 1.55,
      "speedDistributionStandardDeviation" : 0.26,
      "minimumSpeed" : 1.37,
      "maximumSpeed" : 1.73,
      "acceleration" : 2.0
      },
      "teleporter" : null,
      "attributesCar" : {
      "id" : -1,
      "radius" : 0.195,
      "densityDependentSpeed" : false,
      "speedDistributionMean" : 1.55,
      "speedDistributionStandardDeviation" : 0.26,
      "minimumSpeed" : 1.37,
      "maximumSpeed" : 1.73,
      "acceleration" : 2.0,
      "length" : 4.5,
      "width" : 1.7,
      "direction" : {
      "x" : 1.0,
      "y" : 0.0
      }
      }
      },
      "eventInfos" : [ ]
      }
      }
      \ No newline at end of file
      VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
      View file @ 4138f774
      ......@@ -2,7 +2,6 @@
      "name" : "C-060-180-180",
      "description" : "",
      "release" : "0.7",
      "commithash" : "warning: no commit hash",
      "processWriters" : {
      "files" : [ {
      "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
      ......@@ -180,7 +179,8 @@