Commit 98a3d490 authored by hm-schuhba1's avatar hm-schuhba1

change source for group fundamental diagrams

parent 0c23c777
Pipeline #87995 failed with stages
in 99 minutes and 29 seconds
{
"cells": [
{
"cell_type": "code",
"execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
"import pandas as pd\n",
"import numpy as np\n",
"import scipy as sp\n",
"import matplotlib.pyplot as plt\n",
"import vadere_analysis_tool as v"
]
},
{
"cell_type": "code",
"execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
"# import addional stuff \n",
"import pprint as pp"
]
},
{
"cell_type": "code",
"execution_count": 4,
"metadata": {},
"outputs": [],
"source": [
"# set project dir\n",
"project_dir = \"<projectdir>\""
]
},
{
"cell_type": "code",
"execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
"# load vadere project\n",
"p = v.VadereProject(project_dir)"
]
}
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.8"
}
},
"nbformat": 4,
"nbformat_minor": 2
}
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -35,6 +35,10 @@
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "eTimeStep.fundamentalDiagram",
"processors" : [ 13 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "cTimeStep.fundamentalDiagram2",
"processors" : [ 19 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
......@@ -136,6 +140,20 @@
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupSizeProcessor",
"id" : 18
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramCProcessor",
"id" : 19,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 20.0,
"y" : 0.5,
"width" : 2.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
"pedestrianVelocityProcessorId" : 16
}
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
......
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,20 +242,20 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 10.0 ],
"spawnNumber" : 20,
"maxSpawnNumberTotal" : 800,
"spawnNumber" : 500,
"maxSpawnNumberTotal" : 10000,
"startTime" : 0.0,
"endTime" : 600.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -242,9 +242,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 4.0,
"x" : 1.0,
"y" : 1.0,
"width" : 35.0,
"width" : 10.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
......@@ -275,4 +275,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -39,7 +39,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupSizeProcessor",
"id" : 6
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......@@ -64,19 +65,19 @@
"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.17,
"minimumStepLength" : true,
"maxStepDuration" : 3.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : true,
"minimumStepLength" : true,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
......
......@@ -39,7 +39,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupSizeProcessor",
"id" : 6
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......@@ -64,19 +65,19 @@
"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.17,
"minimumStepLength" : true,
"maxStepDuration" : 3.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : true,
"minimumStepLength" : true,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
......
......@@ -39,7 +39,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupSizeProcessor",
"id" : 6
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......@@ -64,19 +65,19 @@
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,