diff --git a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario b/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario deleted file mode 100644 index 2f1ca1c7eb2e8ba68c7d406ec1f85bc44d422105..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario +++ /dev/null @@ -1,403 +0,0 @@ -{ - "name" : "AbstractThreeCorridors", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "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" : "densities.csv", - "processors" : [ 5, 6, 7, 8 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "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.AreaDensityCountingProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2001 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2002 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 7, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2003 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - } ], - "isTimestamped" : false, - "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" : 1000.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : true, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 80.0, - "height" : 50.5 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 35.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 5 - }, { - "shape" : { - "x" : 15.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.0, - "y" : 3.5, - "width" : 12.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 55.0, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 3.5 - }, { - "x" : 55.0, - "y" : 3.5 - } ] - }, - "id" : 8 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 73.5, - "y" : 40.0, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 12.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2001 - }, { - "shape" : { - "x" : 32.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2002 - }, { - "shape" : { - "x" : 52.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2003 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 78.5, - "y" : 40.0, - "width" : 1.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 12.0, - "y" : 10.0, - "width" : 3.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" : 2003, - "absorbing" : false, - "shape" : { - "x" : 52.0, - "y" : 10.0, - "width" : 3.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" : 2002, - "absorbing" : false, - "shape" : { - "x" : 32.0, - "y" : 10.0, - "width" : 3.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" : 2004, - "absorbing" : false, - "shape" : { - "x" : 60.0, - "y" : 6.0, - "width" : 14.5, - "height" : 2.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 1, - "shape" : { - "x" : 74.5, - "y" : 0.5, - "width" : 5.0, - "height" : 7.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.NegativeExponentialDistribution", - "distributionParameters" : [ 2.0 ], - "spawnNumber" : 3, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 1000.0, - "spawnAtRandomPositions" : false, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario b/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario deleted file mode 100644 index ca1304a0d77c09787d9bd2481bb641308d73819e..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario +++ /dev/null @@ -1,432 +0,0 @@ -{ - "name" : "AbstractThreeCorridors_normal", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "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" : "densities.csv", - "processors" : [ 5, 6, 7, 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", - "filename" : "pedestrianDensities.txt", - "processors" : [ 9, 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "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.AreaDensityCountingProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2001 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2002 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 7, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2003 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor", - "attributes" : { - "pedestrianPositionProcessorId" : 11, - "radius" : 1.5 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityGaussianProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityGaussianProcessor", - "attributes" : { - "pedestrianPositionProcessorId" : 11, - "scale" : 10.0, - "standardDeviation" : 0.7, - "obstacleDensity" : true - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", - "id" : 11, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor", - "attributes" : { - "interpolate" : true - } - } ], - "isTimestamped" : false, - "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" : 1000.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 80.0, - "height" : 50.5 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 35.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 5 - }, { - "shape" : { - "x" : 15.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.0, - "y" : 3.5, - "width" : 12.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 55.0, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 3.5 - }, { - "x" : 55.0, - "y" : 3.5 - } ] - }, - "id" : 8 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 68.5, - "y" : 40.0, - "width" : 10.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 12.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2001 - }, { - "shape" : { - "x" : 32.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2002 - }, { - "shape" : { - "x" : 52.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2003 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 78.5, - "y" : 40.0, - "width" : 1.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 12.0, - "y" : 10.0, - "width" : 3.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" : 2003, - "absorbing" : false, - "shape" : { - "x" : 52.0, - "y" : 10.0, - "width" : 3.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" : 2002, - "absorbing" : false, - "shape" : { - "x" : 32.0, - "y" : 10.0, - "width" : 3.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" : 2004, - "absorbing" : false, - "shape" : { - "x" : 60.0, - "y" : 6.0, - "width" : 14.5, - "height" : 2.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 40.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 1, - "shape" : { - "x" : 74.5, - "y" : 0.5, - "width" : 5.0, - "height" : 7.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.NegativeExponentialDistribution", - "distributionParameters" : [ 2.0 ], - "spawnNumber" : 4, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 1000.0, - "spawnAtRandomPositions" : false, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario deleted file mode 100644 index c6d2ce44315ab4821db19c9b122e96ba99fd1578..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario +++ /dev/null @@ -1,364 +0,0 @@ -{ - "name" : "TwoCorridors_forced_5050", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "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.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "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.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - } ], - "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" : 160.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 15.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 12.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "x" : 32.5, - "y" : 10.5, - "width" : 27.0, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 30.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 44.5, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 13.0, - "y" : 13.4, - "width" : 2.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" : 2002, - "absorbing" : false, - "shape" : { - "x" : 30.5, - "y" : 13.6, - "width" : 2.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" : 4, - "shape" : { - "x" : 39.5, - "y" : 0.5, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "reachDistance" : 0.0, - "changeAlgorithmType" : "SELECT_LIST", - "nextTarget" : [ 2001, 1 ], - "probabilityToChangeTarget" : [ 0.5 ] - } ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 44.5, - "y" : 0.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 100, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario deleted file mode 100644 index 5598ab02e22e5618e45ae9cb9e1e3a5b5b24430d..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario +++ /dev/null @@ -1,388 +0,0 @@ -{ - "name" : "TwoCorridors_forced_controller", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "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.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "controllerOutput.txt", - "processors" : [ 11 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "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.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.StrategyControllerValuesRealized", - "id" : 11 - } ], - "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" : 200.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : true, - "strategyModel" : "ReadSetControllerInputs", - "arguments" : [ "Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv" ], - "requiredDataProcessorIds" : [ 10 ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 5.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 2.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 22.5, - "y" : 40.5 - }, { - "x" : 22.5, - "y" : 4.5 - }, { - "x" : 40.0, - "y" : 4.5 - }, { - "x" : 40.0, - "y" : 30.0 - }, { - "x" : 59.5, - "y" : 30.0 - }, { - "x" : 59.5, - "y" : 50.5 - }, { - "x" : 39.9, - "y" : 50.5 - }, { - "x" : 40.0, - "y" : 40.5 - } ] - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 20.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - }, { - "shape" : { - "x" : 27.9, - "y" : 0.5, - "width" : 10.0, - "height" : 4.0, - "type" : "RECTANGLE" - }, - "id" : 555 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 25.0, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 3.0, - "y" : 13.4, - "width" : 2.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" : 2002, - "absorbing" : false, - "shape" : { - "x" : 20.5, - "y" : 13.6, - "width" : 2.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" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 40.0, - "y" : 10.5, - "width" : 19.5, - "height" : 19.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 250, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv deleted file mode 100644 index 8ecfd4e52d563b59ac472885f4ff1723334e0399..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv +++ /dev/null @@ -1,1000 +0,0 @@ -0 0.6146005020908336 -1 0.6650485327222698 -2 0.33868604117396073 -3 0.5081440260356207 -4 0.2809676532131833 -5 0.43729746545966475 -6 0.29478304161180957 -7 0.259265165563503 -8 0.8359333402470007 -9 0.5688453012981368 -10 0.14684167244291757 -11 0.2916153293731746 -12 0.24733700865773356 -13 0.8561120905908465 -14 0.9614794660634766 -15 0.8506888018492919 -16 0.44241240243957436 -17 0.8262778513842619 -18 0.7373309015250838 -19 0.6217182722952229 -20 0.9401076442581188 -21 0.4246391264270659 -22 0.42864220501712635 -23 0.6761520678505538 -24 0.6692768935901807 -25 0.15341758108136905 -26 0.23663715844052668 -27 0.865785559626088 -28 0.9362170662762577 -29 0.4903688738061537 -30 0.08270712924724677 -31 0.7511892936315261 -32 0.97472973081431 -33 0.9036119183627821 -34 0.6834161883563786 -35 0.8721901893616636 -36 0.5783609583259169 -37 0.38332773525953234 -38 0.17953382870939238 -39 0.8526150296010738 -40 0.24030135903611316 -41 0.9850899795808634 -42 0.9167880905212168 -43 0.052404197879932335 -44 0.6993790492856935 -45 0.2926615516558956 -46 0.19198383423671217 -47 0.4510818011396218 -48 0.7835245728424779 -49 0.1361003894891566 -50 0.6725386498947766 -51 0.9939475483592074 -52 0.06286401979336653 -53 0.042641981686528885 -54 0.4438310227193817 -55 0.09201667086821119 -56 0.004517585958102255 -57 0.6280903733280018 -58 0.22368731395985253 -59 0.8124000438226147 -60 0.312010853206081 -61 0.10537875289450183 -62 0.99221825088738 -63 0.11263595542375637 -64 0.1634284357217789 -65 0.8012916277834085 -66 0.07269514890770223 -67 0.5937256026583363 -68 0.8548507993955851 -69 0.27383730367375136 -70 0.4600979375706774 -71 0.922061922754948 -72 0.09809592278111401 -73 0.5435453584356806 -74 0.3840312881623792 -75 0.30997816062809025 -76 0.8197931463846849 -77 0.38298617622158093 -78 0.688143972817824 -79 0.3763030390226625 -80 0.8557546908148563 -81 0.32487098158512007 -82 0.38129835266205114 -83 0.5884156093483849 -84 0.39179925625322076 -85 0.11493855769306649 -86 0.07564524937400496 -87 0.9201877339699558 -88 0.4336109723393837 -89 0.8718292775579153 -90 0.032944404470239275 -91 0.4027596694358895 -92 0.525654227047685 -93 0.35468720191682623 -94 0.3097732275482977 -95 0.23441435389167087 -96 0.37383675041769604 -97 0.7338318788555538 -98 0.10014256148516032 -99 0.6482374440169388 -100 0.26144854547194507 -101 0.9552095631816646 -102 0.11454880834549785 -103 0.2102047654239565 -104 0.9033993348825753 -105 0.6837094587472439 -106 0.9131763545156638 -107 0.4088644594547842 -108 0.9163151698080974 -109 0.04211742653714168 -110 0.33100865232393695 -111 0.21347932868477437 -112 0.5867003711190286 -113 0.9664780020271995 -114 0.14212626757444324 -115 0.3796465701505348 -116 0.8030165868369302 -117 0.37044649699828336 -118 0.681225676751774 -119 0.5336007612887247 -120 0.6204379858036239 -121 0.1983888028725973 -122 0.9045260774173043 -123 0.9997063746331719 -124 0.36103030353209276 -125 0.6271294908657041 -126 0.9132199292109082 -127 0.26116320321862796 -128 0.004349245896879794 -129 0.824223037754533 -130 0.00838729456923315 -131 0.25455650486450376 -132 0.48358104326665463 -133 0.690920740204652 -134 0.7124421290509609 -135 0.30944848030277605 -136 0.7121245274032394 -137 0.7557983199305711 -138 0.8135162378074436 -139 0.0036181033776572225 -140 0.14128947316406715 -141 0.4863571565054222 -142 0.9496807199716708 -143 0.8332490296489768 -144 0.7110792748068546 -145 0.6191346867818919 -146 0.5937738364566388 -147 0.9702405384058607 -148 0.22798417557950457 -149 0.7336208320510129 -150 0.33213983175609807 -151 0.8347259629980781 -152 0.5920223397012541 -153 0.9602201744695826 -154 0.9866143963161755 -155 0.6481920789734562 -156 0.03261142816796436 -157 0.11948946031893959 -158 0.17558745603583226 -159 0.1932862860280451 -160 0.49066445572567674 -161 0.8913649427731462 -162 0.7481356644236755 -163 0.2501885305396103 -164 0.5483489893448809 -165 0.3195740275306813 -166 0.46920697758109897 -167 0.6383266461083896 -168 0.5146171623566057 -169 0.9491827385937975 -170 0.23099537562221006 -171 0.8443233071698799 -172 0.7372235924675711 -173 0.586750486399601 -174 0.06267575417972149 -175 0.692682620193999 -176 0.7479144079775795 -177 0.11677478790115414 -178 0.246340207483434 -179 0.9276651435265092 -180 0.7282475933985066 -181 0.6729901916278033 -182 0.4205036440822575 -183 0.8785900988925225 -184 0.2607814424839735 -185 0.5872051136551484 -186 0.8783832546750349 -187 0.2316570413201009 -188 0.1715734309828092 -189 0.3135920590708339 -190 0.07597905126222537 -191 0.4749300649021928 -192 0.7962460196934528 -193 0.8902609695117507 -194 0.18909444938334874 -195 0.2966707648574253 -196 0.8450909609309223 -197 0.035674019411165436 -198 0.4877819467317872 -199 0.941384723480105 -200 0.3455425536814142 -201 0.31802889011712987 -202 0.044244012079533435 -203 0.9623505748708107 -204 0.09186383216035343 -205 0.9358735515606217 -206 0.049794149179148595 -207 0.8818935375334371 -208 0.0715372926315907 -209 0.592385361090094 -210 0.2403046080691763 -211 0.883106756909924 -212 0.41534566866042677 -213 0.5481387330549392 -214 0.7317235600481665 -215 0.3754869136839968 -216 0.5636140640941161 -217 0.4350325516620861 -218 0.4992285024636428 -219 0.16426171159459269 -220 0.015752657572718043 -221 0.6800233322443755 -222 0.7975646811529056 -223 0.42632517473480824 -224 0.29779841516929684 -225 0.31538032253069115 -226 0.3486721951146843 -227 0.22622312742629402 -228 0.8746376785885601 -229 0.5880759762398509 -230 0.0003048969217748221 -231 0.9402965375873874 -232 0.3779563686411783 -233 0.8428235498531924 -234 0.011103240029316841 -235 0.680786502472297 -236 0.8833430181497568 -237 0.37862494656749657 -238 0.7662274071991965 -239 0.4751099846551532 -240 0.7467130217585064 -241 0.2576972615646206 -242 0.9649529559941266 -243 0.317504408033803 -244 0.6752583346583367 -245 0.21685359427544493 -246 0.9444815560783576 -247 0.5741891578498426 -248 0.7574416027518425 -249 0.8082779655686915 -250 0.9808893998372075 -251 0.3416452577333946 -252 0.12427505207697176 -253 0.7071122369354768 -254 0.4842812890130189 -255 0.6789723577225433 -256 0.0788954949997357 -257 0.67015986855404 -258 0.532978974031281 -259 0.8219666300521072 -260 0.18132932873294527 -261 0.9010052672108977 -262 0.7891626119270135 -263 0.32412864868048974 -264 0.2042941377829206 -265 0.5335756887976593 -266 0.667560889516281 -267 0.860805809930749 -268 0.3040270125628408 -269 0.032647914531071076 -270 0.045307624009188974 -271 0.6247980981243938 -272 0.47119634593148163 -273 0.04151331800589908 -274 0.7284916602447619 -275 0.5132546204226095 -276 0.7475171535773633 -277 0.5172302890453766 -278 0.39229281085924106 -279 0.3317028625799824 -280 0.7167026742115853 -281 0.3863216684511477 -282 0.04013294796855771 -283 0.26130424416649545 -284 0.7275290823281491 -285 0.14255858319582437 -286 0.6490809958131433 -287 0.23659447628076147 -288 0.03910869712885745 -289 0.4641772706235857 -290 0.0022412143241005156 -291 0.7387899576808663 -292 0.9163989647890401 -293 0.7611050222487151 -294 0.7114623445179385 -295 0.8190146880622072 -296 0.2870956084571472 -297 0.2780315800125649 -298 0.20520211619467243 -299 0.8566735750118799 -300 0.6259406895898727 -301 0.6026473954303412 -302 0.160589640599614 -303 0.8359895011687967 -304 0.46470005588221597 -305 0.6243103026632111 -306 0.17396357954757324 -307 0.7048271581775711 -308 0.6417857740531511 -309 0.3816427994538153 -310 0.6662286669810613 -311 0.5658279307972103 -312 0.6676303592661204 -313 0.5825144262687565 -314 0.45432510407287374 -315 0.8173760807789158 -316 0.12086525479318211 -317 0.5855076088590764 -318 0.4789881934304213 -319 0.3869883388010731 -320 0.24278697531316962 -321 0.9761775227751434 -322 0.5328257579195391 -323 0.4736972681794521 -324 0.6125937720270216 -325 0.5311930852241517 -326 0.3659105526517117 -327 0.2967699315708078 -328 0.39121884671909324 -329 0.8365948686300527 -330 0.5362487043576193 -331 0.928135117231052 -332 0.4273179602972903 -333 0.16279823247696568 -334 0.7851789974166563 -335 0.11056733163755961 -336 0.9526183736682573 -337 0.4913085144237389 -338 0.11331186110956237 -339 0.47027187594884157 -340 0.72055130010026 -341 0.8948124144215575 -342 0.5830789705506002 -343 0.4225945696154748 -344 0.8885600200556465 -345 0.5183854246750503 -346 0.06413715196655656 -347 0.19048427357226094 -348 0.40682247765928403 -349 0.22829707845405167 -350 0.774589805339572 -351 0.2884518137670188 -352 0.10154255346452756 -353 0.6575517685730212 -354 0.5303588455192279 -355 0.8300407683155056 -356 0.1632526155641537 -357 0.6529916215796134 -358 0.15125789223842123 -359 0.7062108926298674 -360 0.38232268717012263 -361 0.9879682708172243 -362 0.05585188500465932 -363 0.016071714634469325 -364 0.5586852327244253 -365 0.8798964793766 -366 0.7245053865806828 -367 0.7536853692450781 -368 0.04797091220077632 -369 0.21807221620057682 -370 0.5180297574069261 -371 0.17348390398906632 -372 0.5643330468221551 -373 0.9334344850131515 -374 0.7274289795776246 -375 0.2704819468330595 -376 0.008927722689938244 -377 0.5256518061559697 -378 0.4072521670934499 -379 0.7461733977539089 -380 0.9632070122782046 -381 0.07290759600055918 -382 0.03878472174497283 -383 0.7365115719275168 -384 0.6894787949218665 -385 0.9132346669838214 -386 0.08338975817245409 -387 0.458829777718336 -388 0.6920834740199808 -389 0.8112760885149263 -390 0.20080672085450835 -391 0.3052875492206203 -392 0.9760653750859055 -393 0.3376732001841445 -394 0.3785434455240674 -395 0.6618552137287023 -396 0.808271671898461 -397 0.636084293679116 -398 0.5774255240410008 -399 0.5707091186183084 -400 0.7297847601039609 -401 0.22809302026040512 -402 0.012088275756925393 -403 0.38968985175754445 -404 0.530923902875921 -405 0.7528144195837548 -406 0.6024433298787157 -407 0.22586336958962583 -408 0.46946744737518564 -409 0.24433803162835 -410 0.34522466517245565 -411 0.5141666319886984 -412 0.04561061664952215 -413 0.5815996242617482 -414 0.6834761013858174 -415 0.6368755198971972 -416 0.49431535305069696 -417 0.3192984437508354 -418 0.22650139097870492 -419 0.5488325114845786 -420 0.3616552622770507 -421 0.7672404033170721 -422 0.43681702256736044 -423 0.2590991380635156 -424 0.29380962848732417 -425 0.24993996726119616 -426 0.7185741437598141 -427 0.7349667010974119 -428 0.485053675100966 -429 0.5301666500894326 -430 0.9532631000754033 -431 0.6778436850810353 -432 0.9264447259415625 -433 0.3443432929585798 -434 0.703772295599113 -435 0.42862724998876467 -436 0.5838357340472601 -437 0.41652079975250966 -438 0.44933349429061986 -439 0.37778083734873946 -440 0.5559013140560207 -441 0.8638807380016925 -442 0.3820141120759172 -443 0.8415143737544245 -444 0.10739563544476338 -445 0.9738364987440702 -446 0.7773710878089832 -447 0.7125875742540747 -448 0.23683647248701667 -449 0.2961692825543747 -450 0.6986600950948043 -451 0.30324260021691907 -452 0.15741023521736164 -453 0.2669604761239339 -454 0.7152771152519802 -455 0.8128849477096445 -456 0.12117019090026071 -457 0.8561488083188311 -458 0.5128012322526788 -459 0.11790215221442069 -460 0.40688269187756676 -461 0.24608099166925967 -462 0.007840146840067508 -463 0.7292005473710497 -464 0.9496585369074249 -465 0.6674992462928488 -466 0.2184772081800218 -467 0.23427553099609633 -468 0.4210037772638473 -469 0.63337416911428 -470 0.9829311403363387 -471 0.2266872677454177 -472 0.6234265849127177 -473 0.48081641775834516 -474 0.603853599426888 -475 0.8736687403391108 -476 0.13456700905459673 -477 0.15918483438904896 -478 0.5776251081992172 -479 0.7150590541773992 -480 0.8552002815973839 -481 0.11100272014400492 -482 0.3401499193828672 -483 0.6395184179165113 -484 0.39115755801866603 -485 0.9422951969462622 -486 0.9322979325904929 -487 0.9984259037325194 -488 0.7648380050888037 -489 0.7326549140160928 -490 0.458914284949519 -491 0.4070266671205989 -492 0.8335356575057142 -493 0.33972220389758667 -494 0.5400968988513073 -495 0.7983400094741095 -496 0.2884936537039643 -497 0.09416643073043562 -498 0.6412763941981754 -499 0.8153059729878798 -500 0.36276614300160415 -501 0.2135189361291565 -502 0.9591973103378493 -503 0.6504728184897635 -504 0.01407510152345981 -505 0.5631103524188633 -506 0.2958910015772761 -507 0.20597967500391168 -508 0.6902335385224573 -509 0.7228390931437262 -510 0.8128402335757849 -511 0.3015624734817134 -512 0.148239349063636 -513 0.5895586151712691 -514 0.18726033701635592 -515 0.8924520777983327 -516 0.7488104509858774 -517 0.43270729973958744 -518 0.506914146146703 -519 0.4208688059759784 -520 0.49682056424427823 -521 0.9774371479152311 -522 0.9206923275732642 -523 0.061365780880261456 -524 0.15417225336570473 -525 0.4547149660720362 -526 0.21885290109944866 -527 0.767434281527799 -528 0.7132007626218805 -529 0.6514820123143515 -530 0.8338718034884631 -531 0.058463052099115065 -532 0.7474125220892183 -533 0.564250147112778 -534 0.897760194628157 -535 0.9389767917720141 -536 0.5023267121095448 -537 0.5925587738967764 -538 0.6381831440215647 -539 0.3825525809699386 -540 0.06362921346282546 -541 0.7636187693718737 -542 0.012004033535306435 -543 0.7473393349494399 -544 0.3820779963934038 -545 0.309882174719992 -546 0.35030034832509915 -547 0.6905253240938567 -548 0.9690807471707394 -549 0.1319198229189601 -550 0.22553970975190463 -551 0.8077635883286303 -552 0.5891738249825738 -553 0.6732269819953789 -554 0.35681780585532163 -555 0.965633836362961 -556 0.40646268087795545 -557 0.5067731297649384 -558 0.9795536897212174 -559 0.3338036921855573 -560 0.27769333818682274 -561 0.9982109573679916 -562 0.8853078353892317 -563 0.5859510199664603 -564 0.28876392013095686 -565 0.4765624854297239 -566 0.7600030868070683 -567 0.03058798872042201 -568 0.5781089498544716 -569 0.7406118454572292 -570 0.7240535760817192 -571 0.6763677011887029 -572 0.25107787755385047 -573 0.013406475092380354 -574 0.3291511136024924 -575 0.5525727807976138 -576 0.43963775409927996 -577 0.044657832886989546 -578 0.6959572617015657 -579 0.7890371027271085 -580 0.906280706039855 -581 0.17928362564565203 -582 0.09588828345906364 -583 0.7609401379106291 -584 0.001572813166712983 -585 0.08180235818641624 -586 0.06907596630082824 -587 0.2641653093806875 -588 0.9202825623725778 -589 0.21627828043797326 -590 0.7314206064854518 -591 0.4447797336348318 -592 0.6961636682456007 -593 0.32451368166810646 -594 0.15174203064652347 -595 0.7208953299730961 -596 0.8938108957654243 -597 0.10750104125640947 -598 0.7543223593337812 -599 0.1854641540489892 -600 0.6429177543035923 -601 0.0019113891166390173 -602 0.5445960797721411 -603 0.2880971260404508 -604 0.8689028582466993 -605 0.945035262086271 -606 0.39212058981097087 -607 0.4610761696446807 -608 0.7685320483786504 -609 0.023428509013597387 -610 0.011744811283231127 -611 0.428560539709373 -612 0.6358979426692003 -613 0.07504757291033681 -614 0.24159926144088717 -615 0.9433050375949126 -616 0.4796867799480262 -617 0.2742107063857592 -618 0.19008542856089095 -619 0.5393433752674143 -620 0.1467116537695644 -621 0.2639132248803856 -622 0.88111289971593 -623 0.7403775176881694 -624 0.20998194551926497 -625 0.8754268301480604 -626 0.9132898887485146 -627 0.7501831050088281 -628 0.962552407619942 -629 0.6681920122396682 -630 0.7007031173760395 -631 0.6955429945601611 -632 0.47608500872481807 -633 0.182695114343028 -634 0.3627919331276991 -635 0.6441257352405059 -636 0.3147341784255945 -637 0.36756549421118423 -638 0.8739059695785523 -639 0.05938350174745732 -640 0.9173825268631555 -641 0.3747522938012636 -642 0.5560442523285786 -643 0.8429401714754235 -644 0.8404604605814956 -645 0.5887642964003782 -646 0.8981678198776912 -647 0.8082540057937418 -648 0.38014947469047056 -649 0.18721232627243367 -650 0.7708568624021838 -651 0.9175693802204626 -652 0.15424265491947398 -653 0.2990203787892868 -654 0.8753963490575494 -655 0.5507505845886737 -656 0.324301939221912 -657 0.8396653956821588 -658 0.9445883894354826 -659 0.07885848160057607 -660 0.8446492053306913 -661 0.4860135613090568 -662 0.7788444922220472 -663 0.14850555764802487 -664 0.477412287784455 -665 0.3526328236935945 -666 0.8386477953689166 -667 0.43162716008602175 -668 0.30537971197987235 -669 0.6104010033694522 -670 0.0031978713500798728 -671 0.15866167487023786 -672 0.4940400099373625 -673 0.9697733030921222 -674 0.7995368681576861 -675 0.8737047619072458 -676 0.4345036315303419 -677 0.7512146318270448 -678 0.888998678063122 -679 0.0170406445040443 -680 0.09409292310941608 -681 0.021560058712017938 -682 0.8137575059843485 -683 0.06392934020492913 -684 0.2965609800492517 -685 0.7582509048815675 -686 0.47714057077107797 -687 0.2386779495959186 -688 0.8100286279262591 -689 0.8884225073185965 -690 0.3283893789715192 -691 0.9589072968339333 -692 0.5978340293447107 -693 0.17780969541168068 -694 0.6811912196310966 -695 0.504249403937246 -696 0.12236524198912557 -697 0.4440597440475872 -698 0.6104564706737802 -699 0.912522275549739 -700 0.19820589586718074 -701 0.20044762126472626 -702 0.9059526999755747 -703 0.23353751185466143 -704 0.0917547059559074 -705 0.6475466659717812 -706 0.8901803231954843 -707 0.6486740504517915 -708 0.09784357595845872 -709 0.26059517781536456 -710 0.029462748622342216 -711 0.29054073290670546 -712 0.38507380791326407 -713 0.8144359087554227 -714 0.7316188575629038 -715 0.7463706174136694 -716 0.8057324235572229 -717 0.6729129012481737 -718 0.404583113944471 -719 0.6053260266564192 -720 0.7879625613926748 -721 0.26302835392848223 -722 0.8990688965241548 -723 0.6289375521647088 -724 0.6241769773509612 -725 0.9035363585595281 -726 0.32343192958312905 -727 0.8406914696811322 -728 0.7314714065779175 -729 0.06825950372738898 -730 0.14928465564579474 -731 0.3054367632710753 -732 0.05160128519426632 -733 0.4581635089267273 -734 0.8278255198825754 -735 0.03832156081257021 -736 0.5673939839751806 -737 0.9324164158745445 -738 0.7039221516151496 -739 0.845919995650345 -740 0.13244352486641986 -741 0.3918667158439785 -742 0.6206549288218728 -743 0.12990493375136725 -744 0.0225576441662515 -745 0.24866570290904488 -746 0.24144600856477938 -747 0.7538197043002414 -748 0.10209677601590572 -749 0.11143478122690342 -750 0.7821903921259422 -751 0.3942888474151761 -752 0.0618347741269063 -753 0.3151983905776057 -754 0.3309715499818612 -755 0.06238653582619158 -756 0.5926061013139098 -757 0.7981250545213003 -758 0.22790513673813995 -759 0.2246891717766586 -760 0.6535849194633997 -761 0.04647971339121948 -762 0.6869096503893598 -763 0.7017953305779028 -764 0.40864507705762265 -765 0.610659247284285 -766 0.8311193599023698 -767 0.19904517860343507 -768 0.15374041263988114 -769 0.2020621665909914 -770 0.5921761094816475 -771 0.9593115077484744 -772 0.6665140119096852 -773 0.857597141681306 -774 0.33225788188422567 -775 0.33793117082473545 -776 0.32704650668911306 -777 0.8865302549378776 -778 0.0709818003183238 -779 0.21724924723190997 -780 0.3080789116561514 -781 0.2143170347726231 -782 0.45131900934594293 -783 0.9120919940775968 -784 0.3141905923892572 -785 0.7091547629489223 -786 0.5568749891471545 -787 0.34973926658057597 -788 0.7757329362816435 -789 0.4002729707787839 -790 0.39733281230008355 -791 0.4272631901960915 -792 0.8978601850735832 -793 0.12377622798023125 -794 0.22924693458532697 -795 0.3674526662376072 -796 0.12191098019109037 -797 0.005951274386803096 -798 0.8891696873055005 -799 0.730054184400856 -800 0.8588032157161772 -801 0.42238188854754544 -802 0.6987185979699027 -803 0.919127751576854 -804 0.6417783712247874 -805 0.05971860302083898 -806 0.4371899490012827 -807 0.3319824163520646 -808 0.0834215790016426 -809 0.6796489430667242 -810 0.11381480090503682 -811 0.675867244979735 -812 0.4951978763832017 -813 0.8549319299446665 -814 0.9608560253280477 -815 0.439967542654383 -816 0.6786493415962902 -817 0.1419118322566515 -818 0.8609699528318758 -819 0.38564353527556283 -820 0.42497982034101867 -821 0.27886619921781597 -822 0.11652880251524755 -823 0.7747662858343326 -824 0.9074184132621106 -825 0.1312499890495724 -826 0.49810255511681245 -827 0.6162765657237362 -828 0.15352318207535376 -829 0.8813152934885556 -830 0.9740014698858462 -831 0.43385458041145497 -832 0.9754315273836498 -833 0.628814753474807 -834 0.4622845021790061 -835 0.7439396579358708 -836 0.43134464146590346 -837 0.21086416578823342 -838 0.032444895497195425 -839 0.6121849621463007 -840 0.684031530446989 -841 0.7748993638332198 -842 0.6609256172143887 -843 0.4244936438104321 -844 0.4295140093912041 -845 0.14404507265168598 -846 0.2015746249991921 -847 0.44399403395972825 -848 0.5871204620194638 -849 0.8610112784417061 -850 0.7725654128583747 -851 0.9255389475524322 -852 0.8290399954457885 -853 0.9308033993846286 -854 0.3299223109787075 -855 0.6258490271329071 -856 0.15731923128054814 -857 0.4842502167075543 -858 0.20252214367764332 -859 0.5549884040061428 -860 0.17750496220305634 -861 0.45857137154977934 -862 0.5337504180624256 -863 0.7106733413625976 -864 0.11466729829182942 -865 0.38215502441813254 -866 0.02644322324044346 -867 0.29757394094811407 -868 0.8257491430885802 -869 0.5464022802148416 -870 0.6160801518130258 -871 0.7525025389716961 -872 0.7699324154938205 -873 0.20839819437643092 -874 0.7116764112091769 -875 0.04212094583892523 -876 0.8537956405300061 -877 0.9788523321234054 -878 0.6581091163738675 -879 0.9902434988428545 -880 0.9043595873359431 -881 0.3861021432274948 -882 0.5202055497707494 -883 0.7833466666164538 -884 0.8554426332455726 -885 0.026139903158982958 -886 0.8222195834394732 -887 0.45354675033440717 -888 0.8536575220029834 -889 0.59120946251696 -890 0.8079667986061431 -891 0.6179563686810776 -892 0.8383579805838476 -893 0.7818529793831255 -894 0.6795808291259844 -895 0.7115019464000145 -896 0.7905440241322897 -897 0.9577406032273728 -898 0.26729535802337445 -899 0.045416079827629297 -900 0.6035515481418938 -901 0.116966848241288 -902 0.3157410680277358 -903 0.8497992441028535 -904 0.5297339685748053 -905 0.9150761584860208 -906 0.33640993834406974 -907 0.9362153702730684 -908 0.5997191182533554 -909 0.8931717346981315 -910 0.437625016920725 -911 0.1641119218090722 -912 0.3902671972084635 -913 0.5873096368736422 -914 0.8138169614254551 -915 0.36776204451445893 -916 0.8723916933420434 -917 0.9349552531668429 -918 0.7542542409923305 -919 0.8101728194622346 -920 0.6501632673777481 -921 0.7230195431497476 -922 0.7571382788904574 -923 0.1276967140851748 -924 0.4348635432593073 -925 0.3699206437762256 -926 0.47796872330880147 -927 0.9256334581414346 -928 0.9189495362278106 -929 0.6808834198719146 -930 0.7938200415441474 -931 0.932865927971997 -932 0.08642170445476494 -933 0.3973586649570371 -934 0.07733093809082303 -935 0.621400374319733 -936 0.8708009233351294 -937 0.3211348230266299 -938 0.7586436304075128 -939 0.9883246716130489 -940 0.7099568217949476 -941 0.3103233601917399 -942 0.7093898598092181 -943 0.4926191514912249 -944 0.29130574914660057 -945 0.8707830874936576 -946 0.5962175036310357 -947 0.7942934812125496 -948 0.18829103738976083 -949 0.18488401193730308 -950 0.9147956027466958 -951 0.28798350072026435 -952 0.7808601283330229 -953 0.7869551326381795 -954 0.10433172442974592 -955 0.9368722569605368 -956 0.006934105910896049 -957 0.4490255996053798 -958 0.9426115535116355 -959 0.05192688310084581 -960 0.2974386591413345 -961 0.13929297136295116 -962 0.9900046494188425 -963 0.34779750492585726 -964 0.19087116437155072 -965 0.2694569749489395 -966 0.09091999193751976 -967 0.755672506592075 -968 0.7137906888486424 -969 0.23355514233400632 -970 0.6162931391095195 -971 0.13941528245468937 -972 0.9499295887212055 -973 0.2978719942822655 -974 0.22467109773221228 -975 0.2752109340265576 -976 0.40097291056714457 -977 0.31178633932266064 -978 0.17145116022062645 -979 0.2001574380037373 -980 0.810927099425327 -981 0.5268867792103548 -982 0.7601393797568436 -983 0.9833598314391977 -984 0.18776831145153794 -985 0.9862140415410539 -986 0.15229350814092046 -987 0.6263866953148329 -988 0.10239326174650931 -989 0.8717390913235197 -990 0.05351030675150481 -991 0.654840992216953 -992 0.07938199145667268 -993 0.19930528368294131 -994 0.9508726671299931 -995 0.23506627966858606 -996 0.7579546003275489 -997 0.462407694114665 -998 0.44605299184138913 -999 0.8323424795734158 diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario deleted file mode 100644 index 428cb242748e63f97cdfc32a67c27accd941edfc..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario +++ /dev/null @@ -1,364 +0,0 @@ -{ - "name" : "TwoCorridors_unforced", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "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.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "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.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - } ], - "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" : 160.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 15.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 12.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "x" : 32.5, - "y" : 10.5, - "width" : 27.0, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 30.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 44.5, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 13.0, - "y" : 13.4, - "width" : 2.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" : 2002, - "absorbing" : false, - "shape" : { - "x" : 30.5, - "y" : 13.6, - "width" : 2.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" : 4, - "shape" : { - "x" : 39.5, - "y" : 0.5, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "reachDistance" : 0.0, - "changeAlgorithmType" : "SELECT_LIST", - "nextTarget" : [ 2001, 1 ], - "probabilityToChangeTarget" : [ 0.0 ] - } ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 44.5, - "y" : 0.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 100, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 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, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/vadere.project b/Scenarios/Demos/Density_controller/vadere.project deleted file mode 100644 index ebe3534b324208c8763fbf7e5aa792dad9046e15..0000000000000000000000000000000000000000 --- a/Scenarios/Demos/Density_controller/vadere.project +++ /dev/null @@ -1 +0,0 @@ -plants_controller \ No newline at end of file diff --git a/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario index d507aac03d5f3814c38cc43ef8205ae645c06ced..3d140a3c9078731f2cf05e0a4a55a015c8d852dc 100644 --- a/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario +++ b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario @@ -1,7 +1,7 @@ { "name" : "hm_stairs", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git "a/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" "b/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" index 4ecfd2605f992f59c093e1ce43860f7986054173..387b9f816663cde7e25f53d53fdc218dabde4dfe 100644 --- "a/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" +++ "b/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" @@ -1,7 +1,7 @@ { "name" : "01-Kaiserslautern-Groß", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario b/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario index d9a836ea05f56ee25ba62dc5e18db771577b9959..dae15a2ec93c7517fc73e757110fe7aa250d89bf 100644 --- a/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario +++ b/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario @@ -1,7 +1,7 @@ { "name" : "02-Kaiserslautern-Mittel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario b/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario index 66201637ae543fcfcb57f945ea3c2de682b15cc5..bb69e7fe676a8e91b25060ec1364bceaf3ddaac9 100644 --- a/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario +++ b/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario @@ -1,7 +1,7 @@ { "name" : "03-Kaiserslautern-Klein", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario index 039430a1564f2478550e5bb25ccb8d3538ac715b..9ced284abf1565de4d2be92e63df4761e5a848a4 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario index 68e1048775c9f46bc36f71225bf3033ef8292524..a4ed12e8b2727eb15c341685dd1eabe06f5a79e8 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario index 9ef0a19e27f6f57af316c52574d0eaaab965456f..cbb6aec46b1e20de75c05a3faf758a4b5327628d 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario index 09d80e59bd0d8e79f3875d005e4e969b181e773f..a3489d6d97e93036a4b0707b603a57f8fb0a4d69 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario index 31f5acaba14cfe3d3c98117a00c006cd1cf7dbfd..bce8405dc89a8d80c6712344dbbce7b47f067f9c 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario index e3564783a1fcfbb26a3563a9fc97b53e6db39892..4f8bd5bf45455a1ea9afa5599067fa1ed3dce2e4 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario index 522971b6323d0e74cc0189e4d49cc44343e51ccf..46917cb5981cc4eb6fe0615068603c914a575853 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario index a9d5ce003730aa8d55092660ef85b9dd11bb8cbe..ea2d62ec1d951cb3f64341dc9221cb06c530762a 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok_GPU_event", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario index 1c823a00a6007d2e68279e2890cc21d392db8f93..934d881c0b131d8f3e4bb66a081b5f625e8748be 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok_GPU_parallel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario index 51d5cb2b8e37698c965c0f0d2076c1447cf962a7..dd0368a8c180637d9b7086d395ea7ef7ab48abac 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario index 7ec1bc20e05fa8f605324b2b3ddfe5c6f4aabf3b..b2f30bcf5b20348ff25be73882cf5a594d537613 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario index 7bad5e46bd1df32ea9ceca649ffda49a7df2eb98..3be63a30fc79daa8a516c631103039365397b65c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_fineTargetGrid", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario index f987758d8d8c8b83fb41f473712aeb56001675c4..63b541d9fbe429d4b72a90845f37a9b28c059e03 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario index 9a0da90ab1bc380598387593802dbf68f3c1179e..bf7153d4ed70c7e761838e94670695e382de8f7e 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario index efd833719ce4de11ee01656048220d2541151c1c..5481d4e4cc616a24f58af39e90ba06595510e9ed 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario index a1f8916a879b5edf43020bdeaf1ee8d9840722ad..104092267bb160aaca47e7fbf888a08abc9c50ff 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_1_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario index 15bdf776f7961844bc15970d2e3a40a871b5169b..e567524badb2338435a565618046d8d54f68293c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_3_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario index b415afdb757b66a2b3abf765d0a788a76543b92f..04f2dbbc813552112585083615e454c8bff478d4 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_6_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario index 09804be6d1cfc6b132d86eb1bd7ba1168a14dbfe..42271c64df55beea9e41e03ec4cc6076c0b35ef2 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "NarrowCorridor_3_targets_1_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario index 4b3dfb86a84d03fac5908651663a589dff076acf..e86fc2d9a2701bea006bd33f83163edfb9ca0389 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "NarrowCorridor_3_targets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario index 24c82c6a9dc1e678a1dd9b14dc3e5722cd0fddd9..f942dba5a41c12ac0e0df57baf2d2a5dcd979a91 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario index 9f373e5f8e0e1360130581fdbc9eb8d9f1989f38..00755e04fc8b78d2e8578e51a5f0a3fc513c0117 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario @@ -1,7 +1,7 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting_with_runner", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario index 80cdbf897db90c5c6b8f733f78c1a4d0bc8e93bf..74f4bdd93d6d38f4156414b2d43cbc243299f72e 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario @@ -1,7 +1,7 @@ { "name" : "test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario index c1f23e20f4925b789242271816dab9cce703e9ae..0cf658e9570e0f4552aedab72bbd9b18cd977ff4 100644 --- a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario +++ b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario @@ -1,7 +1,7 @@ { "name" : "bottleneck_2m", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -192,10 +192,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario index 6a852b155fcda940c53615d0c643571dca232a74..e98fc5943567d07a62462a1e1310b588694933e1 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario @@ -1,7 +1,7 @@ { "name" : "VadereSimulation-GroupBehavior_no_groups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario index 9f64442c14e2c8dee6cf6db144afc574107bac2b..1723f3c61e0c07146375e03dcbfe9f9aad348dcc 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source1Place_noGroup", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario index b5481aa4c2a6375624975a4b5c72866dbadfd0b4..1f2e4f7a4f302db32c17c9770ed050fea4c2a4dc 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source2Places_noGroups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario index 4e03b4a5b727d9982f877d2dacc3df71b99b9342..c338eb001faed9a88ed152e8a7cfee6b8bfc1b23 100644 --- a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario +++ b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario @@ -1,7 +1,7 @@ { "name" : "bus_station", "description" : "Scenario used for TGF19 contribution", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { @@ -333,4 +329,4 @@ }, "stimulusInfos" : [ ] } -} +} \ No newline at end of file diff --git a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario index b177f9e38fb0f961ffaf39d98e0de0a010335cee..d71e67e136fcd85812eee28f2e0b8f22d6b0f22c 100644 --- a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario +++ b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario @@ -1,7 +1,7 @@ { "name" : "Liddle_osm_v4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario index d7977f9ab98e7749e8c39c5214499194c9708ebb..2d8cc3dd48b89b59f2d1b2bc6e2d965f6eaae7cc 100644 --- a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario +++ b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario @@ -1,7 +1,7 @@ { "name" : "counterflow", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario index 1400bbfa62f5ca8705f324d04fdcf6c63e069a42..a3a271885226005aa6b27dd44d8b0653f344e09c 100644 --- a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario +++ b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario @@ -1,7 +1,7 @@ { "name" : "supermarket_basic", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario index 1447b86e656bb146bbacd70f6fcf4dbbe67c0ee9..93f61600fe91b43d6e806589cf5452d704886434 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario @@ -1,7 +1,7 @@ { "name" : "groupBaseScenario.scenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -286,10 +286,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario index be00ea42bd71ee33b3c38b9a4bfd69711c5a19fe..0a907c01ffb0b266af267862238a139ed7d69cab 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario index e0e0e154c8f2f09a3fbc177691609ec949b9db29..3f3e2667432ff0f9fa849a44abd066b4e84dd6f3 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_2group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario index 3789cb3ea42c4c78f1420a78ca4686771d1366b8..fa8c735d6b936f9e7acbf72654e555847fb8ddd8 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_3group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario index e83c98ebc00c9d8ca39b129bffae97279631c665..1ef4221d52b5f89e5428b3efe14ceae32cf3dc75 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_3group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario index 1c27d9f958ec11f5010ae1dc7e2caa482bfa70e5..57b5f55c60c13240c1e2abdef7c7eea8f57a39ec 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario index 7f9444ac3563df7612b026521fb40cc11bfc5f7e..4c63154a6eda9d87f86a2d99350a9494c8da5e69 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_4group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario index 428a142466652efe92bf4769cc8bdc6a44ec391f..53ca6203ff8130041012ace582ed108a0d9b9d7f 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_5group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario index 0b6930e9d0b8d85eb34a20a0675fa99c663c8ff2..32b4c6c69df9ac319fb3512575c912e9ede9cec7 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_5group_sparse.scenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario index b8091c0da1386a114f4ed2274b43cffa0da0ac58..793f6495f14f96328219115245c9caee9c2ff976 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario @@ -1,7 +1,7 @@ { "name" : "g2_osm_calibration_minStepSize_0_11", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -230,10 +230,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario index 96938326cf4000d6880432a17788d79381ebeef5..8d43ba286d8d253ddcab0a4b381fcf03f1150a97 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_11_ignore_free_space", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario index 71fe8a3ea03f942a23c329fb030814b433e5d411..2b8f511bdd76142e7b6dce92829b3160b1c6154f 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_17", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario index 7b21251f6a27c231cb30048715b16db76a7cf498..89cc1f98452d42d4a8ddeb720cb6130ec55d31b9 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_25", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario index 0fa66a70ce2f6862946288b463bc57c63728b608..09cdb9dd2d3a8c14baae3800708f28085c05a31f 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_35", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario index ad78d5b421671c9fdef1a9c33fce5f6b0929d64e..c9d3d1c2a4ef66625039b896611846d475c820bc 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario index e15aadfac6968a6fe6db311fd9d67e93e2652ee5..b5f9fb47b1b0920fc7cd4e60ded18b4f5a00b1f3 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625_p18", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario index 764c779d4c78afd96ce3dfed56a88fd414547bed..d6da09cd18b0f6e0eed5fa30e566295cf46b41cc 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625_p4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario index d9f8cc104c249c9b081e499a517bd58a79b674a2..900c6abad7afd6cb255d00d013ed64e7a5b513fa 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_sivers_2016b", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario index a7706e865c7b5d4bb9280d39823dd0b5b14b94b5..c8a4d37dba2f69962611d14e803c00f7cf449f23 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario index a76e8d50aaec2285f444f99a38db99ed0dd3397c..a4b40df4723017450ec5dfee1c58e14d2069972f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180_GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,10 +212,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario index 95d93bc6a8c0001b65e787335d85f91e0180cfc5..dd3862058644e3a0d846bf4065d5797b206a0833 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario index b468c70059644d6637bc983e342c71fc4ff92b8f..8481b61f96e403b63ea726f429154b480d43d8a1 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-060-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario index f1f3d5c2e6fba69d7b9cc7ed890413355c0215bd..dc91a69ebfb457ffdb9f3b00a690ff7d21645fc6 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-060-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario index fe158f4a9bb0353f8c2960d67c7a0f94a0785a14..01de47f475c1c3962d6c8f6d4f493fe741ca7ee2 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-070-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario index 13ef206ff82db0b7ac27988bfe53df3add8ee73d..f79f7f1690c3544b6e466be49595c59d73e85483 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-070-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario index 1731b44706cc79990705b4719b79624f1d6a2153..7737fcc846116aada88a3b3b9dd03b5957b1feb3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-100-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario index 54d68be041f08f6c3698f1bac309b637343efe7b..f98f6932891d7710de72464368f595acf243548f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-100-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario index 0baab1b6b715aacd84bcff06b8e1babfc580c4a5..1e147fff667ed950d1f813da516634905b25c29e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-145-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario index 9d863a5320b7dc066d3255e6b999e18b7c6135bb..9bc5394b74af05d3260c154efc1562e1837144d1 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-145-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario index 96e2c77d39ce98d362782dc1de2169061fb875d4..6a6ccd7d4ad00486e1027ecda9d2557239ddd73c 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario index cd29726519b6c252d1f4f12afb96fa36e020253f..58f8d17fcc69a7ab8239241d1cb152e1a7552b2d 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario index 13815d76e0e6b80ad7cd0594cef8ca4e07e5f1e1..38440cf86cd55b612258554639e229dbbcf9691b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_UNIT", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario index eac75ff054837522a25e47e2ceb6b7ee57fd61ed..af1a3ff4880ab51bfffa979682288020c556f863 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_default", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario index 37b4ffcd04fa69c3ed5ba80d09f2bed5de602a69..9cf7fdae908cdf6b48dea5b3902b6f2c9f9f39b3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_ramp", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario index 15b2fc65df891cdcf49073113ce83ff9bca98e2d..e50a60bd62843056a293b2a0e50d20c6a5512837 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-095", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario index 52e123087f1281fdabdcf13ed03cae1e8368fbed..3457235217bbc1a385bcf8357fb5818df7fb8263 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-095_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario index 997e9802016dc89638b29b0b7b408643dd37b94c..3fe75638eea46522c2956eea289a0c49d7af9d2c 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-120", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario index cd23d8c5be2fbd75c645f543a9d59ca579fafbe2..36099a69b3ff912e427bd63657f022d98744af6b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-120_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario index 91258648efdf7004da8b642bce429d0081a420c3..8a1871f1509c01fc4ed9d8de76765e4da43e9a9f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario index c161d7ad6db0eae90d263647a4266350d5249989..255c5a2fa68265af814fa927eb8d4fe529520c20 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario index 6ecf81afa5d789912af2dd71d2a87e986251c1a6..98c588341e16c684fcef3a747bc6c0caec4f6968 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario index 2adfdb77547ec9fd1c2bc43ed585ddc39f7ad70f..68e32eebf952049005bad79a0f32624b6067332c 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario index 554cb767c6b3f4ae1d81265f56fccb7f4a20eaef..65811bf104b38055a6d370c63338a4df11dad085 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240_OSM_", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -284,10 +284,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario index 35b40fae1758a6e20f7fc49f324c87abc88a95de..13e10ff988fa885757b535e82c0a78e395df5eed 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario index 7113e6fad2df8bb2244757d71e8ebe28d2a8a1bc..ae370c280f27a362222e84300c54dce53330f1e1 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario index 3d9e7ea20e44ec2373e9080c83df99849bc089fb..7a61c6fb7a5e97e1f48f5ee099486057bd5036d3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario index d8cc6b6ff2127ce9ddfd32b7d2a798ab270fb9e1..8f83fb309a9e4d3e35ff616489b87aa62ad9a17d 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario index cebea9b7bb8b7fd2ca917fa74bd80f5754cdaea5..24d9343cf472e32f408bf411285af6bea82e15e5 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario index ae911b8059df18bbb361b8f599bfd80c95b8ca44..ed5ab1fd2e8a53e5971c8b765ad7f99f29d458ae 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario index e6dbadc2e6025000a1451aadf7c06319d46fefdf..0f88f17ec752e0c9faba59b108856adfe8901ee4 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario index 660a4323196f70115721cb1e839c303cf750edc7..beb7718889baaa6b5e174ceac890d6b214320136 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario index 64db78ca365140e2d684526d770ff992e7694053..57dfd395afd1f918d2dc1e6d4cd5d382ee9e065c 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario index 81c29843ae17a5bcac9e9130a8c7844fa462b4ca..058e7006aeb17bc10e0be9f2ef5d77603e60c4fc 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -284,10 +284,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario index 6062d9fb10654c027ce4740c09ff42205ea76448..badbd683e468fa353d5299c6dfdad4795274722b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario index 832fc3ccdd7f5bbe49cf6b7858456254217c59c4..a8b5fa58ed048c54b272552bb52c9e4a99a0b06b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario index f8f5d0ad48bb9dbc49167e4cc63db69613a8a8bd..274e2fa96ff10533683848d81d972d53add86f64 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario index dab2cdb52ac97f7f0c17e3c52497fa4e352795ff..9562187eb05c01c0dd6adfa4923423e4bad23dd3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario index 56897fc0d1b9e1b5160743ac9bf39827c4b17602..1988c0678e1bd1486085317177a073acf22616e9 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario index 74026ef548c2c6de105404d7c7e6c0bfd1fa86e3..701c3b152112fa8a4dde7730bed477b3667eb5d2 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario index 9e93a1a849af4f77b490bdb9da927e8a0484076c..76929479765c69d2eb31d828a5d6cc318baf400d 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario index 9696262a326e6e72c5b6346d61180ab318887d57..b35f744cd139dcbc6d089b158d350cc7c80bbe63 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario index b3b5044fa47d473452553fb094900482e2e12982..a652c0098f2e080529fa774f780a7d3d2a9cf370 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario @@ -1,7 +1,7 @@ { "name" : "floor_field_navigation_test_displaced_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,10 +98,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario index 82d2e5699452fade586be145cf3a2af878253cc0..4c4ec1d0e7090347e4995b2d65dee221c9a5dc3a 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario @@ -1,7 +1,7 @@ { "name" : "floor_field_navigation_test_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,10 +98,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario index d7e3991455e0d9db1e5193f8faafe2c52878757a..5c76129b289f356892bbd4ff7bdb04535cb04185 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario index e4e75ada768bf20ea8280545101bddc8b8648cbc..47be242a7bf7ec4885a938154c6c97a2303579ab 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario @@ -1,7 +1,7 @@ { "name" : "bottleneck", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -122,10 +122,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario index e88827d8707a9ee1a786e7f8cbc560c176485d90..e13d009eec77e3b94c2b51637462cd17fd28dc59 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_displaced_fail", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario index 9e34f86c80cc412998156780d984b09be92bb66b..5570d3c63fcad30b050830b20d741ad70725bb41 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario index 946701843b87b82ca441e8061190e7e7e9b364c5..e4cc319e82a76493822e4f41b17a28b1e592b5d0 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario @@ -1,7 +1,7 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -126,10 +126,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario index 3eae94585ce19e4aa7128c09af9a662b923c1bab..b830d23b8f08fff8dba6f765926a0cee5742cfdc 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario @@ -1,7 +1,7 @@ { "name" : "multiple_sources", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -131,10 +131,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario index 234fb8d4c30d28d6114da15370e8bd8164b36285..68fabc3ce28ce429a301a33338950ee3f8dd2be9 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario @@ -1,7 +1,7 @@ { "name" : "narrow_passage", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -108,10 +108,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario index f339dc3e033bc35fa77d4adb47fb602a4ff68434..a68f8fd7933ea4359d28b5121a60594eeb762812 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario @@ -1,7 +1,7 @@ { "name" : "regular_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario index ac6098ed684f01ff4eee2832e1a8227c5c6fb2cf..077db866fad3eda47513e4c3eeeaa5e597e3f9c6 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -144,10 +144,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario index 97dcf36901e2412922e8c293eff0c5b0a4f6f67f..085c2ebc66f82dd3ebd50101311625a6ee2e7c6d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -208,10 +208,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario index 1d59e35a11e043dd4358429ee6eeae7f6be633fb..bc7a1949f85abf7ba1f5829da80f4abf4926155d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario index 04e9aff71ff3d8ce538ab0c31a046a2f454ef1ba..e37fb8e1d1e9b8df25a797710eb3d70cbd934a59 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario index ed37ba9e717bda28b950cdb5a4f0be50101562bb..609e7dce612395197ce37e9fbe71a6516f769a68 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario index d3d9cbbaa18c4fe00d2b5f0f0be9f15538cc038f..050abf1960fc3aa40ca27414b99156d617e3c88a 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario index 9ce061903520824b32e9df4aa627e9e2fb722e16..f1edb88c7054f353efda784f9b172745a558001f 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario index 88be2f47bee5708113d8ca084bc0902aee51b50f..16c273c8d239ed63419afe56fcdfedba38dc7189 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -139,10 +139,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario index 23052735535d688c861fa15f1fa9b402f05110e9..b459022ecd8658da625be57f8fc758a85c9dd624 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -128,10 +128,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario index 7e9aae06ea510ff459ed9e84f48fca89307f8f4e..42fb219f5e2545a3162dafbe0aaae62963c2bacf 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario index 3d2c330ca152e79e5ccd22ebf8143024f884fac6..65dda49f6ae9ba1eda9df41463e48365e2236069 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_08_parameter_variation_part1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario index fed0dc0ab532f300acb2c588466dc3477ba77716..b3322e2e08a771a1bdc56c3da5dd0db4a7301237 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_public_room_2_exits", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario index 468478eabe464931f250f4466899a0c0b6e22087..e34189590419cea3ab8029f5198a1fda72c93791 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_public_room_4_exits", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario index b2502490a061900eb6dfa63f2b6df556d291326b..26694344c5f13fb7c57846a49d3dd0879437cfef 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -138,10 +138,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario index d3a3ed50fd391ecc51382bbc3572f13dc0cf49da..525507174d6e6f289706317f141b36dd59121a8d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exit_selection", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario index 7672adfdf53d6fd26e0ff028dd024d3997a21b9f..94d6a9607a7d94787f63d5c4e5aca631182e42ed 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_12_evacuation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario index 5e9dd58a965000fef1150c2cfa6f2825eef00264..92ee61667da3e9175d98019be2193d361ef8b2fb 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_14_select_route", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -107,10 +107,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario index 17f6b3fa42aa21d89b8c47eaf8fcee5764a6bde2..c8faf0d0420d88a52faa8e1bbeb69b87f9930c00 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario @@ -1,7 +1,7 @@ { "name" : "see_small_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario index 648ff08767ccc0df246a2ff972e5cc0744cf3467..9d770eedefaa641a42879f83c2491d10ad43fe35 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario @@ -1,7 +1,7 @@ { "name" : "thick_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario index 23865e9adea286cab6bf84aaec5d5e284b66f3db..c8d768fd446853e62d396af953885785bf84c3c9 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario @@ -1,7 +1,7 @@ { "name" : "thin_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -132,10 +132,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario index 3bd4744e5591482181c2a229defe04f428d4a925..7b4ea05d71d8719f0e9a75a5d158a5afa4d06153 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario @@ -1,7 +1,7 @@ { "name" : "thin_wall_and_closer_source", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario index 7e191d415a9c766a3748f640f8b423755ecc8fc3..9d59ecaf20a572a031a300781553b50caf3135da 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario index 80ea473490b6508d77b9a1892936d54eafadfe42..9a17fb516b3ca38947cc2eca6785ac493e8514a9 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm1_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario index f79bdcf4d789eda4ede2a2d13784bcda9ae354ff..0ccce91db03286c1ecf3c6a0434e3449af1fe0db 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario index f293ffd69243b1249baaf111d570305384d737c4..7a8496778a1f501a832b5dcf21fdf200a883493c 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario index 86f223f1bdf04148508c91f4082a355e7ec61269..181758da55bcfc64d7c02a820301bbe46ae8c632 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_1_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario index 79023d126518b855b458759b59875611504804e6..20f2781a8194859968549e4fab67f0ce98ae19ba 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_2_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario index 54f688603031bd08d25220ae2e5c33839433143a..ff894c8f2cac79084d743ec5b4c838e6e7ff99a7 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_3_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario index 8b0892a6863186747960ee4119e82f74e6571822..95c566afbefb95e820da132cdba505d79944701a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario index d66249d833c2378be21cb37c8a7ce4edce889207..bd2b2c0ba7d3bdab199c28beb620c48532e55dd0 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario index 96bc7989659bc0d8560a8b9143d905b632f3aa3a..ca18b88c380c012b3b9c2aae456971c8462f10e3 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario index 0db39a39a58bbe94a50a1a34da60e94753c0101f..470a3628232ff7d3613c8b473200fe2208839e84 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_025_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario index 3a4900024d0770f56b4b5d782421601fb49b8c31..6dd59504f6cadc0c88c52c5e39f08a33c9e74c6a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario index 6958303b30514009109f806d37837ce883529508..6a66aaf324b69bbf693d66abff35b0aeff7a24d1 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario index 7e274ef0ebdd9ee67940a4301cc6ec780d934073..e0683fb0d699cef1b720fbff8ff1820842bc0db0 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario index eea3fc707f21481af0a5268b1eb2fe07f9ec65ef..60af68ebc602bcd1164cbef46870e8c6ba46b65f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario index 84bc32404c40f352c1f10b45fb7ab0495ad18a5f..6d02d3606bc87d3515415eda98ca0e42c73a2c21 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario index 84f728ccb66e438d6117bcfdd93239bbddadda04..534e016ee1bfb3577c076b13ec8fdee21f46338b 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario index 958f2a6bae62dabbcd116be2d02caa1241a092ad..390865488a858a65c3fd557ae99e387a261bb6bc 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario index e5442e7132885f1da494084510553c4d4b7de808..49bf9172ee1a874993672ff7e1434f22d91e885a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_publicRoom_gnm1_2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario index bce52eda6594c2a1cd44965ea9f18687591011cb..32332931bedda267d7ac386505d6b868b4f3d04a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_publicRoom_gnm1_4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario index eaa8f0ff4a011b492e97ab3209fb334b955a1911..ed9a905106f0803dca70cb8270686ed3b9433f5e 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario index c1db628af058aa06308d255395b078c7ba47ce4e..aaef7fc3f3ce1d1a1e301c9389686c418d2e512f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exitSelection_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario index c380ccee8516c32a83c40a2ba8b7275afd5bc7b6..ac094d49a2ad5cac8f3a1d4cad39703a3b1f8499 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_12_evacuation_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario index cc1724d48e2c7408dd6242d75490b146649add3d..2e12df83a9a37216f46099e071b240cd0c696b4c 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_13_stairs_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario index 798f69dcc2a49cc4c1b64475b87b6f1fd0206d1a..0546a0ed3599eb01a7699da0ffd5ee0667e898f4 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_14_selectRoute_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario index 1b2b591dc750ed81ec8a1889486068ddba590d6b..00ef2976b18cdf95d758877a56dc40e65345a0db 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario @@ -1,7 +1,7 @@ { "name" : "VadereSimulation-GroupBehavior", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -107,10 +107,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario index b8f6067717b893f95024aa293367dcd54aaa70e9..93537ac9b67a300a83a336ebe64e6584a6633cec 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source1Place", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -124,10 +124,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario index e96439baf88a09ab4a09709bec08ee282b0b3eb8..038b44c74529e5610a1f552b13ad304ef16e4be9 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source2Places", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario index cdb060bf557aa1f6168f0f37cd137f4e781efa31..edd9f957d196959afbfa1fe59b1070b41d8fd9ab 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_2Sources1Place", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario index 58f100c610e98c19e5d59e1f1efdb921e73ad409..027c52f3e83102ef30a127a4af4df33a8eac59f6 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_2Sources1Place_2Group_and_3Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario index 6e2ef07bb2e202886039dfab486efc20df27bf19..13e7e48de4675509a47f823371d5405f54bc0e8c 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_4Source4Place_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario index 9bc634f6a4c34426573d82a6bbfd475148f4d082..6acd42dd9506f659fcf5cf6085c9b213ed01b76c 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -110,10 +110,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario index 08782341c1081f4cf49779044c0c9e3f3563a126..8741659baca0a895309bc14d1f8eb35ca3816046 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -110,10 +110,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario index 49be5b1582112460ec0f65748669a88421eb9123..8c56d6d4f339ab1460f21b1105487df8bb6f9fb4 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_1group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario index 25152192e6a1b55c36baecb7be5f11e247773628..e2195389164f42019db822ac3c3b2e61f52c3469 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario index 11eae18f70d92b49410be6a035882c5d6a766d34..4e911241dc8e081b8b5285b73f2ff0686d966e6f 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_3group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario index f5219675ca7b3c27f50602e1a9210a467c159d81..3e783e4a0e37dbbf40f7a8c4c08a548722d69375 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario index 931263cf95479cf425f360d98b65e500f08daeb6..97d3e9a94a186c4edf90ffd5c1c1950758e50b1f 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_15group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario index 53b5b19ddebe6f09dcc5954e1469f57bb9843733..b17750707d0be8d132c9363ecc98376eea21c99b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_1group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario index be59b25db900e93173107ed12ed1fc6b21f71188..6387c16d5a5b21ecd4f65054070b448ce2f1b954 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_25group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario index 311d4bdb04527f39532651eb05f2612ef3e3b58d..b889411a140dd40e30f5175fbc3a01557ba0b97f 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario index 8a73fab97f6fa2a6c55975280124459d0ca81733..765bd7e0f7566b90fd2470e367724ac3ae82a9a8 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario index 11086184e79aa756e996f423522f5d128ee15065..deb02292509ebcad4834863b660f91ffa2234ca7 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_2Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario index b8dc2fce114674a57dce29d2ca5cfcab34f36d17..24617d8c49dac14d996d543d9ec3d6bd7ab2fa1e 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_3Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario index 81c23fb094120b1d0dc168e55c64630871b21a71..26174ce9a26b5d64f72f5f595f75b3721f31245d 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_4Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario index 0d758b28e41ba4a3bc08c8a7d95f044a78403b6a..41061b5ae3c494c6733891c17deb959540589705 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_5_1_roadReachTarget_ovm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -68,10 +68,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario index d06a9f4ddff4f62c512a3e78021d8b27e0f6ff45..85e88fa40f723505ee44eb02e0afc355eddfb809 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_5_2_roadReachTarget_ovm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -68,10 +68,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario index f3fa065a83cbce59df334f4999c15ed295dd71d5..27123bc1dc286d085720f82a63c43025c63510d4 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario @@ -1,7 +1,7 @@ { "name" : "testtrafficlight", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario index bfe50e42a1b637677e297347603a50af278698aa..6a7f4ddea3d4f8582423c4d4cc3fdc200bebfbf6 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "01-SimplifiedExperiment-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario index 9b2c142155d00c6057d9863abeb2d6c8fd161a06..b29a6c60ffd70796a9fa6770c3cbd01f2ecef9a3 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario index 2ca0e3abfd7193d7d45a40d291739c451c8e4b5b..5b487a5ca84e7db7d3b4754930366ec33aa94a42 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario @@ -1,7 +1,7 @@ { "name" : "03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario index 3d7bc4a8d09c4dd532168894335db15c07335e90..083492abd24247afd860f91bf6a31c32e89a0325 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "04-SimplifiedExperiment-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario index f03f3f5f5abc2fe74a94db3e22a650d9346adf80..09882695ed0a3c13cdb4702094f128bd6dcda4d7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "05-SimplifiedExperiment-SFM-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,10 +102,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario index 5aa4677388dc80d1b3a4ea91cd957ddef9474785..c523bc0add2fca57900f256efef59adb11c3b563 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario index 47dc20e96fb025d568f506cef14c3ef1a5707cb9..fcbec29d000286f81768fd3e187d1ed1cb87010e 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "07-CounterFlow-OSMSequential-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario index df5e1d4f41700ade44d2c8acf98c9087649b40fa..5e98ce6bf1395319101ae9bf471da4334f5e4e92 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "08-CounterFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario index 7dce8aea2906119aed8aef7861e23bdc3696949c..14847ac09ad6d2d96ececdd9f1cc879bf71465c8 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario @@ -1,7 +1,7 @@ { "name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario index bb77a86e64b6e7c7715734f3c9b3f4dbf6e1b780..f07aa7931ef497732556c7e591f68602e4be4873 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "10-UnidirectionalFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario index 9e374eb938d05e2eecb27f4959fafeba1ea150c3..e1a695cd081f231a5881959f53c2d4e89fa47421 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "11-CounterFlowChicken-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario index eb8e5c304682574832eacda16484d1a71c677b20..970be696cd7dfcb94250928af94b4e82c8a143fb 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "12-CounterFlowChicken-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario index c6f3ac83fcdaac0b418ebd04d6d37d26d37f2f60..ae61fe2cc5244cc4296d6f02fbcaa50299dc8477 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario index fbb14495ca08dbe8884a2c90e7ecf706899fafd9..79fd4e68c5d84341bc6fe279ff800d69fd979242 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario index 70737f3fc14bb49f5c65cb5667777a8dc38f0292..4dc066ad728e4a48e9cddaaaf52d0e33ec2d2b62 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "15-ThreatShort-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario index f74ee0ead556cb8751c8b097efd6fd980e6201aa..ec1adeb6e3c5cf4f38374839fab81997d2151101 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "16-ThreatLong-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario index 1f2baf1c5bf207dbc8653766029a5c67838bb72a..6ed211dc786115a458a080cf92f89e8e8633bc29 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "17-Threat-ImitatingBehavior-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario index 98ac898ab739573594b72640072f112e27815e5d..cfeca00ab2c117a212f04258e3cf1a59c91c1940 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario @@ -1,7 +1,7 @@ { "name" : "18-ScriptAgents-ChangeTargetScriptedCognitionModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "ChangeTargetScriptedCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario index eccd0f6411d1410a38a594aff428e78ac5830216..5c56663f9fe3c09c9b7c1aa94cfa1a6a19c8ab05 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario @@ -1,7 +1,7 @@ { "name" : "19-CounterFlow-CounterflowCognitionModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CounterflowCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario index 3181cb97371f89658427f09eeace66297af37fa0..872e38272f78402fca5981648637181fb982ffdc 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "01-Wait-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario index 91a4e6b4d9f9776a23f185b21ea2ffc935c41d76..fbd22f7a1ed0c3b968a1db41551b8d07a7229908 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario @@ -1,7 +1,7 @@ { "name" : "02-Wait-OSMEventDriven", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario index ea7e1eb22ee0af9d37fa3d7636d347afe7a6a13e..197d91b5fec82ea28c10e5f5682924f9d9b9f3d4 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "03-WaitRecurring-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario index e3b55628a7709678c2997726d21c9bf802a7366c..0597cdd6aaa9be217a9753e65870c7b3120621eb 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "04-WaitInArea-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario index 8bf94c59ed5db24cbbdb5f636dd19779c9a0c1a8..15df6505593e7fb28cbd6fa2e1696bcd23f52d73 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario @@ -1,7 +1,7 @@ { "name" : "05-WaitInArea-BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -80,10 +80,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario index ce74adccc77767fac505354d8966f75e39c44fd7..3fddc47dc1a7688cba87b65c304015d4891762aa 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario @@ -1,7 +1,7 @@ { "name" : "06-Threat-OSMSequential-OneAgent", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario index 7d44864dbd922e3504ee8a606cfb0df9c9ebdf88..ff9c0efd096834d86d08a83f109a53250e7165e1 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario @@ -1,7 +1,7 @@ { "name" : "07-Threat-OSMSequential-MultipleAgents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario index 44f4aad98e05c18712178c5a9c0ad99dd762491a..ed04786f14e5de446fcb4be5089b9b47aff1ee36 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario @@ -1,7 +1,7 @@ { "name" : "08-Threat-OSMSequential-OneAgent-OneObstacle", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario index 738b7520a889821512f6567d1145711185f0d19c..051fa9ccfaeccde5f281d15772a6748e55b6908b 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario @@ -1,7 +1,7 @@ { "name" : "01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario index e5b2a6997dae77a7c14017001271a5a583e97748..fa462a6c69e2cb20eb85b97c188acc6094458daf 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario @@ -1,7 +1,7 @@ { "name" : "02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario index 337de6a2d43beb63124194ca375fb211637054e7..f76c4d681ea67b8a39ec5b795393343c490518f4 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario @@ -1,7 +1,7 @@ { "name" : "03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario index f92342a58ac6b464ba11707da7e3063c1ea27e0c..4ab1d5c0c5bc48c4a62fab95f5d7f33372b6e643 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario @@ -1,7 +1,7 @@ { "name" : "04-Test-TargetChanger-SupportsListsOfTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario index 9632a307f11bf42504fb60a013422a34b8cff87d..76442a83967aa4735b0ca0181f19d2d28a51f695 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario @@ -1,7 +1,7 @@ { "name" : "05-Test-TargetChanger-CanCreateAListOfTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario index 6b9b05692de26c7f05740ae2554ea13cf66533ab..68dd8515e10a4c153d2744348b92cc5d08957ae6 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario @@ -1,7 +1,7 @@ { "name" : "06-Test-TargetChanger-ChangesToDynamicTarget", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario index 9910daf558a65b7754cca592caa537d649e2f36e..9f6106331453eb5fc6b9338061f2d1b8f14f13ad 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario @@ -1,7 +1,7 @@ { "name" : "Reynolds_test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario index 50fe55a2c263d5aaf75f73f785a94749d53c6da4..d2ef41da0fef3ff32aa13e40e80a4174ccbca986 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "Reynolds_test_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -78,10 +78,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario index 7510d10bb33c5bb6a9ebe5e4b8e369481b8798a0..7e54752b6a31c69a5b8be0c02fe7de1a3d4e8429 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario index 79a17118fbae4ff8f3e9ece88ad8b5b0a71bfe00..909e533d536afb52fecd9361174ff330afcb0bdc 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm1_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario index 15a083b6b52bed53e641fa5fbf802efca0b8ef76..739dc14a7dc23bcf910a14a457ec047379b8176b 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario index 637db1a531355412efa8dfa411f5e217f531ba43..ab544b4b4666e04e844dccf913ce3153c9d24a66 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario index f442a600f41285e8c28ff9aeeb6cbe12053e9af4..fd951f77b10842f6faff722fe370e85e8e7e2c71 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_1_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario index 990b2520bba0b4d96e6bebfc9725b8b97580c5d4..132ace31f28743123f2721eab69269e8c650b53f 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_2_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario index 558aef0781050c50ec1658dfba2cb9006693e237..fd8656e82df438afc126c58ebae9198b810022e6 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_3_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario index 3f2c218ce76ffab71cf0cb899e4e4c0b14628b23..2399d5b8d050c17f13afa001b4d2be1e075e4a1b 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario index 0b3f09c7d7a790ddb97ce553ee638e94b770db5f..6297c9271cdc7103b430861c96fa65f62f3ec459 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario index f0098d233bd33e03d51c947e34c4ad0a186a13b0..8ba9830e9c6329c6fa3782d462965250d23133d2 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario index 97f5d23db4bc49edc154b0f487017b183607129d..559f365134415b856e19979733e750bcbb78a386 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario index 4cea6c9b81cb1bc3016bdde905e802717f4a09ff..f98c68c57030d7b825278519abe1e775d00d0b85 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario index 3d05e889a2f682c3906a312e70af3469545941d6..349f4a448a56de22189cc214f87248f58961c0d1 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario index 4fa2d80aba987a3f123b280b0576f8094c0d07ca..29ff2d9b446b0414ca4cd079cd502e68f2d9342d 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_025_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario index 60815bd1d59581dee15e5c4f424525a48d090faa..585da14b7a10b2e61be52792c45e6aa9177d8f23 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario index 7222e23db623bf06328de28a6257248de7473c7c..15fad0689c115c88e948ee089f83774e796ec7dd 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario index e03bc4f0bdf963553ad5b4e1a8fb57b5c2df187b..485b3958644c5e009948dcdc62b0bf0a0778b7d9 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario index 432ab63c84eb23cfaa2dc5f2d3e34d24978fcfd0..2d15ecd6466994fd3d7cf97202adaf06997a83b2 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario index 91240f84784e3e1936bae9d36995f8080be618e3..197d348c2f5746cdcc9894b95620f0f0124fa9aa 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario index dc82d55d5f337ed2bf7502261c1579be27e6cf87..ad67ea78062b1dcef1e180289693cec001baf683 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario index c596e7690fc83c45e5bc10b509ae5ac3849c59c7..d1c9e479fda4c8a70c1d0e1368cef6b6071fa9c1 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario index d6dfe5219fc3f42653111651dd0bcdb041e81e25..2fb7529103a815ddf04264142cb8d9a9a4bfac06 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -105,10 +105,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario index 4246bdeeffa2931652b06600d308137c7511ae57..db8ee05959844360fdd36f9aa101569281e696a8 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_1_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario index 6a46e6d84c5419c8b7fc7318260d6b3f43521ec2..75f8407707e4aad277e24d76ef550fd9e7c06e22 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_1_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario index f275e271f693636fae0d18eeadc5f14925af710b..11636d850ab5f5f28273b739a2ecd45ae983f5af 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_2_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario index da47661967b3ae1c0301df0781e3851bcc424941..619233522e94130d79a1c364de38320b4336491b 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_2_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario index 232807d4d383d872642d14eea32347619b9f80d1..463f29132412cf75b564790d2bf6ee231d40a601 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_3_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario index 677a72b71a730d5cbc84615413654f0db63867e2..720ab63b053e70f7b6f27c58569b6b67080ba8c3 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_3_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario index ef9024b3136318b4e6e725b2dbbce989e09de3d2..8447d34774124b2fd307b3ea4d97d321c54096fc 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_4_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario index 09fd7c41ddc1ef46752ab54b8553849f23555c21..843e4390278b6bc13f8a8d3bd351d40e3ed4ecc9 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_4_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario index 8f2106dde379b9719275dbf1362e5abf9a791703..c845e10916b98c81706f15b0e2df717698e7ef7b 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_1_2_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario index d8b5cad0ec9e9d4db1a378f76552cbc850f8bc10..8053c78182e970848f7da56c1a02ce9402689ed7 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_1_2_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario index 541fb7cfea7866b2e4bfcf02dcfe89660f0ce3a7..378cff4717ac0bba82af6463daad5886b63de9a5 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_3_4_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario index 1ed93db7b0b48c49a167fcc2e1904a30b18e2c68..d2167acbe6c8d68359bd027b93fac5f924da9032 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_3_4_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario index d22d7ff77aa7c138be89a931be919cb08aa9c744..114bd5cf98f577fccd620015f32a0064f6e75c44 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_down_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario index 5c375d47dca77d3f94481829b15b4884d3f0eaeb..dea9086c67a482c00ee9014e0f56b39ad776662c 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_down_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario index 7ae4902c54bf46839e91ad9a86f38df946f58327..9ee9a32f6e69e055298ee8fde0570012ce90352a 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_to_right_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario index 696e2367888151b2d5307fcd41a74df12b5c362f..cd4a8ba2154bacfd0cb2cfc391872917e794bce7 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_to_right_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario index 99af4e4eb703f6fc679290e80e73137c43de617c..6d12c9ab45ac4b48c979fbbc0a0ce3fc429cc299 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_toleft_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario index 35ce28eead8aaacdfdca457f1cc28efb089d2330..88d443d827dce57989e8e2554cbda7458a818b61 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_toleft_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario index 0eab9645c77103ecdd097b3a84eef90b13633d26..813fad49da552da680275e5f0ee1f00860a5ac64 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_up_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario index a46302eb50e02ef578859e038f082aa7c1501bd9..4846a35246dfa37ee7a612e5afae2fc25c0780dc 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_up_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario index f13287aa8963f3d204364ebc40f19aac8bea706f..e94bcafa2c4dfac715c4b282510e1014c239767e 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario @@ -1,7 +1,7 @@ { "name" : "counterflow", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario index 9048b30b5df4550378c2f7658e8245b7ac5dcfe9..3a52537651c7848528cd6bbd3094619525e6c95a 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario @@ -1,7 +1,7 @@ { "name" : "labyrinth", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario index 5d15e5160c978cbe483cca83e52c06ff6e20b9e5..3163ba2e5f43e4533b78d1c587c205df443871f1 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario index 206b33dfd353534902c6df3d3e2897bc750d7f01..56b307c5a8405eec3a58be15c18e0d8c9b450620 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario @@ -1,7 +1,7 @@ { "name" : "s2ucre", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario index cca7d04d84ddee4a59233f5ccb3e037c9d9ce3db..dd549265caf20bdbdcf8a6f5d650273b3a1f07c9 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario @@ -1,7 +1,7 @@ { "name" : "BHM_Liddle_fixed_seed", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -108,10 +108,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario index 0a1abfac92229f5a0fed4609e0cbb663cfdf6032..4204dd9e893a5f2c83d0951face934dd863fe93e 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario @@ -1,7 +1,7 @@ { "name" : "CA_basic_2_density", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario index 513c4d8130cda9d6b7bcf14631f0fbf7a9c46f1c..1c4ae70a066c3652b6d9433a8fee34618ba15212 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario @@ -1,7 +1,7 @@ { "name" : "GNM_basic_1_chicken", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario index 25dff002b234529f7f9736839d023f9ad08fa879..d1aa59484ae2a0d56e838ae687e8ee3b6cf5d35d 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_NAVIGATION", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario index 4e2a55228c2fda7f55a997b6e263a32a9eed4fd8..148380fb9f7c8364b9dc0a426d2b2dbd413cb8f2 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_OBSTACLES", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario index 4049d6abae8a8dfa27544424a0aba1d1fb3d8f49..b04d64eba003091b5a61394ad3fd7c1b12470256 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_QUEUEING", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario index f1549718c990152b5558a650a85a5f10d4114089..7ccb0fa9d72307bf9ffc3d553c771c99c39e5655 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_UNIT", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario index 8e729f038627788262b0240fbd5eb70e03492dd4..d626a5c971b6dec5605eefaaaaf1973cd5451e48 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_NAVIGATION_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario index a2240da5611696967631766b8fe95a38c069b6b0..68e0a4ae9c7f9228b07f89bde215ee6842f82f5e 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_NAVIGATION_groups_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario index fb0aa773af69977ecf1c9d78841562107409cbfb..afb68de5a80a68182cd78a679a960af1e91430eb 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_UNIT_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario index 0d1cd389f9a6fbc0518026741e6b52e0165f7074..3b8e029bcf53c97c56c199ffd0043a3d3c740383 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_UNIT_groups_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/SUQController/tutorial/example.scenario b/Tools/SUQController/tutorial/example.scenario index 16c78560497b93d72bc9a7775ff23f3341b092ae..21ec67817ede059e5d159c06e34af6d24f09b9fc 100644 --- a/Tools/SUQController/tutorial/example.scenario +++ b/Tools/SUQController/tutorial/example.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_pso", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -102,10 +102,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario index d5d700db406faded643306362c3fdd71bd2c7acd..3ba41a2123a73486c446d2b3dd7c2de47ee72297 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario index 8e51a81b73fb72f50a3ae23d368ab61a49840097..6b0fd291924eb305f73fda7f3bd6324168bc3247 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario index c99348c6c8a885b124ada4082927f6187725aa44..a082873e360ec66d549c42470f9c9dc2a1493413 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario index 9b6accfa6ddc30f5d91dc226f96247f5b1cd17c3..b9a1b5167d487c5a0cc47205d8bc6c6c3e219424 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario index b8a503c23827f80c3679e3f5e94b3ed6fcb927c5..58f9d05ab76449b482fd77f1393ee616d5282b06 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario index bfbfb9b4a03948048da74be557d488830ccaa40d..361f907c0ea0542d553c092f6ae212f1e8ffbdba 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario index 6444daa3ff1d3507f1fcb145c2a4181d46c5405f..434453883f5c810b8cb903aae44fc18422ef1816 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario index 2dff5b7fae999887c07159ef356d792026365d22..0f4102cb400922231dc4d8b57b0786ee3676df1e 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario index 962098deadcede60c4144a23715c22865dbd158d..3dfcab8430d7d8e0fdc42b441caf140f76ecf9c9 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario @@ -1,7 +1,7 @@ { "name" : "empty", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario index d5d700db406faded643306362c3fdd71bd2c7acd..3ba41a2123a73486c446d2b3dd7c2de47ee72297 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario index 8e51a81b73fb72f50a3ae23d368ab61a49840097..6b0fd291924eb305f73fda7f3bd6324168bc3247 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario index c99348c6c8a885b124ada4082927f6187725aa44..a082873e360ec66d549c42470f9c9dc2a1493413 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario index 9b6accfa6ddc30f5d91dc226f96247f5b1cd17c3..b9a1b5167d487c5a0cc47205d8bc6c6c3e219424 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario index b8a503c23827f80c3679e3f5e94b3ed6fcb927c5..58f9d05ab76449b482fd77f1393ee616d5282b06 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario index bfbfb9b4a03948048da74be557d488830ccaa40d..361f907c0ea0542d553c092f6ae212f1e8ffbdba 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario index 6444daa3ff1d3507f1fcb145c2a4181d46c5405f..434453883f5c810b8cb903aae44fc18422ef1816 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario index 2dff5b7fae999887c07159ef356d792026365d22..0f4102cb400922231dc4d8b57b0786ee3676df1e 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario index 962098deadcede60c4144a23715c22865dbd158d..3dfcab8430d7d8e0fdc42b441caf140f76ecf9c9 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario @@ -1,7 +1,7 @@ { "name" : "empty", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereGui/resources/messages.properties b/VadereGui/resources/messages.properties index ce16cc5b2128c6231936cd51f5100f5c40751d69..20dd5498f8a8e2660238cef2a59921ab0d40b6f3 100644 --- a/VadereGui/resources/messages.properties +++ b/VadereGui/resources/messages.properties @@ -384,7 +384,6 @@ Tab.Model.insertModelNameMenu.title=Insert model name Tab.Model.insertModelNameSubMenu.title=Main models Tab.Pedestrians.title=Pedestrians Tab.Psychology.title=Psychology -Tab.Strategy.title=Strategy Tab.Topography.title=Topography Tab.Perception.title=Perception Tab.OutputProcessors.title=Data output diff --git a/VadereGui/resources/messages_de_DE.properties b/VadereGui/resources/messages_de_DE.properties index ec0541cdf6f2486bfa95803c858d5ac05bfe4a57..12e9b739ddc3c94bbb4f20fb6d60d58ab0c20178 100644 --- a/VadereGui/resources/messages_de_DE.properties +++ b/VadereGui/resources/messages_de_DE.properties @@ -372,7 +372,6 @@ Tab.Model.insertModelNameMenu.title=Model-Name einf\u00fcgen Tab.Model.insertModelNameSubMenu.title=Hauptmodelle Tab.Pedestrians.title=Fu\u00dfg\u00e4nger Tab.Psychology.title=Psychologie -Tab.Strategy.title=Strategie Tab.Topography.title=Topographie Tab.Perception.title=Perzeption Tab.OutputProcessors.title=Datenausgabe diff --git a/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java b/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java index fe803c4dd736f336927be32fe75df9309c4454d4..19483f8fb981aa30d8d3ceed536adcd9edd53a51 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java @@ -10,7 +10,6 @@ public enum AttributeType { public final static String scenarioAttributes = "scenario attributes"; public final static String carAttributes = "car attributes"; public final static String stimulusAttributes = "stimulus attributes"; - public final static String strategyAttributes = "strategy attributes"; public static AttributeType fromName(String name) { @@ -29,8 +28,6 @@ public enum AttributeType { return CAR; case stimulusAttributes: return PERCEPTION; - case strategyAttributes: - return STRATEGY; default: throw new IllegalArgumentException("name " + name + " does not match any attribute type."); } diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index ab213d95c81cf12601a63ed901c536d568cb382a..1c8b4a404c140ae4135c80c3e4a198617fb6b184 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -39,7 +39,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro // tabs private List menusInTabs = new ArrayList<>(); private TextView attributesSimulationView; // Simulation tab - private TextView attributesStrategyFileView; // Strategy tab private TextView attributesModelView; // Model tab private TextView attributesPsychologyView; // Psychology tab private TextView topographyFileView; // Topography tab @@ -220,11 +219,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro perceptionFileView.isEditable(true); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView); - attributesStrategyFileView = - new TextView("ProjectView.defaultDirectoryAttributes", AttributeType.STRATEGY); - attributesStrategyFileView.isEditable(true); - tabbedPane.addTab(Messages.getString("Tab.Strategy.title"), attributesStrategyFileView); - dataProcessingGUIview = new DataProcessingView(model); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); @@ -318,9 +312,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro this.perceptionFileView.setVadereScenario(scenario); this.perceptionFileView.isEditable(isEditable); - this.attributesStrategyFileView.setVadereScenario(scenario); - this.attributesStrategyFileView.isEditable(isEditable); - this.dataProcessingGUIview.setVadereScenario(scenario); this.dataProcessingGUIview.isEditable(isEditable); } diff --git a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java index 83c6e47ac10bf20c77e410529a0b35a43fb20574..5f35a8b21d8612aabd79f1d459950202a0ea3dcf 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java @@ -200,10 +200,6 @@ public class TextView extends JPanel implements IJsonView { StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuli(json); currentScenario.getScenarioStore().setStimulusInfoStore(stimulusInfoStore); break; - case STRATEGY: - currentScenario - .setAttributesStrategy(StateJsonConverter.deserializeAttributesStrategyModel(json)); - break; default: throw new RuntimeException("attribute type not implemented."); } @@ -306,10 +302,6 @@ public class TextView extends JPanel implements IJsonView { StimulusInfoStore stimulusInfoStore = scenario.getScenarioStore().getStimulusInfoStore(); textfileTextarea.setText(StateJsonConverter.serializeStimuli(stimulusInfoStore)); break; - case STRATEGY: - textfileTextarea - .setText(StateJsonConverter.serializeAttributesStrategyModel(scenario.getAttributesStrategyModel())); - break; default: throw new RuntimeException("attribute type not implemented."); } diff --git a/VadereGui/testResources/test-scenario.scenario b/VadereGui/testResources/test-scenario.scenario index c5eb1fc8de862286d1fb3909917ed6b03be3b9c5..abbb73cd8bd4f0cf826ba0d82009eae5806d4f12 100644 --- a/VadereGui/testResources/test-scenario.scenario +++ b/VadereGui/testResources/test-scenario.scenario @@ -1,7 +1,7 @@ { "name" : "Neues_Szenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -239,10 +239,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java index 1c7180439d8fe2d9e5935c2ad53a540af9efd7d6..eb5a0083120fcbce4f542b81741264ccf515fd4a 100644 --- a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java +++ b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java @@ -11,7 +11,6 @@ import org.vadere.simulator.projects.io.IOVadere; import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.models.AttributesFloorField; import org.vadere.state.attributes.models.AttributesOSM; import org.vadere.state.attributes.models.AttributesPotentialCompact; @@ -48,9 +47,9 @@ public class TestProjectWriterAndReader { attributes.add(new AttributesFloorField()); attributes.add(new AttributesPotentialOSM()); LinkedList tests = new LinkedList<>(); - tests.add(new Scenario(new ScenarioStore(testName + "1", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); - tests.add(new Scenario(new ScenarioStore(testName + "2", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); - tests.add(new Scenario(new ScenarioStore(testName + "3", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); + tests.add(new Scenario(new ScenarioStore(testName + "1", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); + tests.add(new Scenario(new ScenarioStore(testName + "2", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); + tests.add(new Scenario(new ScenarioStore(testName + "3", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); testProject = new VadereProject(testProjectName, tests, Paths.get(".")); } diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java index 67bd2279b0f68ac2be42b47b018999658a7d44d3..b6b70b8f40af3fc177997b58872fc062e6a1acf0 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java @@ -66,7 +66,7 @@ public class OfflineSimulation { .map(t -> t.getAgent(step.getStepNumber())) .filter(opt -> opt.isPresent()).forEach(opt -> topography.addElement(opt.get())); return new SimulationState(vadere.getName(), topography, vadere.getScenarioStore(), - (step.getStepNumber()-1) * vadere.getAttributesSimulation().getSimTimeStepLength(), step.getStepNumber(), null, null); + (step.getStepNumber()-1) * vadere.getAttributesSimulation().getSimTimeStepLength(), step.getStepNumber(), null); } private void prepareOutput() { diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java index 131da8a9d0e5cf352db16e0f4c34c211f2784689..837d41126de4660d1260ad2218b5059aceddb115 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java @@ -17,11 +17,9 @@ import org.vadere.simulator.control.psychology.perception.models.IPerceptionMode import org.vadere.simulator.control.psychology.perception.helpers.PerceptionModelBuilder; import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.scenarioelements.TargetChangerController; -import org.vadere.simulator.control.strategy.helpers.StrategyModelBuilder; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.models.MainModelBuilder; import org.vadere.simulator.models.potential.solver.EikonalSolverCacheProvider; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.projects.Domain; import org.vadere.simulator.projects.RunnableFinishedListener; import org.vadere.simulator.projects.Scenario; @@ -180,7 +178,6 @@ public class ScenarioRun implements Runnable { IPerceptionModel perceptionModel = PerceptionModelBuilder.instantiateModel(scenarioStore); ICognitionModel cognitionModel = CognitionModelBuilder.instantiateModel(scenarioStore); - IStrategyModel strategyModel = StrategyModelBuilder.instantiateModel(scenarioStore); // ensure all elements have unique id before attributes are sealed @@ -194,7 +191,7 @@ public class ScenarioRun implements Runnable { passiveCallbacks, random, processorManager, simulationResult, remoteRunListeners, singleStepMode, - scenarioCache, strategyModel); + scenarioCache); } simulation.run(); diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java index cefd2b149c22afbf764865b7a90df1d1b7325f75..1c884bcffae84c1248049b207597e0812ce90661 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java @@ -5,7 +5,6 @@ import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel; import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.scenarioelements.*; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.models.DynamicElementFactory; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.models.Model; @@ -80,7 +79,6 @@ public class Simulation { private final MainModel mainModel; private final IPerceptionModel perceptionModel; private final ICognitionModel cognitionModel; - private final IStrategyModel strategyModel; /** Hold the topography in an extra field for convenience. */ private final Topography topography; @@ -98,13 +96,13 @@ public class Simulation { List passiveCallbacks, Random random, ProcessorManager processorManager, SimulationResult simulationResult, List remoteRunListeners, boolean singleStepMode, - ScenarioCache scenarioCache, IStrategyModel strategyModel) { + ScenarioCache scenarioCache) { this.name = name; this.mainModel = mainModel; this.perceptionModel = perceptionModel; this.cognitionModel = cognitionModel; - this.strategyModel = strategyModel; + this.scenarioStore = scenarioStore; this.attributesSimulation = scenarioStore.getAttributesSimulation(); @@ -213,9 +211,6 @@ public class Simulation { for (Model m : models) { m.preLoop(simTimeInSec); } - if (strategyModel != null){ - strategyModel.initialize(simTimeInSec); - } for (PassiveCallback c : passiveCallbacks) { c.preLoop(simTimeInSec); @@ -227,7 +222,7 @@ public class Simulation { } private void postLoop() { - simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel, strategyModel); + simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel); topographyController.postLoop(this.simTimeInSec); for (Model m : models) { @@ -286,7 +281,7 @@ public class Simulation { updateCallbacks(simTimeInSec); step++; - this.simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel, strategyModel); + this.simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel); if (attributesSimulation.isWriteSimulationData()) { processorManager.update(this.simulationState); @@ -373,7 +368,7 @@ public class Simulation { } private SimulationState initialSimulationState() { - SimulationState state = new SimulationState(name, topography.clone(), scenarioStore, simTimeInSec, step, mainModel, strategyModel ); + SimulationState state = new SimulationState(name, topography.clone(), scenarioStore, simTimeInSec, step, mainModel); return state; } @@ -382,8 +377,6 @@ public class Simulation { updateScenarioElements(simTimeInSec); - updateStrategyLayer(simTimeInSec); - updatePsychologyLayer(simTimeInSec); updateLocomotionLayer(simTimeInSec); @@ -422,19 +415,6 @@ public class Simulation { topographyController.update(simTimeInSec); //rebuild CellGrid } - private void updateStrategyLayer(double simTimeInSec) { - - if (scenarioStore.getAttributesStrategyModel().isUseStrategyModel()) { - - if (simTimeInSec == startTimeInSec) { - strategyModel.update(simTimeInSec, topography, null); - } - strategyModel.update(simTimeInSec, topography, processorManager); - } - - - } - private void updatePsychologyLayer(double simTimeInSec) { Collection pedestrians = topography.getElements(Pedestrian.class); diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java index 31e94849bd34b9e1af6ff1258b2f7cd7ddc14b89..ab9174102a47ff714a80d26f0737d84a01c69012 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java @@ -1,7 +1,6 @@ package org.vadere.simulator.control.simulation; import org.jetbrains.annotations.Nullable; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.projects.ScenarioStore; import org.vadere.state.scenario.Topography; @@ -18,34 +17,30 @@ public class SimulationState { private final String name; private final MainModel mainModel; private boolean simStop = false; - private final IStrategyModel strategyModel; protected SimulationState(final String name, final Topography topography, final ScenarioStore scenarioStore, final double simTimeInSec, final int step, - @Nullable final MainModel mainModel, - final IStrategyModel strategyModel) { + @Nullable final MainModel mainModel) { this.name = name; this.topography = topography; this.simTimeInSec = simTimeInSec; this.step = step; this.scenarioStore = scenarioStore; this.mainModel = mainModel; - this.strategyModel = strategyModel; } @Deprecated public SimulationState(final Map pedestrianPositionMap, final Topography topography, - final double simTimeInSec, final int step, final IStrategyModel strategyModel) { + final double simTimeInSec, final int step) { this.name = ""; this.topography = topography; this.simTimeInSec = simTimeInSec; this.step = step; this.scenarioStore = null; this.mainModel = null; - this.strategyModel = null; } // public access to getters @@ -90,9 +85,5 @@ public class SimulationState { return simStop; } - public IStrategyModel getStrategyModel(){ - return strategyModel; - } - } diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java deleted file mode 100644 index 59e8127fc3d28ea1d00f3e16775aae72ea2681ff..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.vadere.simulator.control.strategy.helpers; - - -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.simulator.projects.ScenarioStore; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.util.reflection.DynamicClassInstantiator; - -public class StrategyModelBuilder { - - public static final String JAVA_PACKAGE_SEPARATOR = "."; - - public static IStrategyModel instantiateModel(ScenarioStore scenarioStore) { - String simpleClassName = scenarioStore.getAttributesStrategyModel().getStrategyModel(); - if (simpleClassName != null) { - String classSearchPath = "org.vadere.simulator.models.strategy"; - String fullyQualifiedClassName = classSearchPath + JAVA_PACKAGE_SEPARATOR + simpleClassName; - - DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); - IStrategyModel strategyModel = instantiator.createObject(fullyQualifiedClassName); - - strategyModel.build(scenarioStore.getAttributesStrategyModel()); - return strategyModel; - } - else{ - return null; - } - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java deleted file mode 100644 index 5f583a299aee001ead5b0d601d50328a71709fbe..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.vadere.simulator.control.strategy.models; - -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.Topography; - -public interface IStrategyModel { - - /* - * @param pedestrians The pedestrians to update - */ - - - void update(double simTimeInSec, Topography top, ProcessorManager processorManager); - - void build(AttributesStrategyModel attr); - - void initialize(double simTimeInSec); - - V getStrategyInfoForDataProcessor(); - -} diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java deleted file mode 100644 index 48a7d70746af7db8a50eb3899c8b75174a75622c..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.vadere.simulator.control.strategy.models.navigation; - - -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.state.attributes.AttributesStrategyModel; - - -public interface INavigationModel extends IStrategyModel { - -} diff --git a/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java b/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java deleted file mode 100644 index 067937bc6cc3e611c24a9d02d5c2a27f1598fb31..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.vadere.simulator.models.strategy; - -import org.vadere.simulator.control.strategy.models.navigation.INavigationModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.MeasurementArea; -import org.vadere.state.scenario.Pedestrian; -import org.vadere.state.scenario.Topography; -import org.vadere.util.logging.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.*; - -/** - * The ReadSetControllerInputs is directly connected to - * 1. the *.scenario file Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario - * 2 .the *.csv file Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv - * - * The ReadSetControllerInputs class serves as a simple script which allows to proceed - * external multidimensional controller input which can not be passed as a parameter. - * - * In the scenario, there are two corridors. - * The time dependent parameter "percentageLeft" controls how many agents use the left corridor. - * If percentageLeft=0, the agents use the right and shorter path only (default OSM behavior) - * If percentageLeft=1, the agents use the left corridor only. - * @author Christina Mayr - * @since 2020-08-28 - */ - - -public class ReadSetControllerInputs implements INavigationModel { - - private double[][] controllerInputs; - private int counter = 0; - private String filePath; - private ArrayList newAgents = new ArrayList(); - private ArrayList processedAgents = new ArrayList(); - double ratioReal = 0.0; - - private static Logger logger = Logger.getLogger(ReadSetControllerInputs.class); - - - @Override - public void initialize(double simTimeInSec) { - - String fileName = this.filePath; - - try { - this.controllerInputs = Files.lines(Paths.get(fileName)).map(s -> s.split(" ")).map(s -> Arrays.stream(s).mapToDouble(Double::parseDouble).toArray()).toArray(double[][]::new); - } catch (IOException e) { - e.printStackTrace(); - } - - } - - - public void update(double simTimeInSec, Topography top, ProcessorManager processorManager) { - - - double percentageLeft = controllerInputs[counter][1]; - getAgentsInControllerArea(top); - - - if ((!newAgents.isEmpty()) && (counter % 10 == 0)) { - - printAgentIds(simTimeInSec); - - int numberLeft = (int) (newAgents.size() * percentageLeft); - int numberRight = newAgents.size() - numberLeft; - ratioReal = numberLeft * 1.0 / newAgents.size(); - - LinkedList targets = new LinkedList(); - for (int i = 0; i < numberLeft; i++) { - targets.add(2001); - } - for (int i = 0; i < numberRight; i++) { - targets.add(2002); - } - - int c = 0; - for (Pedestrian pedestrian : newAgents) { - - LinkedList nextTargets = new LinkedList(); - nextTargets.add(targets.get(c)); - nextTargets.add(1); - pedestrian.setTargets(nextTargets); - c += 1; - } - - processedAgents.addAll(newAgents); - newAgents.clear(); - - } - - counter += 1; - - } - - private void printAgentIds(double simTimeInSec) { - - String info = "Time: " + String.format("%5.1fs", simTimeInSec) + ": Agents in control area: "; - - for (Pedestrian agent : newAgents) { - info += " " + agent.getId(); - } - logger.info(info); - } - - @Override - public void build(AttributesStrategyModel attr) { - filePath = attr.getArguments().get(0); // first element contains path to file - - } - - private void getAgentsInControllerArea(Topography topography) { - - MeasurementArea m = topography.getMeasurementArea(555); - Collection pedestrians = topography.getElements(Pedestrian.class); - - for (Pedestrian p : pedestrians) { - if (m.getShape().contains(p.getPosition())) { - if (!newAgents.contains(p) && !processedAgents.contains(p)) { - newAgents.add(p); - } - } - } - - } - - @Override - public Double getStrategyInfoForDataProcessor() { - return ratioReal; - } - -} diff --git a/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java b/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java deleted file mode 100644 index 25690c6c0478077f7d56450b9f84b80b890f5a36..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java +++ /dev/null @@ -1,154 +0,0 @@ -package org.vadere.simulator.models.strategy; - -import com.github.cschen1205.fuzzylogic.FuzzySet; -import com.github.cschen1205.fuzzylogic.*; -import com.github.cschen1205.fuzzylogic.memberships.*; -import org.vadere.simulator.control.strategy.models.navigation.INavigationModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.Pedestrian; -import org.vadere.state.scenario.Topography; - -import java.util.*; -import java.util.stream.Collectors; - -// https://github.com/cschen1205/java-fuzzy-logic - - -public class RouteChoiceThreeCorridors implements INavigationModel { - - private RuleInferenceEngine rie; - private FuzzySet corridor; - private FuzzySet density; - private FuzzySet density1; - private FuzzySet density2; - private FuzzySet density3; - private AttributesStrategyModel attributesStrategyModel; - - - @Override - public void initialize(double simTimeInSec) { - - this.rie = new RuleInferenceEngine(); - - double dX = 0.05; - - corridor = new FuzzySet("corridor", 2001, 2004, dX); - corridor.addMembership("use3", new FuzzyReverseGrade(2001, 2002)); - corridor.addMembership("use2", new FuzzyTriangle(2001, 2002, 2003)); - corridor.addMembership("use1", new FuzzyTriangle(2002, 2003, 2004)); - corridor.addMembership("wait", new FuzzyGrade(2003, 2004)); - rie.addFuzzySet(corridor.getName(), corridor); - - density = new FuzzySet("density", 0, 5, dX); - density.addMembership("low", new FuzzyReverseGrade(0, 0.5)); - density.addMembership("high", new FuzzyGrade(0.4, 5)); - rie.addFuzzySet(density.getName(), density); - - density1 = new FuzzySet("density1", 0, 5, dX); - density1.addMembership("low", new FuzzyReverseGrade(0, 0.25)); - density1.addMembership("high", new FuzzyGrade(0.2, 5)); - rie.addFuzzySet(density1.getName(), density1); - - density2 = new FuzzySet("density2", -4, 4, dX); - density2.addMembership("low", new FuzzyReverseGrade(0, 0.25)); - density2.addMembership("high", new FuzzyGrade(0.2, 5)); - rie.addFuzzySet(density2.getName(), density2); - - - Rule rule; - String ruleName; - String[] d0 = {"high", "high", "high", "high", "low", "low", "low", "low"}; - String[] d1 = {"high", "high", "low", "low", "high", "high", "low", "low"}; - String[] d2 = {"high", "low", "high", "low", "high", "low", "high", "low"}; - String[] re = {"wait", "wait", "wait", "wait", "use3", "use2", "use1", "use1"}; - - - for (int i = 0; i < d0.length; i++) { - - ruleName = "Rule " + (i + 1); - rule = new Rule(ruleName); - - rule.addAntecedent(new Clause(density, "Is", d0[i])); - rule.addAntecedent(new Clause(density1, "Is", d1[i])); - rule.addAntecedent(new Clause(density2, "Is", d2[i])); - rule.setConsequent(new Clause(corridor, "Is", re[i])); - rie.addRule(rule); - } - - - } - - @Override - public Object getStrategyInfoForDataProcessor() { - return null; - } - - - public void update(double simTimeInSec, Topography top, ProcessorManager processorManager) { - - Collection pedestrians = top.getElements(Pedestrian.class); - - - if (simTimeInSec > 0.0) { - - - double densityC0 = getDensityFromDataProcessor(8, processorManager); - double densityC1 = getDensityFromDataProcessor(5, processorManager); - double densityC2 = getDensityFromDataProcessor(6, processorManager); - //double densityC3 = getDensityFromDataProcessor(7, processorManager); - - density.setX(densityC0); - density1.setX(densityC1); - density2.setX(densityC2); - rie.Infer(corridor); - - double targetD = corridor.getX(); - int target; - - if (Double.isNaN(targetD)) { - target = 2003; - } else { - target = (int) Math.round(targetD); - } - - LinkedList nextTargets = new LinkedList(); - nextTargets.add(target); - if (target == 2004) { - nextTargets.add(2001); - } - nextTargets.add(1); - - // System.out.println(simTimeInSec + " " + nextTargets + " \n"); - - List newAgents = pedestrians.stream().filter(p -> p.getFootstepHistory().getFootSteps().size() == 0).collect(Collectors.toList()); - for (Pedestrian pedestrian : newAgents) { - pedestrian.setTargets(nextTargets); - } - - } - - } - - @Override - public void build(AttributesStrategyModel attr) { - attributesStrategyModel = attr; - } - - - private double getDensityFromDataProcessor(int processorId, ProcessorManager processorManager) { - double density = -1.0; - if (processorManager != null) { - AreaDensityCountingProcessor a = (AreaDensityCountingProcessor) processorManager.getProcessor(processorId); - TreeMap data = (TreeMap) a.getData(); - double area = a.getMeasurementArea().asPolygon().getArea(); - if (data.size() > 0) { - density = (double) (Integer) data.lastEntry().getValue(); - density = density / area; - } - } - return density; - - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java b/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java index 2130990c5ee34726c80e82c4c8390ae3f31326e1..2aceae55bf8dc4fc43c3ef5c28da3c1053b7602d 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java @@ -10,7 +10,6 @@ import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.scenario.Topography; import org.vadere.util.io.IOUtils; @@ -139,10 +138,6 @@ public class Scenario { return scenarioStore.getAttributesPsychology(); } - public AttributesStrategyModel getAttributesStrategyModel() { - return scenarioStore.getAttributesStrategyModel(); - } - public Topography getTopography() { return scenarioStore.getTopography(); } @@ -163,9 +158,6 @@ public class Scenario { this.scenarioStore.setAttributesPsychology(attributesPsychology); } - public void setAttributesStrategy(@NotNull final AttributesStrategyModel attributesStrategyModel) { - this.scenarioStore.setAttributesStrategyModel(attributesStrategyModel); - } public void setTopography(@NotNull final Topography topography) { scenarioStore.setTopography(topography); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java index d2ccbbc2537ef0f27e48bfaffceba98f40271e94..8b059a852c2f23d935a5d727aa0c3e8c8e3abaa5 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java @@ -7,7 +7,6 @@ import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.scenario.AttributesCar; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.scenario.Topography; @@ -35,24 +34,22 @@ public class ScenarioStore { private List attributesList; private AttributesSimulation attributesSimulation; private AttributesPsychology attributesPsychology; - private AttributesStrategyModel attributesStrategyModel; private Topography topography; private StimulusInfoStore stimulusInfoStore; public ScenarioStore(final String name, final String description, final String mainModel, final List attributesModel, - final AttributesSimulation attributesSimulation, final Topography topography, final AttributesStrategyModel attributesStrategyModel) { - this(name, description, mainModel, attributesModel, attributesSimulation, new AttributesPsychology(), topography, new StimulusInfoStore(), new AttributesStrategyModel()); + final AttributesSimulation attributesSimulation, final Topography topography) { + this(name, description, mainModel, attributesModel, attributesSimulation, new AttributesPsychology(), topography, new StimulusInfoStore()); } public ScenarioStore(final String name, final String description, final String mainModel, final List attributesModel, - final AttributesSimulation attributesSimulation, final AttributesPsychology attributesPsychology, final Topography topography, final StimulusInfoStore stimulusInfoStore, final AttributesStrategyModel attributesStrategyModel ) { + final AttributesSimulation attributesSimulation, final AttributesPsychology attributesPsychology, final Topography topography, final StimulusInfoStore stimulusInfoStore) { this.name = name; this.description = description; this.mainModel = mainModel; this.attributesList = attributesModel; this.attributesSimulation = attributesSimulation; this.attributesPsychology = attributesPsychology; - this.attributesStrategyModel = attributesStrategyModel; this.topography = topography; this.stimulusInfoStore = stimulusInfoStore; } @@ -68,7 +65,7 @@ public class ScenarioStore { } public ScenarioStore(final String name) { - this(name, "", null, new ArrayList<>(), new AttributesSimulation(), new Topography(), new AttributesStrategyModel()); + this(name, "", null, new ArrayList<>(), new AttributesSimulation(), new Topography()); } public AttributesCar getAttributesCar() { @@ -93,7 +90,6 @@ public class ScenarioStore { attributesList.forEach(a -> a.seal()); attributesSimulation.seal(); attributesPsychology.seal(); - attributesStrategyModel.seal(); getTopography().sealAllAttributes(); } @@ -113,9 +109,6 @@ public class ScenarioStore { this.attributesPsychology = attributesPsychology; } - public void setAttributesStrategyModel(final AttributesStrategyModel attributesStrategyModel) { - this.attributesStrategyModel = attributesStrategyModel; - } public void removeAttributesIf(@NotNull final Predicate predicate) { attributesList.removeIf(predicate); @@ -146,8 +139,6 @@ public class ScenarioStore { public AttributesPsychology getAttributesPsychology() { return attributesPsychology; } - public AttributesStrategyModel getAttributesStrategyModel() {return attributesStrategyModel;} - public List getAttributesList() { return attributesList; } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java b/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java deleted file mode 100644 index 77d6b2c4f1f28d7ab1cc935f6df97aa102ef1d5d..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.vadere.simulator.projects.dataprocessing.processor; - -import org.vadere.annotation.factories.dataprocessors.DataProcessorClass; -import org.vadere.simulator.control.simulation.SimulationState; -import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey; - -/** - * @author Christina Mayr - */ -@DataProcessorClass() -public class StrategyControllerValuesRealized extends StrategyDataProcessor { - - - public StrategyControllerValuesRealized() { - super("RealizedValues"); - } - - @Override - protected void doUpdate(final SimulationState state) { - this.putValue(new TimestepKey(state.getStep()), getStrategyModelOutput(state)); - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java b/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java deleted file mode 100644 index 342129a61728c8f4916734971c2fc4566689d561..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.vadere.simulator.projects.dataprocessing.processor; - -import org.jetbrains.annotations.NotNull; -import org.vadere.annotation.factories.dataprocessors.DataProcessorClass; -import org.vadere.simulator.control.simulation.SimulationState; -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey; -import org.vadere.state.attributes.processor.AttributesAreaProcessor; - -/** - * @author Christina Mayr - * - */ - -public abstract class StrategyDataProcessor extends DataProcessor { - - - protected StrategyDataProcessor(final String... headers) { - super(headers); - } - - @Override - public void init(final ProcessorManager manager) { - super.init(manager); - } - - public V getStrategyModelOutput(@NotNull SimulationState state) { - return (V) state.getStrategyModel().getStrategyInfoForDataProcessor(); - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index d06b9d1197e58f3cd1ec5ba814ad512d32089b14..38ef871d77796319d97fdc683da3e6742388741d 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -49,7 +49,6 @@ public class JsonConverter { AttributesSimulation attributesSimulation = StateJsonConverter.deserializeAttributesSimulationFromNode(scenarioNode.get(AttributesSimulation.JSON_KEY)); AttributesPsychology attributesPsychology = StateJsonConverter.deserializeAttributesPsychologyFromNode(scenarioNode.get(AttributesPsychology.JSON_KEY)); - AttributesStrategyModel attributesStrategyModel = StateJsonConverter.deserializeAttributesStrategyModelFromNode(scenarioNode.get(AttributesStrategyModel.JSON_KEY)); JsonNode attributesModelNode = scenarioNode.get("attributesModel"); @@ -62,7 +61,7 @@ public class JsonConverter { ScenarioStore scenarioStore = new ScenarioStore(scenarioName, scenarioDescription, mainModel, attributesModel, attributesSimulation, attributesPsychology, - topography, stimulusInfoStore, attributesStrategyModel); + topography, stimulusInfoStore); Scenario scenarioRunManager = new Scenario(scenarioStore); scenarioRunManager.setDataProcessingJsonManager(DataProcessingJsonManager.deserializeFromNode(rootNode.get(DataProcessingJsonManager.DATAPROCCESSING_KEY))); @@ -115,8 +114,6 @@ public class JsonConverter { vadereNode.set(AttributesSimulation.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class)); vadereNode.set(AttributesPsychology.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class)); - vadereNode.set(AttributesStrategyModel.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesStrategyModel(), JsonNode.class)); - ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); vadereNode.set("topography", topographyNode); @@ -137,7 +134,6 @@ public class JsonConverter { JsonNode attributesSimulationNode = StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class); JsonNode attributesPsychologyNode = StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class); - ObjectNode attributesStrategyNode = StateJsonConverter.serializeAttributesStrategyModelToNode(scenarioStore.getAttributesStrategyModel()); ObjectNode attributesModelNode = StateJsonConverter.serializeAttributesModelToNode(scenarioStore.getAttributesList()); ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); ObjectNode stimulusNode = StateJsonConverter.serializeStimuliToNode(scenarioStore.getStimulusInfoStore()); @@ -153,8 +149,7 @@ public class JsonConverter { StateJsonConverter.deserializeAttributesSimulationFromNode(attributesSimulationNode), StateJsonConverter.deserializeAttributesPsychologyFromNode(attributesPsychologyNode), StateJsonConverter.deserializeTopographyFromNode(topographyNode), - StateJsonConverter.deserializeStimuliFromArrayNode(stimulusInfosArrayNode), - StateJsonConverter.deserializeAttributesStrategyModelFromNode(attributesStrategyNode) + StateJsonConverter.deserializeStimuliFromArrayNode(stimulusInfosArrayNode) ); } } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java index f8263b1efe8493f20a47a2f21029f051b21a503c..37d0c7d66df60095a667b8e97f5ce6c74b5a568e 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java @@ -149,6 +149,19 @@ public abstract class AbstractJsonTransformation implements JsonTransformation, return node; } + private JsonNode sort_since_V1_15(JsonNode node) { + LinkedHashMap source = (LinkedHashMap) StateJsonConverter.convertJsonNodeToObject(node); + LinkedHashMap sortedRoot = new LinkedHashMap<>(); + putObject(sortedRoot, source, "name"); + putObject(sortedRoot, source, "description"); + putObject(sortedRoot, source, "release"); + putObject(sortedRoot, source, "commithash"); + putObject(sortedRoot, source, "processWriters","files", "processors", "isTimestamped", "isWriteMetaData"); + putObject(sortedRoot, source, "scenario", "mainModel", "attributesModel", AttributesSimulation.JSON_KEY, AttributesPsychology.JSON_KEY, "topography", "stimulusInfos"); + + return StateJsonConverter.deserializeToNode(sortedRoot); + } + private JsonNode sort_since_V1_14(JsonNode node) { LinkedHashMap source = (LinkedHashMap) StateJsonConverter.convertJsonNodeToObject(node); LinkedHashMap sortedRoot = new LinkedHashMap<>(); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java index 7f3b0de80b78fa55b8277164264f8fd5a2e136c1..b7c4b48ee6d3638f3d06be36281bddbf14f8a707 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java @@ -1,20 +1,14 @@ package org.vadere.simulator.projects.migration.jsontranformation.json; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; import org.vadere.simulator.projects.migration.MigrationException; import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; -import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.util.StateJsonConverter; import org.vadere.util.version.Version; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Remove node "threatMemory" under "scenario.topography.dynamicElements.psychologyStatus" */ diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java new file mode 100644 index 0000000000000000000000000000000000000000..9e5586e74cbd9478bb0e876513e970c9f5422344 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java @@ -0,0 +1,45 @@ +package org.vadere.simulator.projects.migration.jsontranformation.json; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.projects.migration.MigrationException; +import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.attributes.AttributesStrategyModel; +import org.vadere.state.util.StateJsonConverter; +import org.vadere.util.version.Version; + +/** + * Remove node "threatMemory" under "scenario.topography.dynamicElements.psychologyStatus" + */ +@MigrationTransformation(targetVersionLabel = "1.15") +public class TargetVersionV1_15 extends SimpleJsonTransformation { + + public TargetVersionV1_15(){ + super(Version.V1_15); + } + + @Override + protected void initDefaultHooks() { + addPostHookFirst(this::addStrategyLayer); + addPostHookLast(this::sort); + } + + public JsonNode addStrategyLayer(JsonNode node) throws MigrationException { + + String useStrategyModelKey = "attributesStrategy"; + + JsonNode scenarioNode = path(node, "scenario"); + + if (hasChild(scenarioNode, useStrategyModelKey)) { + + ObjectNode n = (ObjectNode) scenarioNode; + n.remove(useStrategyModelKey); + + } + + return node; + + } + +} diff --git a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java index a7e006d5422b3e6b53c6145432988e569df3b612..ccb3b67e6bb4401bb9e3473c0b3e05bd72a65bbb 100644 --- a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java +++ b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java @@ -5,7 +5,6 @@ import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.utils.scenariochecker.checks.ScenarioCheckerTest; import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.CheckAreasInAreaDensityVoronoiProcessor; import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.DataProcessorsLinkedToMeasurementArea; -import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.StrategyModelDataProcessorCheck; import org.vadere.simulator.utils.scenariochecker.checks.models.CellularAutomatonSetupCheck; import org.vadere.simulator.utils.scenariochecker.checks.simulation.GroupSetupCheck; import org.vadere.simulator.utils.scenariochecker.checks.simulation.SimulationTimeStepLengthCheck; @@ -66,7 +65,6 @@ public class ScenarioChecker { ret.addAll(runCheck(new TopographyOffsetCheck())); ret.addAll(runCheck(new DataProcessorsLinkedToMeasurementArea())); ret.addAll(runCheck(new CheckAreasInAreaDensityVoronoiProcessor())); - ret.addAll(runCheck(new StrategyModelDataProcessorCheck())); ret.addAll(runCheck(new GroupSetupCheck())); ret.addAll(runCheck(new CellularAutomatonSetupCheck())); return ret; diff --git a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java deleted file mode 100644 index 6e6d7c5194462864c75630f9401f96ad8a956202..0000000000000000000000000000000000000000 --- a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.vadere.simulator.utils.scenariochecker.checks.dataProcessors; - -import org.vadere.simulator.projects.Scenario; -import org.vadere.simulator.projects.dataprocessing.processor.DataProcessor; -import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerMessage; -import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerReason; -import org.vadere.simulator.utils.scenariochecker.checks.AbstractScenarioCheck; -import org.vadere.state.attributes.AttributesStrategyModel; - -import java.util.LinkedList; -import java.util.List; -import java.util.PriorityQueue; - -/** - * @author Christina Mayr - * Warnings if data processors used in strategy model are not defined in data output - */ - -public class StrategyModelDataProcessorCheck extends AbstractScenarioCheck { - - @Override - public PriorityQueue runScenarioCheckerTest(Scenario scenario) { - PriorityQueue messages = new PriorityQueue<>(); - - AttributesStrategyModel attr = scenario.getScenarioStore().getAttributesStrategyModel(); - - - if (attr.isUseStrategyModel()) { - - - LinkedList requiredDataProcessorIds = attr.getRequiredDataProcessorIds(); - List> processors = scenario.getDataProcessingJsonManager().getDataProcessors(); - - - for (Integer i : requiredDataProcessorIds) { - - try { - DataProcessor p = processors.get(i - 1); // processor id = (index +1) - } catch (Exception e) { - messages.add(msgBuilder.dataProcessorAttrError() - .reason(ScenarioCheckerReason.DATAPROCESSOR_MISSING, - String.format(" [Strategy model requires data processor id: %d. Processor not defined.]", i)).build()); - } - - - } - - - } - return messages; - } -} diff --git a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario index b7ce6f4132071303caaae87ed562436f0b580926..de36274d9b2686b4218a790b327fc27da38752a4 100644 --- a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario +++ b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario @@ -1,7 +1,7 @@ { "name" : "TopographyCheckerTest", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario index 83681c6af515cbf149b139a7ce226aab2b99b54c..d58bccfa5d2908704d1442e8449010a117849d80 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario index 069c85f4836051e4dd365039be6ecddea5a38908..8f4286acd994c9d1cc67c3c90dbbdbc836b6e2c0 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario index 7ccb9d834800dd6925a214e056f23288f1a4d090..cf1da87f3d8b34a327c489f55dd47d58bdb52b0a 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario index 816bbd38aa12f96d87042db88d56355c88cdeb10..9ef4447b5e42afe2774ab518e002d501c9c96cbf 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario index fe1fe06c46852f2bee039dabd8a4868849d0a868..5011e35b88317bfa11d6c08dcdd21058fe0cd80a 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario index d3e193723f907552a5cba91e3679fa9fa39a9cf1..b5c9868f643ef07f1ad61fd18eaec3b7da1e6291 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario index a1748eb944173810cb0536147b05e2dd97816e5d..1d2546b5c26e064c4d3101c66a78e69bb854061d 100644 --- a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario +++ b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s001.scenario b/VadereSimulator/testResources/data/cache/s001.scenario index 24f8ebebd45156fd4c9fc97f7ea7a07431e26cd5..3217857eb4b3e19b24eebe6926a914c2eb9f80db 100644 --- a/VadereSimulator/testResources/data/cache/s001.scenario +++ b/VadereSimulator/testResources/data/cache/s001.scenario @@ -1,7 +1,7 @@ { "name" : "s001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s002.scenario b/VadereSimulator/testResources/data/cache/s002.scenario index e6d224988c656f4114a7cfb13af2de03c24a74a5..22bd0f4c672cf4a5b7af1f29e9b30a068178a63f 100644 --- a/VadereSimulator/testResources/data/cache/s002.scenario +++ b/VadereSimulator/testResources/data/cache/s002.scenario @@ -1,7 +1,7 @@ { "name" : "s002", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s003.scenario b/VadereSimulator/testResources/data/cache/s003.scenario index 65d13784c73c7564ffbb22364153252f2d057ace..b68a1743ba605565d132f67c21a0772228920224 100644 --- a/VadereSimulator/testResources/data/cache/s003.scenario +++ b/VadereSimulator/testResources/data/cache/s003.scenario @@ -1,7 +1,7 @@ { "name" : "s002", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario b/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario index 7a962917f86be3019e35fc7b62220ca2bbbb87c6..7a09485eeb2817d848400dfdcad1b308f794a18f 100644 --- a/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario +++ b/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario index 2d55a56bb4c872b13547c3d49fdae6a1bd5505b9..8c3bd0d1e3186ced031d8a4aafc335ac8fa0ecfb 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario index 38774fa4537c9bde833417bacd1d34e2146e2082..0f0f47bd6dfd6bb1e4908c011b1d56d2d7dbd2a1 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario index a191b1964d50a2f2deace01df935acf6ab58b552..eee0c2f88aaa5611a0edc8397958fdbc55844e6c 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario index 983b86d4a2bb47829fb193a0e3adc4b4be520647..19f273d18e289ed77eb8b17ee366fcc7ba0fc8ec 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario @@ -1,7 +1,7 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario index 2d55a56bb4c872b13547c3d49fdae6a1bd5505b9..8c3bd0d1e3186ced031d8a4aafc335ac8fa0ecfb 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario index 38774fa4537c9bde833417bacd1d34e2146e2082..0f0f47bd6dfd6bb1e4908c011b1d56d2d7dbd2a1 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario index 9d1a581a3739c64db18a386c451c07d08bee20c8..982fa66e48f79540d6acba9b45ba029316258e23 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario index a191b1964d50a2f2deace01df935acf6ab58b552..eee0c2f88aaa5611a0edc8397958fdbc55844e6c 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario index 983b86d4a2bb47829fb193a0e3adc4b4be520647..19f273d18e289ed77eb8b17ee366fcc7ba0fc8ec 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario @@ -1,7 +1,7 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario index 21fc845f2218974bb4fc89fa7da91f1bfa5ad828..30062a2dd7b4220c848af3299ef0b75cb930859a 100644 --- a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario +++ b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java index f89820e47ae5b26af87c4b73f906c4fd16221a39..1f3d2b97803db03b6bb645fe11680b942a12ac45 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java @@ -24,8 +24,7 @@ public class StimulusControllerTest { null, null, null, - store, - null); + store); } private ScenarioStore getScenarioStoreContainingRecurringStimulus(boolean isRecurring) { @@ -36,7 +35,7 @@ public class StimulusControllerTest { null, null, null, - getStimulusInfoStoreContainingRecurringStimulus(isRecurring), null); + getStimulusInfoStoreContainingRecurringStimulus(isRecurring)); } private StimulusInfoStore getStimulusInfoStoreContainingRecurringStimulus(boolean isRecurring) { @@ -119,7 +118,7 @@ public class StimulusControllerTest { null, null, null, - stimulusInfoStoreWithBothStimuli, null); + stimulusInfoStoreWithBothStimuli); StimulusController stimulusController = new StimulusController(scenarioStoreContainingOneTimeAndRecurringStimulus); diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 72c28156ebe852fd46bdf8dd29d08ce8080d48a6..373e4b5981bc983e7923a1d05a55ed83bdd83519 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -129,15 +129,6 @@ public abstract class StateJsonConverter { return mapper.treeToValue(node, AttributesPsychology.class); } - public static AttributesStrategyModel deserializeAttributesStrategyModel(String json) throws IOException { - return deserializeObjectFromJson(json, AttributesStrategyModel.class); - } - - public static AttributesStrategyModel deserializeAttributesStrategyModelFromNode(JsonNode node) - throws JsonProcessingException { - return mapper.treeToValue(node, AttributesStrategyModel.class); - } - public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); List attributesList = new LinkedList<>(); diff --git a/VadereUtils/src/org/vadere/util/version/Version.java b/VadereUtils/src/org/vadere/util/version/Version.java index 0657e9a85c3a57c153667435ae9378b1db0f67e5..2dd35c19bac777a94927501bb4f76cb8d958d24e 100644 --- a/VadereUtils/src/org/vadere/util/version/Version.java +++ b/VadereUtils/src/org/vadere/util/version/Version.java @@ -45,7 +45,8 @@ public enum Version { V1_11(1, 11), V1_12(1, 12), V1_13(1, 13), - V1_14(1,14); + V1_14(1,14), + V1_15(1,15); private static Logger logger = Logger.getLogger(Version.class); diff --git a/pom.xml b/pom.xml index 415486b06bd6f40bec996ba3ae23ff41f100a2fe..37788dd9ba4d0a0e86e4bb30c533938267000a63 100644 --- a/pom.xml +++ b/pom.xml @@ -118,11 +118,6 @@ - - com.github.cschen1205 - java-fuzzy-logic - 1.0.1 - com.google.guava guava