Skip to content

GitLab

V
vadere
Commit 29c41241 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
1 Browse files
Options

Implemented "JsonTransformationV1_4ToV1_5" to migrate "event/events" to "stimulus/stimuli" 

Also, deleted dummy test files for renaming "event/events" to "stimulus/stimuli".
parent 05754d31
Pipeline #170027 failed with stages
          in 2 minutes and 22 seconds
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 195 additions and 1682 deletions
          Scenarios/ModelTests/TestRefactoring/scenarios/02_bang_event_one_agent.scenario deleted 100644 → 0
          View file @ 05754d31
          {
          "name" : "02_bang_event_one_agent",
          "description" : "",
          "release" : "1.4",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
          "filename" : "postvis.traj",
          "processors" : [ 5, 6 ]
          }, {
          "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 ]
          } ],
          "processors" : [ {
          "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.FootStepProcessor",
          "id" : 5
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
          "id" : 6
          } ],
          "isTimestamped" : true,
          "isWriteMetaData" : false
          },
          "scenario" : {
          "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
          "attributesModel" : {
          "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.1,
          "minimumStepLength" : true,
          "maxStepDuration" : 1.7976931348623157E308,
          "dynamicStepLength" : true,
          "updateType" : "SEQUENTIAL",
          "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
          },
          "org.vadere.state.attributes.models.AttributesFloorField" : {
          "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
          "potentialFieldResolution" : 0.1,
          "obstacleGridPenalty" : 0.1,
          "targetAttractionStrength" : 1.0,
          "cacheType" : "NO_CACHE",
          "cacheDir" : "",
          "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",
          "width" : 0.2,
          "height" : 1.0
          }
          }
          },
          "attributesSimulation" : {
          "finishTime" : 50.0,
          "simTimeStepLength" : 0.4,
          "realTimeSimTimeRatio" : 0.1,
          "writeSimulationData" : true,
          "visualizationEnabled" : true,
          "printFPS" : false,
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -2062305966864041707,
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          "bounds" : {
          "x" : 0.0,
          "y" : 0.0,
          "width" : 30.0,
          "height" : 5.0
          },
          "boundingBoxWidth" : 0.5,
          "bounded" : true,
          "referenceCoordinateSystem" : null
          },
          "obstacles" : [ ],
          "measurementAreas" : [ ],
          "stairs" : [ ],
          "targets" : [ {
          "id" : 1,
          "absorbing" : true,
          "shape" : {
          "x" : 28.0,
          "y" : 1.0,
          "width" : 0.9,
          "height" : 2.9,
          "type" : "RECTANGLE"
          },
          "waitingTime" : 0.0,
          "waitingTimeYellowPhase" : 0.0,
          "parallelWaiters" : 0,
          "individualWaiting" : true,
          "deletionDistance" : 0.1,
          "startingWithRedLight" : false,
          "nextSpeed" : -1.0
          } ],
          "absorbingAreas" : [ ],
          "sources" : [ ],
          "dynamicElements" : [ {
          "source" : null,
          "targetIds" : [ 1 ],
          "position" : {
          "x" : 20.4,
          "y" : 2.5
          },
          "velocity" : {
          "x" : 0.0,
          "y" : 0.0
          },
          "nextTargetListIndex" : 0,
          "freeFlowSpeed" : 1.6,
          "attributes" : {
          "id" : -1,
          "radius" : 0.2,
          "densityDependentSpeed" : false,
          "speedDistributionMean" : 1.34,
          "speedDistributionStandardDeviation" : 0.26,
          "minimumSpeed" : 0.5,
          "maximumSpeed" : 2.2,
          "acceleration" : 2.0,
          "footstepHistorySize" : 4,
          "searchRadius" : 1.0,
          "angleCalculationType" : "USE_CENTER",
          "targetOrientationAngleThreshold" : 45.0
          },
          "idAsTarget" : -1,
          "isChild" : false,
          "isLikelyInjured" : false,
          "mostImportantStimulus" : null,
          "salientBehavior" : "TARGET_ORIENTED",
          "groupIds" : [ ],
          "trajectory" : {
          "footSteps" : [ ]
          },
          "groupSizes" : [ ],
          "modelPedestrianMap" : null,
          "type" : "PEDESTRIAN"
          } ],
          "attributesPedestrian" : {
          "radius" : 0.2,
          "densityDependentSpeed" : false,
          "speedDistributionMean" : 1.34,
          "speedDistributionStandardDeviation" : 0.26,
          "minimumSpeed" : 0.5,
          "maximumSpeed" : 2.2,
          "acceleration" : 2.0,
          "footstepHistorySize" : 4,
          "searchRadius" : 1.0,
          "angleCalculationType" : "USE_CENTER",
          "targetOrientationAngleThreshold" : 45.0
          },
          "teleporter" : null,
          "attributesCar" : null
          },
          "stimulusInfos" : [ {
          "timeframe" : {
          "startTime" : 0.0,
          "endTime" : 0.4,
          "repeat" : false,
          "waitTimeBetweenRepetition" : 0.0
          },
          "stimuli" : [ {
          "type" : "BangEvent",
          "targets" : [ ],
          "originAsTargetId" : 1
          } ]
          } ]
          }
          }
          \ No newline at end of file
          Scenarios/ModelTests/TestRefactoring/scenarios/16-Test-TargetChanger-ChangesToDynamicTarget.scenario deleted 100644 → 0
          View file @ 05754d31
          {
          "name" : "16-Test-TargetChanger-ChangesToDynamicTarget",
          "description" : "",
          "release" : "1.4",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
          "filename" : "postvis.traj",
          "processors" : [ 5, 6 ]
          }, {
          "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 ]
          } ],
          "processors" : [ {
          "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.FootStepProcessor",
          "id" : 5
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
          "id" : 6
          } ],
          "isTimestamped" : true,
          "isWriteMetaData" : false
          },
          "scenario" : {
          "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
          "attributesModel" : {
          "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.1,
          "minimumStepLength" : true,
          "maxStepDuration" : 1.7976931348623157E308,
          "dynamicStepLength" : true,
          "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
          },
          "org.vadere.state.attributes.models.AttributesFloorField" : {
          "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
          "potentialFieldResolution" : 0.1,
          "obstacleGridPenalty" : 0.1,
          "targetAttractionStrength" : 1.0,
          "cacheType" : "NO_CACHE",
          "cacheDir" : "",
          "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",
          "width" : 0.2,
          "height" : 1.0
          }
          }
          },
          "attributesSimulation" : {
          "finishTime" : 100.0,
          "simTimeStepLength" : 0.4,
          "realTimeSimTimeRatio" : 0.1,
          "writeSimulationData" : true,
          "visualizationEnabled" : true,
          "printFPS" : false,
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -3989740141114319444,
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          "bounds" : {
          "x" : 0.0,
          "y" : 0.0,
          "width" : 20.0,
          "height" : 20.0
          },
          "boundingBoxWidth" : 0.5,
          "bounded" : true,
          "referenceCoordinateSystem" : null
          },
          "obstacles" : [ {
          "shape" : {
          "x" : 2.0,
          "y" : 10.0,
          "width" : 16.0,
          "height" : 8.0,
          "type" : "RECTANGLE"
          },
          "id" : 6
          } ],
          "measurementAreas" : [ ],
          "stairs" : [ ],
          "targets" : [ {
          "id" : 1,
          "absorbing" : false,
          "shape" : {
          "x" : 18.3,
          "y" : 17.0,
          "width" : 1.0,
          "height" : 1.0,
          "type" : "RECTANGLE"
          },
          "waitingTime" : 0.0,
          "waitingTimeYellowPhase" : 0.0,
          "parallelWaiters" : 0,
          "individualWaiting" : true,
          "deletionDistance" : 0.1,
          "startingWithRedLight" : false,
          "nextSpeed" : -1.0
          }, {
          "id" : 2,
          "absorbing" : true,
          "shape" : {
          "x" : 0.7,
          "y" : 11.1,
          "width" : 1.1,
          "height" : 1.0,
          "type" : "RECTANGLE"
          },
          "waitingTime" : 0.0,
          "waitingTimeYellowPhase" : 0.0,
          "parallelWaiters" : 0,
          "individualWaiting" : true,
          "deletionDistance" : 0.1,
          "startingWithRedLight" : false,
          "nextSpeed" : -1.0
          }, {
          "id" : 3,
          "absorbing" : true,
          "shape" : {
          "x" : 17.9,
          "y" : 0.9,
          "width" : 1.0,
          "height" : 1.0,
          "type" : "RECTANGLE"
          },
          "waitingTime" : 0.0,
          "waitingTimeYellowPhase" : 0.0,
          "parallelWaiters" : 0,
          "individualWaiting" : true,
          "deletionDistance" : 0.1,
          "startingWithRedLight" : false,
          "nextSpeed" : -1.0
          } ],
          "targetChangers" : [ {
          "id" : 5,
          "shape" : {
          "x" : 15.5,
          "y" : 0.6801097393689985,
          "width" : 0.741975308641976,
          "height" : 2.735274876015615,
          "type" : "RECTANGLE"
          },
          "reachDistance" : 0.0,
          "nextTargetIsPedestrian" : true,
          "nextTarget" : 2,
          "probabilityToChangeTarget" : 1.0
          } ],
          "absorbingAreas" : [ ],
          "sources" : [ {
          "id" : 3,
          "shape" : {
          "x" : 5.5,
          "y" : 8.1,
          "width" : 1.0,
          "height" : 1.0,
          "type" : "RECTANGLE"
          },
          "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
          "distributionParameters" : [ 1.0 ],
          "spawnNumber" : 1,
          "maxSpawnNumberTotal" : -1,
          "startTime" : 0.0,
          "endTime" : 0.0,
          "spawnAtRandomPositions" : false,
          "useFreeSpaceOnly" : true,
          "targetIds" : [ 1, 2 ],
          "groupSizeDistribution" : [ 1.0 ],
          "dynamicElementType" : "PEDESTRIAN"
          }, {
          "id" : 4,
          "shape" : {
          "x" : 1.0,
          "y" : 0.9,
          "width" : 1.1,
          "height" : 1.1,
          "type" : "RECTANGLE"
          },
          "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
          "distributionParameters" : [ 1.0 ],
          "spawnNumber" : 1,
          "maxSpawnNumberTotal" : -1,
          "startTime" : 0.0,
          "endTime" : 0.0,
          "spawnAtRandomPositions" : false,
          "useFreeSpaceOnly" : true,
          "targetIds" : [ 3 ],
          "groupSizeDistribution" : [ 1.0 ],
          "dynamicElementType" : "PEDESTRIAN"
          } ],
          "dynamicElements" : [ ],
          "attributesPedestrian" : {
          "radius" : 0.2,
          "densityDependentSpeed" : false,
          "speedDistributionMean" : 0.5,
          "speedDistributionStandardDeviation" : 0.1,
          "minimumSpeed" : 0.5,
          "maximumSpeed" : 2.2,
          "acceleration" : 2.0,
          "footstepHistorySize" : 4,
          "searchRadius" : 1.0,
          "angleCalculationType" : "USE_CENTER",
          "targetOrientationAngleThreshold" : 45.0
          },
          "teleporter" : null,
          "attributesCar" : {
          "id" : -1,
          "radius" : 0.2,
          "densityDependentSpeed" : false,
          "speedDistributionMean" : 1.34,
          "speedDistributionStandardDeviation" : 0.26,
          "minimumSpeed" : 0.5,
          "maximumSpeed" : 2.2,
          "acceleration" : 2.0,
          "footstepHistorySize" : 4,
          "searchRadius" : 1.0,
          "angleCalculationType" : "USE_CENTER",
          "targetOrientationAngleThreshold" : 45.0,
          "length" : 4.5,
          "width" : 1.7,
          "direction" : {
          "x" : 1.0,
          "y" : 0.0
          }
          }
          },
          "stimulusInfos" : [ ]
          }
          }
          \ No newline at end of file
          Scenarios/ModelTests/TestRefactoring/scenarios/chicken_floorfield_ok.scenario deleted 100644 → 0
          View file @ 05754d31
          {
          "name" : "chicken_floorfield_ok",
          "description" : "",
          "release" : "1.4",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
          "filename" : "waitingTimes.txt",
          "processors" : [ 2 ]
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
          "filename" : "out.txt",
          "processors" : [ 3 ]
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
          "filename" : "out1.txt",
          "processors" : [ 4 ]
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
          "filename" : "postvis.traj",
          "processors" : [ 7, 8 ]
          } ],
          "processors" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
          "id" : 2,
          "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
          "attributes" : {
          "waitingAreaId" : 1
          }
          }, {
          "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.MaxOverlapProcessor",
          "id" : 5,
          "attributesType" : "org.vadere.state.attributes.processor.AttributesMaxOverlapProcessor",
          "attributes" : {
          "pedestrianOverlapProcessorId" : 3
          }
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
          "id" : 6,
          "attributesType" : "org.vadere.state.attributes.processor.AttributesTestPedestrianWaitingTimeProcessor",
          "attributes" : {
          "expectedResult" : "SUCCESS",
          "pedestrianWaitingTimeProcessorId" : 2,
          "maximalWaitingTime" : 0.0,
          "minimalWaitingTime" : 0.0
          }
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
          "id" : 7
          }, {
          "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
          "id" : 8
          } ],
          "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,
          "cacheType" : "NO_CACHE",
          "cacheDir" : "",
          "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",
          "width" : 0.2,
          "height" : 1.0
          }
          },
          "org.vadere.state.attributes.models.AttributesOSM" : {
          "stepCircleResolution" : 18,
          "numberOfCircles" : 1,
          "optimizationType" : "NELDER_MEAD",
          "varyStepDirection" : false,
          "movementType" : "ARBITRARY",
          "stepLengthIntercept" : 0.4625,
          "stepLengthSlopeSpeed" : 0.2345,
          "stepLengthSD" : 0.036,
          "movementThreshold" : 0.0,
          "minStepLength" : 0.4625,
          "minimumStepLength" : false,
          "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,