Skip to content

GitLab

Commit ffeeb4f3 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Renamed test folder "Bang" to "Threat" and "MiscStimuli" to "VariousStimuli"

parent 9c31fb6e
Pipeline #204329 passed with stages
in 123 minutes and 51 seconds
Hide whitespace changes
Inline Side-by-side
Scenarios/ModelTests/TestPsychology/Stimuli/Bang/scenarios/04_bang_event_one_agent_one_obstacle.scenario deleted 100644 → 0
View file @ 9c31fb6e
{
"name" : "04_bang_event_one_agent_one_obstacle",
"description" : "",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 6 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 6
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.1,
"minimumStepLength" : true,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : true,
"updateType" : "SEQUENTIAL",
"seeSmallWalls" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 50.0,
"obstPotentialWidth" : 0.8,
"obstPotentialHeight" : 6.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
"attributesSimulation" : {
"finishTime" : 50.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -2062305966864041707,
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
}
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 30.0,
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
"x" : 12.9,
"y" : 1.9,
"width" : 2.5,
"height" : 1.2,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"radius" : 1.0,
"center" : {
"x" : 28.0,
"y" : 2.5
},
"type" : "CIRCLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ ],
"dynamicElements" : [ {
"attributes" : {
"id" : 3,
"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
},
"source" : null,
"targetIds" : [ 1 ],
"nextTargetListIndex" : 0,
"isCurrentTargetAnAgent" : false,
"position" : {
"x" : 20.4,
"y" : 2.5
},
"velocity" : {
"x" : 0.0,
"y" : 0.0
},
"freeFlowSpeed" : 1.6,
"followers" : [ ],
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"psychologyStatus" : {
"mostImportantStimulus" : null,
"perceivedThreat" : null,
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
},
"groupIds" : [ ],
"groupSizes" : [ ],
"trajectory" : {
"footSteps" : [ ]
},
"modelPedestrianMap" : null,
"type" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
},
"teleporter" : null,
"attributesCar" : null
},
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 0.0,
"endTime" : 0.4,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"stimuli" : [ {
"type" : "Threat",
"originAsTargetId" : 1,
"loudness" : 1.0,
"radius" : 10.0
} ]
} ]
}
}
\ No newline at end of file
Scenarios/ModelTests/TestPsychology/Stimuli/Bang/scenarios/02-Bang-OneAgent.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/Threat/scenarios/02-Threat-OneAgent.scenario
View file @ ffeeb4f3
{
"name" : "02-Bang-OneAgent",
"name" : "02-Threat-OneAgent",
"description" : "",
"release" : "1.8",
"processWriters" : {
......@@ -225,4 +225,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Stimuli/Bang/scenarios/03-Bang-MultipleAgents.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/Threat/scenarios/03-Threat-MultipleAgents.scenario
View file @ ffeeb4f3
{
"name" : "03-Bang-MultipleAgents",
"name" : "03-Threat-MultipleAgents",
"description" : "",
"release" : "1.8",
"processWriters" : {
......@@ -360,4 +360,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Stimuli/Bang/scenarios/04-Bang-OneAgent-OneObstacle.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/Threat/scenarios/04-Threat-OneAgent-OneObstacle.scenario
View file @ ffeeb4f3
{
"name" : "04_bang_event_one_agent_one_obstacle",
"name" : "04-Threat-OneAgent-OneObstacle",
"description" : "",
"release" : "1.8",
"processWriters" : {
......@@ -234,4 +234,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/01-Wait-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/01-Wait-OSM-Sequential.scenario
View file @ ffeeb4f3
{
"name" : "01-Wait-OSM-Sequential",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/02-Wait-OSM-EventDriven.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/02-Wait-OSM-EventDriven.scenario
View file @ ffeeb4f3
{
"name" : "02-Wait-OSM-EventDriven",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/03-Wait-Recurring-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/03-Wait-Recurring-OSM-Sequential.scenario
View file @ ffeeb4f3
{
"name" : "03-Wait-Recurring-OSM-Sequential",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/04-WaitInArea-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/04-WaitInArea-OSM-Sequential.scenario
View file @ ffeeb4f3
{
"name" : "04-WaitInArea-OSM-Sequential",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/05-WaitInArea-BHM.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/05-WaitInArea-BHM.scenario
View file @ ffeeb4f3
{
"name" : "05-WaitInArea-BHM",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/07-Bang-OSM-EventDriven.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/06-Threat-OSM-Sequential.scenario
View file @ ffeeb4f3
{
"name" : "07-Bang-OSM-EventDriven",
"name" : "06-Threat-OSM-Sequential",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -273,7 +273,7 @@
"waitTimeBetweenRepetition" : 0.0
},
"stimuli" : [ {
"type" : "Bang",
"type" : "Threat",
"originAsTargetId" : 0,
"loudness" : 1.0,
"radius" : 10.0
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/06-Bang-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/07-Threat-OSM-EventDriven.scenario
View file @ ffeeb4f3
{
"name" : "06-Bang-OSM-Sequential",
"name" : "07-Threat-OSM-EventDriven",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -273,7 +273,7 @@
"waitTimeBetweenRepetition" : 0.0
},
"stimuli" : [ {
"type" : "Bang",
"type" : "Threat",
"originAsTargetId" : 0,
"loudness" : 1.0,
"radius" : 10.0
......
Scenarios/ModelTests/TestPsychology/Stimuli/MiscStimuli/scenarios/08-Bang-SelfCatThreatModel.scenario → Scenarios/ModelTests/TestPsychology/Stimuli/VariousStimuli/scenarios/08-Threat-SelfCatThreatModel.scenario
View file @ ffeeb4f3
{
"name" : "08-Bang-SelfCatThreatModel",
"name" : "08-Threat-SelfCatThreatModel",
"description" : "",
"release" : "1.7",
"release" : "1.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -344,7 +344,7 @@
"waitTimeBetweenRepetition" : 0.0
},
"stimuli" : [ {
"type" : "Bang",
"type" : "Threat",
"originAsTargetId" : 0,
"loudness" : 1.0,
"radius" : 10.0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment