Commit 49e3f67a authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Removed "Tools/DO_NOT_MIGRATE" and migrated scenario files under "Tools" to avoid CI errors

parent ca08d5a2
Pipeline #186119 failed with stages
in 736 minutes and 52 seconds
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.9", "release" : "1.7",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -19,7 +18,11 @@ ...@@ -19,7 +18,11 @@
} ], } ],
"processors" : [ { "processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "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", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2 "id" : 2
...@@ -34,7 +37,8 @@ ...@@ -34,7 +37,8 @@
"pedestrianOverlapProcessorId" : 3 "pedestrianOverlapProcessorId" : 3
} }
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -44,6 +48,8 @@ ...@@ -44,6 +48,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "NAVIGATION", "type" : "NAVIGATION",
...@@ -53,29 +59,31 @@ ...@@ -53,29 +59,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" : "NELDER_MEAD",
"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" : "NELDER_MEAD", "minStepLength" : 0.1,
"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.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ], "submodels" : [ ]
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45, "pedPotentialIntimateSpaceWidth" : 0.45,
...@@ -100,6 +108,13 @@ ...@@ -100,6 +108,13 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -109,7 +124,8 @@ ...@@ -109,7 +124,8 @@
"height" : 50.0 "height" : 50.0
}, },
"boundingBoxWidth" : 0.5, "boundingBoxWidth" : 0.5,
"bounded" : true "bounded" : true,
"referenceCoordinateSystem" : null
}, },
"obstacles" : [ { "obstacles" : [ {
"shape" : { "shape" : {
...@@ -175,6 +191,7 @@ ...@@ -175,6 +191,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -229,6 +246,8 @@ ...@@ -229,6 +246,8 @@
"startingWithRedLight" : false, "startingWithRedLight" : false,
"nextSpeed" : -1.0 "nextSpeed" : -1.0
} ], } ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : -1, "id" : -1,
"shape" : { "shape" : {
...@@ -250,17 +269,8 @@ ...@@ -250,17 +269,8 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : {
"id" : -1,
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
"speedDistributionMean" : 1.34, "speedDistributionMean" : 1.34,
...@@ -268,16 +278,14 @@ ...@@ -268,16 +278,14 @@
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0, "acceleration" : 2.0,
"length" : 4.5, "footstepHistorySize" : 4,
"width" : 1.7, "searchRadius" : 1.0,
"direction" : { "walkingDirectionCalculation" : "BY_TARGET_CENTER",
"x" : 1.0, "walkingDirectionSameIfAngleLessOrEqual" : 45.0
"y" : 0.0
}
}, },
"dynamicElements" : [ ], "teleporter" : null,
"teleporter" : null "attributesCar" : null
}, },
"eventInfos" : [ ] "stimulusInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.9", "release" : "1.7",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -19,7 +18,11 @@ ...@@ -19,7 +18,11 @@
} ], } ],
"processors" : [ { "processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "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", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2 "id" : 2
...@@ -34,7 +37,8 @@ ...@@ -34,7 +37,8 @@
"pedestrianOverlapProcessorId" : 3 "pedestrianOverlapProcessorId" : 3
} }
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -44,6 +48,8 @@ ...@@ -44,6 +48,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "NAVIGATION", "type" : "NAVIGATION",
...@@ -53,29 +59,31 @@ ...@@ -53,29 +59,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" : "NELDER_MEAD",
"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" : "NELDER_MEAD", "minStepLength" : 0.1,
"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.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ], "submodels" : [ ]
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45, "pedPotentialIntimateSpaceWidth" : 0.45,
...@@ -100,6 +108,13 @@ ...@@ -100,6 +108,13 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"attributesPsychology" : {
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -109,7 +124,8 @@ ...@@ -109,7 +124,8 @@
"height" : 50.0 "height" : 50.0
}, },
"boundingBoxWidth" : 0.5, "boundingBoxWidth" : 0.5,
"bounded" : true "bounded" : true,
"referenceCoordinateSystem" : null
}, },
"obstacles" : [ { "obstacles" : [ {
"shape" : { "shape" : {
...@@ -175,6 +191,7 @@ ...@@ -175,6 +191,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -229,6 +246,8 @@ ...@@ -229,6 +246,8 @@
"startingWithRedLight" : false, "startingWithRedLight" : false,
"nextSpeed" : -1.0 "nextSpeed" : -1.0
} ], } ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : -1, "id" : -1,
"shape" : { "shape" : {
...@@ -250,17 +269,8 @@ ...@@ -250,17 +269,8 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : {
"id" : -1,
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
"speedDistributionMean" : 1.34, "speedDistributionMean" : 1.34,
...@@ -268,16 +278,14 @@ ...@@ -268,16 +278,14 @@
"minimumSpeed" : 0.5, "minimumSpeed" : 0.5,
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0, "acceleration" : 2.0,
"length" : 4.5, "footstepHistorySize" : 4,
"width" : 1.7, "searchRadius" : 1.0,
"direction" : { "walkingDirectionCalculation" : "BY_TARGET_CENTER",
"x" : 1.0, "walkingDirectionSameIfAngleLessOrEqual" : 45.0
"y" : 0.0
}
}, },
"dynamicElements" : [ ], "teleporter" : null,
"teleporter" : null "attributesCar" : null
}, },
"eventInfos" : [ ] "stimulusInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_with_offset", "name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "", "description" : "",
"release" : "0.9", "release" : "1.7",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -19,7 +18,11 @@ ...@@ -19,7 +18,11 @@
} ], } ],
"processors" : [ { "processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "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", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2 "id" : 2
...@@ -34,7 +37,8 @@ ...@@ -34,7 +37,8 @@
"pedestrianOverlapProcessorId" : 3 "pedestrianOverlapProcessorId" : 3
} }
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -44,6 +48,8 @@ ...@@ -44,6 +48,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "NAVIGATION", "type" : "NAVIGATION",
...@@ -53,29 +59,31 @@ ...@@ -53,29 +59,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" : "NELDER_MEAD",
"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" : "NELDER_MEAD", "minStepLength" : 0.1,
"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.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ], "submodels" : [ ]
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45, "pedPotentialIntimateSpaceWidth" : 0.45,
...@@ -100,6 +108,13 @@ ...@@ -100,6 +108,13 @@