Commit 27efc461 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen

minor changes to the fundamental diagram processors, better plots for the calibration.

parent 07536903
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -128,7 +128,8 @@
"width" : 45.0,
"height" : 3.2,
"type" : "RECTANGLE"
}
},
"pedestrianVelocityProcessorId" : 16
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityProcessor",
......
......@@ -128,7 +128,8 @@
"width" : 45.0,
"height" : 3.2,
"type" : "RECTANGLE"
}
},
"pedestrianVelocityProcessorId" : 16
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityProcessor",
......
......@@ -31,6 +31,10 @@
"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",
......@@ -66,7 +70,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"backSteps" : 1
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
......@@ -121,7 +125,8 @@
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
},
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramDProcessor",
......@@ -141,7 +146,37 @@
"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" : 3
}
}, {
"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
......@@ -150,19 +185,19 @@
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 3,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.235,
"stepLengthSlopeSpeed" : 0.302,
"stepLengthSD" : 0.0,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : 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",
......@@ -182,10 +217,10 @@
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.02,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"type" : "OBSTACLES",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
......@@ -333,14 +368,15 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
......
......@@ -19,6 +19,22 @@
"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",
......@@ -54,7 +70,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"backSteps" : 1
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
......@@ -70,6 +86,98 @@
"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" : 3
}
}, {
"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
},
......@@ -77,19 +185,19 @@
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 3,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.235,
"stepLengthSlopeSpeed" : 0.302,
"stepLengthSD" : 0.0,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : 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",
......@@ -112,7 +220,7 @@
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"type" : "OBSTACLES",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
......@@ -260,14 +368,15 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
......
......@@ -19,6 +19,22 @@
"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",
......@@ -54,7 +70,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"backSteps" : 1
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
......@@ -70,6 +86,98 @@
"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" : 3
}
}, {
"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
},
......@@ -77,19 +185,19 @@
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 3,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.235,
"stepLengthSlopeSpeed" : 0.302,
"stepLengthSD" : 0.0,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : 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",
......@@ -112,7 +220,7 @@
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"type" : "OBSTACLES",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
......@@ -260,14 +368,15 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
......
......@@ -19,6 +19,22 @@
"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",
......@@ -54,7 +70,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"backSteps" : 1
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
......@@ -70,6 +86,98 @@
"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" : 3
}
}, {
"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,