diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario index dba0074e1bb7dfbfc3b5c927f473ba1e3bc7610b..b18e45fd31ceb7a21e51832e4700c908f9a55923 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckA", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -152,7 +152,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -313,7 +327,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario index cb878390445160126123251f85a1616ca32efc48..9c6748c6b144df54f49563e6bb79bc5d87b45724 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckB", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -177,7 +177,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -416,7 +430,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario index a618054937b38810a47e993a6755c6af9557bd8d..4baf409ad9ce07a6d5e882cea60607dfeb7abf15 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckB_socialDistancing", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -177,7 +177,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -416,7 +430,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario index 56fc4c8b4f9304b26dde24dcc90b3fb85f47cff5..a7534c9e80111708ff7022802b8af4a8d513f48d 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario @@ -1,8 +1,8 @@ { "name" : "closeContact", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -171,7 +171,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -313,7 +327,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario index 548bb374936cb729068d5a318fb3080dc815a45f..cbb93bc15dad54fd8754dc0ab4dd833d70e1cdcf 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario @@ -1,8 +1,8 @@ { "name" : "passageway", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -152,7 +152,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -318,7 +332,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario index 8f69bcb4dcb9c8a7e3857b1337076259aca5f841..4a47e36f25908541194c7e0402477ac436cf82e5 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario @@ -1,8 +1,8 @@ { "name" : "queue", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -192,7 +192,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -380,7 +394,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario index 2859f010c4373edf662e78ad9af5386d635cb39f..08faa30a657e55e4817d99ac70d5a06c74403f36 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario @@ -1,8 +1,8 @@ { "name" : "hamner-2020-life_postvis_template", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -152,7 +152,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -212,7 +226,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario index 06baa65ecdc95f30facfd1bd50f362138d89d817..6353d1c44c759c818ee314215062f08c66580489 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario @@ -1,8 +1,8 @@ { "name" : "hamner-2020-life_template", "description" : "Superspreading event during a choir rehearsal following hamner-2020-life;\n\nL. Hamner, P. Dubbel, I. Capron, A. Ross, A. Jordan,\nJ. Lee, J. Lynn, A. Ball, S. Narwal, S. Russell, et al.\nHigh SARS-CoV-2 attack rate following exposure at a\nchoir practice — skagit county, washington, march 2020.\nMMWR. Morbidity and Mortality Weekly Report, 69\n(19):606–610, 2020. doi:10.15585/mmwr.mm6919e6.", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -110,7 +110,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -170,7 +184,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario index 35bf98e1582311c93c35ab5f2b12a40bb13f98f0..02445942dc6783badf8dabf1875165c1ab9549fb 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario @@ -1,8 +1,8 @@ { "name" : "lu-2020-life", "description" : "Superspreading event in a restaurant following lu-2021-life;\n\nJ. Lu, J. Gu, K. Li, C. Xu, W. Su, Z. Lai, D. Zhou,\nC. Yu, B. Xu, and Z. Yang. COVID-19 outbreak associated\nwith air conditioning in restaurant, guangzhou,\nchina, 2020. Emerging Infectious Diseases, 26(7):1628–\n1631, 2020. doi:10.3201/eid2607.200764.", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -141,7 +141,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -773,7 +787,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario index 42f6a0cbe9ef6251a27351d1d885e5e9b1dc157a..e6c92f9317fd7a16381a478016426c5e165526c7 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario @@ -1,8 +1,8 @@ { "name" : "miller-2020-life_template", "description" : "Superspreading event during a choir rehearsal following miller-2020-life;\n\nS. L. Miller, W. W. Nazaroff, J. L. Jimenez, A. Boerstra, G. Buonanno, S. J. Dancer, J. Kurnitski, L. C. Marr, L. Morawska, and C. Noakes. Transmission of SARSCoV-2 by inhalation of respiratory aerosol in the skagit valley chorale superspreading event. Indoor Air, 31(2): 314–323, 2020. doi:10.1111/ina.12751.", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -117,7 +117,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -177,7 +191,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git "a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" "b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" index 5b5af0740b4dd337cb7b9d866dfb7972888ce7b1..affdfac9d199579e87b454d9eecc8bd1ce1567ee 100644 --- "a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" +++ "b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" @@ -1,8 +1,8 @@ { "name" : "01-Kaiserslautern-Groß", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -49006,7 +49020,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario index 0cb0a58d885f7fbf90c346ade850dd34fc1f0f6a..ea41a7acec006af199152415e9ffdca49371165d 100644 --- a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario +++ b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario @@ -1,8 +1,8 @@ { "name" : "02-Kaiserslautern-Mittel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -29485,7 +29499,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario index 7c4ba2d0a3a859826692837babf1ae64a60dc971..133b0f4ac788b2044f0fa118e51bad1b2309e25d 100644 --- a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario +++ b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario @@ -1,8 +1,8 @@ { "name" : "03-Kaiserslautern-Klein", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -116,7 +116,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -5753,7 +5767,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario index ff79bcc683bdfdcae5c3717feaa2f963ca568e31..a91c057a7f851ebf87c59e3d5821219e679eb6a7 100644 --- a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario +++ b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario @@ -1,8 +1,8 @@ { "name" : "RichardWagnerStrasse", "description" : "", - "release" : "2.0", - "commithash" : "a45e488c23340a40f8809fb9abb820a7037f1d56", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -132,7 +132,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1218,7 +1232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario index 4e83e8d38d169d45722b76cfc04e60be4e46dc4a..8be2c61dac108c2485724019198937f789f3d5a9 100644 --- a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario +++ b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario @@ -1,8 +1,8 @@ { "name" : "RichardWagnerStrasseScaled", "description" : "", - "release" : "2.0", - "commithash" : "a45e488c23340a40f8809fb9abb820a7037f1d56", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -132,7 +132,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1218,7 +1232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario index 83066e3b30540eea39639e5454fdf0aff1007602..526af1239b5e956944ebd11f073750f3ad703c6d 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -131,7 +131,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -954,15 +968,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : -1, "loudness" : 1.0, "radius" : 5.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario index aa343b7bcb85fade8f9791026488ff13f9846a85..48c375a2dda4132baa8fc8e113102b2074965727 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -131,7 +131,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -945,7 +959,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario index e341bdba6aaf64875ace0dd4e7d8878a7b0ab719..b11518f62efc15dde030e8641b40031050f71953 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -873,7 +887,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario index 0b11ad1436f0ce8d2568adfb4f86514fee58f80e..d05b8e59b747af78d86fbfe820be7f0a4fb35d73 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -131,7 +131,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -885,7 +899,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario index 2daea927722088d021082ffc1c44cd0646a207ff..d462a92bfb280f51a4294aa35022af9c80dd8e00 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -2590,7 +2604,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario index 320dac50687232bab1097e344983933c4c8afe25..46236f927e7a60a64857374a09169fb8d4c9ec83 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -2590,7 +2604,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario index 2c08d81e3d08fd7676f4bad65a63de4c553e51b7..9b63c3844ef37fabd509dbeb0eb13d9c451bce40 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -2590,7 +2604,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ 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 dc039f27d335107f3699dc9c3c4667e59fbe7b66..cb0f10e7073438b961a38cfcc10135c464c8b856 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,8 +1,8 @@ { "name" : "hm_stairs", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1403,7 +1417,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 99b901763e0b7246e2ef628a6fe0a168b5a89daa..ba224539350ad38844c2d8eaf3a45f73a9d5f657 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,8 +1,8 @@ { "name" : "chicken_floorfield_ok_GPU_event", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -170,7 +184,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 45814ad06e9b40cdcef8e3c5f8c330c226b74793..e0ccc15db3e3fce96d80a062165ee244767f99ff 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,8 +1,8 @@ { "name" : "chicken_floorfield_ok_GPU_parallel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -170,7 +184,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario index c137628dca14280fc13e68e51dde76f1b5f6fef1..ecbbb56accd182815dc3b1718b0b0be130856f6c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1137,7 +1151,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario index ff73444b12910bb2db34efaf226555d2f21f69ef..89389a4a3a9e2c7c05599ddd7ab38111320c649e 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1137,7 +1151,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario index 7040ea89001bfabebe4ca76ee4f0e6c11e536e4c..669ea7fd909058266b073cbd877734a8d357e1b7 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_fineTargetGrid", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1069,7 +1083,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario index 3f0e8ee5c1c3231402e06dd932ef6163411d6c68..dd56e41c59192999510160a5206bd3bca507c00b 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1018,7 +1032,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 df70b55418f921a874487cc2592a35e47a3407cb..4368dbf80e0b64d2ee4af533ac623dc931f32697 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets_2_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -448,7 +462,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario index 32862aa6bc8b8bcd41e061857e1871ee897091e1..17bd9e073be639ddb2c362ab497d9963acbb453e 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1120,7 +1134,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 e48f9027f768b93aba2d72e442772a8622cdd475..ed379d19a7652f459f91c70cd93c366b9c5967fc 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_1_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -436,7 +450,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9c5a126bc7c4e8787d2c7dd37b2af5fd7f09bc3b..9e773e02f41dcf62cb9669248ed8bdecf86f49f1 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_3_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +93,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -550,7 +564,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4201bfc52bf3e1a1048cacaf157dbfdd353bc959..5f73b0d2303a9fdc248e873a48a23a975661037a 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_6_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,7 +102,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -730,7 +744,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b1c52267211d55e1c7db22cca4a2d1bf198b6ef4..e7b51655c6ba77baced1f46ca4c76c74bb46ff0c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "NarrowCorridor_3_targets_1_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,7 +102,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -310,7 +324,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 2d6d20f7cb4ce0e7f7a313fca163d50906070db7..7134a7aadcc8624092cf5923941d9fe2381f60e9 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "NarrowCorridor_3_targets_2_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,7 +102,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -368,7 +382,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 3c27dd65dd2a793f01e289222fc01228442feab9..55f603b27fde6273bc268459d3ce2f86cf8d219f 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,7 +102,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -332,7 +346,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 386e702a9a9e0fef0b46a048db9c68111e0d00ac..8cae5cf5d42cd86b5277776fb9abddb821e0d591 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,8 +1,8 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting_with_runner", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,7 +102,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -332,7 +346,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario index a5a2f41b3c2e8753d1680653213345124aafc17a..b16896cfd573b2893163048067223369fd5906c3 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario @@ -1,8 +1,8 @@ { "name" : "test", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1710,7 +1724,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario b/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario index 39952209c139aea4386b028a0d1f71088541b2e8..75ddf32cfac9e0f1345f5cb310e5b743086a6032 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario @@ -1,8 +1,8 @@ { "name" : "MWE_groups_target_changer", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -253,7 +267,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario b/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario index 7fe2c79436edef87b9e283efb60cc53f56109660..d841658966a8ff58412a591a0397d97f24024547 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -275,7 +289,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario index d5e5dfafd0cebbebdc60cf6be750d9f2292606d8..b7b017fc2d8306459976a92f1e2d710bfd56c9da 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_groups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -415,7 +429,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario index d2608db0b972840d815673c03dcfa9e02e3c8a8a..872c848f5bbf17df03b70f2aca97c8accd24ecfe 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -981,7 +995,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario index 1ea3cd8e8ff8786b48fc5f03e91711d023c469ee..c85fb3a1dc7089b4a757f143f9772d204111e42f 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting_less_targets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -669,7 +683,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario index d2b0b92db3984df21da6245b31ec9b15a2f16f79..ce450ddee79a4f982df3a0fe8a4bcc52f993d19a 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting_less_targets_groups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -669,7 +683,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario index 92c707261ef90884d51b45851786dd89bc0a9d37..b08f7f2d21630dd62aae23d0942cc51df7d7f0b3 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_groups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -448,7 +462,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario index 446833dffd87d116cd9cf38f7dd8f8fec55f16bb..c3c653da0498e4c6b696d801bb37d164b41365b8 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_simple", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -299,7 +313,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario index 9b518a15788bf6d88c10496a32baef1409264014..b70ef817bba288e86d9ce954675d1803b90a6fb6 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -981,7 +995,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario index a7db204f20060318b13359c5ca3c93cd92351379..f8f80250e331dda2e0c3985ad186b01d8d0d81ca 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting_less_targets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -663,7 +677,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario index cf4a1a1dcb9f6c768c357be7a5e1d9988fa82977..e7cd5a50a039a25b3a39708157ab2735210a33ea 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting_less_targets_groups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,7 +95,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -669,7 +683,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario index 100494e26c05d26bca9f8b2786b46cbe041dee2c..8246409d9e3a6849af8e1c863e84a8b6e93c2e95 100644 --- a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario +++ b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneck_2m", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -190,7 +190,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -309,7 +323,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario index 705279fb022ca5b9915de135e5fe9b955c3ece85..49eb55cce3f54362f6580670ed47e10bde80551a 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario @@ -1,8 +1,8 @@ { "name" : "VadereSimulation-GroupBehavior_no_groups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -101,7 +101,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -243,7 +257,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario index 7000531dd7653247157695e8cbff49cbad94fa95..076681aa37326089b01f06eb34b7838cd74c6a08 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source1Place_noGroup", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -173,7 +187,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario index 0b6349a6d3d38d72b83e37d43b4590d7ae38e9bc..813811f7b6c0b2385600cd8eef4c317f18b46bd2 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source2Places_noGroups", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -251,7 +265,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario index f41825df6dc5195770d37de9b1070ac5bd19f2dd..573c1d2712f6041c02eae9e1ba6ceb4969efe2ca 100644 --- a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario +++ b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario @@ -1,8 +1,8 @@ { "name" : "bus_station", "description" : "Scenario used for TGF19 contribution", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", @@ -116,7 +116,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -332,7 +346,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/mf_base.scenario b/Scenarios/Demos/roVer/scenarios/mf_base.scenario index 5c408650b08aabb28ba6ee9467cf8474a8fcc2d8..f04d6c9ed53300faf99832a23b1f100f3cf34021 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_base.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_base.scenario @@ -1,8 +1,8 @@ { "name" : "mf_base", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -3624,7 +3638,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario b/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario index ef9a42727976824ec1c5d130cb967a809f199179..411d13154c8e3f1fe86661e393a310ee437c6593 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario @@ -1,8 +1,8 @@ { "name" : "mf_detailed", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -6549,7 +6563,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/mf_underground.scenario b/Scenarios/Demos/roVer/scenarios/mf_underground.scenario index 85ceca515609535bfd14bff3418a7755c2725aef..c0c83e64856dc1ac9c936ae6d94b534b82c36979 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_underground.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_underground.scenario @@ -1,8 +1,8 @@ { "name" : "mf_underground", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1270,7 +1284,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario b/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario index 93064bfd81a69789200364b5d25d9195da6bbafb..077d5e343a087f628b857abefcba9c6ca488fd2a 100644 --- a/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario +++ b/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario @@ -1,8 +1,8 @@ { "name" : "roVerTest001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -11669,7 +11683,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario b/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario index 6bc19742a1a3fe1ea57bf25f2c02a75e8ec0bdcd..989ec5c996d18059a07ed981fddab31fdb3d2cbf 100644 --- a/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario +++ b/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario @@ -1,8 +1,8 @@ { "name" : "roVerTest002", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -334,7 +348,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/scenario001.scenario b/Scenarios/Demos/roVer/scenarios/scenario001.scenario index affe987bf6d42366b58859ee3dc824f73ef36427..e0b247d056250ae00ef00e6b88cb8eceabfef545 100644 --- a/Scenarios/Demos/roVer/scenarios/scenario001.scenario +++ b/Scenarios/Demos/roVer/scenarios/scenario001.scenario @@ -1,8 +1,8 @@ { "name" : "scenario001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -116,7 +116,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -216,7 +230,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/scenario002.scenario b/Scenarios/Demos/roVer/scenarios/scenario002.scenario index 85a45b048f22970eeddb8387ee7019c5e03c895b..9a5ffd1ade34346249e2e150655d1e56c540f871 100644 --- a/Scenarios/Demos/roVer/scenarios/scenario002.scenario +++ b/Scenarios/Demos/roVer/scenarios/scenario002.scenario @@ -1,8 +1,8 @@ { "name" : "scenario002", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -286,7 +300,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario b/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario index 72c023d6ec8136ec82661315a915b47a6a3bb424..e582abf7109b69d96b7890cd9079e6ab71e61759 100644 --- a/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario +++ b/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario @@ -1,8 +1,8 @@ { "name" : "separation_slow_fast", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -269,7 +283,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario b/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario index 2cc1bfea2cab09eb72cca0b0250e0042dd6c462f..e1924ea3c377392f740320332326a973dbc765bd 100644 --- a/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario +++ b/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario @@ -1,8 +1,8 @@ { "name" : "spawn_agents_time_series", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -220,7 +234,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "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 ae3ce58d37bb15ffb6fdca62f1c53ec0054dec56..5d7f31e499ce4c20990bbac1c37ecef47784383c 100644 --- a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario +++ b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario @@ -1,8 +1,8 @@ { "name" : "Liddle_osm_v4", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -241,7 +255,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario index 5ee0288e9501b5a6b88495bb7c17aa65cfb14de0..e30bfaf9b582dd3b40af0591334b5230214dca5c 100644 --- a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario +++ b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario @@ -1,8 +1,8 @@ { "name" : "counterflow", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -264,7 +278,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario index 4edbb9658cee51746c20243897493ca25c81843a..83e1293b258180a123ca9eac7e9a9393d2c92964 100644 --- a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario +++ b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario @@ -1,8 +1,8 @@ { "name" : "supermarket_basic", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -116,7 +116,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -4538,7 +4552,6 @@ }, "stimuli" : [ { "type" : "WaitInArea", - "id" : -1, "area" : { "x" : 0.0, "y" : 0.0, @@ -4547,7 +4560,6 @@ "type" : "RECTANGLE" } } ] - } ], - "reactionProbabilities" : [ ] + } ] } } \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/aaa.scenario b/Scenarios/MigrationTests/scenarios/aaa.scenario new file mode 100644 index 0000000000000000000000000000000000000000..1292cfa6c4532b67fd403857842e41cb95127531 --- /dev/null +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -0,0 +1,280 @@ +{ + "name" : "aaa", + "description" : "", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", + "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 ] + } ], + "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 + } + } ], + "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" : 20.0, + "simTimeStepLength" : 0.4, + "realTimeSimTimeRatio" : 0.1, + "writeSimulationData" : true, + "visualizationEnabled" : true, + "printFPS" : false, + "digitsPerCoordinate" : 2, + "useFixedSeed" : true, + "fixedSeed" : -2474893121473667580, + "simulationSeed" : 0 + }, + "attributesPsychology" : { + "usePsychologyLayer" : true, + "psychologyLayer" : { + "perception" : "SimplePerceptionModel", + "cognition" : "SocialDistancingCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel" : { + "repulsionFactor" : 1.6444, + "repulsionIntercept" : 0.4845, + "minDistance" : 1.25, + "maxDistance" : 2.0 + } + } + } + }, + "topography" : { + "attributes" : { + "bounds" : { + "x" : 0.0, + "y" : 0.0, + "width" : 10.0, + "height" : 10.0 + }, + "boundingBoxWidth" : 0.5, + "bounded" : true, + "referenceCoordinateSystem" : null + }, + "obstacles" : [ ], + "measurementAreas" : [ ], + "stairs" : [ ], + "targets" : [ { + "id" : 1, + "absorbing" : true, + "shape" : { + "x" : 7.9, + "y" : 1.1, + "width" : 1.0, + "height" : 1.6, + "type" : "RECTANGLE" + }, + "waitingTime" : 0.0, + "waitingTimeYellowPhase" : 0.0, + "parallelWaiters" : 0, + "individualWaiting" : true, + "deletionDistance" : 0.1, + "startingWithRedLight" : false, + "nextSpeed" : -1.0 + }, { + "id" : 2, + "absorbing" : true, + "shape" : { + "x" : 8.1, + "y" : 6.0, + "width" : 0.9, + "height" : 1.7, + "type" : "RECTANGLE" + }, + "waitingTime" : 0.0, + "waitingTimeYellowPhase" : 0.0, + "parallelWaiters" : 0, + "individualWaiting" : true, + "deletionDistance" : 0.1, + "startingWithRedLight" : false, + "nextSpeed" : -1.0 + }, { + "id" : 3, + "absorbing" : true, + "shape" : { + "x" : 1.2, + "y" : 2.0, + "width" : 1.4, + "height" : 1.7, + "type" : "RECTANGLE" + }, + "waitingTime" : 0.0, + "waitingTimeYellowPhase" : 0.0, + "parallelWaiters" : 0, + "individualWaiting" : true, + "deletionDistance" : 0.1, + "startingWithRedLight" : false, + "nextSpeed" : -1.0 + } ], + "targetChangers" : [ ], + "absorbingAreas" : [ ], + "aerosolClouds" : [ ], + "droplets" : [ ], + "sources" : [ { + "id" : 1, + "shape" : { + "x" : 1.0, + "y" : 7.4, + "width" : 1.0, + "height" : 1.4, + "type" : "RECTANGLE" + }, + "interSpawnTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 1.0 + }, + "spawnNumber" : 1, + "maxSpawnNumberTotal" : -1, + "startTime" : 0.0, + "endTime" : 0.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" : [ { + "timeframe" : { + "startTime" : 1.0, + "endTime" : 10.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "stimuli" : [ { + "type" : "DistanceRecommendation", + "socialDistance" : 1.5, + "cloggingTimeAllowedInSecs" : 5.0 + } ] + } ] + } +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/vadere.project b/Scenarios/MigrationTests/vadere.project new file mode 100644 index 0000000000000000000000000000000000000000..2a0cbce5859396b371f5a6ba9cf00b392362f86f --- /dev/null +++ b/Scenarios/MigrationTests/vadere.project @@ -0,0 +1 @@ +testProject \ No newline at end of file diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario index 4a13630c76dfe7a2cb53e6cbac3b147363450167..50fd7bbf80362922a5cda4f83cae58549550463d 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario @@ -1,8 +1,8 @@ { "name" : "groupBaseScenario.scenario", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -284,7 +284,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -402,7 +416,6 @@ }, "stimuli" : [ { "type" : "WaitInArea", - "id" : -1, "area" : { "x" : 45.5, "y" : 0.0, @@ -411,7 +424,6 @@ "type" : "RECTANGLE" } } ] - } ], - "reactionProbabilities" : [ ] + } ] } } \ No newline at end of file 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 c605c7673ef694dd8448f3d1662c3b2f44d0187b..b3e87b79e24fbcc5fb324435f66d474b99b5e6d4 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_2group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 ac0ef5ed5ed028563e53a41c3324a7c5e4f031e7..b3d6cc5652c4213282a696aac9e653c0547a09e8 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_2group_sparse", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 88180eb410c2c0c29e17f127a6c14f873c9b55b4..acd6a995dd331005019568ecceb3a903af88b15f 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_3group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 13eb594f80138816f9107623a33192dbba59ac04..250468aeb2dac879570de563e00e93e402bb2690 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_3group_sparse", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 840ed2a59222dc89e1af167c152802a2ff0e2102..45895109ba5ade17637abcd1fa540b348c9a6772 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_4group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7f147ad17cd6346eae534e8e30454d92a66530ec..e3cb911d19dd21ced78a25b6d067358ec678935d 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_4group_sparse", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b49976206648dacae3bba9d4ba138c86f83d20d6..731d770b83e61eaef9371f4c623f48f9a30e9723 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_5group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,7 +119,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 95d901d05844316cf175530a52d0212c894e69ae..5b518dbf360eb991ba7f3bc9bc753beef2b11e25 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,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_5group_sparse.scenario", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -253,7 +267,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario index 2d38454e1bf7ab4303876e047f918fcf39e8284e..0c4fa14645f2d8c14aba0bf9a791031e79ad73dc 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario @@ -1,8 +1,8 @@ { "name" : "g2_osm_calibration_minStepSize_0_11", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -228,7 +228,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -346,7 +360,6 @@ }, "stimuli" : [ { "type" : "WaitInArea", - "id" : -1, "area" : { "x" : 45.5, "y" : 0.0, @@ -355,7 +368,6 @@ "type" : "RECTANGLE" } } ] - } ], - "reactionProbabilities" : [ ] + } ] } } \ No newline at end of file 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 499d03ad23cd8ba429e508cedbb59d9e12d91294..55f65ca193b3aea7ddb2ba0405664be8073f09c6 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_11_ignore_free_space", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d287035731639b7d4376934041b849081b3611da..be3bdc99ff01d0914ef99d5a5bd74aee6a1b63aa 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_17", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 801bae7616fde59448f671c5233314078bd123b2..a1c71d74ad0b5eb22e15aae229eed985d0153059 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_25", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6cbefc689dd85995d24795887d22b9602ef35f2e..c18a333dde16442e26e2965fdbd4aa741fc157a1 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_35", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 67e0fb9fcc77841ce871931a2d9128199cdc2caf..d94571ab065e03c3e86c12f5f22ac336c786dac6 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 043c42b0f013dc9976ee9fe47f4d3505d43fc531..6edf58da1fec583648be81331e2649baf558580b 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625_p18", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 98cc1c45a9ebccf837025fba96ad716206322990..5ce464905bbe4faf8ff5cc2d03fe5c39bbf11f99 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,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625_p4", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7c9565fb02639e8c026b6c09f5ae6a8d7f5ec248..804885183defd10bd96ec24cc143e873c5f9118e 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_sivers_2016b", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -187,7 +187,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ }, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4b680c8356b6239b8a0dd8ba051f57b368fb097b..ffe19e4ca7e2a8f40669780785b73dd860d5a3aa 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,8 +1,8 @@ { "name" : "C-050-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5937579939a702978eb5c110c44b962978bff4d9..b2be728e5e11cd608ed4de9e80e632f02d5dc668 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,8 +1,8 @@ { "name" : "C-050-180-180_GNM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -210,7 +210,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -373,7 +387,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6cd750df57f54fc31f344ab1aa04c282258bf971..0c3778ff923cc825032ecffe64ce1903e38a1bf0 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,8 +1,8 @@ { "name" : "C-050-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 fb7efce9e35d4e8a26fcb550b143b803ce98ac16..74c73961bf583ff1a0989128b560e9be975ae51d 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,8 +1,8 @@ { "name" : "C-060-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1be4b8515bd7fe0c336c728193465284111fff18..3b91f5770d537ca692abfddac59af3257a8777fd 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,8 +1,8 @@ { "name" : "C-060-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 dccf535e30e52985ccb16735dd17509edd24b28a..d4b61abc339b8b85b10274ce6e8fe62aca94dbed 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,8 +1,8 @@ { "name" : "C-070-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0f904f390040fd09cfc63ec19da0890462baa306..9de1eed05a07759566b3f5f6e8f658ccae5323c6 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,8 +1,8 @@ { "name" : "C-070-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0823105087bc990002a22aa55ed22f76a8bfcf6d..da4c3c83d4b1f25b58a9cbb9028508811b63988a 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,8 +1,8 @@ { "name" : "C-100-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b6d1d12531c31d5c77f60772013bed0628ec39ef..a8c7401777219d2fc6dc63c3730fc1264c8ec37b 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,8 +1,8 @@ { "name" : "C-100-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 63346454846186447dfab18fd6d12a0c74f21da5..d2fa452d98dd1ef1bbe5d89242bd06c4aa5adecc 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,8 +1,8 @@ { "name" : "C-145-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7f85ab5e30c72b88b0138edf3878623b36a1aa74..c54fe20e8686d4a633d0f9b8c571e24e8e5b874f 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,8 +1,8 @@ { "name" : "C-145-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 3edf114dd696ad3a05e77be9303236c6fbeea9b1..c6f0492a324561ebc34cd3b8101bad6a4ed9b174 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,8 +1,8 @@ { "name" : "C-180-180-070", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -425,7 +439,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0ba087103fdffa41e7dd9289082a25c5780d0a84..2be3a1d70771b3762ef2964cd04098e9ae7e1ea8 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,8 +1,8 @@ { "name" : "C-180-180-070_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -425,7 +439,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0f38f665f511dbb91758f4866145751f21190334..9f8e30f1e095f33f29cef7690ca7b19d0ab47103 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,8 +1,8 @@ { "name" : "C-180-180-070_UNIT", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -407,7 +421,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0ae6f4728b2522e2c4384572ae2b0e56555a94d4..f28708fe813f7497f55f037a57a727441f113a4b 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,8 +1,8 @@ { "name" : "C-180-180-070_default", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -425,7 +439,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9f4116c548a644bbd0223858b03499db74918b86..27e2b512b391e7d5d22e28c85c9c39a969ad12dd 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,8 +1,8 @@ { "name" : "C-180-180-070_ramp", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -437,7 +451,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 01b3280a12d10fdc079bc3744a082f870b5af1d7..8cf49356cfbc6dff66dfe8ba59a06de3c50a9f42 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,8 +1,8 @@ { "name" : "C-180-180-095", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -407,7 +421,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9dd4f2f7f0ff69979d279cc25fbf8773f342cfac..63f58e5e6a76713e7d3bac25c27045418a06ca56 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,8 +1,8 @@ { "name" : "C-180-180-095_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -407,7 +421,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 e739efd8bc0f1228ce640f7180ab1551ada01df6..a13887edabf9b63b17336a8e5b25523988e2d69e 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,8 +1,8 @@ { "name" : "C-180-180-120", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -407,7 +421,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 e53be134fbc06b5bf7834204a092122e28fc3247..6f4d26b664b9957f17a15981d128426e16b38c70 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,8 +1,8 @@ { "name" : "C-180-180-120_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -407,7 +421,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6301dec2c696295cdae7b077ef152360eff8ca97..6c97212d36d09de4b100103d0e954e87563e2f35 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,8 +1,8 @@ { "name" : "C-180-180-180", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6698efba32dec716fa33baf1b670b51d5444b17c..c29f127701962d254d60153f00104637ce0a2eda 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,8 +1,8 @@ { "name" : "C-180-180-180_Q", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -226,7 +226,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -389,7 +403,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 ce0f2b882f3e509e957448ddf952c1488ad1ed4b..2445ea7e10d4aefea2b5d934051e40bae40b89d9 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,8 +1,8 @@ { "name" : "T-240-050-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -528,7 +542,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f15027151c00049136ba2ad6807e660b627ba984..6513efe47ef93b9ca88108193b80ce7d28f0e13d 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,8 +1,8 @@ { "name" : "T-240-050-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -541,7 +555,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5bf01ba6d44b161be21082f467d02ef62f36b8f3..88981208ed572cd0174e919310beac0623094cdd 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,8 +1,8 @@ { "name" : "T-240-050-240_OSM_", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -282,7 +282,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -532,7 +546,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 01939bbe5ce42ec5702f4436197ee1529443b8ea..bc1849899eea668da6c1198e10e5146c55ba4277 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,8 +1,8 @@ { "name" : "T-240-060-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -528,7 +542,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4b484e95aa020cd74f7aa105c2ed89ae6de1a6f9..5663a8975ce673871d04e3d753451406990d5280 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,8 +1,8 @@ { "name" : "T-240-060-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -541,7 +555,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c57d708ac179db9c9de90fff953c7061ec5ac446..571fc6db4fb4e639cfc8708f8ad716a45fe6cf50 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,8 +1,8 @@ { "name" : "T-240-060-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -535,7 +549,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 a2ac6fd1be2440d32499e745dee714db312414ea..f8b0fbc819bd07a87a1bd2afd9534cd1358b7e13 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,8 +1,8 @@ { "name" : "T-240-080-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -528,7 +542,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 203c7d123c5c40a4deb5cedf1c2e0357eed80945..88c404c7fa3b45541b9f8758df6437a7931fdcb2 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,8 +1,8 @@ { "name" : "T-240-080-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -541,7 +555,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0b1df10e5d1ab8f08be6d589dceb353141c42bef..748645486364db1e6240cd0924d2ee9e15a65164 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,8 +1,8 @@ { "name" : "T-240-080-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -535,7 +549,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 17192952929ecc5e17637fcc64d52e8a8ab7fed9..9d1769774a2ab37758505d43ef04ae1a2ddf3d08 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,8 +1,8 @@ { "name" : "T-240-100-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -528,7 +542,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 467f7e7b097da5b56b5d2e843e5aa74658c9b0fb..58eba622e0815de9ba4bc01be379624d258080ba 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,8 +1,8 @@ { "name" : "T-240-100-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -541,7 +555,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 dff99a24297157ade8ecaed1b3222f3dc73d63cb..193c2588bd98fe82d10af5ac19b970c2e4732097 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,8 +1,8 @@ { "name" : "T-240-100-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -535,7 +549,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c3f8e943536c5ec71953764c567fcceb7c63c1a8..f0d970001ed9d749360b242e8af97071ac3d2e41 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,8 +1,8 @@ { "name" : "T-240-120-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -282,7 +282,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -514,7 +528,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f59b5fff67372b7d84cf98e43ccd8270c55a1c89..d4ca00f9aa9eae1e58d5180887d59cfdf4c0ccba 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,8 +1,8 @@ { "name" : "T-240-120-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -523,7 +537,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4545775a1d9500e6a72cb7c83c740d938fe88b38..050c30d9b29a268b96be979621c0c802215dea07 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,8 +1,8 @@ { "name" : "T-240-120-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -517,7 +531,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7ac113c9916ce3b56588a896584c1268b67908ed..57b837bdf12c849b32b0596030ff8a134d2083aa 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,8 +1,8 @@ { "name" : "T-240-150-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -510,7 +524,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 447f90346bad9940ef9419243456453628da0a5b..465a68e4e7ccfd5e6cf8d9b04efd1352b0b75de1 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,8 +1,8 @@ { "name" : "T-240-150-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -523,7 +537,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 30e2d742f81cc544b3cd27859d4177c3f8916fb6..f3493d7405af88d75bfa5ac599f099a9fda8dca3 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,8 +1,8 @@ { "name" : "T-240-150-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -517,7 +531,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6efbd87c6b8fe611e2eeab3a84cd469f9a2ec845..e5864d6d4408ed327e431af7fda321eb2d4cc1c4 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,8 +1,8 @@ { "name" : "T-240-240-240", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -278,7 +278,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -510,7 +524,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 e8d59b0c29d73b87113076e6f2b8863de9a16d5b..64e53d6f8e0b245b937375086c6453252a4479c8 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,8 +1,8 @@ { "name" : "T-240-240-240_BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -291,7 +291,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -523,7 +537,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 099fcf7bc90bcc6c4c8f6064690216b06ff9744a..d5cfa813da46b7bfe009a315d09ad774e9eb1c30 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,8 +1,8 @@ { "name" : "T-240-240-240_OSM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -285,7 +285,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -517,7 +531,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario index 01d3d5d466ca87bcd0fefc2a59a114ded9ca2ffa..f7a10a5a04ce8c5c5d2a63c98588a37ca8cb8529 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario @@ -1,8 +1,8 @@ { "name" : "BHM-FloorFieldTest-Labyrinth", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -97,7 +97,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -269,7 +283,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario index 05cbbecbcb6e532f9959833f89f618cd97235097..a6136da2c524bda6396f8710452313d8288e20be 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario @@ -1,8 +1,8 @@ { "name" : "BHM-FloorFieldTest-TwoObstacles", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -97,7 +97,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -215,7 +229,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario index 80da7efa1dd3c1a50e3d377364bfe32aa4d2f4c1..87c40e6f8902e9a8de0ff703af18556643c13f11 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario @@ -1,8 +1,8 @@ { "name" : "Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CounterflowCognitionModel" + "cognition" : "CounterflowCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario index 1c8d931e838a71839403e921fe5ca2eae5b1bb4c..c0da10d8ba1edf5eee35c23586332b932bc66cb8 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario @@ -1,8 +1,8 @@ { "name" : "Corridor-BHM-Defaults-WithFloorField", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CounterflowCognitionModel" + "cognition" : "CounterflowCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario index c8550060e95250b17fcdc71bc28001143ba1f7af..770a849f5abe550e3d627672228f5c4a2f298800 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario @@ -1,8 +1,8 @@ { "name" : "Corridor-BHM-Defaults", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -79,7 +79,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CounterflowCognitionModel" + "cognition" : "CounterflowCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel" : { } + } } }, "topography" : { @@ -202,7 +216,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario index 25252fcd408e1051fcdfcc063c61448ce3809685..724e90e8e65472f84be48df630adbe07496854f3 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario @@ -1,8 +1,8 @@ { "name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CounterflowCognitionModel" + "cognition" : "CounterflowCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario index 8f5a7ac56d9fcc12478b656bc772286f100bbaa7..837fe1ad4540177ac89c1d6ebd9fa6933b329349 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario @@ -1,8 +1,8 @@ { "name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CounterflowCognitionModel" + "cognition" : "CounterflowCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario index 3f6962792561cb81def7ff615f8b92daa53fcb9d..c9921ddacdef1498896180428bb9087576b54a15 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -127,7 +127,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -245,7 +259,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario index 92bdd2e5aaa554bfb44ef5fbd88d9b24cd21693b..7296a929cbb31f593e09068c4b0cd4952b4c6a10 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneck", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +120,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -251,7 +265,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario index 0517f246ca0907d64661b98006fd96448c55fdf1..fbc19ce1dba06f0163eb59c778943c34c34b1354 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_displaced_fail", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -117,7 +117,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -238,7 +252,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario index 7ff747a802bd68dd82d3007d55fb410dd9eee6e6..783404cf2d70705a7c3e64273f3d9787ec48c58d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -127,7 +127,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -248,7 +262,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 62ff2613843f516b35d996a8e9b55648ca4946de..32fbf46a21d7af2d87e84588329901cfaf07c340 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario @@ -1,8 +1,8 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -124,7 +124,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -296,7 +310,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario index fd775423dc842af2211195b16f9666fb269f92b9..c7c8ad52a6faced6d7502af5ae17574091bca1c9 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario @@ -1,8 +1,8 @@ { "name" : "multiple_sources", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -129,7 +129,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -271,7 +285,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario index cdc3cce47527d269d481f9c49f18faea970dcc4c..d5b01a6ea0b7a68297ff9bbaa9249a1a7d1704df 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -106,7 +106,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -221,7 +235,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario index a63c816407b19e0d939e98e98944d0a32ad82ab7..56a4f228b24acd4f0dd48f6f518ec3472ca97e18 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -213,7 +227,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario index fbdfe60b285cd42131fb0c87cebbb5b7dfd929b1..528ceeca82675037da89e3c5706e8b35bdf13728 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -142,7 +142,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c6066a299ec60e9dda4dfdf5fff3321dd752450f..817d50dab864dc4613b285bc4e5bd7477c2b4117 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,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -206,7 +206,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -306,7 +320,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 75585b4f28d8efb81aeb93ee8e8a02968d4fb108..d4eef4ea744cd3dbaa70abd5b6a9a544c3d2b990 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,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -202,7 +202,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -302,7 +316,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 3f15c9fdea7badfd238f8a1b950136463410f086..56f7a03b2dae386fbcc1a7b88cad4251f88b62c1 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,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -202,7 +202,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -302,7 +316,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c33bbc957014c7a4e3e5e7c7f345b4ab844ffe43..e8a85a354d860ca36d7a26f8f7093a7b1de24ea5 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,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -202,7 +202,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -302,7 +316,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 aeef85cec2c90ca241baecccc058274b8e533be3..fb740baddca9cc5ccc35be7b609953ecda8ed628 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,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -202,7 +202,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -302,7 +316,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario index c1e98acb998a3ef4c38d79e164479d316a159cb9..ba674a88c30ecfc99b029f8eb7f21bdc09d1810c 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -188,7 +202,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario index ff330511bdbd1b6a7522b5e5626803a9e589fb9b..43225f63ab2c145ac5d4e3692f3a32f481997063 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -137,7 +137,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -366,7 +380,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario index f843376119fcc6f4c526710e84ff14fed2488680..4f73709e048366205a814d3a5487b5b5b8697f91 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -126,7 +126,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -208,7 +222,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario index c243e760946be7941bb8d2741e1999f5d1dd2c66..6c97e534bf4f93503568edb17d711d2f7a2f6265 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -3452,7 +3466,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f57bcc4eb8a42f6da5ce61d9edf84505020c598a..ddc3b1bcbf0e19f30043d3c4e4bb860b54b83f3d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation_part1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -3452,7 +3466,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 12f7debdd7c7d0238f1f50eb7e07c19932f27a70..7730ad85cbbb05094778c357f55e52191e8e691a 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,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -280,7 +294,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9dedff6e5e11edb99ac0a0f72bbb404ad45799e4..cd3b6ea700459b3a7e5c898c0152e3f9d480620b 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,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -289,7 +303,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario index 7578d83a6988d7cd8548cbaaab1b15294d4f34c3..c36ea640ce42dc99477d114eaac78f0daa929292 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -853,7 +867,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario index fc8fe4d2017366453378a6db83cbc0aeb968a5d3..36feb883c55b7f8f09fae77921718f844851fd3e 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -215,7 +229,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario index 5eeabcde8c43d27b4054c13dd31ce5ae57db0753..97c3a7490fea3eec4d6deaaef6cf787d8cf4eed0 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -206,7 +220,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario index 9891668a1fcba028be0a57e96766159511804e89..34d9a0a678b667b08d43a26369e40a8db3b3dd10 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -105,7 +105,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -244,7 +258,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario index 17bf7de33c1bdb37e70227e722809afac073e4ab..33ead9a0e8ff2a9de6001ff4bfa9b2be5747078f 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario index 283d00c9e2ad8c82b5df7b4cd2d826417df35d26..700dfb232436179978f7632099e4ae3cc6add27a 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario index f1bd9b79919e4ab617f0639d18671e0b0181eac8..8922c4459be48a87433f737bad347dbc389011d3 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -130,7 +130,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -230,7 +244,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 77a64df23c0f0ff0843e939eb6da19598b26539a..307febadce18b43ef4b4c9dc7f01d04fee2ac1fd 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario index 315a1044bba442ce16764715816454a60e37cd4a..c8437d560c2958b313fa8c054ccce81c1aad33c1 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -178,7 +192,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 22e9b6a27fca2a6a424d6062dfcf42b9a6731e7e..9231c37cc0a858ff7feaf8cba2bd8f2c2a81f8b5 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm1_displaced", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -178,7 +192,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario index c6d9f4a73e18dd4ad7e87e37908d9b4d096984ca..54680c09b6a240cf513074400ec217546bcbfa70 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -178,7 +192,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario index 82682760ce09a65bb0e44603fbe9d9b22fa076f3..ae80f1f729f90874cde4bb4f8e1a2f04fb0d843c 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -187,7 +201,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 be8698eba7600df4a87f6d92d0c639aac7996e9e..2cb0793476460a6620d7e165961b895b10952a6e 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_1_wall_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -160,7 +174,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 364283265478fae83bd995e5a0951bbfac551558..553b5b6199c4d6aeef1567e5bd4d755b9a2a3235 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_2_wall_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -160,7 +174,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 a585e9a309c0b3a5883fc9b9596b0a2ffebee91c..b37028a835ab6d9d33ece6a89bd12e10dd8427c9 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_3_wall_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -160,7 +174,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 db7c412183dc8d1d74e3693e7032feac69bcbb2b..5115c14974acad48f048c7f94af26acf6e185183 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_1_wall_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -160,7 +174,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7783862912516acbe5861ce8e81ae9d26afb5d31..7195a351453cdaf6aa31a2d5253de2da3feb8bdd 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_2_wall_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -160,7 +174,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario index 88aa91110950ea8c8e9906c713b48fdb048ef1dc..7db3673dd6aff419bc9d17dc2e74cfdf6b220396 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 19a9fdb8a5dd9fcfe3bfe52f55d796910b0907f5..783dc00956df598ffcbe87d46f0d683cc3e1ea50 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,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_025_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0727e6f6ab5a3957e862074483ced452420c635d..1d0107261df6b73c29c3906cbd2d0c598915eb59 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,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_050_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5669d04ae645bdaacadd49dc8a8b6feb76dc4100..6614b548d2642b7ba5d00d97d4638fbea1d2ac65 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,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_075_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 a933e907d569067648afd124d226fd463861623a..1e7e0f3f213062502d190b33b750fd386b05b29c 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,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_100_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 ecfbeeac8c9b65d5aec6451e8025ebdc084d75ca..1e87f15731643e9b2766d83d9601ad50a8eebd6e 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,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_125_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario index ae1d37e60f5cacaebe1354e2d943b6ce6102f04d..68b17a7ab072aec485c75f550d636914e2e5fac8 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -169,7 +183,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario index 448a9899a74afd190ed2f7e15ff3b2353199b139..8fcbcff26321a292fb1e46b73e2814cf83ebace7 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -169,7 +183,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario index 322aacada9d0c75b99591829de0f8be66880a017..1684c182aefd1dead7c17990d6d0377c31bb9253 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 279b078ea19cf097d27c94f4016567fc81dbb36d..18e9a09c015127c9bc414e3bae34f5128dbb97ea 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_publicRoom_gnm1_2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -253,7 +267,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 90990eb6267d69abbe9ec8c0d3c8cd174716e075..dd5032d18fcef3a7860fb03ba53209dc6d0ea4ab 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_publicRoom_gnm1_4", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -235,7 +249,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario index 27e88efc2fe845dabbda407e39e7ddce0084cc3d..907029433018c9d67ec68daf9ea6dece447fb366 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -819,7 +833,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario index d534194502280fb3a25ab30a52dee3db10a00cb7..7059933af6b54824b14dc9ab78998d7553c6e191 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exitSelection_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario index 6b8dbe4a305d2dd24f6bac9b95f014b1c7b4735a..73e15f6409d19f33ffbdc9635e422cfd3597e295 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -187,7 +201,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario index bd779fcb0fef7901be23f72acab77661142b9837..b2527bd4d4cdcaa088a958da4aa3eee961e0bca5 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -183,7 +197,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario index fbcf11a2d8250bcf5f12aa8b1bcea385fdd71e0a..5c935293bcc60699308a05e54f05b1dde0f660cb 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_selectRoute_gnm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario index b1db2e427390882237848739dbd0527aa241677c..c22f5f1cd8eed2f5dc407030a3e6ee56ad6db137 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_discrete_ca", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -128,7 +128,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -246,7 +260,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario index 98df38d30ab6abe30c3fae2b758bb9f71cc9ac5a..74737dd77b98702a350a73610c9679ea13a778ec 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -218,7 +232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario index 3557a465a160d330d049cb69f0499d6a9eeb038d..4e3843ad41d09e74f0aa2bf2a5cad2a531005f1a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_displaced_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -127,7 +127,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -245,7 +259,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario index e4fd973208c99f540b633ccef628d501c1f7c414..1240002bb950dcf4adceddd0bb33d5fa31b6835d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -137,7 +137,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -255,7 +269,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario index 520813e0fb6f15fcb10983e7345e31885b3ad5d6..4369fc3304561df3f207b94ff42e31b4900e5c8b 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario @@ -1,8 +1,8 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -127,7 +127,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario index 330f3ecdc013dea8fecbe2a122a09992fe291aba..4076ca890b1661e81395aeca68de8be91be9906e 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_discrete_CA_fail", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -116,7 +116,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -477,7 +491,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario index 3d356672005e7e48040bdae59252e824fa2cb942..522809ac86300d8a696b207aac6a6a3d40e89e9d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -132,7 +132,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -421,7 +435,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario index 33733049e84aca63e3ee7241767383c3d396d972..81e91c271b79659b4f4e03d31c185b86476e3417 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_pso_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -132,7 +132,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -709,7 +723,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario b/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario index 4fc34848abd36342495c26a4322cb1996bf4fc57..3fb6387fb1151401609bae13d7b470428b635492 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario @@ -1,8 +1,8 @@ { "name" : "queueing_dynamic_floorfield_visual_check", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -107,7 +107,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -207,7 +221,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario index a6cabbc4c90106ea9fe3ed93579d9e9269214bd1..ecef0402f1f1a0d556cf6fdfabed089e6aae38a9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_discrete_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -295,7 +309,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario index 91705a6a1dc8bd872ff5e70ab48e8f4ac07bb57f..0cdd71da1d3f22044dd050540f1035e4aa2c3da3 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -295,7 +309,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario index 73c191b86db0cefcd3858694d0aaab7e0f14f4d1..86d063fc326cc7fe2819830349da01cf226f00b0 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_pso_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario index c84bbef6f9024e3b9bc2071d82d6117b546c3eed..eab19e0bea1a304ecbc61554ca6d1bab32e64293 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_discrete_brute_force", "description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -362,7 +376,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario index 7e23196e178a7b3e6129b6d9c21b71eb2a54b92f..e5f9834dbbf0624efc88ab63bdba0bb241be1cf8 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_discrete_ca", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -362,7 +376,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario index c5155dff8440537128641be6a3cfe924a453db8b..9a7e01dd1bc475890aae15779d9d444cd42fe986 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_025_d", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario index 92558cd60dcb8630eac6d16e7625e7d4c7f7821d..b5ed5fe9a166fd56d69657679f10a19aab9bcdbe 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_025_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario index 474b1aa329d0da362c5f5cff6cd731163ee5b1e8..6463e33bc51720791a1c131883cd7e0e4de70ee4 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_d", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario index 5531de450fe3de94641ed2a865e4d10f0a8d56ac..a1cc0acf1b0ef26ea60a618ee31e29e43609308a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -216,7 +216,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -316,7 +330,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario index 1139805ecfc9ba9eb3e4868153325ec44e791cb1..9234e370f2415ef0896407a4c3ebb7098691e93d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario index 35b1a354960dcdbfe5330d8bafb0d77cd897dd1d..b63af8249ccea393bd1fa49c6ac3a5413bcabecf 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_d", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario index 9a976bed7f707bdb8cd30eb796f6dbd349abc6e0..86a4ebcb0593466ecdc15fdd8ca880491fee4cb4 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -312,7 +326,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario index 9b5b56c8aaf83389b9ae52ac595c43e218591636..ca530a6623e73013c95f1f32db3f75418fa9f40b 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario index 075a1051cdcb0204b14d5172410a4c9773dc710e..b1a44f146ce02294754ac6de35e582982d8eba6d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_d", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario index 263b48d222b50db22d07d9dc500eaf46540871d9..f6d0e11eaea4115f1af1c5e87f0a07290e3f0875 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -312,7 +326,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario index 28a3aa40be6e73e01100407d4454c8af599643db..d67e33f9ebed52185e1da7f21ddf735ffc59cff5 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario index 6e7c28e188cd8ff033c7d2cf4d2177db1fdde5e8..b5c22d724f7c0d8ebe03f3cf65dfef8b21b02264 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_d", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario index 8812db9b5ca5c15a9cdcd9c92d93032375248691..ea63388d8d3510877b6379422bb883884e3f91e5 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -312,7 +326,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario index f4a34a8c5fc05f4c309c7476d67bd596f07e06da..b13cf24cdb88d91e41edee003a2d7c0ebb5dc9af 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario index fda9edfa138e37e81336234f731783feb51b0cb5..1fbd13b67f512deb4eb0b7b51000882b6c3e0b8c 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -312,7 +326,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario index 1deb67887c959d03b8430dc25c85452aa4a18524..9fca3d02574c290432791718ba7c3e6f14ddf71f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_550_up", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario index dee563aba5655cc28b507e292f74d8206c7b5303..c534dc4b09b199b5579d1c001c28673d1f60db2a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -198,7 +212,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario index 0a4956eb4202a1d778eb47fe5b4afa0447e98236..75b919d81548409d6b272d56c4cb42c3dad999e6 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -147,7 +147,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -370,7 +384,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario index 477415673b06be0f00a98a39e285e5da2cd685db..759ecc676a56caa563a45d348a01bc1717f77f43 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_discrete_ca", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -218,7 +232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario index 109361d6621f202dc9646564fa233e123a428b6b..2c56fc2e6bd2bef5f33e1f42485c041df8f37837 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -218,7 +232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario index 8522bdaf24be0ce8d84bc56032d9f879061e87cf..a68dfe0a31b5fec57f8c30a4bad0feaa72a366e5 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -136,7 +136,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -506,7 +520,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario index 1afe96455c1b3b28ca07c4dd2102523a940231de..8767ef108bf6d85fdd3bc7c03e8f4149040226c9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -3453,7 +3467,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario index 12b87f6fc6bd6a5afb99a1f4f4787f7174d9fbe3..a4dc1c7b09f97777a9f2b21cdf7a3fced21bedd3 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -143,7 +143,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -318,7 +332,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario index 9a2c3f206a3ddf91ba55875bb634797397e0b8b0..666d429bc14984aedc545b83bd967973ecab332e 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -143,7 +143,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -318,7 +332,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario index d493800120d487c795e7ad60068aeafe7bcd5a72..b76e31b945aad39dabf0ae0f2542cf06441da8d0 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -143,7 +143,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -309,7 +323,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario index 58d84cf3b7959c02ce089aecc0b11fec7d7d22c7..529eb49a82be3e27dba5650e15abaa9d3697b1c6 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -143,7 +143,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -309,7 +323,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario index 69289aee878a6c03c5cb232ba814af50e9d88fa6..716f8fa9e9b88a9c6aa70a8f7dcaf968efa12a4a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -146,7 +146,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -914,7 +928,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario index 8466ab98db78699a82dcac09bd294a474006ca1b..6987b85270905520fc123dbf3a836c9417ce4023 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -252,7 +266,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario index aa9c986250eb5ba2a4e74b7594adee55100367ab..ebfe0168f54ccbfe04ab8a9f07141012eb330c44 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -252,7 +266,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario index b2c0b097560f6aa6064de2a104269556397c391d..0fc7d9c1f911d6f273ed5dde2100841c5cedd039 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -107,7 +107,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -225,7 +239,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario index 14e946e5f26d32b132ef8b5a5281c570a7be8ce2..61fdfc6c06c88230a8b836966c96cf6aff99db3f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -107,7 +107,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -225,7 +239,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario index 04153121210c40e3db25b961c76b26c718f7710a..fa90d318a420ee4b29b162e4482f0f288b64a9d8 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_long_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -229,7 +243,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario index ea7b0a8df58a8f82deda0621df40e2a732f2717a..c0ab83b773ceff905ed5cc913cdbc984b50c5de0 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_long_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -229,7 +243,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario index e08658bf92a92204ec1edc6cd559fd642aff963e..08e276a2ebbf9a8c4275f97d757b892536b2c823 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -229,7 +243,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario index d4c0ff4761aa9325af4d1d347dc6bc00fa3030f3..00fd641e0117087b549151fcbb7d7a71ba2f0983 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -229,7 +243,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario index 97ae5120b22cf13c605c929e1c0f445132acf363..c89646cfce93db42c4c482bb4e1c8d954d6527da 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -279,7 +293,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario index 9f6de576e6b54c4bbc231010d2cbeb35e42bf887..a42e95c452fd7d217e9b5b5c19ca4e8abbfc572a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -279,7 +293,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario index a4d0d7e12f467c8facc07834c7617bd0b73c36fa..2951dba1ad7bd83989a9b9f84a704e031be7452b 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario index c3475a6d124de0b33d28982927a5687800a6e83a..6c99fcbceefc1000f662ae39e75a528cc9157d4f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall_pso_fail", "description" : "The particle swarm optimizer does not use the attribute seeSmallWalls.", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario index c1b35d253d09371a9ffdb7c7bfac22c19fdd6d05..b96c0f9884ada1d4fcf181cdced79ea923c86971 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_discrete_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario index f4f52d548d87b8431502a491867cc11e50c86e1a..e9539e3a4351030a4a76358c18b93d97576ba59b 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario index 68d7593374140396fc84687f82cc7804ca01f3f3..628bea8578cc33281b58112e0417be697a9d2664 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_pso_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario index 12680c2d826bdb906ddd7f4a4d940875f5c39831..44a2f332e0af05396b1da5c0190b8f698b7984cf 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_discrete_could_fail", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario index b997a9e01f0e5b971398d913610d193385f3fe7c..11cde8b106f353fcd4cf50853e208e0d65bb4b8a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario index f03508cfae3727c0ea45f0977130d0c33cc36761..6aa3999374a75351049c364676e7aef67dae566f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_pso_could_fail", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario index 17e47d5bd5d4d2ee1cda81eadb315195fdf25541..0db6ce6f31bd3f126f941bee69d1b28923489f30 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_discrete_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -240,7 +254,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario index ca5865052f794774e7eac6edb4d79cef1284afe7..ae8abbf346621cf05875d0b4da165e9b06265b6a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_nelder_mead_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario index acd0e5d519a8cdc0429d0be003006f76504a2980..8fb64f00185c10ce6060bd59fc9a5a807da77fff 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_pso_ok", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -133,7 +133,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -233,7 +247,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario index 531009375eae6419ca0df07dfd7e4ccc5be948e1..a2341a2e1434fcc0a07a87c6035c380024441cfa 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario @@ -1,8 +1,8 @@ { "name" : "VadereSimulation-GroupBehavior", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -105,7 +105,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -247,7 +261,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario index d131d0bd97000c0d722ec46c52d052d5a2e93c1b..f6f6b5065f74215caad2655fdc4988588e1bcd43 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source1Place", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -122,7 +122,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -204,7 +218,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario index 8e1333d813aae7060a8a71c5d3bf1a321c8eef98..39c36a8511d452b0cb92c7ba32e70b9a1b8bb636 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source2Places", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -240,7 +254,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario index 0d933e8564e3c71329cba5f5b26d0d2dec31fa12..9959016188498023bb1bc03d4adf8ed30771bc35 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_2Sources1Place", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -222,7 +236,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f3a366427b1535bc0278f2cd9bc195fcafa881ab..3b86e517b7660c77922897148a310e2049522498 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,8 +1,8 @@ { "name" : "group_OSM_2Sources1Place_2Group_and_3Group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -240,7 +254,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f6a068add494e1b539e704bdd374b210efc03db4..c2f9d3ca54a794e4c5bad3bb48a99dd6c3ed5456 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,8 +1,8 @@ { "name" : "group_OSM_4Source4Place_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -101,7 +101,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -306,7 +320,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4d99f91ac65ab93e784e987883e9da02a829939e..9970e71d9b60a1ec712d2b3847f26d8543e536e3 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,8 +1,8 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,7 +108,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -340,7 +354,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d86ae5ff36d3f4cf288919c8a71edd1f394e3b8a..019bc56892cdb9c8433f0b8c2ebad79e0199cb87 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,8 +1,8 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,7 +108,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -340,7 +354,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 8ffb341d4f83fdc021b12bffce557e4f41ae109c..8e76ac618a5fbdd7405244cbaac1687b500ab89e 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_classroom_1group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1998,7 +2012,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 68259557cea7ab88c6f424e760c6ee60a60b990b..9b6910d83114d57b4baea63ab87c4154ca7eda2b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_classroom_2group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1998,7 +2012,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 895e00767cf7138adbe40932213dae17c0e6ca7b..b4eef44a152c3717384f6fa9261b9c59f66d34e6 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_classroom_3group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1998,7 +2012,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c41a15a5da9ade8e6ace475209c48344bd84b17b..49a64b3f862e60fae30573305fac5deea9bcd30d 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_classroom_4group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1998,7 +2012,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b16ab9fb4cb3614443090f0da046b67e39b0ff07..3365cc326972790552ae7846afc6e091f628ee9b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_labratory_15group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -285,7 +299,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 a9e825399d092415a94c53deb67b42e24a03f408..019cd391a9caebf0833342e984c25f97a01991a3 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_labratory_1group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -285,7 +299,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 84c999dd970d47a08581a491376aec208560f3b6..7f714efab782ff3ab247b873cb5ce5a8c9cc1a7c 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_labratory_25group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -285,7 +299,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6392480f4dc3e17d1a4de8a20116ecc7a526ebaf..b712a8d0a307912580ce1c474e53a892ebf9d626 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_labratory_2group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -285,7 +299,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 fe03c68833a32c8cbf0dce17f8de5e95e5fccc35..e7cab2466907f31bea5add8677fed4d5ecc99cde 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_labratory_4group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -140,7 +140,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -285,7 +299,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b47f29cb11e0311a66131c04c877ef25eda4ea6e..3abf5a01238f530562a812b109a59ce985ab2bcf 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_long_corr_2Group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -195,7 +209,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 eccc7b8f09459a611600c12713a0f29642e114e3..5d893e9626172d50aabd7ecc31a9cb58cac00e8b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_long_corr_3Group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -101,7 +101,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -183,7 +197,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 41901dc3f0b5627d2d867cd9e51a4b9cc0faa57e..5e1ab72139b74e4064644d1edaa571416d04e140 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_long_corr_4Group", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -101,7 +101,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -183,7 +197,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario index d9e5cae04c9a35d93e33db8b2673ec6ceb0ae4de..d99352c3baedaa797c55f10601cd4f2b120e7920 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_target_changer", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -249,7 +263,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d4fe9cd5dcb1d0a9e61ce8e22c717900b6aea1ef..813043bcf3af9d1846d2e6c2934710bbc84b732e 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_5_1_roadReachTarget_ovm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -66,7 +66,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -148,7 +162,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9135f5097d325e50df9a16a2fc8c0279bbcb1a12..e5b7d7279aebb37f12415a64ddd1ce18dcd1398f 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_5_2_roadReachTarget_ovm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -66,7 +66,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -165,7 +179,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario index 7619fd9ba818703f15b273459260cf0c4751982b..77ad1f4a40c86718511526d9dfc3ece6328adc61 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario @@ -1,8 +1,8 @@ { "name" : "testtrafficlight", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -179,7 +193,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 ca22dcf822bcea467ffae64e561cc3d49f9c930a..877ff5661e319b941a842632adb6caf2a7eabcb9 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "01-SimplifiedExperiment-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -935,7 +949,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 2439fcc34a87eef1ed7437b31956e5a2c4f50e2c..8723c3864930e1bc893e4869d8744358fd7cc31c 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -935,7 +949,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1775dc58fcabaf2efc966625d77cc01df5c5f8b3..3bf23dc952ebc1ab4ce53700846794c60bc88f63 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,8 +1,8 @@ { "name" : "03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -935,7 +949,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 68e73a3ea6790d3d126ff7d770f77f145c58bf13..0cfe1e06df4b28373da54ee08bfae3ab35fe2f48 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "04-SimplifiedExperiment-OSMSequential-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -935,7 +949,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7900f6ad322fbf6e95cf34c64d27cd45908e932b..7b1f96fe9a3bf34718d3775ca662fe078ca2e100 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "05-SimplifiedExperiment-SFM-PsychDisabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1168,7 +1182,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5846fe4b215a21c31b10eaf3890baa0220708660..7c55c683e412739c672a09b5d7e1fb8ffb0bff31 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -980,7 +994,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 a62157bf1fd7da9b9d2faa3d5bbd8a020c21dc97..52ccf8fe4574b77f51c5086b7fb85065aa007e00 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "07-CounterFlow-OSMSequential-PsychDisabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -235,7 +249,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6db2fe8edfa3b2cddeabffc28923c19cdc188639..1e5f7d5ed3d5b3fe7f1d98561305cf05f8c83251 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "08-CounterFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -235,7 +249,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0e582bd8747062f659408da16680890b7d6ed410..5fc6ff34452d58e1420d29d886204ace875b6b8d 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,8 +1,8 @@ { "name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -235,7 +249,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6077090ba4d0f7d3de2f3e60be6ea99028e164fd..f01f9dabe60aac217cfb4b5b27e89244371871bc 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "10-UnidirectionalFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -194,7 +208,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1724310c6542172a1c50b23ee4efa0a82831f7a9..f2ecbacc2720f9405f19df952f6ceba3f2cd9e39 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "11-CounterFlowChicken-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -271,7 +285,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 06d44398a1bbd5b471f05772415a6925146f4332..b17dcdb042fca1e6030a0794dc39d26ae18cdf79 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "12-CounterFlowChicken-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -271,7 +285,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5909cd7c4be692639aab6bfd1debddd775a20bc0..74bfa131f6da3b1664e2ab2a94817d5a39871ac4 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,8 +1,8 @@ { "name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -260,7 +274,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f48bc60661c10ec90f0599c051f072f38dbedaea..2c4ee6ec38a34136241080e6e488bd5af31536bb 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,8 +1,8 @@ { "name" : "14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -260,7 +274,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario index 9bf1fa2ed51905fd45a76d244d6a461188a96c1e..123cb96aa5c82fbb4a5ddfbebc6ec6c4913d99d7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "15-ThreatShort-SelfCatThreatModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -339,15 +353,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario index 9568480c4418994fff5cf4b23033170c5b8598ae..31c93083f9fd98db672273395e160ef9282315a8 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "16-ThreatLong-SelfCatThreatModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -339,15 +353,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file 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 dc39f0e3db70d41d239e2161dd138fd57e5f5b4c..759ab40f50f6f6f8ec6e8c15ed844d9c37deab29 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "17-Threat-ImitatingBehavior-SelfCatThreatModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,7 +115,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -483,15 +497,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario index ec8ff97244153e3ba34bce6af2c7cf6226efb2ce..cd11e8f46b31019fbbc0a1053cbc94906528ca7b 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario @@ -1,8 +1,8 @@ { "name" : "18-ScriptAgents-ChangeTargetScriptedCognitionModel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -112,7 +112,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ChangeTargetScriptedCognitionModel" + "cognition" : "ChangeTargetScriptedCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesChangeTargetScriptedCognitionModel" : { } + } } }, "topography" : { @@ -321,7 +335,6 @@ }, "stimuli" : [ { "type" : "ChangeTargetScripted", - "id" : -1, "allowedTimeDelta" : 0.4, "changeRemainingPedestrians" : false, "originalTargetIds" : [ 1, 2 ], @@ -329,10 +342,6 @@ "simTimesToChangeTarget" : [ 4.0, 8.0 ], "totalAgentsToChangeTarget" : [ 1, 2 ] } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario index be168aecba7d57eb88f2f4e6c2a94f3d47efba6e..19b4746c570568f804ac9ef3b0eba9d78eb1d8d9 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario @@ -1,8 +1,8 @@ { "name" : "19-DistanceRecommendation-SocialDistancing-OSMEventSDriven", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,26 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SocialDistancingCognitionModel" + "cognition" : "SocialDistancingCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel" : { + "repulsionFactor" : 1.6444, + "repulsionIntercept" : 0.4845, + "minDistance" : 1.25, + "maxDistance" : 2.0 + } + } } }, "topography" : { @@ -237,14 +256,9 @@ }, "stimuli" : [ { "type" : "DistanceRecommendation", - "id" : 1, "socialDistance" : 1.5, "cloggingTimeAllowedInSecs" : 5.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : 1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario index ac022a044e90082624581c9f2d751bf090501c2d..363d7f9830e3558f1a85af2bdc09cc481f63bf37 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario @@ -1,8 +1,8 @@ { "name" : "20-DistanceRecommendation-SocialDistancing_clogging", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,26 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SocialDistancingCognitionModel" + "cognition" : "SocialDistancingCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel" : { + "repulsionFactor" : 1.6444, + "repulsionIntercept" : 0.4845, + "minDistance" : 1.25, + "maxDistance" : 2.0 + } + } } }, "topography" : { @@ -237,14 +256,9 @@ }, "stimuli" : [ { "type" : "DistanceRecommendation", - "id" : 10, "socialDistance" : 1.5, "cloggingTimeAllowedInSecs" : 5.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : 10, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario index 983a597eb365a32e42a85a4ac1cf4be7a40a25c2..898d9aed20ee84ae5050d95d1f4efe0fc39e914e 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario @@ -1,8 +1,8 @@ { "name" : "21-Ped-SocialDistancing_1.5m", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -123,7 +123,26 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SocialDistancingCognitionModel" + "cognition" : "SocialDistancingCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel" : { + "repulsionFactor" : 1.6444, + "repulsionIntercept" : 0.4845, + "minDistance" : 1.25, + "maxDistance" : 2.0 + } + } } }, "topography" : { @@ -251,14 +270,9 @@ }, "stimuli" : [ { "type" : "DistanceRecommendation", - "id" : 10, "socialDistance" : 1.5, "cloggingTimeAllowedInSecs" : 5.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : 10, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario index acee5396bfa97fd1a2eccc35b1a068ebb774005f..bb93c02ac41ff99486dceb96062fdbc4dbbec0e0 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario @@ -1,8 +1,8 @@ { "name" : "21-Ped-normal_behavior", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -123,7 +123,26 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SocialDistancingCognitionModel" + "cognition" : "SocialDistancingCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel" : { + "repulsionFactor" : 1.6444, + "repulsionIntercept" : 0.4845, + "minDistance" : 1.25, + "maxDistance" : 2.0 + } + } } }, "topography" : { @@ -251,14 +270,9 @@ }, "stimuli" : [ { "type" : "DistanceRecommendation", - "id" : 10, "socialDistance" : 1.5, "cloggingTimeAllowedInSecs" : 5.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : 10, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario index c842e020bd32f18a14b5f18915947cf0ccae9ac2..089ba1809db881a5f80a076fafe2ace614d30cb2 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario @@ -1,8 +1,8 @@ { "name" : "01-Wait-OSMSequential", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -225,13 +239,8 @@ "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "Wait", - "id" : -1 + "type" : "Wait" } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario index 82ff539ca57228cc3a9568bcc075a0a272900f52..131bb8be16f14d3b736fd2836365a4a9d2294b5f 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario @@ -1,8 +1,8 @@ { "name" : "02-Wait-OSMEventDriven", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -225,13 +239,8 @@ "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "Wait", - "id" : -1 + "type" : "Wait" } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario index 59849fe52d3edabe931e4a796beecc7b8035f512..fcc44c2dd803bed67fa8c4b7179d9ccac59d6f61 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario @@ -1,8 +1,8 @@ { "name" : "03-WaitRecurring-OSMSequential", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -225,13 +239,8 @@ "waitTimeBetweenRepetition" : 10.0 }, "stimuli" : [ { - "type" : "Wait", - "id" : -1 + "type" : "Wait" } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario index 82b9166895ec1fc34b61aaf83736be03b2281084..3275f8803656bfce569c2224c018c180f1a32237 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario @@ -1,8 +1,8 @@ { "name" : "04-WaitInArea-OSMSequential", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -226,7 +240,6 @@ }, "stimuli" : [ { "type" : "WaitInArea", - "id" : -1, "area" : { "x" : 15.0, "y" : 0.0, @@ -235,10 +248,6 @@ "type" : "RECTANGLE" } } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario index dda2249a70500a1e8b9398d8658fc4fd0e1c5b4d..fb73a4844ced0d863ebe7c2e4f200b12382cd85c 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario @@ -1,8 +1,8 @@ { "name" : "05-WaitInArea-BHM", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -79,7 +79,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "SimpleCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel" : { } + } } }, "topography" : { @@ -224,7 +238,6 @@ }, "stimuli" : [ { "type" : "WaitInArea", - "id" : -1, "area" : { "x" : 15.0, "y" : 0.0, @@ -233,10 +246,6 @@ "type" : "RECTANGLE" } } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file 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 d02c5167691dd120f6ff7b4d53b15b314053f33a..31efb6aa66c10a42412956c502326a697935bbe8 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario @@ -1,8 +1,8 @@ { "name" : "06-Threat-OSMSequential-OneAgent", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -236,15 +250,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file 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 006c395811b2b5ea478fc3843d5c510041ea6266..e04387fa433e6c2bbf38d6e3ab7eac5bfa5719e1 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario @@ -1,8 +1,8 @@ { "name" : "07-Threat-OSMSequential-MultipleAgents", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -407,15 +421,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file 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 7c0eea24acf2a4507135fb15f0e137bf4e67b0fd..0cd84f64a100fa5ba1f322366d65796732a1830c 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,8 +1,8 @@ { "name" : "08-Threat-OSMSequential-OneAgent-OneObstacle", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "ThreatCognitionModel" + "cognition" : "ThreatCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel" : { } + } } }, "topography" : { @@ -245,15 +259,10 @@ }, "stimuli" : [ { "type" : "Threat", - "id" : -1, "originAsTargetId" : 0, "loudness" : 1.0, "radius" : 10.0 } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/09-Wait-Probabilistic-OSMEventDriven.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/09-Wait-Probabilistic-OSMEventDriven.scenario index 205a8622c297a684ff4db5612029d65c364c2878..508f1e44c87687c6f33801008bc327b2dd25c323 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/09-Wait-Probabilistic-OSMEventDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/09-Wait-Probabilistic-OSMEventDriven.scenario @@ -1,8 +1,8 @@ { "name" : "09-Wait-Probabilistic-OSMEventDriven", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,13 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "perception" : "MultiPerceptionModel", - "cognition" : "ProbabilisticCognitionModel" + "cognition" : "ProbabilisticCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesMultiPerceptionModel" : { }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesProbabilisticCognitionModel" : { + "routeChoices" : [ ] + } + } } }, "topography" : { @@ -184,13 +190,8 @@ "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "Wait", - "id" : -1 + "type" : "Wait" } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 } ] } } \ No newline at end of file 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 765824aa0afe74bcfbe6ee50e4a1cf41092d2e65..227c94b68acc0f674b85191da3f40c8437cda9c9 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario @@ -1,8 +1,8 @@ { "name" : "01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -281,7 +295,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c333e62662771e167737302512e54bacea685167..0a4658d25b80143274158cc91a96bab772123eb4 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario @@ -1,8 +1,8 @@ { "name" : "02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -281,7 +295,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 03e647cf24c216a03f9743b370e3eebea023a7fb..1efd4ec3a32bf5049da48e89b71e8b0bddd40777 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario @@ -1,8 +1,8 @@ { "name" : "03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -281,7 +295,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 95838a9f69b1e3e99480093e06b200df18d5868c..76c8e9c93c4fc91cf3829520fe8814f13d12492e 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario @@ -1,8 +1,8 @@ { "name" : "04-Test-TargetChanger-SupportsListsOfTargets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -298,7 +312,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 94cf45ad575d8583f821a32f59012c09c6547067..4b0552d5247b50c9b4409d8991189d97b264a14b 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario @@ -1,8 +1,8 @@ { "name" : "05-Test-TargetChanger-CanCreateAListOfTargets", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -298,7 +312,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 36f63d243b83bb3f60b943414852caa2ed7759a0..376527e5e1d71ea624acf40ebc2b248d7d8d9b89 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario @@ -1,8 +1,8 @@ { "name" : "06-Test-TargetChanger-ChangesToDynamicTarget", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -109,7 +109,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -290,7 +304,6 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario index 5ad70044b7cf098f0456eac9f2dcb76e7cdfe3f9..f8bec5da8d5b8b8c88c0db126cff37eb9f0514a7 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario @@ -1,8 +1,8 @@ { "name" : "Reynolds_test", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -83,7 +83,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -174,7 +188,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario index bc31c292869f5f2b722e1cf0d3da231ff0a03f01..cf78695178078ed4bc29adfe6464a2bb04b5fc40 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario @@ -1,8 +1,8 @@ { "name" : "Reynolds_test_displaced", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -167,7 +181,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario index f93484e5c2394c4057269eab6672848aaf15f220..2a6f79de0e82df2139d2815abe572bde20a2119d 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 15b01be40a7d828d11a5f9fbf08e3a13678150bd..b75bf3ddaf11fe860d4ab4a65aea7ae29a9867d3 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_sfm1_displaced", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario index 7957547351fadbf11c7f3bea3e1e7167e6ede64d..ce000b88fe218dfb25dd179d2201ce13617e700a 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_sfm2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario index 4e81b6984a60860393f2b78ecdff3fffe232a0a3..4c909a35582e745822a936ed3fc05fb89ddb4589 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -88,7 +88,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -206,7 +220,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 caa0ecf3933780fe9947ebb932b1db9cd9e5cf26..2c34af428b4fdddc7d54701d389982757a174779 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_1_wall_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9bfa9ab92a2c4256f1eb4296d6c44d45fab4d87b..f56b970e8adefa14c63f32cfd909444661315d83 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_2_wall_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c66821e6f1804322d1e6bd08eb7c78c3e481d6a2..b887bf96ecc830e12af4dc5a3162bc3233d2299b 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_3_wall_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 b2ec9be6bc8f64387982a1288da7d4ddad4daa12..65f756f5adf6ff1dd8d1ca973d0a8a6709d87ccc 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_1_wall_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 ceccecd52876982630557d74788491a27f987cef..a91aec3757dca6c6e2bf9918498a463f2350557a 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_1_wall_sfm2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 166de78c9f7334201de370e9559ec7bbe53b4624..99d2c863bd7712835b56f6d33bf6f360fef42952 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_2_wall_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6b346b3e4d79ab3fa2400f64da1dbee55b65d8d1..8779fef9213351e3432e816e4d694e7d3c2a6d30 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_2_wall_sfm2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -180,7 +194,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario index d9f7cc21bc4cb03f5c3e0e4ff5a3e32820c02491..304f9e9e8c93fa5d72a73caaabe9ba4103bf58b5 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -83,7 +83,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -165,7 +179,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario index 8c5c6594e494dc3b400dca4c363d456c56d9e2f0..01cbac852a06bfc05921d317646f260c23b2ad26 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_sfm2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -83,7 +83,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -165,7 +179,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7fb3132bde37adf919f7bd46a8aad7186e9591fe..1f1f41c6dfdfde473824114334639402cb14319b 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,8 +1,8 @@ { "name" : "rimea_04_flow_sfm1_025_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d2a8db7ff06d32486b20c4daa8df1cb7c9a484ed..225e2be496a496faab4414eda4d6671580729dc5 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,8 +1,8 @@ { "name" : "rimea_04_flow_sfm1_050_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1f5fa19bc9e3cb6b50a1d6ed83bf29a0417141a9..f166db3fec2ae108cabcb045b1d7715d7aa93729 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,8 +1,8 @@ { "name" : "rimea_04_flow_sfm1_075_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 8b077646c614b3751ab4c75d4582bfb194135f11..93adfc0a931d7ed8432e9495e1974e7028173bad 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,8 +1,8 @@ { "name" : "rimea_04_flow_sfm1_100_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 79c3bbccba67086370cc3325d0fb5d75dbe3fc2a..4e23f35dc8b0becd521204fd12c2e15a558e07a1 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,8 +1,8 @@ { "name" : "rimea_04_flow_sfm1_125_h", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -151,7 +165,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario index 80bdde020ede589fb397c9a7c43bc0604f9e5246..4bca5196372feca8a267b8d987d4fd109e25ae3a 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -69,7 +69,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -169,7 +183,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario index f8e6224633c7401c78f41a71aecac4ed63e97796..a14c6e02ceba19e34d8bb9b912ff1b7285421240 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -101,7 +101,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -210,7 +224,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario index afb7c145c3339fba150680e1351e87742ca9af1a..e45766c35dee577db7f9c919db8ff9e225c56c52 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -83,7 +83,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -165,7 +179,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario index be7a6c10b332573cf08ee484467af85c7e81ec4c..8e9778e5baf2ef7821dec2c6eabc4ee7db615fbc 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding_sfm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -103,7 +103,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -853,7 +867,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario index 2c6dfca71934fffe735eb21122226009ae813db0..c473cfb2b99ca9dc35bd75167ca7abd9b428226d 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_1_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario index a81ba18aaef6af9b744f5c5a34e21f2d5b42a95e..c95685745c09196998ccd2d808e977b9fd54fc5d 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_1_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario index ecd44b73392e68fadbed6f96a1c7168d18228cb4..e2d31bfc52e4291434d5f92639774aad2cdd4e24 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_2_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario index b8e560387d8fb93ad820dc113dac38a0315629a1..e261220fa5509074c887cea79693e05f1b196f67 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_2_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario index 60fcaa45db3d13bb9649bb1f36f7d7c3fb6c7c38..be510a02039f5c7e48de7ce02db9f896abb02fb9 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_3_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario index 64cb31c2768ac1c82c5b9bbbd574fe749f7d1933..36be104c17185b8b59ef58afc737dfdaeb56657c 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_3_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario index f290ed22f0137de4709eafef31132cc2a85eeb08..b1ea2badc36d6c49243e6a73b15797c7783132af 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_4_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario index 58fb1bcca10c15b17d74c0115c53c926427cef0a..d30e0b06db1cdac812541018826a5e73df774594 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_diagonal_4_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -232,7 +246,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c999d3271140f7ea97edbf878674b5a111057a9c..ae4e9c72c91b91e6e68b0998987cab8416b73ef6 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,8 +1,8 @@ { "name" : "stairs_diagonal_both_1_2_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -273,7 +287,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 28948b89d09457bc01d15269a2e8f771b7dd24e3..a5f74521c0423b149341a88c41d042e5cc8d6f93 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,8 +1,8 @@ { "name" : "stairs_diagonal_both_1_2_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -273,7 +287,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 3c78295bf10a5c572ec9596f49dc13ddadc41869..6f2976c3d3876cf2c1aac5cee90fed4938cf9eda 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,8 +1,8 @@ { "name" : "stairs_diagonal_both_3_4_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -273,7 +287,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 546e8114874702007caa5f9e04c5b4511601a0ad..5268ff2961335a00e7ca2955ca790374ce6e21b6 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,8 +1,8 @@ { "name" : "stairs_diagonal_both_3_4_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -273,7 +287,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 9e2cf5408f9c8388c26dc3d8494ee095de7c8963..ef7940439c9ff1167568e32fbbb595c8a823c45e 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_down_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 5b6d0707b21ebfcea616e2c9ae779afa3184f921..0515c327593d304d514dbe2e4a0bf74a83a899a1 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_down_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1375efa6a09d772af71d520d38e9f23bf9763bf1..bb3ef26b29f820fee4ba9f87d7c43728e8905379 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,8 +1,8 @@ { "name" : "stairs_upward_direction_to_right_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 1a37de35cddc0bff5a50f3fb4f56f2a9886ba033..8df153e09a9ac2f282d29891163e514b2729050f 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,8 +1,8 @@ { "name" : "stairs_upward_direction_to_right_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c22b5be4643a7275f7a274018171263e6fb38377..05cc7bed89494311a8cb61e35965203d86bf74d1 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_toleft_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 de3c95a8cffb61dc5c7a8b88a9f541edb55703b4..c58a48010d98aed3dddf747588d99ca38142d215 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_toleft_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c439813cbc0067b65fdb9f34465adfdd0b443fc8..01390f3de8290c73164f860da96e1bd265d1c8cb 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_up_+1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d17f9cf0f1db387485d601ba1d05cc93b48eee60..c16f01a4d91a23246224f406b246ebf611c4f4a9 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario @@ -1,8 +1,8 @@ { "name" : "stairs_upward_direction_up_-1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -205,7 +219,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario index 58e0f893f68924ab35ed55e4892efe7f4937f6fe..390e4384e31fbdf1d6ee47f6c21046755584267e 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario @@ -1,8 +1,8 @@ { "name" : "counterflow", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -128,7 +128,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -251,7 +265,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario index 230dbf9ac4f5e2541149d02d9794cdfd6ee42bcf..e301e9152cb736e97edd87da9454762b97bc4174 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario @@ -1,8 +1,8 @@ { "name" : "labyrinth", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -128,7 +128,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -300,7 +314,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 03af76b90b4ec8538070082ac498c728a57792bd..7ac9c3532aeb1c2cd5e5ec71729101afba77f0a8 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,8 +1,8 @@ { "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -128,7 +128,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -276,7 +290,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario index cee7dbd2e61d253b18cd58e54bff4a48241cbef9..3cce73e27fd4429799aa967036a39eb7b65a5afb 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ ], "processors" : [ { @@ -128,7 +128,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -291,7 +305,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario index 2fd6f9fac3495d349fecbab4ca506cffbaf7e097..e0748a6143bcabfffcc8742344ee73b8365f2b5c 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario index c95045261c04330bb4c652db32d801b43c2c51fe..40d8ea8e17a35a55a143f00f05ec7bf5e3c48292 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario index 1a61f1c7b0c7444286f0c6e00e81308946292804..431c79d4790c2149b0cbb38b3a7f8b67125e4be9 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_navigation_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario index d385d74d19b0d9cc9fb505576b49e8c63f1dd910..725718a8135aec9f296ad1111b016d36a2bcbfee 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_navigation_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario index be72f9479de8204c0221e10efb4f5ae18dc42918..61883982c262eb8783d9e4700c8315bfcf2222c8 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario index 3bb9e19acab40426b5284328e8ff5bd00ae73228..e4109b9a3eb3d689c25832158526a17b6666765b 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario index f1cb1dd9710dd153dfdc3d3c35eeec2f8381fd4b..60b013e8f0d56c448867f1cffa18ceea73bd3533 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_unit_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario index 9aeb20407895077f6f1b6ed5c9fd3c54390308f4..8f6dfc8d048ad84af4fcf92169298207a027e6b8 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "2_bridge_coordinates_kai_unit_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario index 5a5fc1bd1f10e807068daae73536390ddc31c52d..f74c72ca34ad1b3aa30f0df829a376bd7a378f75 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario index 433b23be2b6a9cae4a0fe9f083c05ff1a82979da..9f3ff37edd936fab19f1def65a21a1abc99ba214 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario index 7f797f18cee1bc5ae709a79db2a03941b79f643d..bef67712a27f3c2626b616878a41a8d088288633 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario index 3d9222e578beae2d316e5d409bd20ed84f841d87..9405026f19011bed854943d4a08dab7e43f7579a 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario index 1d5fbf004e182406783d153522aa6693ede16a4b..e616bb3c01e360d2c198d33568e3d770e9f72f36 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_unit_random_pos_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario index a0f0dfe0b4f868dbdec1d852e3704b0be133758f..2096c66465321ed401deabf7ded7c3f9f7759c1b 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_unit_random_pos_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario index 0dbea4bbc171bcee4e3dd809ce7734206b53a878..7059e2ec31c351a65a00d72ea16e2b99c9e1ed44 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_unit_with_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario index 209ce6d86acd6ad22014ecac1b523cc02b172bae..ee9e7d51c058e7886ba4f74073bee89d932031f1 100644 --- a/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario +++ b/Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai_unit_without_offset", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 4be7a9feca2bf925ee2e2c91e4fdd2f77ef1a404..4b800d7856d839b08a328d9fcb96b1f2a993eb56 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,8 +1,8 @@ { "name" : "BHM_Liddle_fixed_seed", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -107,7 +107,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -242,7 +256,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 e43ca707f14be74e44ea9e0ca829d1579ccad492..629e83b6142c0c4a6c7ef04fd17bf0b2db3de6a2 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,8 +1,8 @@ { "name" : "CA_basic_2_density", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -127,7 +127,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -245,7 +259,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6b17243af05efb80fafec9049047fe52783db1eb..32f044d9fe58729b8eed3ee46510bced72da1ae5 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,8 +1,8 @@ { "name" : "GNM_basic_1_chicken", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -80,7 +80,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -189,7 +203,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6c8ba01523096ace1fbf57a47c9c2c87a023ebec..5fae1bd448c29cc55dee6aa1489b25bc8b60278a 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,8 +1,8 @@ { "name" : "bridge_timeCost_NAVIGATION", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 079319f0176be995e257eb0615e78c9fd79ba197..e2ac9920a06b11847ad42c83ea4866cd3e7e073c 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,8 +1,8 @@ { "name" : "bridge_timeCost_OBSTACLES", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 42b5eb531835a3a0de910020e510d458a34c4a91..d165b1f788ff97982b57af7846cb001ee2328b25 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,8 +1,8 @@ { "name" : "bridge_timeCost_QUEUEING", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7cf8749891b0f5221a18714198a9b2c0d86aba37..69acdad09024fca61ff58aef9a20e64d9e86187d 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,8 +1,8 @@ { "name" : "bridge_timeCost_UNIT", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d8b265d62f43d3a2dd79111544de7f68dc677b31..2c286dab828563981ccfeb5b30979d4e3f36e94e 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,8 +1,8 @@ { "name" : "complex_NAVIGATION_001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -463,7 +477,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 2b5aecfab56c1a40e48d52f972622084ac5e7e09..8415d0ddb6d7a9ae0997f096cf149732fa56612c 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,8 +1,8 @@ { "name" : "complex_NAVIGATION_groups_001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -117,7 +117,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -493,7 +507,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 84c56de17bff71f6d7620cefb1fd4da1375aeed5..c6e72b35496a5e7e492d1e68d14e1563ca26c601 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,8 +1,8 @@ { "name" : "complex_UNIT_001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -463,7 +477,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 6391f144c1ee57d2c28c268236969096dd693311..b08f7edb4bb4156efbb55b9df2017ac3f6c8a11f 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,8 +1,8 @@ { "name" : "complex_UNIT_groups_001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -117,7 +117,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -493,7 +507,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/Tools/SUQController/tutorial/example.scenario b/Tools/SUQController/tutorial/example.scenario index 98df38d30ab6abe30c3fae2b758bb9f71cc9ac5a..c9299c10351b8ee84a4b1da0d3115ca1b922bbeb 100644 --- a/Tools/SUQController/tutorial/example.scenario +++ b/Tools/SUQController/tutorial/example.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_pso", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -100,7 +100,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -218,7 +232,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0f99d334ed36acfb5c6a49bfc6125e1613e30d74..51cef79e4fe4acf6c257682771b2e34ebb25cc1d 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d874f54c238202b4133d6554d2d000eb77dccc68..cc1a62a12dd0459f5141565db644e7aa77738636 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c0fe39ac9c6006a04e31a35a61a30dd840f774a3..d6d424ead7c0e5e74ce490ca9dfe5770bfc1522a 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 aaa564d480f981a2bc7538ef78d129002104dd2a..7af516e7ef7bbd1360f6f93349fdff08273ac8e7 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c393db87c4deac5c5a7d158dd597c1ff426ddf4f..96740014c549738bdf986ace583778acf1178f03 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0bb7b31ce08dee4a0a893acb181c6b4c15c8b641..005173be3cda51f3b755b97f19be8e6cc6eef538 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f27b93af9613289d97c338ac3a01ca66af98c41c..a491eede5a13f7a6816067b6857b85dc874bee2b 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 aef1bf964ad30bcfea609c7cf1feb23e80bbc772..4091ed50fae05cc08e0ac904e642797f53cc804c 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d9bf0a409fd6028251a53f2c99b0587d5456945a..d9c83db89848f9f542674067c7ce9fab9a13593f 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario @@ -1,8 +1,8 @@ { "name" : "empty", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -195,7 +209,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0f99d334ed36acfb5c6a49bfc6125e1613e30d74..51cef79e4fe4acf6c257682771b2e34ebb25cc1d 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d874f54c238202b4133d6554d2d000eb77dccc68..cc1a62a12dd0459f5141565db644e7aa77738636 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c0fe39ac9c6006a04e31a35a61a30dd840f774a3..d6d424ead7c0e5e74ce490ca9dfe5770bfc1522a 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 aaa564d480f981a2bc7538ef78d129002104dd2a..7af516e7ef7bbd1360f6f93349fdff08273ac8e7 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 c393db87c4deac5c5a7d158dd597c1ff426ddf4f..96740014c549738bdf986ace583778acf1178f03 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 0bb7b31ce08dee4a0a893acb181c6b4c15c8b641..005173be3cda51f3b755b97f19be8e6cc6eef538 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 f27b93af9613289d97c338ac3a01ca66af98c41c..a491eede5a13f7a6816067b6857b85dc874bee2b 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 aef1bf964ad30bcfea609c7cf1feb23e80bbc772..4091ed50fae05cc08e0ac904e642797f53cc804c 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,8 +1,8 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -293,7 +307,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 d9bf0a409fd6028251a53f2c99b0587d5456945a..d9c83db89848f9f542674067c7ce9fab9a13593f 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario @@ -1,8 +1,8 @@ { "name" : "empty", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -195,7 +209,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereGui/resources/messages.properties b/VadereGui/resources/messages.properties index 1e938d8f7ff292cc2f12ca7971792a49b34df86a..15b98d6610e1563bb8cb4749635ba0da301507fc 100644 --- a/VadereGui/resources/messages.properties +++ b/VadereGui/resources/messages.properties @@ -417,8 +417,10 @@ Tab.Model.insertModelNameMenu.title=Insert model name Tab.Model.insertModelNameSubMenu.title=Main models Tab.Pedestrians.title=Pedestrians Tab.Psychology.title=Psychology +Tab.PerceptionModel.loadTemplateMenu.title=Load Perception Model +Tab.CognitionModel.loadTemplateMenu.title=Load Cognition Model Tab.Topography.title=Topography -Tab.Perception.title=Perception +Tab.Perception.title=Stimuli Tab.OutputProcessors.title=Data output Tab.TopographyCreator.title=Topography creator Tab.PostVisualization.title=Post-Visualization diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index 347e2d5486319f503ac6b503e0ae40e369e129dd..aa27984c9ade28fa728ec4ccec23c8b7997f20f6 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -122,8 +122,8 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro JMenu mnPresetMenu = new JMenu(Messages.getString("Tab.Model.loadTemplateMenu.title")); presetMenuBar.add(mnPresetMenu); - menusInTabs.add(mnPresetMenu); + menusInTabs.add(mnPresetMenu); ModelPresets.getPresets().forEach( modelDefinition -> mnPresetMenu.add(new JMenuItem(new AbstractAction(modelDefinition.getMainModel()) { private static final long serialVersionUID = 1L; @@ -212,7 +212,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesPsychologyView.setScenarioChecker(model); // use .isEditable(true); to save time (no check!) tabbedPane.addTab(Messages.getString("Tab.Psychology.title"), attributesPsychologyView); - topographyFileView = new TextView("ProjectView.defaultDirectoryScenarios", AttributeType.TOPOGRAPHY); topographyFileView.setScenarioChecker(model); tabbedPane.addTab(Messages.getString("Tab.Topography.title"), topographyFileView); diff --git a/VadereGui/testResources/test-scenario.scenario b/VadereGui/testResources/test-scenario.scenario index 90d009e6c2ca2829a1aefff912777abecbbdb65b..7ae050eaa36a4b723021a55615ada60da13ef7c9 100644 --- a/VadereGui/testResources/test-scenario.scenario +++ b/VadereGui/testResources/test-scenario.scenario @@ -1,8 +1,8 @@ { "name" : "Neues_Szenario", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -237,7 +237,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -354,7 +368,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java b/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java index bc02d5a09b9f3bbcf2568e9db6dece6ec2cca4c1..e720ad82ce0f48e561f89dd8bd842ac2692d4054 100644 --- a/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java +++ b/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java @@ -1,13 +1,10 @@ package org.vadere.manager.traci.commandHandler; import com.fasterxml.jackson.core.JsonProcessingException; - import org.apache.commons.collections.ListUtils; import org.vadere.annotation.traci.client.TraCIApi; import org.vadere.manager.RemoteManager; import org.vadere.manager.traci.TraCICmd; -import org.vadere.state.psychology.perception.json.ReactionProbability; -import org.vadere.state.traci.TraCIDataType; import org.vadere.manager.traci.commandHandler.annotation.VadereHandler; import org.vadere.manager.traci.commandHandler.annotation.VadereHandlers; import org.vadere.manager.traci.commandHandler.variables.VadereVar; @@ -22,6 +19,7 @@ import org.vadere.state.attributes.scenario.AttributesTargetChanger; import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.scenario.TargetChanger; +import org.vadere.state.traci.TraCIDataType; import org.vadere.state.types.ScenarioElementType; import org.vadere.state.util.StateJsonConverter; @@ -137,8 +135,6 @@ public class VadereCommandHandler extends CommandHandler { StimulusInfoStore sis = new StimulusInfoStore(); sis.setStimulusInfos(lsi); - List reactionProbabilities = sic.getScenarioStore().getStimulusInfoStore().getReactionProbabilities(); - sis.setReactionProbabilities(reactionProbabilities); TraCIGetResponse res; String data; diff --git a/VadereManager/testResources/stimulusInfoData.json b/VadereManager/testResources/stimulusInfoData.json index a3afb9c441c723ab49dc7d02c756b9d4e23b3f1d..d695c52bb0454de78afb52e47fd0a93bebe19ab3 100644 --- a/VadereManager/testResources/stimulusInfoData.json +++ b/VadereManager/testResources/stimulusInfoData.json @@ -7,12 +7,7 @@ "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "Wait", - "id" : -1 + "type" : "Wait" } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 0.75 } ] } \ No newline at end of file diff --git a/VadereManager/testResources/test005/scenarios/mf_small_simple.scenario b/VadereManager/testResources/test005/scenarios/mf_small_simple.scenario index 9c536bbbcbce7acc63e8d5eb31e9be5864aab503..9d3f378652e2149ad13115420535da0af275e25d 100644 --- a/VadereManager/testResources/test005/scenarios/mf_small_simple.scenario +++ b/VadereManager/testResources/test005/scenarios/mf_small_simple.scenario @@ -1,8 +1,8 @@ { "name" : "mf_small_simple", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1992,7 +2006,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/test005/scenarios/s004.scenario b/VadereManager/testResources/test005/scenarios/s004.scenario index 90733dd5b4b9b4ebed4115ac86a428368ea3ab9c..a120b41541261430425287e34d8f74a3c86e7f12 100644 --- a/VadereManager/testResources/test005/scenarios/s004.scenario +++ b/VadereManager/testResources/test005/scenarios/s004.scenario @@ -1,8 +1,8 @@ { "name" : "s004", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -213,7 +227,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/mf_001.scenario b/VadereManager/testResources/testProject001/scenarios/mf_001.scenario index c091d711c008cdc34d75fad56eb67055c71b1518..79d2ff6f429f704028519f05a5e0a30e82582fe0 100644 --- a/VadereManager/testResources/testProject001/scenarios/mf_001.scenario +++ b/VadereManager/testResources/testProject001/scenarios/mf_001.scenario @@ -1,8 +1,8 @@ { "name" : "mf_001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -10795,7 +10809,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/mf_small.scenario b/VadereManager/testResources/testProject001/scenarios/mf_small.scenario index 3f5ce0b047baca63212d82bf575f82d7991389ed..88a58a165f15f0e931a9717f0dedd5720af25992 100644 --- a/VadereManager/testResources/testProject001/scenarios/mf_small.scenario +++ b/VadereManager/testResources/testProject001/scenarios/mf_small.scenario @@ -1,8 +1,8 @@ { "name" : "mf_small", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -3149,7 +3163,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/mf_small_simple.scenario b/VadereManager/testResources/testProject001/scenarios/mf_small_simple.scenario index 8c3360d0a6994f304fb3e30cfb39a6199a16fd7b..49d9168049fba36cfd2df0f5b4a6937c9908e48e 100644 --- a/VadereManager/testResources/testProject001/scenarios/mf_small_simple.scenario +++ b/VadereManager/testResources/testProject001/scenarios/mf_small_simple.scenario @@ -1,8 +1,8 @@ { "name" : "mf_small_simple", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -1992,7 +2006,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/roVerTest001.scenario b/VadereManager/testResources/testProject001/scenarios/roVerTest001.scenario index 5895d6d758092ed50caf5d068c3126b3599ddee1..28891f242679b199e58cedb31e6f7ee26672519c 100644 --- a/VadereManager/testResources/testProject001/scenarios/roVerTest001.scenario +++ b/VadereManager/testResources/testProject001/scenarios/roVerTest001.scenario @@ -1,8 +1,8 @@ { "name" : "roVerTest001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -132,7 +132,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -292,7 +306,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/scenario001.scenario b/VadereManager/testResources/testProject001/scenarios/scenario001.scenario index 9e3a11b7d2f0e55c62b0cc73eee159c7bc11e6b6..0d73a0b880ffb0564840042433af903d6683fc35 100644 --- a/VadereManager/testResources/testProject001/scenarios/scenario001.scenario +++ b/VadereManager/testResources/testProject001/scenarios/scenario001.scenario @@ -1,8 +1,8 @@ { "name" : "scenario001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -213,7 +227,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/testResources/testProject001/scenarios/scenario002.scenario b/VadereManager/testResources/testProject001/scenarios/scenario002.scenario index fa60f724d109e766997d5fb3cd4d28c58ef5720c..304a24ad381941520e84963b24298c3f3fa0239a 100644 --- a/VadereManager/testResources/testProject001/scenarios/scenario002.scenario +++ b/VadereManager/testResources/testProject001/scenarios/scenario002.scenario @@ -1,8 +1,8 @@ { "name" : "scenario002", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -290,7 +304,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereManager/tests/org/vadere/manager/traci/commandHandler/VadereCommandHandlerTest.java b/VadereManager/tests/org/vadere/manager/traci/commandHandler/VadereCommandHandlerTest.java index c87e56fb63e3cb92a6b3be4992de183f832f5768..eaf200b1a5e125ff9de86dcd71c659f72576b392 100644 --- a/VadereManager/tests/org/vadere/manager/traci/commandHandler/VadereCommandHandlerTest.java +++ b/VadereManager/tests/org/vadere/manager/traci/commandHandler/VadereCommandHandlerTest.java @@ -6,8 +6,6 @@ import org.vadere.manager.RemoteManager; import org.vadere.manager.RemoteScenarioRun; import org.vadere.manager.TestRemoteManager; import org.vadere.manager.traci.TraCICmd; -import org.vadere.state.psychology.perception.json.ReactionProbability; -import org.vadere.state.traci.TraCIDataType; import org.vadere.manager.traci.commandHandler.variables.VadereVar; import org.vadere.manager.traci.commands.TraCICommand; import org.vadere.manager.traci.commands.TraCIGetCommand; @@ -18,19 +16,17 @@ import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.scenario.TargetChanger; import org.vadere.state.scenario.Topography; +import org.vadere.state.traci.TraCIDataType; import org.vadere.state.util.StateJsonConverter; import org.vadere.util.io.IOUtils; import java.io.IOException; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Random; import static org.mockito.ArgumentMatchers.isA; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class VadereCommandHandlerTest extends CommandHandlerTest { @@ -56,7 +52,6 @@ public class VadereCommandHandlerTest extends CommandHandlerTest { List stimuli = sis.getStimulusInfos(); List oneTimeStimuli = StimulusController.filterOneTimeStimuli(stimuli); List recurringStimuli = StimulusController.filterRecurringStimuli(stimuli); - List reactionProbabilities = sis.getReactionProbabilities(); TraCIGetCommand cmd = (TraCIGetCommand) getFirstCommand(TraCIGetCommand.build( TraCICmd.GET_VADERE_VALUE, varID, elementID)); @@ -66,7 +61,6 @@ public class VadereCommandHandlerTest extends CommandHandlerTest { StimulusController sc = mock(StimulusController.class, Mockito.RETURNS_DEEP_STUBS); when(sc.getOneTimeStimuli()).thenReturn(oneTimeStimuli); when(sc.getRecurringStimuli()).thenReturn(recurringStimuli); - when(sc.getScenarioStore().getStimulusInfoStore().getReactionProbabilities()).thenReturn(reactionProbabilities); when(remoteManager.getRemoteSimulationRun().getStimulusController()).thenReturn(sc); } }; diff --git a/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java b/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java new file mode 100644 index 0000000000000000000000000000000000000000..6109d13569d6892b01b67e93f9fe084aca36c147 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java @@ -0,0 +1,61 @@ +package org.vadere.simulator.control.external.models; + +import org.json.JSONObject; +import org.vadere.state.psychology.perception.types.DistanceRecommendation; +import org.vadere.state.psychology.perception.types.InformationStimulus; +import org.vadere.state.psychology.perception.types.Stimulus; +import org.vadere.state.scenario.Pedestrian; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Random; +import java.util.stream.Collectors; + + +public class InformationStimulusProvider extends ControlModel { + + + public InformationStimulusProvider() { + super(); + } + + + @Override + protected Stimulus getStimulusFromJsonCommand(JSONObject command, int stimulusId, double timeCommandExecuted) { + String instruction = readSocialDistanceFromJson(command); + return new InformationStimulus(timeCommandExecuted,instruction, stimulusId); + } + + @Override + public void update(String commandRaw, Double time, int pedId) { + + CtlCommand command = new CtlCommand(commandRaw); + + Collection pedestrians; + if (pedId == -1) pedestrians = new ArrayList<>(topography.getPedestrianDynamicElements().getElements()); + else pedestrians = topography.getPedestrianDynamicElements().getElements().stream().filter(pedestrian -> pedestrian.getId() == pedId).collect(Collectors.toList()); + + for (Pedestrian ped : pedestrians) { + + if (this.informationFilter.isPedInDefinedArea(ped, command.getSpace())){ + Stimulus stimulus = this.getStimulusFromJsonCommand(command.getPedCommand(), command.getStimulusId(), getTimeCommandExecuted(time)); + setPedSpecificStimuli(time, ped, stimulus); + } else { + System.out.println(ped.getId() + " out of area."); + } + } + } + + protected boolean isBehaviorChangeEnduring() { + return false; + } + + + + + private String readSocialDistanceFromJson(JSONObject command) { + return command.getString("instruction"); + } + + +} diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/helpers/CognitionModelBuilder.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/helpers/CognitionModelBuilder.java index ce354ca7e3023ef25ddb26562439895a2783061b..cf538516c39eb78d77063f2fc9cfd43b8136d1b8 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/helpers/CognitionModelBuilder.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/helpers/CognitionModelBuilder.java @@ -1,9 +1,15 @@ package org.vadere.simulator.control.psychology.cognition.helpers; import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel; +import org.vadere.simulator.models.Model; import org.vadere.simulator.projects.ScenarioStore; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; import org.vadere.util.reflection.DynamicClassInstantiator; +import java.util.List; +import java.util.Random; + /** * This class encapsulates the creation of a concrete {@link ICognitionModel} * which is defined by the user in the JSON scenario description. @@ -23,7 +29,15 @@ public class CognitionModelBuilder { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); ICognitionModel cognitionModel = instantiator.createObject(fullyQualifiedClassName); - cognitionModel.initialize(scenarioStore.getTopography()); + List attributes = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); + + Random random = new Random(scenarioStore.getAttributesSimulation().getSimulationSeed()); + cognitionModel.initialize(scenarioStore.getTopography(), random); + + List attributesList = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); + + AttributesCognitionModel attributesCognitionModel = Model.findAttributes(attributesList, cognitionModel.getAttributes().getClass()); + cognitionModel.setAttributes(attributesCognitionModel); return cognitionModel; } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ChangeTargetScriptedCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ChangeTargetScriptedCognitionModel.java index 9a21ba167142280f89c47aa8de0dd61c8d5e55f0..46bbaed093e688a386e34c3c4bced921ae31d19e 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ChangeTargetScriptedCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ChangeTargetScriptedCognitionModel.java @@ -1,5 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.models.psychology.cognition.AttributesChangeTargetScriptedCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ChangeTargetScripted; import org.vadere.state.scenario.Pedestrian; @@ -8,6 +10,7 @@ import org.vadere.state.scenario.Topography; import java.util.Collection; import java.util.LinkedList; import java.util.List; +import java.util.Random; import java.util.stream.Collectors; /** @@ -20,10 +23,12 @@ import java.util.stream.Collectors; public class ChangeTargetScriptedCognitionModel implements ICognitionModel { private Topography topography; + private AttributesChangeTargetScriptedCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { this.topography = topography; + this.attributes = new AttributesChangeTargetScriptedCognitionModel(); } @Override @@ -41,6 +46,17 @@ public class ChangeTargetScriptedCognitionModel implements ICognitionModel { pedestrians.stream().forEach(pedestrian -> pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED)); } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + this.attributes = (AttributesChangeTargetScriptedCognitionModel) attributes; + + } + + @Override + public AttributesChangeTargetScriptedCognitionModel getAttributes() { + return attributes; + } + private void changeTargetsAccordingToStimulus(ChangeTargetScripted changeTargetScripted, Collection pedestrians) { int activeIndex = getActiveIndexFromStimulusList(changeTargetScripted); diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModel.java index 1e265530c268bcecc5ad38b1f69185fe77981dd9..d6eb8100d315676bb81e9db2e43bb35f7d723dd0 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModel.java @@ -1,11 +1,14 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; +import java.util.Random; /** * The {@link CooperativeCognitionModel} makes a pedestrian cooperative if its @@ -19,10 +22,12 @@ import java.util.Collection; public class CooperativeCognitionModel implements ICognitionModel { private Topography topography; + private AttributesCooperativeCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { this.topography = topography; + this.attributes = new AttributesCooperativeCognitionModel(); } @Override @@ -37,6 +42,17 @@ public class CooperativeCognitionModel implements ICognitionModel { } } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + this.attributes = (AttributesCooperativeCognitionModel) attributes; + + } + + @Override + public AttributesCooperativeCognitionModel getAttributes() { + return this.attributes; + } + protected boolean pedestrianCannotMove(Pedestrian pedestrian) { boolean cannotMove = false; diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CounterflowCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CounterflowCognitionModel.java index 7b6ba6ad55417c1833fc9a7e7a2b58881e8eec7e..6c24c87b882ada7e5ce7bfdcb3114fe7f48d971c 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CounterflowCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/CounterflowCognitionModel.java @@ -1,11 +1,14 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCounterflowCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.Collection; +import java.util.Random; /** * The {@link CounterflowCognitionModel} enables a pedestrian to evade if @@ -18,10 +21,12 @@ import java.util.Collection; public class CounterflowCognitionModel implements ICognitionModel { private Topography topography; + private AttributesCounterflowCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { this.topography = topography; + this.attributes = new AttributesCounterflowCognitionModel(); } @Override @@ -43,4 +48,16 @@ public class CounterflowCognitionModel implements ICognitionModel { } } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + + this.attributes = (AttributesCounterflowCognitionModel) attributes; + + } + + @Override + public AttributesCounterflowCognitionModel getAttributes() { + return this.attributes; + } + } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ICognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ICognitionModel.java index c1febcabb14ff7f13bd2a2964f2f87a7774cd810..b38a6ca6b0e5bd57f325a45743b265e0ce6b74c4 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ICognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ICognitionModel.java @@ -1,12 +1,14 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.models.Model; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.Threat; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.Collection; +import java.util.Random; /** * Interface for a cognition model. @@ -38,7 +40,7 @@ public interface ICognitionModel { * a model can acquire additional information about a pedestrian's surrounding * when evaluating pedestrian's cognition. */ - void initialize(Topography topography); + void initialize(Topography topography, Random random); /** * Usually, this method iterates over the pededestrians and calls @@ -51,4 +53,8 @@ public interface ICognitionModel { */ void update(Collection pedestrians); + void setAttributes(AttributesCognitionModel attributes); + + AttributesCognitionModel getAttributes(); + } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModel.java index b69f28027260c46d505794eb0b7651b7a35d9f8a..595aeac221d3c3c8417897a6f2328e8e80679def 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModel.java @@ -3,17 +3,18 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.apache.commons.math3.distribution.EnumeratedIntegerDistribution; import org.apache.commons.math3.random.JDKRandomGenerator; import org.apache.commons.math3.random.RandomGenerator; +import org.apache.commons.math3.util.Precision; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesProbabilisticCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesRouteChoiceDefinition; import org.vadere.state.psychology.cognition.SelfCategory; -import org.vadere.state.psychology.information.InformationState; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; -import org.vadere.state.simulation.FootstepHistory; import org.vadere.util.logging.Logger; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.IntStream; public class ProbabilisticCognitionModel extends AProbabilisticModel { @@ -21,151 +22,121 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private RandomGenerator rng; + public AttributesProbabilisticCognitionModel getAttributes() { + return attributesProbabilisticCognitionModel; + } + + public void setAttributes(AttributesCognitionModel attributesProbabilisticCognitionModel) { + this.attributesProbabilisticCognitionModel = (AttributesProbabilisticCognitionModel) attributesProbabilisticCognitionModel; + } + + private AttributesProbabilisticCognitionModel attributesProbabilisticCognitionModel; + private Topography topography; + @Override - public void initialize(Topography topography) { - rng = new JDKRandomGenerator(0); //TODO: use seed from json? + public void initialize(Topography topography, Random random) { + this.rng = new JDKRandomGenerator(random.nextInt()); + this.attributesProbabilisticCognitionModel = new AttributesProbabilisticCognitionModel(); + this.topography = topography; + + checkModelAttributes(); + } + @Override public void update(Collection pedestrians) { + //TODO how to consider groups? + for (Pedestrian pedestrian : pedestrians) { - LinkedList oldStimuli = pedestrian.getPerceivedStimuli(); - LinkedList newStimuli = pedestrian.getNextPerceivedStimuli(); + Stimulus stimulus = pedestrian.getMostImportantStimulus(); - if (!oldStimuli.equals(newStimuli)) { - Stimulus mostImportantStimulus = drawStimulusFromRandomDistribution(newStimuli); - pedestrian.setMostImportantStimulus(mostImportantStimulus); - setInformationState(pedestrian, mostImportantStimulus,newStimuli); - applyAction(pedestrian); - } - pedestrian.setNextPerceivedStimuli(newStimuli); - setInformationStateGroupMember(pedestrian.getPedGroupMembers()); - } - } + if (stimulus instanceof InformationStimulus) { - protected boolean pedestrianCannotMove(Pedestrian pedestrian) { - boolean cannotMove = false; + InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); + String instruction = information.getInformation(); - FootstepHistory footstepHistory = pedestrian.getFootstepHistory(); - int requiredFootSteps = 2; + if (!pedestrian.getKnowledgeBase().knowsAbout(instruction)) { - if (footstepHistory.size() >= requiredFootSteps - && footstepHistory.getAverageSpeedInMeterPerSecond() <= 0.05) { - cannotMove = true; - } + AttributesRouteChoiceDefinition attr = getFilteredAttributes(instruction); + LinkedList newTarget = getNewTarget(attr.getTargetIds(), attr.getTargetProbabilities()); + pedestrian.setTargets(newTarget); + pedestrian.setNextTargetListIndex(0); - return cannotMove; - } + pedestrian.getKnowledgeBase().addInformation(new KnowledgeItem(instruction)); + pedestrian.setSelfCategory(SelfCategory.CHANGE_TARGET); + } else { + pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED); + } - protected void applyAction(Pedestrian pedestrian){ - if (pedestrianCannotMove(pedestrian)) { - pedestrian.setSelfCategory(SelfCategory.COOPERATIVE); - } else { - // in the super class CooperativeCognitionModel, there is no differentiation between sub-behaviors. - Stimulus stimulus = pedestrian.getMostImportantStimulus(); - SelfCategory nextSelfCategory; - - if (stimulus instanceof ChangeTarget) { - nextSelfCategory = SelfCategory.CHANGE_TARGET; - // make sure that the target is set directly - // this is necessary, because the target is set in the update scheme only, it the agent takes a step - // if agents are not in the event queue or their timeOfNextStep > simeTimeStep, the target will not be set properly in the locomotion layer - // In the {@link ChangeTargetScriptedCognitionModel}, the target is also set twice. - ChangeTarget changeTarget = (ChangeTarget) pedestrian.getMostImportantStimulus(); - pedestrian.setTargets(changeTarget.getNewTargetIds()); - pedestrian.setNextTargetListIndex(0); - - } else if (stimulus instanceof Threat) { - nextSelfCategory = SelfCategory.THREATENED; - } else if (stimulus instanceof Wait || stimulus instanceof WaitInArea) { - nextSelfCategory = SelfCategory.WAIT; - } else if (stimulus instanceof ElapsedTime) { - nextSelfCategory = SelfCategory.TARGET_ORIENTED; } else { - throw new IllegalArgumentException(String.format("Stimulus \"%s\" not supported by \"%s\"", - stimulus.getClass().getSimpleName(), - this.getClass().getSimpleName())); + pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED); } - pedestrian.setSelfCategory(nextSelfCategory); - } } + public AttributesRouteChoiceDefinition getFilteredAttributes(String information) { - protected void setInformationState(Pedestrian pedestrian, Stimulus mostImportantStimulus, List stimuli) { - // Each external stimulus has an acceptance rate defined - // If an agent accepts an external stimulus, the internal stimulus ElapsedTime is replaced by that external stimulus. - // If there are external stimuli, but the internal stimulus (ElapsedTime) is still present, - // we assume that the agent does not respond to that external stimulus, because they think is is not important for them. - // In this case, the information is not convincing. - if ((mostImportantStimulus instanceof ElapsedTime) && (getExternalStimuli(stimuli).size() > 0)){ - pedestrian.getKnowledgeBase().setInformationState(InformationState.INFORMATION_UNCONVINCING_RECEIVED); - } - else{ - pedestrian.getKnowledgeBase().setInformationState(InformationState.INFORMATION_CONVINCING_RECEIVED); - } - } - - // private + List routeChoices = attributesProbabilisticCognitionModel.getRouteChoices(); + List filteredAttributes = routeChoices + .stream() + .filter(routeChoice -> routeChoice.getInstruction().equals(information)) + .collect(Collectors.toList()); + if (filteredAttributes.size() == 0) { + throw new RuntimeException("Instruction >" + information + "< not found in " + AttributesProbabilisticCognitionModel.class.getSimpleName() + " definition."); + } else if (filteredAttributes.size() > 1) { + throw new RuntimeException("Multiple attribute definitions found for instruction >" + information + "<. Instruction must be unique."); + } - private Stimulus drawStimulusFromRandomDistribution(List newStimuli) { - Stimulus elapsedTimeStimulus = newStimuli.stream().filter(stimulus -> stimulus instanceof ElapsedTime).findFirst().orElseThrow(); - List externalStimuli = newStimuli.stream().filter(stimulus -> !(stimulus instanceof ElapsedTime)).collect(Collectors.toList()); - checkIfProbabiliesValid(externalStimuli); + return filteredAttributes.get(0); - // collect possible stimuli in a list: [stimulus 1, stimulus 2, ... stimulus n, ElapsedTimeStimulus] - List stimuli = externalStimuli; + } + public LinkedList getNewTarget(LinkedList targetIdList, LinkedList targetProbabilityList) { - // collect assigned probabilities in a list [probability 1 probability 2 ... probability n 1 - sum(..9 ] - List acceptanceDistribution = externalStimuli.stream().map(Stimulus::getPerceptionProbability).collect(Collectors.toList()); + int[] targetIds = targetIdList.stream().mapToInt(i -> i).toArray(); + double[] targetProbabilities = targetProbabilityList.stream().mapToDouble(i -> i).toArray(); - acceptanceDistribution.add(1 - getSumOfProbsExternalStimuli(externalStimuli)); - stimuli.add(elapsedTimeStimulus); + EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, targetIds, targetProbabilities); + Integer newTargetId = dist.sample(); - // setup distribution and draw index - EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, - IntStream.range(0, stimuli.size()).boxed().collect(Collectors.toList()).stream().mapToInt(i -> i).toArray(), - acceptanceDistribution.stream().mapToDouble(i -> i).toArray()); + LinkedList newTarget = new LinkedList<>(); + newTarget.add(newTargetId); - int indexDrawn = dist.sample(); - return stimuli.get(indexDrawn); + return newTarget; } - - private List getExternalStimuli(final List stimuli) { - return stimuli.stream() - .filter(stimulus -> !(stimulus instanceof ElapsedTime)) - .collect(Collectors.toList()); - } - - private Stimulus getMostImportStimulus(final List stimuli) { - return stimuli.stream() - .filter(stimulus -> stimulus instanceof ElapsedTime) - .collect(Collectors.toList()) - .get(0); + // checks + private void checkModelAttributes() { + List routeChoices = attributesProbabilisticCognitionModel.getRouteChoices(); + for (AttributesRouteChoiceDefinition r : routeChoices) { + checkIfTargetIdsValid(r.getTargetIds()); + checkIfProbabilitiesValid(r.getTargetProbabilities()); + } } - private void checkIfProbabiliesValid(final List externalStimuli) { + private void checkIfProbabilitiesValid(final List targetProbabilities) { - double sumOfProbsExternalStimuli = getSumOfProbsExternalStimuli(externalStimuli); - if (sumOfProbsExternalStimuli > 1.0){ - throw new IllegalArgumentException("The sum of probabilites = " + sumOfProbsExternalStimuli +". This exceeds 1.0"); + double sum = targetProbabilities.stream().reduce(0.0, Double::sum); + if (!Precision.equals(sum, 1.0)) { + throw new IllegalArgumentException("Sum of probabilities must be 1.0." + sum + ". Got: " + targetProbabilities + "."); } } - private double getSumOfProbsExternalStimuli(final List externalStimuli) { - return externalStimuli.stream().map(Stimulus::getPerceptionProbability).reduce(0.0, Double::sum); - } - + private void checkIfTargetIdsValid(LinkedList targetIds) { + List targetIdsTopography = topography.getTargetIds(); + if (!targetIdsTopography.containsAll(targetIds)) { + throw new RuntimeException("Targets defined in topography and targets defined in " + AttributesProbabilisticCognitionModel.class.getSimpleName() + " mismatch."); + } + } } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SimpleCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SimpleCognitionModel.java index 88b199f27e8e1017221890ff152bb02c22b78061..5e142de0bc739eb0d729b46aa0669aeee9e4a3d8 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SimpleCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SimpleCognitionModel.java @@ -1,11 +1,14 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesSimpleCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.Collection; +import java.util.Random; /** * The {@link SimpleCognitionModel} just passes the perceived stimulus to the @@ -14,10 +17,12 @@ import java.util.Collection; public class SimpleCognitionModel implements ICognitionModel { private Topography topography; + private AttributesSimpleCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { this.topography = topography; + this.attributes = new AttributesSimpleCognitionModel(); } @Override @@ -45,4 +50,14 @@ public class SimpleCognitionModel implements ICognitionModel { } } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + this.attributes = (AttributesSimpleCognitionModel) attributes; + } + + @Override + public AttributesSimpleCognitionModel getAttributes() { + return this.attributes; + } + } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SocialDistancingCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SocialDistancingCognitionModel.java index d3d3040023df04a1601dceef2a86feee3598afc5..e948d6d20b779c9fc7c99069ec7b3d2c09be5721 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SocialDistancingCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/SocialDistancingCognitionModel.java @@ -1,5 +1,9 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.simulator.models.osm.PedestrianOSM; +import org.vadere.state.attributes.models.AttributesPedestrianRepulsionPotentialStrategy; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.DistanceRecommendation; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -11,6 +15,7 @@ import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; import java.util.HashMap; +import java.util.Random; /** * Suppose a distance recommendation (a {@link DistanceRecommendation}) occurred (keyword: social distancing). @@ -24,9 +29,11 @@ import java.util.HashMap; public class SocialDistancingCognitionModel implements ICognitionModel { private HashMap cloggingStartTimes = new HashMap<>(); + private AttributesSocialDistancingCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { + this.attributes = new AttributesSocialDistancingCognitionModel(); } @Override @@ -39,10 +46,29 @@ public class SocialDistancingCognitionModel implements ICognitionModel { pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED); } else if (stimulus instanceof DistanceRecommendation) { pedestrian.setSelfCategory(SelfCategory.SOCIAL_DISTANCING); + PedestrianOSM ped = (PedestrianOSM) pedestrian; + + AttributesPedestrianRepulsionPotentialStrategy attr = new AttributesPedestrianRepulsionPotentialStrategy(); + attr.setSocialDistanceUpperBound(this.attributes.getMaxDistance()); + attr.setSocialDistanceLowerBound(this.attributes.getMinDistance()); + attr.setPersonalSpaceWidthIntercept(this.attributes.getRepulsionIntercept()); + attr.setPersonalSpaceWidthFactor(this.attributes.getRepulsionFactor()); + ped.setCombinedPotentialStrategyAttributes(attr); } } } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + this.attributes = (AttributesSocialDistancingCognitionModel) attributes; + + } + + @Override + public AttributesSocialDistancingCognitionModel getAttributes() { + return this.attributes; + } + protected boolean ignoreDistanceRecommendationInCaseOfClogging(Pedestrian pedestrian) { diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModel.java index 6693850e28a69b1090107c6f00f9552baaa69699..4cb6979103c58302a60a297733e4788406808f37 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModel.java @@ -1,6 +1,8 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesThreatCognitionModel; import org.vadere.state.psychology.cognition.GroupMembership; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -12,6 +14,7 @@ import org.vadere.util.geometry.shapes.VPoint; import java.util.Collection; import java.util.List; +import java.util.Random; import java.util.stream.Collectors; /** @@ -28,10 +31,12 @@ import java.util.stream.Collectors; public class ThreatCognitionModel implements ICognitionModel { private Topography topography; + private AttributesThreatCognitionModel attributes; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, Random random) { this.topography = topography; + this.attributes = new AttributesThreatCognitionModel(); } @Override @@ -48,6 +53,16 @@ public class ThreatCognitionModel implements ICognitionModel { } } + @Override + public void setAttributes(AttributesCognitionModel attributes) { + this.attributes = (AttributesThreatCognitionModel) attributes; + } + + @Override + public AttributesThreatCognitionModel getAttributes() { + return this.attributes; + } + private void handleThreat(Pedestrian pedestrian, Stimulus stimulus) { if (isNewThreatForPedestrian(pedestrian, (Threat) stimulus)) { pedestrian.getThreatMemory().setLatestThreatUnhandled(true); diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java index 724f76c2d741e3c2cdc3fa86e4e4c1b8c5eabf6f..0c253fe0e4ecc121e855b2bf15da22370ff000a9 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java @@ -1,7 +1,6 @@ package org.vadere.simulator.control.psychology.perception; import org.vadere.simulator.projects.ScenarioStore; -import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -28,8 +27,6 @@ public class StimulusController { private List recurringStimuli; - - private HashMap reactionProbabilities; private HashMap> pedSpecificStimuli; @@ -44,7 +41,6 @@ public class StimulusController { oneTimeStimuli.stream().forEach(stimulusInfo -> throwExceptionIfTimeframeIsInvalid(stimulusInfo.getTimeframe(), false)); recurringStimuli.stream().forEach(stimulusInfo -> throwExceptionIfTimeframeIsInvalid(stimulusInfo.getTimeframe(), true)); - setReactionProbabilites(scenarioStore.getStimulusInfoStore().getReactionProbabilities()); pedSpecificStimuli = new HashMap<>(); } @@ -57,7 +53,6 @@ public class StimulusController { } public List getOneTimeStimuli() { return oneTimeStimuli; } public List getRecurringStimuli() { return recurringStimuli; } - public HashMap getReactionProbabilities() { return reactionProbabilities; } // Setters @@ -66,10 +61,6 @@ public class StimulusController { } public void setOneTimeStimuli(List oneTimeStimuli) { this.oneTimeStimuli = oneTimeStimuli; } public void setRecurringStimuli(List recurringStimuli) { this.recurringStimuli = recurringStimuli; } - protected void setReactionProbabilites(List reactionProbabilities) { - reactionProbabilities.forEach(reactionProbability -> throwExceptionIfReactionProbabilityIsInvalid(reactionProbability)); - this.reactionProbabilities = (HashMap) reactionProbabilities.stream().collect(Collectors.toMap(ReactionProbability::getStimulusId,ReactionProbability::getReactionProbability)); - } // Methods public List getStimuliForTime(double simulationTime) { @@ -88,23 +79,10 @@ public class StimulusController { stimuli.addAll(activeOneTimeStimuli); stimuli.addAll(activeRecurringStimuli); - setReactionProbability(stimuli); - return stimuli; } - private void setReactionProbability(final List stimuli) { - for (Stimulus stimulus : stimuli){ - if (!(stimulus instanceof ElapsedTime)){ - if (reactionProbabilities.containsKey(stimulus.getId())){ - stimulus.setPerceptionProbability(reactionProbabilities.get(stimulus.getId())); - } - else{ - throw new RuntimeException("Stimulus id = "+ stimulus.getId() + " is not defined in perceptionLayer/reactionProbabilities." ); - } - } - } - } + public void setPedSpecificStimuli(final HashMap> pedSpecificStimuli) { @@ -225,7 +203,6 @@ public class StimulusController { public void setPedSpecificDynamicStimulus(Pedestrian ped, StimulusInfo stimulusInfo){ - setReactionProbability(stimulusInfo.getStimuli()); List stimulusInfos = new ArrayList<>(); if (pedSpecificStimuli.containsKey(ped)) { @@ -354,15 +331,6 @@ public class StimulusController { } } - /** - * Throw {@link IllegalArgumentException} if probability is not in 0..1 - */ - private static void throwExceptionIfReactionProbabilityIsInvalid(ReactionProbability reactionProbability) { - double probability = reactionProbability.getReactionProbability(); - if ( probability > 1.0 || probability < 0.0) { - throw new IllegalArgumentException("ReactionProbability: probability must be in [0,1]. Got " + probability); - } - } } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/helpers/PerceptionModelBuilder.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/helpers/PerceptionModelBuilder.java index 6cecfba6a5b269c649618e68eeca64724e7afc36..e50990594ee4291ac215c05671face2cd7953eec 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/helpers/PerceptionModelBuilder.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/helpers/PerceptionModelBuilder.java @@ -1,9 +1,15 @@ package org.vadere.simulator.control.psychology.perception.helpers; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel; +import org.vadere.simulator.models.Model; import org.vadere.simulator.projects.ScenarioStore; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; +import org.vadere.state.scenario.Topography; import org.vadere.util.reflection.DynamicClassInstantiator; +import java.util.List; + /** * This class encapsulates the creation of a concrete {@link IPerceptionModel} * which is defined by the user in the JSON scenario description. @@ -23,7 +29,16 @@ public class PerceptionModelBuilder { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); IPerceptionModel perceptionModel = instantiator.createObject(fullyQualifiedClassName); - perceptionModel.initialize(scenarioStore.getTopography(), scenarioStore.getAttributesSimulation().getSimTimeStepLength()); + Topography topography = scenarioStore.getTopography(); + double simTimeStepLength = scenarioStore.getAttributesSimulation().getSimTimeStepLength(); + List attributesList = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); + + perceptionModel.initialize(topography, simTimeStepLength); + + AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); + perceptionModel.setAttributes(attributes); + + return perceptionModel; } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/IPerceptionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/IPerceptionModel.java index bacba0c99298370a5cb86044768e8a8fcdc740e7..a09f7027d226c160db878a6afacea7e64d2c23fe 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/IPerceptionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/IPerceptionModel.java @@ -1,6 +1,7 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.state.psychology.perception.types.ElapsedTime; import org.vadere.state.psychology.perception.types.Stimulus; import org.vadere.state.scenario.Pedestrian; @@ -43,4 +44,9 @@ public interface IPerceptionModel { * */ void update(HashMap> pedSpecificStimuli); + void setAttributes(AttributesPerceptionModel attributes); + + AttributesPerceptionModel getAttributes(); + + } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/MultiPerceptionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/MultiPerceptionModel.java index d9c0e2e5cca52595a583ba1a632a40f3aab1f1c1..20d496f0eb8a8e00c7bb490ef020197bece59c64 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/MultiPerceptionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/MultiPerceptionModel.java @@ -1,5 +1,7 @@ package org.vadere.simulator.control.psychology.perception.models; +import org.vadere.state.attributes.models.psychology.perception.AttributesMultiPerceptionModel; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -15,11 +17,14 @@ import java.util.stream.Collectors; public class MultiPerceptionModel extends PerceptionModel { private Topography topography; + private AttributesMultiPerceptionModel attributes; @Override public void initialize(Topography topography, final double simTimeStepLengh) { this.topography = topography; + this.attributes = new AttributesMultiPerceptionModel(); + } @Override @@ -34,4 +39,16 @@ public class MultiPerceptionModel extends PerceptionModel { } + @Override + public void setAttributes(AttributesPerceptionModel attributes) { + this.attributes = (AttributesMultiPerceptionModel) attributes; + + } + + @Override + public AttributesMultiPerceptionModel getAttributes() { + return this.attributes; + } + + } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/PerceptionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/PerceptionModel.java index ecd97e2f6f9fc4df7aac41629149d3ff4115d31e..750f7e53d1eae4ba87eb6f6be452eb971a484201 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/PerceptionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/PerceptionModel.java @@ -1,13 +1,5 @@ package org.vadere.simulator.control.psychology.perception.models; -import org.vadere.state.psychology.information.InformationState; -import org.vadere.state.psychology.perception.types.ElapsedTime; -import org.vadere.state.psychology.perception.types.Stimulus; -import org.vadere.state.scenario.Pedestrian; - -import java.util.Collection; - public abstract class PerceptionModel implements IPerceptionModel { - } diff --git a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/SimplePerceptionModel.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/SimplePerceptionModel.java index 9c56022803a0570831ad1d16b8218f84ef0716d3..de375c6c9507ef2bb5b41c73e2f254db2079cd4f 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/SimplePerceptionModel.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/models/SimplePerceptionModel.java @@ -1,13 +1,12 @@ package org.vadere.simulator.control.psychology.perception.models; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; +import org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; -import org.vadere.util.geometry.shapes.VPoint; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -17,13 +16,16 @@ import java.util.stream.Collectors; */ public class SimplePerceptionModel extends PerceptionModel { + private AttributesSimplePerceptionModel attributes; private Topography topography; @Override public void initialize(Topography topography, final double simTimeStepLengh) { this.topography = topography; + this.attributes = new AttributesSimplePerceptionModel(); } + @Override public void update(HashMap> pedSpecificStimuli) { for (Pedestrian pedestrian : pedSpecificStimuli.keySet()) { @@ -32,6 +34,16 @@ public class SimplePerceptionModel extends PerceptionModel { } } + @Override + public void setAttributes(AttributesPerceptionModel attributes) { + this.attributes = (AttributesSimplePerceptionModel) attributes; + } + + @Override + public AttributesSimplePerceptionModel getAttributes() { + return this.attributes; + } + private Stimulus rankChangeTargetAndThreatHigherThanWait(List stimuli, Pedestrian pedestrian) { // Assume the "ElapsedTime" is the most important stimulus @@ -41,12 +53,29 @@ public class SimplePerceptionModel extends PerceptionModel { .collect(Collectors.toList()) .get(0); + LinkedList stimuliSorted = new LinkedList<>(); + stimuliSorted.add(mostImportantStimulus); + + // first element in stimuliSorted is the most important stimulus + + List attr = attributes.getSortedPriorityQueue().values().stream().collect(Collectors.toList()); + Collections.reverse(attr); + for (String typeName : attr){ + Stimulus stimulus = StimulusFactory.stringToStimulus(typeName); + if (stimulus != null) { + stimuliSorted.addAll(stimuli.stream().filter(s -> s.getClass() == stimulus.getClass()).collect(Collectors.toList())); + } + } + // add ElapsedTime stimulus as last element, since any other stimulus is more important + + + + /* depracted List waitStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof Wait).collect(Collectors.toList()); List waitInAreaStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof WaitInArea).collect(Collectors.toList()); List threatStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof Threat).collect(Collectors.toList()); List changeTargetStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof ChangeTarget).collect(Collectors.toList()); List changeTargetScriptedStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof ChangeTargetScripted).collect(Collectors.toList()); - // place List changepersonalspace here List distanceRecommendationStimuli = stimuli.stream().filter(stimulus -> stimulus instanceof DistanceRecommendation).collect(Collectors.toList()); @@ -63,9 +92,11 @@ public class SimplePerceptionModel extends PerceptionModel { }else if (distanceRecommendationStimuli.size() >= 1){ mostImportantStimulus = distanceRecommendationStimuli.get(0); } - else if(true){} // place changepersonalspace here + else if(true){} */ + + return stimuliSorted.getLast(); + - return mostImportantStimulus; } diff --git a/VadereSimulator/src/org/vadere/simulator/models/Model.java b/VadereSimulator/src/org/vadere/simulator/models/Model.java index 280c4e4391250f4deccb3a0863b90acd31d9abe8..bb3b08dd21a3f9b773a78cd0830f4783c7771cab 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/Model.java +++ b/VadereSimulator/src/org/vadere/simulator/models/Model.java @@ -50,4 +50,7 @@ public interface Model { } } + + + } diff --git a/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java b/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java index f491bebdedfbb727051b90a335321588f09a809f..e253c94ebc2e4363002ed5fc27687bff52182048 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java +++ b/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java @@ -4,8 +4,9 @@ import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.NotNull; import org.vadere.simulator.models.StepSizeAdjuster; import org.vadere.simulator.models.osm.optimization.OptimizationMetric; -import org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell; +import org.vadere.state.attributes.models.AttributesCombinedPotentialStrategy; import org.vadere.simulator.models.potential.combinedPotentials.*; +import org.vadere.state.attributes.models.AttributesPedestrianRepulsionPotentialStrategy; import org.vadere.util.geometry.shapes.*; import org.vadere.simulator.models.SpeedAdjuster; import org.vadere.simulator.models.osm.optimization.StepCircleOptimizer; @@ -38,6 +39,7 @@ public class PedestrianOSM extends Pedestrian { private transient IPotentialFieldTarget potentialFieldTarget; private transient PotentialFieldObstacle potentialFieldObstacle; + private AttributesCombinedPotentialStrategy attributesCombinedPotentialStrategy; public PotentialFieldAgent getPotentialFieldPedestrian() { return potentialFieldPedestrian; @@ -380,7 +382,8 @@ public class PedestrianOSM extends Pedestrian { } else if (newStrategy == CombinedPotentialStrategy.PEDESTRIAN_REPULSION_STRATEGY){ this.combinedPotentialStrategy = new PedestrianRepulsionStrategy(this.potentialFieldTarget, this.potentialFieldObstacle, - this.potentialFieldPedestrian); + this.potentialFieldPedestrian, + (AttributesPedestrianRepulsionPotentialStrategy) this.attributesCombinedPotentialStrategy); } else { throw new UnsupportedOperationException(); } @@ -449,4 +452,12 @@ public class PedestrianOSM extends Pedestrian { } return peds; } + + public void setCombinedPotentialStrategyAttributes(AttributesCombinedPotentialStrategy attributes) { + this.attributesCombinedPotentialStrategy = attributes; + } + + public AttributesCombinedPotentialStrategy getAttributesCombinedPotentialStrategy(){ + return this.attributesCombinedPotentialStrategy; + } } diff --git a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/ICombinedPotentialStrategy.java b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/ICombinedPotentialStrategy.java index ee802dbe54ce427bf68ed0c82b75489f6489ccc5..84fdeacd42df6e88da89c210c3801a4bddfd69ef 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/ICombinedPotentialStrategy.java +++ b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/ICombinedPotentialStrategy.java @@ -30,4 +30,5 @@ public interface ICombinedPotentialStrategy { * Get the combined potential at given position. */ public double getValue(IPoint newPos, Agent thisAgent, Collection otherAgents); + } diff --git a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java index f372f4dcf05ad3560b93bdcf278501e92b2fd0ac..1f90ea7f01452c6e883e5f5c707f30b2f29b362a 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java +++ b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java @@ -5,12 +5,12 @@ import org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoft import org.vadere.simulator.models.potential.fields.IPotentialFieldTarget; import org.vadere.simulator.models.potential.fields.PotentialFieldAgent; import org.vadere.simulator.models.potential.fields.PotentialFieldObstacle; +import org.vadere.state.attributes.models.AttributesPedestrianRepulsionPotentialStrategy; import org.vadere.state.psychology.perception.types.DistanceRecommendation; import org.vadere.state.psychology.perception.types.Stimulus; import org.vadere.state.scenario.Agent; import org.vadere.util.geometry.shapes.IPoint; -import javax.management.RuntimeErrorException; import java.util.Collection; /** @@ -25,11 +25,17 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { private IPotentialFieldTarget potentialFieldTarget; private PotentialFieldObstacle potentialFieldObstacle; private PotentialFieldAgent potentialFieldAgent; + private AttributesPedestrianRepulsionPotentialStrategy attributes; - public PedestrianRepulsionStrategy(IPotentialFieldTarget potentialFieldTarget, PotentialFieldObstacle potentialFieldObstacle, PotentialFieldAgent potentialFieldAgent) { + public PedestrianRepulsionStrategy(IPotentialFieldTarget potentialFieldTarget, PotentialFieldObstacle potentialFieldObstacle, PotentialFieldAgent potentialFieldAgent, AttributesPedestrianRepulsionPotentialStrategy attributes) { this.potentialFieldTarget = potentialFieldTarget; this.potentialFieldObstacle = potentialFieldObstacle; this.potentialFieldAgent = potentialFieldAgent; + this.attributes = attributes; + } + + public void setAttributes(AttributesPedestrianRepulsionPotentialStrategy attributes) { + this.attributes = attributes; } @Override @@ -70,6 +76,7 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { return socialDistance; } + /** * Compute the personal space width depending on the social distance for the realistic use case. * Original equation: @@ -78,8 +85,7 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { * We use a fixed corridor width c=2 in this implementation. * **/ private double getPersonalSpaceFromSocialDistance(double socialDistance) { - - return 1.6444*socialDistance-0.4845; + return getAttributes().getPersonalSpaceWidthFactor() *socialDistance - getAttributes().getPersonalSpaceWidthIntercept(); } /** @@ -87,15 +93,15 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { * the height must be set to 850. * */ private double getHeightFromSocialDistance(double socialDistance) { - return 850.0; + return attributes.getPersonalSpaceStrength(); } private boolean isSocialDistanceInRange(double socialDistance) { // additional check (already checked in ScenarioChecker!) - return (socialDistance >= 1.25 && socialDistance <= 2.0); + return (socialDistance >= getAttributes().getSocialDistanceLowerBound() && socialDistance <= getAttributes().getSocialDistanceUpperBound()); } - - - + public AttributesPedestrianRepulsionPotentialStrategy getAttributes() { + return attributes; + } } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index 37f99fef7a648c145035cac16601e2eb617b488f..33e9858cbdc91be32e93b24ed06e265f9ad79f5e 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -113,7 +113,9 @@ public class JsonConverter { vadereNode.set("attributesModel", attributesModelNode); vadereNode.set(AttributesSimulation.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class)); - vadereNode.set(AttributesPsychology.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class)); + + ObjectNode psychologyNode = StateJsonConverter.serializeAttributesPsychologyToNode(scenarioStore.getAttributesPsychology()); + vadereNode.set(AttributesPsychology.JSON_KEY, psychologyNode); ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); vadereNode.set("topography", topographyNode); @@ -132,8 +134,8 @@ public class JsonConverter { public static ScenarioStore cloneScenarioStore(ScenarioStore scenarioStore) throws IOException { JsonNode attributesSimulationNode = StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class); - JsonNode attributesPsychologyNode = StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class); + ObjectNode attributesPsychologyNode = StateJsonConverter.serializeAttributesPsychologyToNode(scenarioStore.getAttributesPsychology()); ObjectNode attributesModelNode = StateJsonConverter.serializeAttributesModelToNode(scenarioStore.getAttributesList()); ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); ObjectNode stimulusNode = StateJsonConverter.serializeStimuliToNode(scenarioStore.getStimulusInfoStore()); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java index 30b80e65e24230d703e30341708b4fd7cf34113d..f5c5252acf0b705aad43c48601d06f9ad86efaa6 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java @@ -142,9 +142,15 @@ public class MigrationUtil { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { boolean hasTreeMarker = treeMarker.stream().anyMatch(m -> dir.resolve(m).toFile().exists()); + if (ignoreDirs.contains(dir.getFileName().toString())) { // skip ignored directories-trees. return FileVisitResult.SKIP_SUBTREE; } else if (hasTreeMarker) { // skip directory tree if treeMarker is present. + + if (dir.resolve(IOUtils.LEGACY_DIR).toFile().exists()){ + throw new RuntimeException("Cannot migrate directory " + dir + " due to a legacy folder. Delete the legacy folder and re-run the migration."); + } + return FileVisitResult.SKIP_SUBTREE; } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_16.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_16.java index 1a83731af820b7470e36b3c852f378ff55abfa19..352a1df65e17f6c95ae8ea6c8ab88a0893c695a2 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_16.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_16.java @@ -1,29 +1,22 @@ 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.ObjectMapper; 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.psychology.perception.json.ReactionProbability; -import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.util.JacksonObjectMapper; -import org.vadere.state.util.StateJsonConverter; import org.vadere.util.version.Version; -import java.util.Collections; -import java.util.Iterator; - -import static org.vadere.state.util.StateJsonConverter.serializeStimuliToNode; - /** * Remove node "threatMemory" under "scenario.topography.dynamicElements.psychologyStatus" */ @MigrationTransformation(targetVersionLabel = "1.16") public class TargetVersionV1_16 extends SimpleJsonTransformation { + JacksonObjectMapper mapper = new JacksonObjectMapper(); + + public TargetVersionV1_16(){ super(Version.V1_16); } @@ -43,23 +36,21 @@ public class TargetVersionV1_16 extends SimpleJsonTransformation { } - private void addNewFieldToScenarioNode(final JsonNode node) { + private JsonNode addNewFieldToScenarioNode(final JsonNode node) { + + String key = "reactionProbabilities"; JsonNode scenarioNode = node.get("scenario"); - StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuliFromArrayNode(scenarioNode); - if (stimulusInfoStore.getReactionProbabilities().isEmpty() && !stimulusInfoStore.getStimulusInfos().isEmpty()){ - stimulusInfoStore.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); + if (path(scenarioNode, key).isMissingNode()) { + ((ObjectNode) scenarioNode).put(key, mapper.createArrayNode()); } - ObjectNode node1 = serializeStimuliToNode(stimulusInfoStore); - Iterator iter = node1.fieldNames(); - while (iter.hasNext()) { - String fieldName = iter.next(); - ((ObjectNode)scenarioNode).put(fieldName, node1.get(fieldName)); - } + return node; + + } - private void removeRedudanteAttribute(final JsonNode node) { + private JsonNode removeRedudanteAttribute(final JsonNode node) { String perceptionProbabilityKey = "perceptionProbability"; JsonNode stimulusInfosNode = path(node, "scenario/stimulusInfos"); @@ -76,6 +67,8 @@ public class TargetVersionV1_16 extends SimpleJsonTransformation { } } } + + return node; } } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java new file mode 100644 index 0000000000000000000000000000000000000000..749bee8d6951ec7eca02f5c54d7defacb08d3f09 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java @@ -0,0 +1,113 @@ +package org.vadere.simulator.projects.migration.jsontranformation.json; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.control.psychology.perception.models.PerceptionModel; +import org.vadere.simulator.projects.migration.MigrationException; +import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.attributes.AttributesPsychologyLayer; +import org.vadere.state.util.JacksonObjectMapper; +import org.vadere.util.version.Version; + + +@MigrationTransformation(targetVersionLabel = "2.2") +public class TargetVersionV2_2 extends SimpleJsonTransformation { + + JacksonObjectMapper mapper = new JacksonObjectMapper(); + + public TargetVersionV2_2() { + super(Version.V2_2); + } + + @Override + protected void initDefaultHooks() { + addPostHookFirst(this::addPsychologyLayerNodeIfMissing); + addPostHookLast(this::addNestedModelAttributesKeyInPsychologyLayer); + addPostHookLast(this::removeReactionProbabilities); + addPostHookLast(this::removeStimulusIds); + addPostHookLast(this::sort); + } + + + private JsonNode removeReactionProbabilities(JsonNode node) { + String key = "reactionProbabilities"; + JsonNode scenarioNode = node.get("scenario"); + + if (!path(scenarioNode, key).isMissingNode()) { + ((ObjectNode) scenarioNode).remove(key); + } + + return node; + } + + private JsonNode removeStimulusIds(JsonNode node) { + + String key = "stimulusInfos"; + JsonNode scenarioNode = node.get("scenario"); + + if (!path(scenarioNode, "stimulusInfos").isMissingNode()) { + + ArrayNode psychologyLayer = (ArrayNode) scenarioNode.get(key); + + for (JsonNode entry : psychologyLayer){ + ArrayNode stimuli = (ArrayNode) entry.get("stimuli"); + for (JsonNode stimulus : stimuli){ + ((ObjectNode) stimulus).remove("id"); + } + } + + } + + return node; + } + + + private JsonNode addPsychologyLayerNodeIfMissing(JsonNode node) { + + String keyMissing = "psychologyLayer"; + String psychologyLayerKey = "/scenario/attributesPsychology"; + + ObjectNode psychologyLayer = (ObjectNode) node.at(psychologyLayerKey); + + if (path(psychologyLayer, keyMissing).isMissingNode()) { + ObjectNode attributes = mapper.createObjectNode(); + attributes.put("perception", "SimplePerceptionModel"); //AttributesPsychologyLayer.DEFAULT_PERCEPTION_MODEL + attributes.put("cognition", "SimpleCognitionModel"); //AttributesPsychologyLayer.DEFAULT_COGNITION_MODEL + psychologyLayer.put(keyMissing, attributes); + } + + return node; + } + + private JsonNode addNestedModelAttributesKeyInPsychologyLayer(JsonNode node) throws MigrationException { + + String keyMissing = "attributesModel"; + String psychologyLayerKey = "/scenario/attributesPsychology/psychologyLayer"; + + ObjectNode psychologyLayer = (ObjectNode) node.at(psychologyLayerKey); + + if (path(psychologyLayer, keyMissing).isMissingNode()) { + ObjectNode attributesNode = mapper.createObjectNode(); + attributesNode.put(extracted(psychologyLayer, "perception"), mapper.createObjectNode()); + attributesNode.put(extracted(psychologyLayer, "cognition"), mapper.createObjectNode()); + + psychologyLayer.put(keyMissing, attributesNode); // add empty node + + } else { + throw new MigrationException("Key " + keyMissing + " not allowed under " + psychologyLayerKey + "."); + } + + return node; + } + + private String extracted(ObjectNode psychologyLayer, String key) { + + String path = "org.vadere.state.attributes.models.psychology."+ key +".Attributes"; + return path + psychologyLayer.get(key).toString().replace("\"", ""); + } + + + +} diff --git a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario index e319c8d8171209df3b430ec669fa440f0509866e..0f5e8a01521c4482e7126aeddb80e773c6b4a6f1 100644 --- a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario +++ b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario @@ -1,8 +1,8 @@ { "name" : "TopographyCheckerTest", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -794,7 +808,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 27d08f40a8ee4ec4d6fe35f4a153a1c5f4b726af..c332583ac8b87f8f985a1251b637e7bfc7f23ea2 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,8 +1,8 @@ { "name" : "Test1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -178,7 +192,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 913c2493398ffd6cf95b70300466544033d5089d..3bf319cfdd60b2411147a5f61cb3542272dab835 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,8 +1,8 @@ { "name" : "Test2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -137,7 +151,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario index f1278d5459f5666782a84d8b39cd792a453781cd..3d1dc824ef9bccac782fbda304fe6e3aa7496e22 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario @@ -1,8 +1,8 @@ { "name" : "Test1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -178,7 +192,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario index 45b3f68b9802f32eb444e0a5e20bb43a70dbc188..1c21d342bc662409b0c6370a3e473846a3431b38 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario @@ -1,8 +1,8 @@ { "name" : "Test2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -87,7 +87,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -137,7 +151,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario index 5be1a061569fda8c7e9da8f5eeb1fc8ff1ebd905..9dcc7a5a7a48cd81dd395b5e7e21aac3557b3d41 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario @@ -1,8 +1,8 @@ { "name" : "Test1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -182,7 +196,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario index 16fd55536dd2e107197e3b837f2014a6566c21f3..f23156eefa9c74ef411035149748419c496186bc 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario @@ -1,8 +1,8 @@ { "name" : "Test2", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -141,7 +155,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario index 565cbdefccba07081ce476d5964245858dcdf658..8b7dbc7c0ab7b4b4d7e40dcb687ea8de386b1238 100644 --- a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario +++ b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -98,7 +98,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -207,7 +221,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/cache/s001.scenario b/VadereSimulator/testResources/data/cache/s001.scenario index 7c6b6110e3f19b73e3eb2c9ce35ade9ca1ec8c6e..fcd9ea0e30fcbe4d156a992e122ce5b28cdb1626 100644 --- a/VadereSimulator/testResources/data/cache/s001.scenario +++ b/VadereSimulator/testResources/data/cache/s001.scenario @@ -1,8 +1,8 @@ { "name" : "s001", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -290,7 +304,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/cache/s002.scenario b/VadereSimulator/testResources/data/cache/s002.scenario index e385279f360081f545376d1fab2ef4491589cceb..cbd952658657b96df31a14e939c8c3e6d7c0ad80 100644 --- a/VadereSimulator/testResources/data/cache/s002.scenario +++ b/VadereSimulator/testResources/data/cache/s002.scenario @@ -1,8 +1,8 @@ { "name" : "s002", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -290,7 +304,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/cache/s003.scenario b/VadereSimulator/testResources/data/cache/s003.scenario index c89818ddb576c3d13b1efbfd559ed4a22ee546cd..a96cd377c8c9062d1ea6ec72b17d9438a6381413 100644 --- a/VadereSimulator/testResources/data/cache/s003.scenario +++ b/VadereSimulator/testResources/data/cache/s003.scenario @@ -1,8 +1,8 @@ { "name" : "s002", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -113,7 +113,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -290,7 +304,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 2edbb96973d86a06f393597c20832d5a746e9c3e..fb27673ca22d8ee74156a37d7eb63aef82c48f8d 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -94,7 +94,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -446,7 +460,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 13d6b66abfa49ec23ae609c4d1b1873aa7a24c3b..f276083dffc9bf746b5ffa54791471250a99108f 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario @@ -1,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7cd462e514fd7de702dbcc440121fba952b1298e..7b9392f4cc16c5340700196ce3bd2f006d14b59f 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario index f9089cd5189c1c49a2ee5b9f713657d2e1bf81a9..a0e4249aa66b1453b298ce857e3ba8625fbc55fb 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario @@ -1,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 60f69cec759b027f8bed40d88bdc24fda295573b..0e33bf811cbc37a902713861c4eaf6805ae2d1aa 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario @@ -1,8 +1,8 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario index 13d6b66abfa49ec23ae609c4d1b1873aa7a24c3b..f276083dffc9bf746b5ffa54791471250a99108f 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario @@ -1,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 7cd462e514fd7de702dbcc440121fba952b1298e..7b9392f4cc16c5340700196ce3bd2f006d14b59f 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file 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 458e59782df61a15db4857220c4bf220b48e8bab..c2f1c200980f4dabe40765eb671e709e3ab3c9e2 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,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario index f9089cd5189c1c49a2ee5b9f713657d2e1bf81a9..a0e4249aa66b1453b298ce857e3ba8625fbc55fb 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario @@ -1,8 +1,8 @@ { "name" : "test_postvis", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,7 +90,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -199,7 +213,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario index 60f69cec759b027f8bed40d88bdc24fda295573b..0e33bf811cbc37a902713861c4eaf6805ae2d1aa 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario @@ -1,8 +1,8 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -123,7 +123,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -223,7 +237,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario index 91e1e6cb439b70f82658076c156324e9a5b52140..fb3eb116e6feb5bdb59acdc9d0544d4419f53ae9 100644 --- a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario +++ b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "2.1", - "commithash" : "4f8202a8bd2a52cd623cfe8d28b5f0627a11d309", + "release" : "2.2", + "commithash" : "d9d2b99fc786eb7cd6932d373880911fde7d8471", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -91,7 +91,21 @@ "usePsychologyLayer" : false, "psychologyLayer" : { "perception" : "SimplePerceptionModel", - "cognition" : "CooperativeCognitionModel" + "cognition" : "CooperativeCognitionModel", + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel" : { + "priority" : { + "1" : "InformationStimulus", + "2" : "ChangeTargetScripted", + "3" : "ChangeTarget", + "4" : "Threat", + "5" : "Wait", + "6" : "WaitInArea", + "7" : "DistanceRecommendation" + } + }, + "org.vadere.state.attributes.models.psychology.cognition.AttributesCooperativeCognitionModel" : { } + } } }, "topography" : { @@ -200,7 +214,6 @@ "teleporter" : null, "attributesCar" : null }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ ] } } \ No newline at end of file diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java index 5fa71c51c7dad84700ebfd31cc0ac92329f1f78a..aebbecda38141c001c5fb017d7c1da0d4432b8a1 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition; import org.junit.Test; import org.vadere.simulator.control.psychology.cognition.models.CounterflowCognitionModel; +import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.psychology.cognition.SelfCategory; @@ -19,6 +20,9 @@ import static org.junit.Assert.assertEquals; public class CounterflowCognitionModelTest { + private List attributes = new LinkedList<>(); + + private List createPedestrians(int totalPedestrians, boolean usePedIdAsTargetId) { List pedestrians = new ArrayList<>(); @@ -87,7 +91,7 @@ public class CounterflowCognitionModelTest { Topography topography = createTopography(pedestrians); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -108,7 +112,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -118,6 +122,7 @@ public class CounterflowCognitionModelTest { } } + @Test public void updateDoesNotChangeSelfCategoryIfNeighborIsFurtherAwayFromOwnTarget() { boolean usePedIdAsTargetId = true; @@ -128,7 +133,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(0.5,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -148,7 +153,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -169,7 +174,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java index 74fc4d943a7f578ecaba6b84e79b29e193aa70d9..c36abd2e3d586108d2938450cde8dfbc5392b309 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition; import org.junit.Test; import org.vadere.simulator.control.psychology.cognition.models.SimpleCognitionModel; +import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; @@ -10,6 +11,7 @@ import org.vadere.state.scenario.Topography; import org.vadere.util.geometry.shapes.VPoint; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.Random; @@ -17,6 +19,8 @@ import static org.junit.Assert.assertEquals; public class SimpleCognitionModelTest { + private List attributes = new LinkedList<>(); + private Topography createTopography() { return new Topography(); } @@ -47,7 +51,7 @@ public class SimpleCognitionModelTest { } SimpleCognitionModel simpleCognitionModel = new SimpleCognitionModel(); - simpleCognitionModel.initialize(createTopography()); + simpleCognitionModel.initialize(createTopography(), new Random(0)); simpleCognitionModel.update(pedestrians); diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModelTest.java index 73049547e9a92018f67fa278ab4899df9bea2d8b..304a39f984df802424b511c8b9881d9882f14673 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/CooperativeCognitionModelTest.java @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.junit.Before; import org.junit.Test; +import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.scenario.Pedestrian; @@ -10,6 +11,7 @@ import org.vadere.state.simulation.FootStep; import org.vadere.util.geometry.shapes.VPoint; import java.lang.reflect.Field; +import java.util.LinkedList; import java.util.List; import java.util.Random; @@ -19,6 +21,7 @@ public class CooperativeCognitionModelTest { private Pedestrian pedestrian; private List pedestrians; + private List attributes = new LinkedList<>(); @Before public void initializePedestrian() { @@ -29,6 +32,8 @@ public class CooperativeCognitionModelTest { this.pedestrians = List.of(pedestrian); } + + @Test public void initializeSetsTopography() { String fieldName = "topography"; @@ -39,7 +44,7 @@ public class CooperativeCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography()); + modelUnderTest.initialize(new Topography(), new Random(0)); assertNotNull(privateTopographyField.get(modelUnderTest)); } catch (IllegalAccessException ex) { diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModelTest.java index bf0a9dbe9ff4f85dec7053be804e53a9c42637fe..992c90182f6f24d0e8df76f9b0d21e423cac022f 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ProbabilisticCognitionModelTest.java @@ -2,12 +2,16 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.apache.commons.math3.util.Precision; +import org.jetbrains.annotations.NotNull; +import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.cognition.AttributesProbabilisticCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesRouteChoiceDefinition; import org.vadere.state.attributes.scenario.AttributesAgent; -import org.vadere.state.psychology.perception.types.ChangeTarget; -import org.vadere.state.psychology.perception.types.ElapsedTime; -import org.vadere.state.psychology.perception.types.Stimulus; -import org.vadere.state.psychology.perception.types.Wait; +import org.vadere.state.psychology.cognition.SelfCategory; +import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -15,13 +19,54 @@ import org.vadere.state.scenario.Topography; import java.util.*; import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; + public class ProbabilisticCognitionModelTest { + private List attributes; + + private AttributesProbabilisticCognitionModel attributesProbabilisticCognitionModel; + private String instruction = "take target 2"; private static double ALLOWED_DOUBLE_ERROR = 10e-3; + @Before + public void initializeReactionBehavior(){ + + + AttributesRouteChoiceDefinition attr1 = getRouteChoiceDefinition(1,2,0.1, 0.9, "A"); + AttributesRouteChoiceDefinition attr2 = getRouteChoiceDefinition(3,4,0.5, 0.5, "B"); + + AttributesProbabilisticCognitionModel probModelAttr = new AttributesProbabilisticCognitionModel(); + probModelAttr.getRouteChoices().add(attr1); + probModelAttr.getRouteChoices().add(attr2); + this.attributesProbabilisticCognitionModel = probModelAttr; + + this.attributes = new LinkedList<>(); + this.attributes.add(probModelAttr); + + } + + @NotNull + private AttributesRouteChoiceDefinition getRouteChoiceDefinition(int targetId1, int targetId2, double prob1, double prob2, String instruction) { + AttributesRouteChoiceDefinition attr = new AttributesRouteChoiceDefinition(); + + LinkedList routeIds = new LinkedList<>(); + routeIds.add(targetId1); + routeIds.add(targetId2); + attr.setTargetIds(routeIds); + + LinkedList routeProbs = new LinkedList<>(); + routeProbs.add(prob1); + routeProbs.add(prob2); + attr.setTargetProbabilities(routeProbs); + + attr.setInstruction(instruction); + return attr; + } + private List createPedestrians(int totalPedestrians) { List pedestrians = new ArrayList<>(); @@ -51,7 +96,15 @@ public class ProbabilisticCognitionModelTest { } private Topography createTopography() { - Topography topography = new Topography(); + Topography topography = mock(Topography.class, Mockito.RETURNS_DEEP_STUBS); + + List routeIds = new LinkedList<>(); + routeIds.add(1); + routeIds.add(2); + routeIds.add(3); + routeIds.add(4); + + Mockito.when(topography.getTargetIds()).thenReturn(routeIds); return topography; } @@ -63,73 +116,33 @@ public class ProbabilisticCognitionModelTest { double presicison = 0.025; // percentage error Topography topography = createTopography(); - double time = 0.0; int sampleSize = 10000; - double prob2Is = 0.4; - double prob3Is = 0.2; - double prob1Is = 1.0-prob2Is-prob3Is; + AttributesProbabilisticCognitionModel attr = this.attributesProbabilisticCognitionModel; + List pedestrians = createPedestrians(sampleSize); - LinkedList stimuli = new LinkedList<>(); - stimuli.add(new ElapsedTime(time)); - stimuli.add(new ChangeTarget(time, prob2Is)); - stimuli.add(new Wait(time, prob3Is)); + pedestrians.stream().forEach(ped -> ped.setMostImportantStimulus(new InformationStimulus("A"))); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography); + probabilisticPerceptionModel.initialize(topography, new Random(0)); + probabilisticPerceptionModel.setAttributes(attr); - for (Pedestrian pedestrian : pedestrians){ - pedestrian.setPerceivedStimuli(new LinkedList<>()); - pedestrian.setNextPerceivedStimuli(stimuli); - } - probabilisticPerceptionModel.update(pedestrians); - double prob1 = 1.0 * pedestrians.stream().filter(ped -> ped.getMostImportantStimulus() instanceof ElapsedTime).count() / sampleSize; - double prob2 = 1.0 * pedestrians.stream().filter(ped -> ped.getMostImportantStimulus() instanceof ChangeTarget).count() / sampleSize; - double prob3 = 1.0 * pedestrians.stream().filter(ped -> ped.getMostImportantStimulus() instanceof Wait).count() / sampleSize; + LinkedList targetIds = probabilisticPerceptionModel.getFilteredAttributes("A").getTargetIds(); + LinkedList targetProbs = probabilisticPerceptionModel.getFilteredAttributes("A").getTargetProbabilities(); - assertTrue( Precision.equals(prob1, prob1Is, presicison)); - assertTrue( Precision.equals(prob2, prob2Is, presicison)); - assertTrue( Precision.equals(prob3, prob3Is, presicison)); - } + probabilisticPerceptionModel.update(pedestrians); + double prob1Is = 1.0 * pedestrians.stream().filter(ped -> ped.getTargets().getFirst() == targetIds.get(0)).count() / sampleSize; + double prob2Is = 1.0 * pedestrians.stream().filter(ped -> ped.getTargets().getFirst() == targetIds.get(1)).count() / sampleSize; - @Test - public void testCommandIdMissingWrapper() { - try { - wrongProbs(0.9); - } catch (final IllegalArgumentException e) { - assertTrue(e.getMessage().equals("The sum of probabilites = 1.3. This exceeds 1.0")); - } + assertTrue( Precision.equals(targetProbs.get(0), prob1Is, presicison)); + assertTrue( Precision.equals(targetProbs.get(1), prob2Is, presicison)); } - public void wrongProbs(double prob3Is) { - - Topography topography = createTopography(); - double time = 0.0; - int sampleSize = 10000; - - double prob2Is = 0.4; - - List pedestrians = createPedestrians(sampleSize); - LinkedList stimuli = new LinkedList<>(); - stimuli.add(new ElapsedTime(time)); - stimuli.add(new ChangeTarget(time, prob2Is)); - stimuli.add(new Wait(time, prob3Is)); - - - ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - - probabilisticPerceptionModel.initialize(topography); - pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); - - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli); - - } - @Test public void testRecurring() { @@ -137,66 +150,20 @@ public class ProbabilisticCognitionModelTest { List pedestrians = createPedestrians(1); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography); - pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); - - - double time = 0.0; - double time1 = 0.4; - double time2 = 0.8; - double time3 = 1.2; - double time4 = 1.4; - - LinkedList stimuli = new LinkedList<>(); - stimuli.add(new ElapsedTime(time)); - stimuli.add(new ChangeTarget(time, 0)); - stimuli.add(new Wait(time, 0)); + probabilisticPerceptionModel.initialize(topography, new Random(0)); + probabilisticPerceptionModel.setAttributes(this.attributesProbabilisticCognitionModel); - LinkedList stimuli1 = new LinkedList<>(); - stimuli1.add(new ElapsedTime(time1)); - stimuli1.add(new ChangeTarget(time1, 0)); - stimuli1.add(new Wait(time1, 0)); - - - LinkedList stimuli2 =new LinkedList<>(); - stimuli2.add(new ElapsedTime(time2)); - stimuli2.add(new ChangeTarget(time2, 0)); - stimuli2.add(new Wait(time2, 1)); - - LinkedList stimuli3 = new LinkedList<>(); - stimuli3.add(new ElapsedTime(time3)); - stimuli3.add(new ChangeTarget(time3, 0)); - stimuli3.add(new Wait(time3, 1)); - - LinkedList stimuli4 = new LinkedList<>(); - stimuli4.add(new ElapsedTime(time4)); - stimuli4.add(new ChangeTarget(time4, 0)); - stimuli4.add(new Wait(time4, 1)); - - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli); - pedestrians.forEach(pedestrian -> assertTrue(pedestrian.getMostImportantStimulus() instanceof ElapsedTime)); - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli1); - pedestrians.forEach(pedestrian -> assertTrue(pedestrian.getMostImportantStimulus() instanceof ElapsedTime)); - - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli2); - pedestrians.forEach(pedestrian -> assertTrue(pedestrian.getMostImportantStimulus() instanceof Wait)); - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli3); - pedestrians.forEach(pedestrian -> assertTrue(pedestrian.getMostImportantStimulus() instanceof Wait)); - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli4); - pedestrians.forEach(pedestrian -> assertTrue(pedestrian.getMostImportantStimulus() instanceof Wait)); + pedestrians.stream().forEach(ped -> ped.setMostImportantStimulus(new InformationStimulus("A"))); + probabilisticPerceptionModel.update(pedestrians); + assertTrue(pedestrians.get(0).getSelfCategory().equals(SelfCategory.CHANGE_TARGET)); + probabilisticPerceptionModel.update(pedestrians); + assertTrue(pedestrians.get(0).getSelfCategory().equals(SelfCategory.TARGET_ORIENTED)); } - private void updateStimuli(final List pedestrians, final ProbabilisticCognitionModel probabilisticPerceptionModel, final LinkedList stimuli) { - for (Pedestrian pedestrian : pedestrians){ - pedestrian.setPerceivedStimuli(new LinkedList<>()); - pedestrian.setNextPerceivedStimuli(stimuli); - } - - probabilisticPerceptionModel.update(pedestrians); - } + //TODO test groups } diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModelTest.java index cb531a22bda79222ca9776421d6fcf6b51592c59..67e06ec09c4816f1d6646579d8b01e827d93b02b 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/models/ThreatCognitionModelTest.java @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.junit.Before; import org.junit.Test; +import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesObstacle; import org.vadere.state.attributes.scenario.AttributesTarget; @@ -21,6 +22,7 @@ import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VRectangle; import java.lang.reflect.Field; +import java.util.LinkedList; import java.util.List; import java.util.Random; @@ -31,6 +33,7 @@ public class ThreatCognitionModelTest { private Pedestrian pedestrian; private List pedestrians; private Topography topography; + private List attributes = new LinkedList<>(); @Before public void initializePedestrian() { @@ -67,7 +70,7 @@ public class ThreatCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography()); + modelUnderTest.initialize(new Topography(), new Random(0)); assertNotNull(privateTopographyField.get(modelUnderTest)); } catch (IllegalAccessException ex) { @@ -92,7 +95,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -108,7 +111,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -126,7 +129,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -148,7 +151,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -176,7 +179,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); modelUnderTest.update(pedestrians); @@ -202,7 +205,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); // The "Threat" stimulus is processed for the first time. // Subsequent stimuli will be "ElapsedTime". @@ -230,7 +233,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); pedestrian.setSelfCategory(SelfCategory.WAIT); modelUnderTest.update(pedestrians); @@ -273,7 +276,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, new Random(0)); modelUnderTest.update(pedestrians); diff --git a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java index 8574526b757bce8760b6bd4996188133a725a78b..abec1a8f4654763e5a6bc96ba70f548241454314 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java @@ -2,6 +2,8 @@ package org.vadere.simulator.control.psychology.perception; import org.junit.Test; import org.vadere.simulator.control.psychology.perception.models.SimplePerceptionModel; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.perception.AttributesSimplePerceptionModel; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.psychology.perception.types.*; @@ -12,16 +14,15 @@ import org.vadere.util.geometry.shapes.VCircle; import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VShape; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Random; +import java.util.*; import static org.junit.Assert.*; public class SimplePerceptionModelTest { private static double ALLOWED_DOUBLE_ERROR = 10e-3; + private List attributesList = Collections.singletonList(new AttributesSimplePerceptionModel()); + private List createPedestrians(int totalPedestrians) { List pedestrians = new ArrayList<>(); @@ -87,7 +88,7 @@ public class SimplePerceptionModelTest { List stimuli = createElapsedTimeStimuli(1); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography,0 ); + simplePerceptionModel.initialize(topography,0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); 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 edd7abab4f2101c7c54c1e3567fbabe4bfd34fc5..1eac2556707a6378a0055f0de1c841904f74c99f 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java @@ -4,11 +4,9 @@ import org.junit.Test; import org.vadere.simulator.projects.ScenarioStore; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesTarget; -import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.psychology.perception.types.*; -import org.vadere.state.psychology.perception.types.Stimulus; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Target; import org.vadere.state.scenario.Topography; @@ -60,7 +58,6 @@ public class StimulusControllerTest { StimulusInfoStore stimulusInfoStore = new StimulusInfoStore(); stimulusInfoStore.setStimulusInfos(stimulusInfos); - stimulusInfoStore.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); return stimulusInfoStore; } @@ -68,7 +65,6 @@ public class StimulusControllerTest { private StimulusInfoStore getStimulusInfoStore(List stimulusList){ StimulusInfoStore store = new StimulusInfoStore(); store.setStimulusInfos(stimulusList); - store.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); return store; } @@ -459,72 +455,6 @@ public class StimulusControllerTest { assertEquals(2, pedSpecificStimuli.size()); } - @Test - public void checkProbabilityMappingGeneralStimuliOnly(){ - - int commandIdWait = -33; - double probWait = 0.11; - - // define stimuli and store them in stimulusInfo object - Stimulus wait = new Wait(); - wait.setId(commandIdWait); - Timeframe timeframe = new Timeframe(0, 1, false,0); - StimulusInfo waitInfo = new StimulusInfo(timeframe, Collections.singletonList(wait)); - - // define probababilites for stimuli - LinkedList reactionProbabilities = new LinkedList<>(); - reactionProbabilities.add(new ReactionProbability(commandIdWait, probWait)); - - // setup stimuluscontroller - StimulusController stimulusController = new StimulusController(getScenarioStore(getStimulusInfoStore(Collections.singletonList(waitInfo)))); - stimulusController.setReactionProbabilites(reactionProbabilities); - - List stimuli = stimulusController.getStimuliForTime(0.4); - double isProbWait = stimuli.stream().filter(stimulus -> stimulus instanceof Wait).findFirst().orElseThrow().getPerceptionProbability(); - assert isProbWait == probWait; - } - - - @Test - public void checkProbabilityMappingMixedSetting(){ - - int commandIdWait = -33; - int commandIdChangeTarget = 55; - double probWait = 0.5; - double probChangeTarget = 0.75; - - Pedestrian ped = new Pedestrian(new AttributesAgent(), new Random()); - - // define stimuli and store them in stimulusInfo object - Stimulus wait = new Wait(); - wait.setId(commandIdWait); - Stimulus changeTargetOriginal = new ChangeTarget(); - changeTargetOriginal.setId(commandIdChangeTarget); - Timeframe timeframe = new Timeframe(0, 1, false,0); - StimulusInfo waitInfo = new StimulusInfo(timeframe, Collections.singletonList(wait)); - - // define probababilites for stimuli - LinkedList reactionProbabilities = new LinkedList<>(); - reactionProbabilities.add(new ReactionProbability(commandIdWait, probWait)); - reactionProbabilities.add(new ReactionProbability(commandIdChangeTarget, probChangeTarget)); - - - // setup stimuluscontroller - StimulusController stimulusController = new StimulusController(getScenarioStore(getStimulusInfoStore(Collections.singletonList(waitInfo)))); - stimulusController.setReactionProbabilites(reactionProbabilities); - stimulusController.setPedSpecificDynamicStimulusEnduring(ped, changeTargetOriginal); - - // check if probability is set in mixed setting (general + pedestrian specific stimuli) - List stimuli = stimulusController.getStimuliForTime(0.0, ped); - double isProbWait = stimuli.stream().filter(stimulus -> stimulus instanceof Wait).findFirst().orElseThrow().getPerceptionProbability(); - double isProbChangeTarget = stimuli.stream().filter(stimulus -> stimulus instanceof ChangeTarget).findFirst().orElseThrow().getPerceptionProbability(); - - assert isProbWait == probWait; - assert isProbChangeTarget == probChangeTarget; - } - - - @Test public void getDynamicStimuli(){ @@ -629,28 +559,6 @@ public class StimulusControllerTest { } - @Test - public void assignReactionProbabilites() { - double expectedProbVal = 0.77; - double time = 1.2; - - StimulusInfo stimulusInfo1 = getStimulusInfo( - new Timeframe(time, 7, false,0), - new Wait(time) - ); - - StimulusInfoStore store = getStimulusInfoStore(Collections.singletonList((stimulusInfo1))); - store.setReactionProbabilities(Collections.singletonList(new ReactionProbability(expectedProbVal))); - StimulusController stimulusController = new StimulusController(getScenarioStore(store)); - - List stimuli = stimulusController.getStimuliForTime(time); - Stimulus waitStimulus = stimuli.stream().filter(stimulus -> stimulus instanceof Wait).collect(Collectors.toList()).get(0); - Stimulus elapsedTimeStimulus = stimuli.stream().filter(stimulus -> stimulus instanceof ElapsedTime).collect(Collectors.toList()).get(0); - - assertEquals(expectedProbVal, waitStimulus.getPerceptionProbability(), Double.MIN_VALUE); - assertEquals(1.0, elapsedTimeStimulus.getPerceptionProbability(), Double.MIN_VALUE); - - } diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java index 9b7ff60469ab8d3a9af5159b63432918af1d3c52..d2355d92c60a80523dca8057c31ad5efc1b6b171 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java @@ -1,7 +1,6 @@ package org.vadere.state.attributes; import java.util.Objects; -import java.util.Random; /** * This class encapsulates psychology-related simulation attributes. @@ -45,4 +44,5 @@ public class AttributesPsychology extends Attributes { public int hashCode() { return Objects.hash(usePsychologyLayer, psychologyLayer); } + } diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java index e08954602763bb6c244caab407e4fa537b90a861..e56cd72f4a0048e9a6f8772429f3efa4618b080d 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java @@ -1,7 +1,6 @@ package org.vadere.state.attributes; -import java.util.HashMap; -import java.util.Objects; +import java.util.*; /** * This class beautifies the JSON content by mapping @@ -14,6 +13,7 @@ public class AttributesPsychologyLayer { public static final String DEFAULT_PERCEPTION_MODEL = "SimplePerceptionModel"; public static final String DEFAULT_COGNITION_MODEL = "SimpleCognitionModel"; + // Variables // Both should reference to concrete "IPerception" and "ICognition" // implementations! We do not reference them here to avoid cyclic @@ -21,14 +21,17 @@ public class AttributesPsychologyLayer { private String perception; private String cognition; + public List attributesModel; + // Constructors public AttributesPsychologyLayer() { - this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL); + this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL, new ArrayList<>()); } - public AttributesPsychologyLayer(String perception, String cognition) { + public AttributesPsychologyLayer(String perception, String cognition, List attributesModel ) { this.perception = perception; this.cognition = cognition; + this.attributesModel = attributesModel; } // Getter @@ -64,4 +67,15 @@ public class AttributesPsychologyLayer { return Objects.hash(perception, cognition); } + + public List getAttributesModel() { + return attributesModel; + } + + public void setAttributesModel(List attributesModel) { + this.attributesModel = attributesModel; + } + + + } diff --git a/VadereState/src/org/vadere/state/attributes/models/AttributesCombinedPotentialStrategy.java b/VadereState/src/org/vadere/state/attributes/models/AttributesCombinedPotentialStrategy.java new file mode 100644 index 0000000000000000000000000000000000000000..3914ad424f1d3172c67d1b629bfdf7663e9e5f6a --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/AttributesCombinedPotentialStrategy.java @@ -0,0 +1,8 @@ +package org.vadere.state.attributes.models; + +import org.vadere.state.attributes.Attributes; + +public abstract class AttributesCombinedPotentialStrategy extends Attributes { + + +} diff --git a/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java b/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java index e090adde6aaf6321d9e393cbceed2d8167219b76..917243208ff3fdb5fd921afa4c59a9e307dc87e2 100644 --- a/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java +++ b/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java @@ -171,7 +171,9 @@ public class AttributesOSM extends Attributes { private String obstaclePotentialModel = "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell"; private List submodels = new LinkedList<>(); - public AttributesOSM() {} + public AttributesOSM() { + + } // Getters... public int getStepCircleResolution() { diff --git a/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java new file mode 100644 index 0000000000000000000000000000000000000000..5534e344d78d38142469d7a9ec6aa81c08ed1367 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java @@ -0,0 +1,52 @@ +package org.vadere.state.attributes.models; + +public class AttributesPedestrianRepulsionPotentialStrategy extends AttributesCombinedPotentialStrategy { + + /* Parameter values, see Mayr, Koester: Social distancing with the Optimal Steps Model*/ + + private double personalSpaceWidthFactor = 1.6444; + private double personalSpaceWidthIntercept = 0.4845; + private double socialDistanceLowerBound = 1.25; + private double socialDistanceUpperBound = 2.0; + private double personalSpaceStrength = 850.0; + + public double getSocialDistanceUpperBound() { + return socialDistanceUpperBound; + } + + public void setSocialDistanceUpperBound(double socialDistanceUpperBound) { + this.socialDistanceUpperBound = socialDistanceUpperBound; + } + + public double getPersonalSpaceWidthIntercept() { + return personalSpaceWidthIntercept; + } + + public void setPersonalSpaceWidthIntercept(double personalSpaceWidthIntercept) { + this.personalSpaceWidthIntercept = personalSpaceWidthIntercept; + } + + public double getSocialDistanceLowerBound() { + return socialDistanceLowerBound; + } + + public void setSocialDistanceLowerBound(double socialDistanceLowerBound) { + this.socialDistanceLowerBound = socialDistanceLowerBound; + } + + public double getPersonalSpaceWidthFactor() { + return personalSpaceWidthFactor; + } + + public void setPersonalSpaceWidthFactor(double personalSpaceWidthFactor) { + this.personalSpaceWidthFactor = personalSpaceWidthFactor; + } + + public double getPersonalSpaceStrength() { + return personalSpaceStrength; + } + + public void setPersonalSpaceStrength(double personalSpaceStrength) { + this.personalSpaceStrength = personalSpaceStrength; + } +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesChangeTargetScriptedCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesChangeTargetScriptedCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..c6e07f34c403fe5204b15de39eb668923bb43bcf --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesChangeTargetScriptedCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesChangeTargetScriptedCognitionModel extends AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..d9b58fcb2a1957b7736fb0f8fcc16e647ad08a66 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java @@ -0,0 +1,6 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +import org.vadere.state.attributes.Attributes; + +public abstract class AttributesCognitionModel extends Attributes { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCooperativeCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCooperativeCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..9ec602678743cb3d4fd46549513121f8dd9611ec --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCooperativeCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesCooperativeCognitionModel extends AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCounterflowCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCounterflowCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..de0791dd2d79e6160ad670f6d46d887dbb461bce --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCounterflowCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesCounterflowCognitionModel extends AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..94ea9b5dffcd9cece8ab4fa2fe2ce7570d7bda20 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java @@ -0,0 +1,22 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +import java.util.LinkedList; +import java.util.List; + +public class AttributesProbabilisticCognitionModel extends AttributesCognitionModel { + List routeChoices; + + public AttributesProbabilisticCognitionModel(){ + routeChoices = new LinkedList<>(); + } + + public List getRouteChoices() { + return routeChoices; + } + + public void setRouteChoices(List routeChoices) { + this.routeChoices = routeChoices; + } + + +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java new file mode 100644 index 0000000000000000000000000000000000000000..001ef83e9906c680f77c3742bd233d4722a756b7 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java @@ -0,0 +1,40 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +import java.util.LinkedList; + +public class AttributesRouteChoiceDefinition { + + private String instruction; + private LinkedList targetIds; + private LinkedList targetProbabilities; + + public AttributesRouteChoiceDefinition(){ + instruction = ""; + targetIds = new LinkedList<>(); + targetProbabilities = new LinkedList<>(); + } + + public String getInstruction() { + return instruction; + } + + public void setInstruction(String instruction) { + this.instruction = instruction; + } + + public LinkedList getTargetIds() { + return targetIds; + } + + public void setTargetIds(LinkedList targetIds) { + this.targetIds = targetIds; + } + + public LinkedList getTargetProbabilities() { + return targetProbabilities; + } + + public void setTargetProbabilities(LinkedList targetProbabilities) { + this.targetProbabilities = targetProbabilities; + } +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSimpleCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..e79022346e289607379d0bc39464008ce8c0b4c4 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSimpleCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesSimpleCognitionModel extends AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..11b15b83eb3a5a7a598cf22c315383b9e72f4d55 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java @@ -0,0 +1,41 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesSocialDistancingCognitionModel extends AttributesCognitionModel { + + private double repulsionFactor = 1.6444; + private double repulsionIntercept = 0.4845; + private double minDistance = 1.25; + private double maxDistance = 2.0; + + public double getRepulsionFactor() { + return repulsionFactor; + } + + public void setRepulsionFactor(double repulsionFactor) { + this.repulsionFactor = repulsionFactor; + } + + public double getRepulsionIntercept() { + return repulsionIntercept; + } + + public void setRepulsionIntercept(double repulsionIntercept) { + this.repulsionIntercept = repulsionIntercept; + } + + public double getMinDistance() { + return minDistance; + } + + public void setMinDistance(double minDistance) { + this.minDistance = minDistance; + } + + public double getMaxDistance() { + return maxDistance; + } + + public void setMaxDistance(double maxDistance) { + this.maxDistance = maxDistance; + } +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesThreatCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesThreatCognitionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..bd782d8dbab8e528d8abb26f9d1f64b3e77eebfb --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesThreatCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesThreatCognitionModel extends AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..5c908617e08a44e36c7b883580e5a6bb412435e7 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java @@ -0,0 +1,5 @@ +package org.vadere.state.attributes.models.psychology.perception; + +public class AttributesMultiPerceptionModel extends AttributesPerceptionModel { + +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..7cf330f627459e264931809e4935921acddb1b6e --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java @@ -0,0 +1,6 @@ +package org.vadere.state.attributes.models.psychology.perception; + +import org.vadere.state.attributes.Attributes; + +public abstract class AttributesPerceptionModel extends Attributes { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java new file mode 100644 index 0000000000000000000000000000000000000000..41a1a1823e446b3180414fe80738d10f57842bfa --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java @@ -0,0 +1,33 @@ +package org.vadere.state.attributes.models.psychology.perception; + +import org.vadere.state.psychology.perception.types.*; + +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; + +public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { + Map priority; + + public AttributesSimplePerceptionModel() { + this.priority = getDefaultRanking(); + } + + public Map getDefaultRanking() { + Map map = new HashMap(); + + map.put(1, InformationStimulus.class.getSimpleName()); + map.put(2, ChangeTargetScripted.class.getSimpleName()); + map.put(3, ChangeTarget.class.getSimpleName()); + map.put(4, Threat.class.getSimpleName()); + map.put(5, Wait.class.getSimpleName()); + map.put(6, WaitInArea.class.getSimpleName()); + map.put(7, DistanceRecommendation.class.getSimpleName()); + + return map; + } + + public TreeMap getSortedPriorityQueue(){ + return new TreeMap<>(this.priority); + } +} diff --git a/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java b/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java index 94690328d06828f072279732b37320e5fe3bbee2..b21eb15f101257f3dbf8d63884d7f2377062dcd7 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java +++ b/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java @@ -39,31 +39,22 @@ public class StimulusInfoStore { // Member Variables private List stimulusInfos; - private List reactionProbabilities; // Constructors public StimulusInfoStore() { this.stimulusInfos = new ArrayList<>(); - this.reactionProbabilities = new ArrayList<>(); } // Getter public List getStimulusInfos() { return stimulusInfos; } - public List getReactionProbabilities() { - return reactionProbabilities; - } // Setter public void setStimulusInfos(List stimulusInfos) { this.stimulusInfos = stimulusInfos; } - public void setReactionProbabilities(final List reactionProbabilities) { - this.reactionProbabilities = reactionProbabilities; - } - public static void main(String... args) { // Create "Timeframe" and "Stimulus" objects and encapsulate them in "StimulusInfo" objects. Timeframe timeframe = new Timeframe(5, 30, false, 0); @@ -80,13 +71,8 @@ public class StimulusInfoStore { List stimulusInfos = new ArrayList<>(); stimulusInfos.add(stimulusInfo1); - List reactionProbabilities = new ArrayList<>(); - reactionProbabilities.add(new ReactionProbability()); - StimulusInfoStore stimulusInfoStore = new StimulusInfoStore(); stimulusInfoStore.setStimulusInfos(stimulusInfos); - stimulusInfoStore.setReactionProbabilities(reactionProbabilities); - // Use annotations at stimulus classes to specify how JSON <-> Java mapping should look like. // "VShape" are mapped by "JacksonObjectMapper" implementation. @@ -105,7 +91,6 @@ public class StimulusInfoStore { for (StimulusInfo stimulusInfo : deserializedStimulusInfoStore.getStimulusInfos()) { System.out.print(stimulusInfo.getTimeframe()); System.out.print(stimulusInfo.getStimuli()); - System.out.println(reactionProbabilities); } System.out.println(); } catch (IOException e) { diff --git a/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java b/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java index 1a1d2b6f3f4c04831948cccabccf8be7048d3fea..a23b83ba3949613b49e9b627f23ff76a58bb0f1b 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java +++ b/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java @@ -1,7 +1,6 @@ package org.vadere.state.psychology.perception.presettings; import com.fasterxml.jackson.databind.ObjectMapper; -import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.psychology.perception.types.*; @@ -9,7 +8,10 @@ import org.vadere.state.util.JacksonObjectMapper; import org.vadere.util.geometry.shapes.VRectangle; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Provide JSON presettings for commonly used stimuli. @@ -31,6 +33,7 @@ public class StimulusPresettings { new ChangeTarget(), new ChangeTargetScripted(), new DistanceRecommendation(), + new InformationStimulus(), }; for (Stimulus stimulus : stimuliToUse) { @@ -49,7 +52,6 @@ public class StimulusPresettings { StimulusInfoStore stimulusInfoStore = new StimulusInfoStore(); stimulusInfoStore.setStimulusInfos(stimulusInfos); - stimulusInfoStore.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); try { diff --git a/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java b/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java index 48d4ea74c66595c46478f9904293d241237aa384..0bdc8c7ae8166167c09b32a40fb454bafa904905 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java @@ -4,36 +4,33 @@ import org.apache.commons.math3.util.Precision; /** * Class encodes some kind of information a pedestrian knows about. - * The information is active from the time gien in {@link #time} and will be - * forgotten at {@link #obsolete_at} (or never if {@link #obsolete_at} == -1 */ public class InformationStimulus extends Stimulus { private String information; - private double obsolete_at; + + public InformationStimulus(){ + super(0.0); + } public InformationStimulus(String information) { super(0.0); this.information = information; - this.obsolete_at = -1; // never } - public InformationStimulus(double time, double obsolete_at, String information) { + public InformationStimulus(double time, String information) { super(time); this.information = information; - this.obsolete_at = obsolete_at; } - public InformationStimulus(double time, double obsolete_at, String information, int id) { + public InformationStimulus(double time, String information, int id) { super(time, id); this.information = information; - this.obsolete_at = obsolete_at; } public InformationStimulus(InformationStimulus other) { super(other.time); this.information = other.information; - this.obsolete_at = other.obsolete_at; } @@ -43,11 +40,6 @@ public class InformationStimulus extends Stimulus { } - public double getObsolete_at() { - return obsolete_at; - } - - @Override public Stimulus clone() { return new InformationStimulus(this); @@ -60,7 +52,6 @@ public class InformationStimulus extends Stimulus { InformationStimulus informationStimulus = (InformationStimulus) that; boolean isProb = Precision.equals(this.perceptionProbability, informationStimulus.getPerceptionProbability(), Double.MIN_VALUE); boolean isInformation = this.information.equals(informationStimulus.getInformation()); - boolean obsolete = Precision.equals(this.obsolete_at, informationStimulus.getObsolete_at(), Double.MIN_VALUE); - return isProb && isInformation && obsolete; + return isProb && isInformation; } } diff --git a/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java b/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java index e4e9fe403f639345967f4841e0730bfc24880003..1fadb0a30b28c0fc585dfaa3e7e487c1fc5b9421 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java @@ -39,10 +39,11 @@ import java.util.List; @Type(value = ChangeTarget.class, name = "ChangeTarget"), @Type(value = ChangeTargetScripted.class, name = "ChangeTargetScripted"), @Type(value = DistanceRecommendation.class, name = "DistanceRecommendation"), + @Type(value = InformationStimulus.class, name = "InformationStimulus"), }) // "time" is set when the stimulus is injected into the simulation run and must not be de-/serialized. // "perceptionProbability" is assigned by the StimulusController -@JsonIgnoreProperties({ "time", "perceptionProbability" }) +@JsonIgnoreProperties({"time", "perceptionProbability", "id"}) public abstract class Stimulus implements Cloneable { // Member Variables diff --git a/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java b/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java index c6038f89707dd55134484aca0f4e54ac02567619..b3a5a85bafd101d8e1723ca906dca6eb4a9c529f 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java @@ -12,7 +12,9 @@ public class StimulusFactory { public static Stimulus stringToStimulus(@NotNull String stimulusAsString) { Stimulus stimulusObject = null; - if (stimulusAsString.matches(ChangeTarget.class.getSimpleName())) { + if (stimulusAsString.matches(ChangeTargetScripted.class.getSimpleName())){ + stimulusObject = new ChangeTargetScripted(); + } else if (stimulusAsString.matches(ChangeTarget.class.getSimpleName())) { stimulusObject = new ChangeTarget(); } else if (stimulusAsString.matches(Threat.class.getSimpleName())) { stimulusObject = new Threat(); @@ -24,6 +26,8 @@ public class StimulusFactory { stimulusObject = new WaitInArea(); }else if (stimulusAsString.matches(DistanceRecommendation.class.getSimpleName())) { stimulusObject = new DistanceRecommendation(); + } else if (stimulusAsString.matches(InformationStimulus.class.getSimpleName())){ + stimulusObject = new InformationStimulus(); } return stimulusObject; diff --git a/VadereState/src/org/vadere/state/scenario/Topography.java b/VadereState/src/org/vadere/state/scenario/Topography.java index fd1513487c1c79272e0b618599f7326282169279..8ffdaa5b8a06c1d2098b3aeda4f024dc098a8a02 100644 --- a/VadereState/src/org/vadere/state/scenario/Topography.java +++ b/VadereState/src/org/vadere/state/scenario/Topography.java @@ -856,4 +856,8 @@ public class Topography implements DynamicElementMover{ this.contextId = contextId; } + public List getTargetIds(){ + return targets.stream().map(target -> target.getId()).collect(Collectors.toList()); + } + } diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 7cebe8232d7383438599a41ec73f8161a31ce81e..177c0ae3a262a05bc53d4ce1d083df1a398f8229 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -8,14 +8,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; - import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang3.tuple.Pair; import org.vadere.state.attributes.*; import org.vadere.state.attributes.models.AttributesFloorField; import org.vadere.state.attributes.scenario.*; -import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.scenario.*; @@ -24,15 +21,8 @@ import org.vadere.util.logging.Logger; import org.vadere.util.reflection.DynamicClassInstantiator; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; -import java.util.stream.StreamSupport; public abstract class StateJsonConverter { @@ -40,6 +30,11 @@ public abstract class StateJsonConverter { public static final String MAIN_MODEL_KEY = "mainModel"; + private static final String ATTRIBUTES_MODEL_KEY = "attributesModel"; + + private static final String PSYCHOLOGY_LAYER_KEY = "psychologyLayer"; + + private static final TypeReference> mapTypeReference = new TypeReference>() {}; @@ -126,14 +121,35 @@ public abstract class StateJsonConverter { } public static AttributesPsychology deserializeAttributesPsychology(String json) throws IOException { - return deserializeObjectFromJson(json, AttributesPsychology.class); + return deserializeAttributesPsychologyFromNode(mapper.readTree(json)); } - public static AttributesPsychology deserializeAttributesPsychologyFromNode(JsonNode node) + public static AttributesPsychology deserializeAttributesPsychologyFromNode(JsonNode jsonNode) throws JsonProcessingException { - return mapper.treeToValue(node, AttributesPsychology.class); + + ObjectNode node = jsonNode.deepCopy(); + JsonNode layer = node.get(PSYCHOLOGY_LAYER_KEY); + node.remove(PSYCHOLOGY_LAYER_KEY); + + AttributesPsychology attributesPsychology = mapper.treeToValue(node, AttributesPsychology.class); + attributesPsychology.setPsychologyLayer(deseralizeAttributesPsychologyLayerFromNode(layer)); + + return attributesPsychology; } + private static AttributesPsychologyLayer deseralizeAttributesPsychologyLayerFromNode(JsonNode jsonNode) throws JsonProcessingException { + + ObjectNode node = jsonNode.deepCopy(); + JsonNode attributesModel = node.get(ATTRIBUTES_MODEL_KEY); + node.remove(ATTRIBUTES_MODEL_KEY); + + AttributesPsychologyLayer layer = mapper.treeToValue(node, AttributesPsychologyLayer.class); + layer.setAttributesModel(deserializeAttributesListFromNode(attributesModel)); + + return layer; + } + + public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); List attributesList = new LinkedList<>(); @@ -204,14 +220,6 @@ public abstract class StateJsonConverter { node.forEach(stimulusInfoNode -> stimulusInfoList.add(mapper.convertValue(stimulusInfoNode, StimulusInfo.class))); stimulusInfoStore.setStimulusInfos(stimulusInfoList); } - - key = "reactionProbabilities"; - if (nodef.has(key)) { - node = nodef.get(key); - List reactionProbabilities = new ArrayList<>(); - node.forEach(reactionProbabilityNode -> reactionProbabilities.add(mapper.convertValue(reactionProbabilityNode, ReactionProbability.class))); - stimulusInfoStore.setReactionProbabilities(reactionProbabilities); - } } return stimulusInfoStore; @@ -274,7 +282,7 @@ public abstract class StateJsonConverter { ObjectNode node = mapper.createObjectNode(); node.put(MAIN_MODEL_KEY, modelDefinition.getMainModel()); - node.set("attributesModel", serializeAttributesModelToNode(modelDefinition.getAttributesList())); + node.set(ATTRIBUTES_MODEL_KEY, seri