From 75110c0feee0d9a03919b973cdd8ea0762ab2979 Mon Sep 17 00:00:00 2001 From: Christina Date: Thu, 21 Apr 2022 17:12:16 +0200 Subject: [PATCH 01/49] add scenario file and attributes --- .../scenarios/New_scenario.scenario | 122 ++++++++++++++++++ .../MigrationTests/vadere.project | 1 + VadereGui/resources/messages.properties | 4 +- .../gui/projectview/view/ScenarioPanel.java | 44 +++++++ .../attributes/AttributesPsychologyLayer.java | 8 ++ .../attributes/models/AttributesOSM.java | 4 +- .../psychology/AttributesCognitionModel.java | 4 + .../psychology/AttributesPerceptionModel.java | 4 + 8 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario create mode 100644 Scenarios/MigrationTests/MigrationTests/vadere.project create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario b/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario new file mode 100644 index 000000000..26686d181 --- /dev/null +++ b/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario @@ -0,0 +1,122 @@ +{ + "name" : "New_scenario", + "description" : "", + "release" : "2.1", + "commithash" : "e3380d4e5e342354de928fe9cb9b39dc54c15ec8", + "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" : null, + "attributesModel" : { }, + "attributesSimulation" : { + "finishTime" : 500.0, + "simTimeStepLength" : 0.4, + "realTimeSimTimeRatio" : 0.1, + "writeSimulationData" : true, + "visualizationEnabled" : true, + "printFPS" : false, + "digitsPerCoordinate" : 2, + "useFixedSeed" : true, + "fixedSeed" : -2474893121473667580, + "simulationSeed" : 0 + }, + "attributesPsychology" : { + "usePsychologyLayer" : false, + "psychologyLayer" : { + "perception" : "SimplePerceptionModel", + "cognition" : "SimpleCognitionModel" + } + }, + "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" : [ ], + "targetChangers" : [ ], + "absorbingAreas" : [ ], + "aerosolClouds" : [ ], + "droplets" : [ ], + "sources" : [ ], + "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" : [ ], + "reactionProbabilities" : [ ] + } +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/MigrationTests/vadere.project b/Scenarios/MigrationTests/MigrationTests/vadere.project new file mode 100644 index 000000000..2a0cbce58 --- /dev/null +++ b/Scenarios/MigrationTests/MigrationTests/vadere.project @@ -0,0 +1 @@ +testProject \ No newline at end of file diff --git a/VadereGui/resources/messages.properties b/VadereGui/resources/messages.properties index 1e938d8f7..15b98d661 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 347e2d548..f396732a9 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -1,6 +1,7 @@ package org.vadere.gui.projectview.view; +import com.fasterxml.jackson.databind.JsonNode; import org.vadere.gui.components.control.HelpTextView; import org.vadere.gui.components.utils.Messages; import org.vadere.gui.onlinevisualization.OnlineVisualization; @@ -12,6 +13,7 @@ import org.vadere.simulator.models.ModelHelper; import org.vadere.simulator.projects.ProjectFinishedListener; import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.projects.VadereProject; +import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.ModelAttributeFactory; import org.vadere.state.scenario.Topography; import org.vadere.state.util.StateJsonConverter; @@ -124,6 +126,8 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro presetMenuBar.add(mnPresetMenu); menusInTabs.add(mnPresetMenu); + + // load template ModelPresets.getPresets().forEach( modelDefinition -> mnPresetMenu.add(new JMenuItem(new AbstractAction(modelDefinition.getMainModel()) { private static final long serialVersionUID = 1L; @@ -160,6 +164,8 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro } }))); + + // help Attributes JMenu mnHelpAttributesMenu = new JMenu(Messages.getString("Tab.Model.helpAttributesMenu.title")); presetMenuBar.add(mnHelpAttributesMenu); menusInTabs.add(mnHelpAttributesMenu); @@ -207,11 +213,45 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesModelView.getPanelTop().add(presetMenuBar, 0); // the 0 puts it at the leftmost position instead of the rightmost tabbedPane.addTab(Messages.getString("Tab.Model.title"), attributesModelView); + // psychology layer + + JMenuBar templatePsychologyModels = new JMenuBar(); + JMenu mnAttributesPerception = new JMenu(Messages.getString("Tab.PerceptionModel.loadTemplateMenu.title")); + templatePsychologyModels.add(mnAttributesPerception); + JMenu mnAttributesCognition = new JMenu(Messages.getString("Tab.CognitionModel.loadTemplateMenu.title")); + templatePsychologyModels.add(mnAttributesCognition); + + + + + + attributesPsychologyView = new TextView("ProjectView.defaultDirectoryAttributes", AttributeType.PSYCHOLOGY); attributesPsychologyView.setScenarioChecker(model); // use .isEditable(true); to save time (no check!) + + attributesPsychologyView.getPanelTop().add(templatePsychologyModels, 0); tabbedPane.addTab(Messages.getString("Tab.Psychology.title"), attributesPsychologyView); + attributeFactory.sortedAttributeStream().forEach( + attributesClassName -> mnAttributesPerception.add(new JMenuItem(new AbstractAction(attributesClassName) { + @Override + public void actionPerformed(ActionEvent e) { + + try { + AttributesPsychology json = StateJsonConverter.deserializeAttributesPsychology(attributesPsychologyView.getText()); + } catch (IOException ex) { + ex.printStackTrace(); + } + + + attributesPsychologyView.setText("1232423423423423"); + } + }))); + + + + /////////// topographyFileView = new TextView("ProjectView.defaultDirectoryScenarios", AttributeType.TOPOGRAPHY); topographyFileView.setScenarioChecker(model); @@ -221,6 +261,10 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro perceptionFileView.setScenarioChecker(model); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView); + + + + dataProcessingGUIview = new DataProcessingView(model); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java index e08954602..d723e442c 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java @@ -1,6 +1,11 @@ package org.vadere.state.attributes; +import org.vadere.state.attributes.models.psychology.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; + +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Objects; /** @@ -13,6 +18,9 @@ public class AttributesPsychologyLayer { // Watch out: Make sure these classes exist! public static final String DEFAULT_PERCEPTION_MODEL = "SimplePerceptionModel"; public static final String DEFAULT_COGNITION_MODEL = "SimpleCognitionModel"; + public List perceptionModelAttributes; + public List cognitionModelAttributes; + // Variables // Both should reference to concrete "IPerception" and "ICognition" diff --git a/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java b/VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java index e090adde6..917243208 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/psychology/AttributesCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java new file mode 100644 index 000000000..240cc1158 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public abstract class AttributesCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java new file mode 100644 index 000000000..04d04bea7 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public abstract class AttributesPerceptionModel { +} -- GitLab From ea3e9998ba8b9f223aa7b53cf53fc5ccfaa9cecd Mon Sep 17 00:00:00 2001 From: Christina Date: Thu, 21 Apr 2022 18:05:57 +0200 Subject: [PATCH 02/49] add scenario --- .../MigrationTests/scenarios/s2.scenario | 129 ++++++++++++++++++ .../gui/projectview/view/ScenarioPanel.java | 12 +- .../attributes/AttributesPsychology.java | 3 + .../attributes/AttributesPsychologyLayer.java | 32 ++++- 4 files changed, 166 insertions(+), 10 deletions(-) create mode 100644 Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario new file mode 100644 index 000000000..bfeb3b231 --- /dev/null +++ b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario @@ -0,0 +1,129 @@ +{ + "name" : "s2", + "description" : "", + "release" : "2.1", + "commithash" : "e3380d4e5e342354de928fe9cb9b39dc54c15ec8", + "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" : null, + "attributesModel" : { }, + "attributesSimulation" : { + "finishTime" : 500.0, + "simTimeStepLength" : 0.4, + "realTimeSimTimeRatio" : 0.1, + "writeSimulationData" : true, + "visualizationEnabled" : true, + "printFPS" : false, + "digitsPerCoordinate" : 2, + "useFixedSeed" : true, + "fixedSeed" : -2474893121473667580, + "simulationSeed" : 0 + }, + "attributesPsychology" : { + "usePsychologyLayer" : false, + "psychologyLayer" : { + "perception" : "SimplePerceptionModel", + "cognition" : "SimpleCognitionModel", + "perceptionModelAttributes" : { + "argPerception" : 123, + "arg2Perception" : [1,2,3], + }, + "cognitionModelAttributes" : { + "argCognition" : 1.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" : [ ], + "targetChangers" : [ ], + "absorbingAreas" : [ ], + "aerosolClouds" : [ ], + "droplets" : [ ], + "sources" : [ ], + "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" : [ ], + "reactionProbabilities" : [ ] + } +} diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index f396732a9..14a913e1e 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -216,10 +216,10 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro // psychology layer JMenuBar templatePsychologyModels = new JMenuBar(); - JMenu mnAttributesPerception = new JMenu(Messages.getString("Tab.PerceptionModel.loadTemplateMenu.title")); - templatePsychologyModels.add(mnAttributesPerception); - JMenu mnAttributesCognition = new JMenu(Messages.getString("Tab.CognitionModel.loadTemplateMenu.title")); - templatePsychologyModels.add(mnAttributesCognition); + //JMenu mnAttributesPerception = new JMenu(Messages.getString("Tab.PerceptionModel.loadTemplateMenu.title")); + //templatePsychologyModels.add(mnAttributesPerception); + //JMenu mnAttributesCognition = new JMenu(Messages.getString("Tab.CognitionModel.loadTemplateMenu.title")); + //templatePsychologyModels.add(mnAttributesCognition); @@ -233,7 +233,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesPsychologyView.getPanelTop().add(templatePsychologyModels, 0); tabbedPane.addTab(Messages.getString("Tab.Psychology.title"), attributesPsychologyView); - attributeFactory.sortedAttributeStream().forEach( +/* attributeFactory.sortedAttributeStream().forEach( attributesClassName -> mnAttributesPerception.add(new JMenuItem(new AbstractAction(attributesClassName) { @Override public void actionPerformed(ActionEvent e) { @@ -247,7 +247,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesPsychologyView.setText("1232423423423423"); } - }))); + })));*/ diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java index 9b7ff6046..f48a63e36 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java @@ -1,5 +1,7 @@ package org.vadere.state.attributes; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; + import java.util.Objects; import java.util.Random; @@ -45,4 +47,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 d723e442c..08cb7b547 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java @@ -18,8 +18,14 @@ public class AttributesPsychologyLayer { // Watch out: Make sure these classes exist! public static final String DEFAULT_PERCEPTION_MODEL = "SimplePerceptionModel"; public static final String DEFAULT_COGNITION_MODEL = "SimpleCognitionModel"; - public List perceptionModelAttributes; - public List cognitionModelAttributes; + + + + public AttributesPerceptionModel perceptionModelAttributes; + + + + public AttributesCognitionModel cognitionModelAttributes; // Variables @@ -31,12 +37,14 @@ public class AttributesPsychologyLayer { // Constructors public AttributesPsychologyLayer() { - this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL); + this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL, null, null); } - public AttributesPsychologyLayer(String perception, String cognition) { + public AttributesPsychologyLayer(String perception, String cognition, AttributesPerceptionModel attributesPerceptionModel, AttributesCognitionModel attributesCognitionModel) { this.perception = perception; this.cognition = cognition; + this.perceptionModelAttributes = attributesPerceptionModel; + this.cognitionModelAttributes = attributesCognitionModel; } // Getter @@ -72,4 +80,20 @@ public class AttributesPsychologyLayer { return Objects.hash(perception, cognition); } + public AttributesPerceptionModel getPerceptionModelAttributes() { + return perceptionModelAttributes; + } + + public void setPerceptionModelAttributes(AttributesPerceptionModel perceptionModelAttributes) { + this.perceptionModelAttributes = perceptionModelAttributes; + } + + public AttributesCognitionModel getCognitionModelAttributes() { + return cognitionModelAttributes; + } + + public void setCognitionModelAttributes(AttributesCognitionModel cognitionModelAttributes) { + this.cognitionModelAttributes = cognitionModelAttributes; + } + } -- GitLab From 597bf486837cf2827f0e9154af6e5b6976551f41 Mon Sep 17 00:00:00 2001 From: Christina Date: Thu, 21 Apr 2022 18:06:08 +0200 Subject: [PATCH 03/49] extend statejsonconverter --- .../org/vadere/state/util/StateJsonConverter.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 7cebe8232..f6bfa53ab 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -14,6 +14,8 @@ 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.models.psychology.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.attributes.scenario.*; import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; @@ -388,7 +390,17 @@ public abstract class StateJsonConverter { public static String serializeAttributesPsychology(AttributesPsychology attributesPsychology) throws JsonProcessingException { - return prettyWriter.writeValueAsString(mapper.convertValue(attributesPsychology, JsonNode.class)); + + ObjectNode node = mapper.createObjectNode(); + node.put("perception", attributesPsychology.getPsychologyLayer().getPerception()); + AttributesPerceptionModel attributesPerceptionModel = attributesPsychology.getPsychologyLayer().getPerceptionModelAttributes(); + node.set("perception", mapper.convertValue(attributesPerceptionModel, JsonNode.class)); + + node.put("cognition", attributesPsychology.getPsychologyLayer().getCognition()); + AttributesCognitionModel attributesCognitionModel = attributesPsychology.getPsychologyLayer().getCognitionModelAttributes(); + node.set("cognition", mapper.convertValue(attributesPsychology, JsonNode.class)); + + return prettyWriter.writeValueAsString(node); } public static String serializeAttributesStrategyModel(AttributesStrategyModel attributesStrategyModel) -- GitLab From 7baf6b742f785d1009f3f281f51049c6ac962d3a Mon Sep 17 00:00:00 2001 From: Christina Date: Thu, 21 Apr 2022 18:30:38 +0200 Subject: [PATCH 04/49] add testattributes --- .../MigrationTests/scenarios/s2.scenario | 4 ++-- .../AttributesSimplePerceptionModel.java | 8 ++++++++ .../org/vadere/state/util/StateJsonConverter.java | 14 +++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario index bfeb3b231..f9aa9847f 100644 --- a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario @@ -59,10 +59,10 @@ "cognition" : "SimpleCognitionModel", "perceptionModelAttributes" : { "argPerception" : 123, - "arg2Perception" : [1,2,3], + "arg2Perception" : [1,2,3] }, "cognitionModelAttributes" : { - "argCognition" : 1.0, + "argCognition" : 1.0 } } }, diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java new file mode 100644 index 000000000..ec2cc7fb7 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java @@ -0,0 +1,8 @@ +package org.vadere.state.attributes.models.psychology; + +import java.util.LinkedList; + +public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { + int argPerception; + LinkedList arg2Perception; +} diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index f6bfa53ab..2e00cb731 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -16,6 +16,7 @@ import org.vadere.state.attributes.*; import org.vadere.state.attributes.models.AttributesFloorField; import org.vadere.state.attributes.models.psychology.AttributesCognitionModel; import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; +import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.attributes.scenario.*; import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; @@ -133,7 +134,18 @@ public abstract class StateJsonConverter { public static AttributesPsychology deserializeAttributesPsychologyFromNode(JsonNode node) throws JsonProcessingException { - return mapper.treeToValue(node, AttributesPsychology.class); + + JsonNode node2 = node.get("psychologyLayer"); + + String perceptionModel = String.valueOf(node2.get("perception")); + String cognitionModel = String.valueOf(node2.get("cognition")); + + JsonNode attributesModelNode = node2.get("perceptionModelAttributes"); + AttributesPerceptionModel attributesPerceptionModel = mapper.treeToValue(attributesModelNode, AttributesSimplePerceptionModel.class); + + AttributesPsychologyLayer layer = new AttributesPsychologyLayer( perceptionModel, cognitionModel, attributesPerceptionModel, null); + + return new AttributesPsychology(); } public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { -- GitLab From a3734879995a69add0bb38edc4bc36fe0f5bd366 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 09:46:15 +0200 Subject: [PATCH 05/49] update scenario definition --- .../scenarios/New_scenario.scenario | 122 ------------------ .../MigrationTests/scenarios/s2.scenario | 23 ++-- .../psychology/AttributesCognitionModel.java | 4 +- .../psychology/AttributesPerceptionModel.java | 4 +- .../AttributesSimpleCognitionModel.java | 5 + .../vadere/state/util/StateJsonConverter.java | 11 +- 6 files changed, 32 insertions(+), 137 deletions(-) delete mode 100644 Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario b/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario deleted file mode 100644 index 26686d181..000000000 --- a/Scenarios/MigrationTests/MigrationTests/scenarios/New_scenario.scenario +++ /dev/null @@ -1,122 +0,0 @@ -{ - "name" : "New_scenario", - "description" : "", - "release" : "2.1", - "commithash" : "e3380d4e5e342354de928fe9cb9b39dc54c15ec8", - "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" : null, - "attributesModel" : { }, - "attributesSimulation" : { - "finishTime" : 500.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : -2474893121473667580, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "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" : [ ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "aerosolClouds" : [ ], - "droplets" : [ ], - "sources" : [ ], - "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" : [ ], - "reactionProbabilities" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario index f9aa9847f..bdc7e32b0 100644 --- a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario @@ -53,18 +53,21 @@ "simulationSeed" : 0 }, "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { + "usePsychologyLayer" : true, + "psychologyLayer" : + { "perception" : "SimplePerceptionModel", "cognition" : "SimpleCognitionModel", - "perceptionModelAttributes" : { - "argPerception" : 123, - "arg2Perception" : [1,2,3] - }, - "cognitionModelAttributes" : { - "argCognition" : 1.0 - } - } + "attributesModel" : + { + "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { + "argPerception" : 123, + "arg2Perception" : [1,2,3] }, + "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : { + "argCognition" : 1.0 + } + } + } }, "topography" : { "attributes" : { diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java index 240cc1158..94f6f1679 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java @@ -1,4 +1,6 @@ package org.vadere.state.attributes.models.psychology; -public abstract class AttributesCognitionModel { +import org.vadere.state.attributes.Attributes; + +public abstract class AttributesCognitionModel extends Attributes { } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java index 04d04bea7..a94131ded 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java @@ -1,4 +1,6 @@ package org.vadere.state.attributes.models.psychology; -public abstract class AttributesPerceptionModel { +import org.vadere.state.attributes.Attributes; + +public abstract class AttributesPerceptionModel extends Attributes { } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java new file mode 100644 index 000000000..9259b4cbd --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java @@ -0,0 +1,5 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesSimpleCognitionModel extends AttributesCognitionModel { + double argCognition; +} diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 2e00cb731..dfbd15367 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -137,17 +137,22 @@ public abstract class StateJsonConverter { JsonNode node2 = node.get("psychologyLayer"); + String perceptionModel = String.valueOf(node2.get("perception")); String cognitionModel = String.valueOf(node2.get("cognition")); - JsonNode attributesModelNode = node2.get("perceptionModelAttributes"); - AttributesPerceptionModel attributesPerceptionModel = mapper.treeToValue(attributesModelNode, AttributesSimplePerceptionModel.class); - AttributesPsychologyLayer layer = new AttributesPsychologyLayer( perceptionModel, cognitionModel, attributesPerceptionModel, null); + ObjectNode node3 = (ObjectNode) node2.get("attributesModel"); + List res = deserializeAttributesListFromNode(node3); + + + AttributesPsychologyLayer layer = new AttributesPsychologyLayer( perceptionModel, cognitionModel, null, null); return new AttributesPsychology(); } + + public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); List attributesList = new LinkedList<>(); -- GitLab From 2b0a7a47ac7501858e3f01dafec2aa96531af5ae Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 10:28:36 +0200 Subject: [PATCH 06/49] clean deserialization --- .../attributes/AttributesPsychologyLayer.java | 39 +++++++------------ .../vadere/state/util/StateJsonConverter.java | 26 +++++++------ 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java index 08cb7b547..76c1e5d88 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java @@ -3,10 +3,9 @@ package org.vadere.state.attributes; import org.vadere.state.attributes.models.psychology.AttributesCognitionModel; import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * This class beautifies the JSON content by mapping @@ -21,11 +20,18 @@ public class AttributesPsychologyLayer { - public AttributesPerceptionModel perceptionModelAttributes; + //public AttributesPerceptionModel perceptionModelAttributes; + //public AttributesCognitionModel cognitionModelAttributes; + public List getAttributesModel() { + return attributesModel; + } + public void setAttributesModel(List attributesModel) { + this.attributesModel = attributesModel; + } - public AttributesCognitionModel cognitionModelAttributes; + public List attributesModel; // Variables @@ -37,14 +43,13 @@ public class AttributesPsychologyLayer { // Constructors public AttributesPsychologyLayer() { - this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL, null, null); + this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL, new ArrayList<>()); } - public AttributesPsychologyLayer(String perception, String cognition, AttributesPerceptionModel attributesPerceptionModel, AttributesCognitionModel attributesCognitionModel) { + public AttributesPsychologyLayer(String perception, String cognition, List attributesModel ) { this.perception = perception; this.cognition = cognition; - this.perceptionModelAttributes = attributesPerceptionModel; - this.cognitionModelAttributes = attributesCognitionModel; + this.attributesModel = attributesModel; } // Getter @@ -80,20 +85,6 @@ public class AttributesPsychologyLayer { return Objects.hash(perception, cognition); } - public AttributesPerceptionModel getPerceptionModelAttributes() { - return perceptionModelAttributes; - } - - public void setPerceptionModelAttributes(AttributesPerceptionModel perceptionModelAttributes) { - this.perceptionModelAttributes = perceptionModelAttributes; - } - - public AttributesCognitionModel getCognitionModelAttributes() { - return cognitionModelAttributes; - } - public void setCognitionModelAttributes(AttributesCognitionModel cognitionModelAttributes) { - this.cognitionModelAttributes = cognitionModelAttributes; - } } diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index dfbd15367..db97e3580 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -10,13 +10,11 @@ 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.models.psychology.AttributesCognitionModel; import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.attributes.scenario.*; import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; @@ -35,7 +33,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.StreamSupport; public abstract class StateJsonConverter { @@ -137,20 +134,25 @@ public abstract class StateJsonConverter { JsonNode node2 = node.get("psychologyLayer"); + deseralizeAttributesPsychologyLayerFromNode(node2); - String perceptionModel = String.valueOf(node2.get("perception")); - String cognitionModel = String.valueOf(node2.get("cognition")); + return new AttributesPsychology(); + } - ObjectNode node3 = (ObjectNode) node2.get("attributesModel"); - List res = deserializeAttributesListFromNode(node3); + private static AttributesPsychologyLayer deseralizeAttributesPsychologyLayerFromNode(JsonNode jsonNode) throws JsonProcessingException { + ObjectNode node0 = (ObjectNode) jsonNode; + ObjectNode node3 = (ObjectNode) jsonNode.get("attributesModel"); + node0.remove("attributesModel"); - AttributesPsychologyLayer layer = new AttributesPsychologyLayer( perceptionModel, cognitionModel, null, null); - return new AttributesPsychology(); - } + AttributesPsychologyLayer layer = mapper.treeToValue(node0, AttributesPsychologyLayer.class); + layer.setAttributesModel(deserializeAttributesListFromNode(node3)); + + return layer; + } public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { @@ -409,13 +411,13 @@ public abstract class StateJsonConverter { throws JsonProcessingException { ObjectNode node = mapper.createObjectNode(); - node.put("perception", attributesPsychology.getPsychologyLayer().getPerception()); + /*node.put("perception", attributesPsychology.getPsychologyLayer().getPerception()); AttributesPerceptionModel attributesPerceptionModel = attributesPsychology.getPsychologyLayer().getPerceptionModelAttributes(); node.set("perception", mapper.convertValue(attributesPerceptionModel, JsonNode.class)); node.put("cognition", attributesPsychology.getPsychologyLayer().getCognition()); AttributesCognitionModel attributesCognitionModel = attributesPsychology.getPsychologyLayer().getCognitionModelAttributes(); - node.set("cognition", mapper.convertValue(attributesPsychology, JsonNode.class)); + node.set("cognition", mapper.convertValue(attributesPsychology, JsonNode.class));*/ return prettyWriter.writeValueAsString(node); } -- GitLab From 8cdd714c5d32756e67a77121d221410f8bb4b90c Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 10:39:57 +0200 Subject: [PATCH 07/49] deserialization of psychologylayer --- .../vadere/state/util/StateJsonConverter.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index db97e3580..fa4485ee2 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -13,8 +13,6 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.tuple.Pair; import org.vadere.state.attributes.*; import org.vadere.state.attributes.models.AttributesFloorField; -import org.vadere.state.attributes.models.psychology.AttributesCognitionModel; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.attributes.scenario.*; import org.vadere.state.psychology.perception.json.ReactionProbability; import org.vadere.state.psychology.perception.json.StimulusInfo; @@ -40,6 +38,9 @@ public abstract class StateJsonConverter { public static final String MAIN_MODEL_KEY = "mainModel"; + private static String ATTRIBUTES_MODEL_KEY = "attributesModel"; + + private static final TypeReference> mapTypeReference = new TypeReference>() {}; @@ -142,14 +143,12 @@ public abstract class StateJsonConverter { private static AttributesPsychologyLayer deseralizeAttributesPsychologyLayerFromNode(JsonNode jsonNode) throws JsonProcessingException { - ObjectNode node0 = (ObjectNode) jsonNode; - ObjectNode node3 = (ObjectNode) jsonNode.get("attributesModel"); - node0.remove("attributesModel"); - - - AttributesPsychologyLayer layer = mapper.treeToValue(node0, AttributesPsychologyLayer.class); - layer.setAttributesModel(deserializeAttributesListFromNode(node3)); + 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; } @@ -295,7 +294,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, serializeAttributesModelToNode(modelDefinition.getAttributesList())); return prettyWriter.writeValueAsString(node); } @@ -435,7 +434,7 @@ public abstract class StateJsonConverter { throws JsonProcessingException { ObjectNode node = mapper.createObjectNode(); node.put(MAIN_MODEL_KEY, mainModel); - node.set("attributesModel", serializeAttributesModelToNode(attributesList)); + node.set(ATTRIBUTES_MODEL_KEY, serializeAttributesModelToNode(attributesList)); return prettyWriter.writeValueAsString(node); } @@ -501,7 +500,7 @@ public abstract class StateJsonConverter { public static String addAttributesModel(String attributesClassName, String json) throws IOException { JsonNode node = mapper.readTree(json); - JsonNode attributesModelNode = node.get("attributesModel"); + JsonNode attributesModelNode = node.get(ATTRIBUTES_MODEL_KEY); DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); ((ObjectNode) attributesModelNode).set( attributesClassName, -- GitLab From 2e0451ef237347e8b1b72a9171e31b4fafc860b3 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 11:01:54 +0200 Subject: [PATCH 08/49] finish deserialization --- .../org/vadere/state/util/StateJsonConverter.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index fa4485ee2..56f88598e 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -38,8 +38,10 @@ public abstract class StateJsonConverter { public static final String MAIN_MODEL_KEY = "mainModel"; - private static String ATTRIBUTES_MODEL_KEY = "attributesModel"; + private static final String ATTRIBUTES_MODEL_KEY = "attributesModel"; + private static final String PSYCHOLOGY_LAYER_KEY = "psychologyLayer"; + private static final TypeReference> mapTypeReference = new TypeReference>() {}; @@ -130,13 +132,15 @@ public abstract class StateJsonConverter { return deserializeObjectFromJson(json, AttributesPsychology.class); } - public static AttributesPsychology deserializeAttributesPsychologyFromNode(JsonNode node) + public static AttributesPsychology deserializeAttributesPsychologyFromNode(JsonNode jsonNode) throws JsonProcessingException { - JsonNode node2 = node.get("psychologyLayer"); - - deseralizeAttributesPsychologyLayerFromNode(node2); + 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 new AttributesPsychology(); } @@ -410,6 +414,7 @@ public abstract class StateJsonConverter { throws JsonProcessingException { ObjectNode node = mapper.createObjectNode(); + /*node.put("perception", attributesPsychology.getPsychologyLayer().getPerception()); AttributesPerceptionModel attributesPerceptionModel = attributesPsychology.getPsychologyLayer().getPerceptionModelAttributes(); node.set("perception", mapper.convertValue(attributesPerceptionModel, JsonNode.class)); -- GitLab From 54c682f98fc19f716f9a28d948c59b770897817a Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 12:52:38 +0200 Subject: [PATCH 09/49] return correct attributes --- .../vadere/state/util/StateJsonConverter.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 56f88598e..4477d1a79 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -142,7 +142,7 @@ public abstract class StateJsonConverter { AttributesPsychology attributesPsychology = mapper.treeToValue(node, AttributesPsychology.class); attributesPsychology.setPsychologyLayer(deseralizeAttributesPsychologyLayerFromNode(layer)); - return new AttributesPsychology(); + return attributesPsychology; } private static AttributesPsychologyLayer deseralizeAttributesPsychologyLayerFromNode(JsonNode jsonNode) throws JsonProcessingException { @@ -413,15 +413,11 @@ public abstract class StateJsonConverter { public static String serializeAttributesPsychology(AttributesPsychology attributesPsychology) throws JsonProcessingException { - ObjectNode node = mapper.createObjectNode(); - - /*node.put("perception", attributesPsychology.getPsychologyLayer().getPerception()); - AttributesPerceptionModel attributesPerceptionModel = attributesPsychology.getPsychologyLayer().getPerceptionModelAttributes(); - node.set("perception", mapper.convertValue(attributesPerceptionModel, JsonNode.class)); - - node.put("cognition", attributesPsychology.getPsychologyLayer().getCognition()); - AttributesCognitionModel attributesCognitionModel = attributesPsychology.getPsychologyLayer().getCognitionModelAttributes(); - node.set("cognition", mapper.convertValue(attributesPsychology, JsonNode.class));*/ + ObjectNode node = mapper.valueToTree(attributesPsychology); + ObjectNode psychologyLayer = (ObjectNode) node.get(PSYCHOLOGY_LAYER_KEY); + // add class names to attributes + ObjectNode attributesModel = serializeAttributesModelToNode(attributesPsychology.getPsychologyLayer().getAttributesModel()); + psychologyLayer.put(ATTRIBUTES_MODEL_KEY, attributesModel); return prettyWriter.writeValueAsString(node); } -- GitLab From ea548de02403997a410030067d123b61e629df39 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 13:12:33 +0200 Subject: [PATCH 10/49] read and write psychology layer attributes --- .../gui/projectview/view/ScenarioPanel.java | 51 ------------------- .../vadere/state/util/StateJsonConverter.java | 2 +- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index 14a913e1e..4f533cac3 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -1,7 +1,6 @@ package org.vadere.gui.projectview.view; -import com.fasterxml.jackson.databind.JsonNode; import org.vadere.gui.components.control.HelpTextView; import org.vadere.gui.components.utils.Messages; import org.vadere.gui.onlinevisualization.OnlineVisualization; @@ -13,7 +12,6 @@ import org.vadere.simulator.models.ModelHelper; import org.vadere.simulator.projects.ProjectFinishedListener; import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.projects.VadereProject; -import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.ModelAttributeFactory; import org.vadere.state.scenario.Topography; import org.vadere.state.util.StateJsonConverter; @@ -26,7 +24,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Optional; import javax.swing.*; import javax.swing.border.EmptyBorder; @@ -125,9 +122,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro JMenu mnPresetMenu = new JMenu(Messages.getString("Tab.Model.loadTemplateMenu.title")); presetMenuBar.add(mnPresetMenu); menusInTabs.add(mnPresetMenu); - - - // load template ModelPresets.getPresets().forEach( modelDefinition -> mnPresetMenu.add(new JMenuItem(new AbstractAction(modelDefinition.getMainModel()) { private static final long serialVersionUID = 1L; @@ -163,9 +157,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro } } }))); - - - // help Attributes JMenu mnHelpAttributesMenu = new JMenu(Messages.getString("Tab.Model.helpAttributesMenu.title")); presetMenuBar.add(mnHelpAttributesMenu); menusInTabs.add(mnHelpAttributesMenu); @@ -212,47 +203,10 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesModelView.getPanelTop().add(presetMenuBar, 0); // the 0 puts it at the leftmost position instead of the rightmost tabbedPane.addTab(Messages.getString("Tab.Model.title"), attributesModelView); - - // psychology layer - - JMenuBar templatePsychologyModels = new JMenuBar(); - //JMenu mnAttributesPerception = new JMenu(Messages.getString("Tab.PerceptionModel.loadTemplateMenu.title")); - //templatePsychologyModels.add(mnAttributesPerception); - //JMenu mnAttributesCognition = new JMenu(Messages.getString("Tab.CognitionModel.loadTemplateMenu.title")); - //templatePsychologyModels.add(mnAttributesCognition); - - - - - - attributesPsychologyView = new TextView("ProjectView.defaultDirectoryAttributes", AttributeType.PSYCHOLOGY); attributesPsychologyView.setScenarioChecker(model); // use .isEditable(true); to save time (no check!) - - attributesPsychologyView.getPanelTop().add(templatePsychologyModels, 0); tabbedPane.addTab(Messages.getString("Tab.Psychology.title"), attributesPsychologyView); - -/* attributeFactory.sortedAttributeStream().forEach( - attributesClassName -> mnAttributesPerception.add(new JMenuItem(new AbstractAction(attributesClassName) { - @Override - public void actionPerformed(ActionEvent e) { - - try { - AttributesPsychology json = StateJsonConverter.deserializeAttributesPsychology(attributesPsychologyView.getText()); - } catch (IOException ex) { - ex.printStackTrace(); - } - - - attributesPsychologyView.setText("1232423423423423"); - } - })));*/ - - - - /////////// - topographyFileView = new TextView("ProjectView.defaultDirectoryScenarios", AttributeType.TOPOGRAPHY); topographyFileView.setScenarioChecker(model); tabbedPane.addTab(Messages.getString("Tab.Topography.title"), topographyFileView); @@ -260,11 +214,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro perceptionFileView = new TextView( "ProjectView.defaultDirectoryAttributes", AttributeType.PERCEPTION); perceptionFileView.setScenarioChecker(model); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView); - - - - - dataProcessingGUIview = new DataProcessingView(model); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 4477d1a79..e8cf7c4d8 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -129,7 +129,7 @@ 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 jsonNode) -- GitLab From 49c84dd28264e0087feb069a30009d36228b3735 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 13:44:11 +0200 Subject: [PATCH 11/49] correct temp save --- .../simulator/projects/io/JsonConverter.java | 4 +++- .../vadere/state/util/StateJsonConverter.java | 18 +++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index 37f99fef7..4e96c915d 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); diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index e8cf7c4d8..2d822d56d 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -8,7 +8,6 @@ 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.lang3.tuple.Pair; import org.vadere.state.attributes.*; @@ -23,13 +22,7 @@ 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; public abstract class StateJsonConverter { @@ -413,13 +406,16 @@ public abstract class StateJsonConverter { public static String serializeAttributesPsychology(AttributesPsychology attributesPsychology) throws JsonProcessingException { + ObjectNode node = serializeAttributesPsychologyToNode(attributesPsychology); + return prettyWriter.writeValueAsString(node); + } + + public static ObjectNode serializeAttributesPsychologyToNode(AttributesPsychology attributesPsychology) { ObjectNode node = mapper.valueToTree(attributesPsychology); ObjectNode psychologyLayer = (ObjectNode) node.get(PSYCHOLOGY_LAYER_KEY); - // add class names to attributes ObjectNode attributesModel = serializeAttributesModelToNode(attributesPsychology.getPsychologyLayer().getAttributesModel()); psychologyLayer.put(ATTRIBUTES_MODEL_KEY, attributesModel); - - return prettyWriter.writeValueAsString(node); + return node; } public static String serializeAttributesStrategyModel(AttributesStrategyModel attributesStrategyModel) -- GitLab From adb50296733b11781f0f0ed15dc69641abeb0758 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 13:56:26 +0200 Subject: [PATCH 12/49] update test project --- .../MigrationTests/{MigrationTests => }/scenarios/s2.scenario | 0 Scenarios/MigrationTests/{MigrationTests => }/vadere.project | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Scenarios/MigrationTests/{MigrationTests => }/scenarios/s2.scenario (100%) rename Scenarios/MigrationTests/{MigrationTests => }/vadere.project (100%) diff --git a/Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario similarity index 100% rename from Scenarios/MigrationTests/MigrationTests/scenarios/s2.scenario rename to Scenarios/MigrationTests/scenarios/s2.scenario diff --git a/Scenarios/MigrationTests/MigrationTests/vadere.project b/Scenarios/MigrationTests/vadere.project similarity index 100% rename from Scenarios/MigrationTests/MigrationTests/vadere.project rename to Scenarios/MigrationTests/vadere.project -- GitLab From caba0c59f477e4dc0bc09316d7c29664acfc55aa Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 14:05:31 +0200 Subject: [PATCH 13/49] update jsonconverter --- .../src/org/vadere/simulator/projects/io/JsonConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index 4e96c915d..33e9858cb 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -134,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()); -- GitLab From e9f4137d2667b128fcca00a1b0c97bdac343eed9 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 14:25:47 +0200 Subject: [PATCH 14/49] update pretty file --- .../MigrationTests/scenarios/s2.scenario | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index bdc7e32b0..71644e843 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -2,7 +2,6 @@ "name" : "s2", "description" : "", "release" : "2.1", - "commithash" : "e3380d4e5e342354de928fe9cb9b39dc54c15ec8", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -54,20 +53,19 @@ }, "attributesPsychology" : { "usePsychologyLayer" : true, - "psychologyLayer" : - { + "psychologyLayer" : { + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { + "argPerception" : 12366666, + "arg2Perception" : [ 1, 2, 3 ] + }, + "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : { + "argCognition" : 1.0 + } + }, "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel", - "attributesModel" : - { - "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "argPerception" : 123, - "arg2Perception" : [1,2,3] }, - "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : { - "argCognition" : 1.0 - } - } - } + "cognition" : "SimpleCognitionModel" + } }, "topography" : { "attributes" : { @@ -129,4 +127,4 @@ "stimulusInfos" : [ ], "reactionProbabilities" : [ ] } -} +} \ No newline at end of file -- GitLab From d04d131a88265e54bf038846221f34c35e9a76c8 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 14:28:14 +0200 Subject: [PATCH 15/49] add scenarios --- .../scenarios/emptyscenario.scenario | 122 +++++++++++++++++ .../scenarios/perceptionOnly.scenario | 127 ++++++++++++++++++ .../MigrationTests/scenarios/s2.scenario | 2 +- 3 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 Scenarios/MigrationTests/scenarios/emptyscenario.scenario create mode 100644 Scenarios/MigrationTests/scenarios/perceptionOnly.scenario diff --git a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario new file mode 100644 index 000000000..7bee441fd --- /dev/null +++ b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario @@ -0,0 +1,122 @@ +{ + "name" : "emptyscenario", + "description" : "", + "release" : "2.1", + "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" : null, + "attributesModel" : { }, + "attributesSimulation" : { + "finishTime" : 500.0, + "simTimeStepLength" : 0.4, + "realTimeSimTimeRatio" : 0.1, + "writeSimulationData" : true, + "visualizationEnabled" : true, + "printFPS" : false, + "digitsPerCoordinate" : 2, + "useFixedSeed" : true, + "fixedSeed" : -851834714596684454, + "simulationSeed" : 0 + }, + "attributesPsychology" : { + "usePsychologyLayer" : false, + "psychologyLayer" : { + "attributesModel" : { }, + "perception" : "SimplePerceptionModel", + "cognition" : "SimpleCognitionModel" + } + }, + "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" : [ ], + "targetChangers" : [ ], + "absorbingAreas" : [ ], + "aerosolClouds" : [ ], + "droplets" : [ ], + "sources" : [ ], + "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" : [ ], + "reactionProbabilities" : [ ] + } +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario new file mode 100644 index 000000000..2f297c520 --- /dev/null +++ b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario @@ -0,0 +1,127 @@ +{ + "name" : "perceptionOnly", + "description" : "", + "release" : "2.1", + "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" : null, + "attributesModel" : { }, + "attributesSimulation" : { + "finishTime" : 500.0, + "simTimeStepLength" : 0.4, + "realTimeSimTimeRatio" : 0.1, + "writeSimulationData" : true, + "visualizationEnabled" : true, + "printFPS" : false, + "digitsPerCoordinate" : 2, + "useFixedSeed" : true, + "fixedSeed" : -7838408672018301953, + "simulationSeed" : 0 + }, + "attributesPsychology" : { + "usePsychologyLayer" : false, + "psychologyLayer" : { + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { + "argPerception" : 123, + "arg2Perception" : [ 1, 2, 3 ] + } + }, + "perception" : "SimplePerceptionModel", + "cognition" : "SimpleCognitionModel" + } + }, + "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" : [ ], + "targetChangers" : [ ], + "absorbingAreas" : [ ], + "aerosolClouds" : [ ], + "droplets" : [ ], + "sources" : [ ], + "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" : [ ], + "reactionProbabilities" : [ ] + } +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 71644e843..7669d572f 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -56,7 +56,7 @@ "psychologyLayer" : { "attributesModel" : { "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "argPerception" : 12366666, + "argPerception" : 123, "arg2Perception" : [ 1, 2, 3 ] }, "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : { -- GitLab From bb97bbcac440d2001a3901c96dfad6504bc6be2d Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 15:17:41 +0200 Subject: [PATCH 16/49] add migration --- .../json/TargetVersionV2_2.java | 45 +++++++++++++++++++ .../src/org/vadere/util/version/Version.java | 1 + 2 files changed, 46 insertions(+) create mode 100644 VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java 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 000000000..dc981c29a --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java @@ -0,0 +1,45 @@ +package org.vadere.simulator.projects.migration.jsontranformation.json; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.projects.migration.MigrationException; +import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.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::addNestedModelAttributesKeyInPsychologyLayer); + addPostHookLast(this::sort); + } + + 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()) { + psychologyLayer.put(keyMissing, mapper.createObjectNode()); // add empty node + } else { + throw new MigrationException("Key " + keyMissing + " not allowed under " + psychologyLayerKey + "."); + } + + return node; + } + + +} diff --git a/VadereUtils/src/org/vadere/util/version/Version.java b/VadereUtils/src/org/vadere/util/version/Version.java index 9a8199568..2bcb1e467 100644 --- a/VadereUtils/src/org/vadere/util/version/Version.java +++ b/VadereUtils/src/org/vadere/util/version/Version.java @@ -50,6 +50,7 @@ public enum Version { V1_16(1,16), V2_0(2,0), V2_1(2,1), + V2_2(2,2), ; -- GitLab From 0df64310a147b3f60729a385eabe9861f198757b Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 15:20:26 +0200 Subject: [PATCH 17/49] remove VadereGui changes --- .../src/org/vadere/gui/projectview/view/ScenarioPanel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index 4f533cac3..aa27984c9 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Optional; import javax.swing.*; import javax.swing.border.EmptyBorder; @@ -121,6 +122,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro JMenu mnPresetMenu = new JMenu(Messages.getString("Tab.Model.loadTemplateMenu.title")); presetMenuBar.add(mnPresetMenu); + menusInTabs.add(mnPresetMenu); ModelPresets.getPresets().forEach( modelDefinition -> mnPresetMenu.add(new JMenuItem(new AbstractAction(modelDefinition.getMainModel()) { @@ -157,6 +159,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro } } }))); + JMenu mnHelpAttributesMenu = new JMenu(Messages.getString("Tab.Model.helpAttributesMenu.title")); presetMenuBar.add(mnHelpAttributesMenu); menusInTabs.add(mnHelpAttributesMenu); @@ -203,10 +206,12 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro attributesModelView.getPanelTop().add(presetMenuBar, 0); // the 0 puts it at the leftmost position instead of the rightmost tabbedPane.addTab(Messages.getString("Tab.Model.title"), attributesModelView); + attributesPsychologyView = new TextView("ProjectView.defaultDirectoryAttributes", AttributeType.PSYCHOLOGY); 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); @@ -214,6 +219,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro perceptionFileView = new TextView( "ProjectView.defaultDirectoryAttributes", AttributeType.PERCEPTION); perceptionFileView.setScenarioChecker(model); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView); + dataProcessingGUIview = new DataProcessingView(model); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); -- GitLab From 137a35ab91527bda43649eb4e8b8472dacd825f0 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 15:36:57 +0200 Subject: [PATCH 18/49] update version manually in new files --- .../MigrationTests/scenarios/emptyscenario.scenario | 4 ++-- .../MigrationTests/scenarios/perceptionOnly.scenario | 4 ++-- Scenarios/MigrationTests/scenarios/s2.scenario | 2 +- .../perception/models/IPerceptionModel.java | 6 ++++++ .../perception/models/MultiPerceptionModel.java | 5 +++++ .../perception/models/PerceptionModel.java | 4 ++++ .../perception/models/SimplePerceptionModel.java | 12 ++++++++++-- 7 files changed, 30 insertions(+), 7 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario index 7bee441fd..fdb28fc65 100644 --- a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario +++ b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario @@ -1,7 +1,7 @@ { "name" : "emptyscenario", "description" : "", - "release" : "2.1", + "release" : "2.2", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -119,4 +119,4 @@ "stimulusInfos" : [ ], "reactionProbabilities" : [ ] } -} \ No newline at end of file +} diff --git a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario index 2f297c520..440e2499f 100644 --- a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario +++ b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario @@ -1,7 +1,7 @@ { "name" : "perceptionOnly", "description" : "", - "release" : "2.1", + "release" : "2.2", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -124,4 +124,4 @@ "stimulusInfos" : [ ], "reactionProbabilities" : [ ] } -} \ No newline at end of file +} diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 7669d572f..cb1341085 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -1,7 +1,7 @@ { "name" : "s2", "description" : "", - "release" : "2.1", + "release" : "2.2", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", 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 bacba0c99..0b9b1322b 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,9 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.AttributesPsychologyLayer; +import org.vadere.state.attributes.models.psychology.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 +46,7 @@ public interface IPerceptionModel { * */ void update(HashMap> pedSpecificStimuli); + void setAttributes(List attributes); + + } 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 d9c0e2e5c..4122e57ef 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,6 @@ package org.vadere.simulator.control.psychology.perception.models; +import org.vadere.state.attributes.Attributes; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -34,4 +35,8 @@ public class MultiPerceptionModel extends PerceptionModel { } + @Override + public void setAttributes(List 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 ecd97e2f6..fe204ae11 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,17 @@ package org.vadere.simulator.control.psychology.perception.models; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; 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; +import java.util.List; public abstract class PerceptionModel implements IPerceptionModel { + public abstract void setAttributes(List attributes); } 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 9c5602280..184540a27 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,11 +1,13 @@ package org.vadere.simulator.control.psychology.perception.models; +import org.vadere.simulator.models.Model; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.AttributesOVM; +import org.vadere.state.attributes.models.psychology.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.stream.Collectors; @@ -17,6 +19,7 @@ import java.util.stream.Collectors; */ public class SimplePerceptionModel extends PerceptionModel { + private AttributesSimplePerceptionModel attributesSimplePerceptionModel; private Topography topography; @Override @@ -24,6 +27,11 @@ public class SimplePerceptionModel extends PerceptionModel { this.topography = topography; } + @Override + public void setAttributes(List attributes) { + this.attributesSimplePerceptionModel = Model.findAttributes(attributes, AttributesSimplePerceptionModel.class); + } + @Override public void update(HashMap> pedSpecificStimuli) { for (Pedestrian pedestrian : pedSpecificStimuli.keySet()) { -- GitLab From 313b9a7d5d6e19de4abc818708af196a2386b368 Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 16:11:39 +0200 Subject: [PATCH 19/49] change interface for passing parameters --- .../scenarios/emptyscenario.scenario | 2 +- .../scenarios/perceptionOnly.scenario | 2 +- .../MigrationTests/scenarios/s2.scenario | 102 +++++++++++++++++- .../helpers/CognitionModelBuilder.java | 6 +- .../ChangeTargetScriptedCognitionModel.java | 3 +- .../models/CooperativeCognitionModel.java | 4 +- .../models/CounterflowCognitionModel.java | 4 +- .../cognition/models/ICognitionModel.java | 4 +- .../models/ProbabilisticCognitionModel.java | 3 +- .../models/SimpleCognitionModel.java | 9 +- .../SocialDistancingCognitionModel.java | 4 +- .../models/ThreatCognitionModel.java | 3 +- .../helpers/PerceptionModelBuilder.java | 9 +- .../perception/models/IPerceptionModel.java | 6 +- .../models/MultiPerceptionModel.java | 5 +- .../perception/models/PerceptionModel.java | 2 - .../models/SimplePerceptionModel.java | 8 +- .../CounterflowCognitionModelTest.java | 15 ++- .../cognition/SimpleCognitionModelTest.java | 6 +- .../models/CooperativeCognitionModelTest.java | 7 +- .../ProbabilisticCognitionModelTest.java | 8 +- .../models/ThreatCognitionModelTest.java | 21 ++-- .../perception/SimplePerceptionModelTest.java | 20 ++-- 23 files changed, 191 insertions(+), 62 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario index fdb28fc65..e9c3b80a0 100644 --- a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario +++ b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario @@ -119,4 +119,4 @@ "stimulusInfos" : [ ], "reactionProbabilities" : [ ] } -} +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario index 440e2499f..16f8ee927 100644 --- a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario +++ b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario @@ -124,4 +124,4 @@ "stimulusInfos" : [ ], "reactionProbabilities" : [ ] } -} +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index cb1341085..1626c339e 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -37,8 +37,61 @@ "isWriteMetaData" : false }, "scenario" : { - "mainModel" : null, - "attributesModel" : { }, + "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" : 500.0, "simTimeStepLength" : 0.4, @@ -82,12 +135,53 @@ "obstacles" : [ ], "measurementAreas" : [ ], "stairs" : [ ], - "targets" : [ ], + "targets" : [ { + "id" : 11, + "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 + } ], "targetChangers" : [ ], "absorbingAreas" : [ ], "aerosolClouds" : [ ], "droplets" : [ ], - "sources" : [ ], + "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" : [ 11 ], + "groupSizeDistribution" : [ 1.0 ], + "dynamicElementType" : "PEDESTRIAN", + "attributesPedestrian" : null + } ], "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.2, 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 ce354ca7e..8c37d5f8a 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 @@ -2,8 +2,11 @@ package org.vadere.simulator.control.psychology.cognition.helpers; import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel; import org.vadere.simulator.projects.ScenarioStore; +import org.vadere.state.attributes.Attributes; import org.vadere.util.reflection.DynamicClassInstantiator; +import java.util.List; + /** * This class encapsulates the creation of a concrete {@link ICognitionModel} * which is defined by the user in the JSON scenario description. @@ -23,7 +26,8 @@ public class CognitionModelBuilder { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); ICognitionModel cognitionModel = instantiator.createObject(fullyQualifiedClassName); - cognitionModel.initialize(scenarioStore.getTopography()); + List attributes = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); + cognitionModel.initialize(scenarioStore.getTopography(), attributes); 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 9a21ba167..d23e544ad 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,6 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.Attributes; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ChangeTargetScripted; import org.vadere.state.scenario.Pedestrian; @@ -22,7 +23,7 @@ public class ChangeTargetScriptedCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { this.topography = topography; } 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 1e265530c..08e81bb57 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,13 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.Attributes; 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.List; /** * The {@link CooperativeCognitionModel} makes a pedestrian cooperative if its @@ -21,7 +23,7 @@ public class CooperativeCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { this.topography = topography; } 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 7b6ba6ad5..36b09812f 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,13 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; +import org.vadere.state.attributes.Attributes; 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.List; /** * The {@link CounterflowCognitionModel} enables a pedestrian to evade if @@ -20,7 +22,7 @@ public class CounterflowCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { this.topography = topography; } 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 c1febcabb..e7faabf97 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.Attributes; 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.List; /** * 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, List attributes); /** * Usually, this method iterates over the pededestrians and calls 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 b69f28027..6fc54ef4b 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,6 +3,7 @@ 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.vadere.state.attributes.Attributes; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.information.InformationState; import org.vadere.state.psychology.perception.types.*; @@ -22,7 +23,7 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private RandomGenerator rng; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { rng = new JDKRandomGenerator(0); //TODO: use seed from json? } 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 88b199f27..087459267 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,16 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.simulator.models.Model; +import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel; +import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; 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.List; /** * The {@link SimpleCognitionModel} just passes the perceived stimulus to the @@ -14,10 +19,12 @@ import java.util.Collection; public class SimpleCognitionModel implements ICognitionModel { private Topography topography; + private AttributesSimpleCognitionModel attributesSimpleCognitionModel; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { this.topography = topography; + this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); } @Override 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 d3d304002..4d6635252 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,6 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.state.attributes.Attributes; 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 +12,7 @@ import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; import java.util.HashMap; +import java.util.List; /** * Suppose a distance recommendation (a {@link DistanceRecommendation}) occurred (keyword: social distancing). @@ -26,7 +28,7 @@ public class SocialDistancingCognitionModel implements ICognitionModel { private HashMap cloggingStartTimes = new HashMap<>(); @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { } @Override 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 6693850e2..92d6b70bb 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,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; +import org.vadere.state.attributes.Attributes; import org.vadere.state.psychology.cognition.GroupMembership; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -30,7 +31,7 @@ public class ThreatCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography) { + public void initialize(Topography topography, List attributes) { this.topography = topography; } 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 6cecfba6a..58d85c210 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 @@ -2,8 +2,12 @@ package org.vadere.simulator.control.psychology.perception.helpers; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel; import org.vadere.simulator.projects.ScenarioStore; +import org.vadere.state.attributes.Attributes; +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,8 +27,11 @@ 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, attributesList); 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 0b9b1322b..12580e637 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 @@ -2,8 +2,6 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.AttributesPsychologyLayer; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.psychology.perception.types.ElapsedTime; import org.vadere.state.psychology.perception.types.Stimulus; import org.vadere.state.scenario.Pedestrian; @@ -34,7 +32,7 @@ public interface IPerceptionModel { * a model can acquire additional information about a pedestrian's surrounding * when evaluating pedestrian's perception. */ - void initialize(Topography topography, final double simTimeStepLengh); + void initialize(Topography topography, final double simTimeStepLengh, List attributesList); /** @@ -46,7 +44,5 @@ public interface IPerceptionModel { * */ void update(HashMap> pedSpecificStimuli); - void setAttributes(List attributes); - } 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 4122e57ef..371987020 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 @@ -19,7 +19,7 @@ public class MultiPerceptionModel extends PerceptionModel { @Override - public void initialize(Topography topography, final double simTimeStepLengh) { + public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { this.topography = topography; } @@ -35,8 +35,5 @@ public class MultiPerceptionModel extends PerceptionModel { } - @Override - public void setAttributes(List 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 fe204ae11..d20d345e9 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 @@ -12,6 +12,4 @@ import java.util.List; public abstract class PerceptionModel implements IPerceptionModel { - - public abstract void setAttributes(List attributes); } 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 184540a27..b6acb5877 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 @@ -2,7 +2,6 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.AttributesOVM; import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -23,14 +22,11 @@ public class SimplePerceptionModel extends PerceptionModel { private Topography topography; @Override - public void initialize(Topography topography, final double simTimeStepLengh) { + public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { this.topography = topography; + this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); } - @Override - public void setAttributes(List attributes) { - this.attributesSimplePerceptionModel = Model.findAttributes(attributes, AttributesSimplePerceptionModel.class); - } @Override public void update(HashMap> pedSpecificStimuli) { 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 5fa71c51c..631372d04 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, attributes); 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, attributes); 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, attributes); 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, attributes); 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, attributes); 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 74fc4d943..7ad3ba55e 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(), attributes); 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 73049547e..cd9511301 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(), attributes); 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 bf0a9dbe9..96de20809 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 @@ -3,6 +3,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.apache.commons.math3.util.Precision; import org.junit.Test; +import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.psychology.perception.types.ChangeTarget; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -18,6 +19,7 @@ import static org.junit.Assert.*; public class ProbabilisticCognitionModelTest { + private List attributes = new LinkedList<>(); private static double ALLOWED_DOUBLE_ERROR = 10e-3; @@ -77,7 +79,7 @@ public class ProbabilisticCognitionModelTest { stimuli.add(new Wait(time, prob3Is)); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography); + probabilisticPerceptionModel.initialize(topography, attributes); for (Pedestrian pedestrian : pedestrians){ pedestrian.setPerceivedStimuli(new LinkedList<>()); @@ -123,7 +125,7 @@ public class ProbabilisticCognitionModelTest { ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography); + probabilisticPerceptionModel.initialize(topography, attributes); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli); @@ -137,7 +139,7 @@ public class ProbabilisticCognitionModelTest { List pedestrians = createPedestrians(1); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography); + probabilisticPerceptionModel.initialize(topography, attributes); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); 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 cb531a22b..045f3ea49 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(), attributes); 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, attributes); 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, attributes); 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, attributes); 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, attributes); 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, attributes); modelUnderTest.update(pedestrians); @@ -202,7 +205,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography); + modelUnderTest.initialize(topography, attributes); // 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, attributes); 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, attributes); 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 8574526b7..db38f6f09 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,7 @@ 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.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.psychology.perception.types.*; @@ -12,16 +13,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 = new LinkedList<>(); + private List createPedestrians(int totalPedestrians) { List pedestrians = new ArrayList<>(); @@ -87,7 +87,7 @@ public class SimplePerceptionModelTest { List stimuli = createElapsedTimeStimuli(1); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography,0 ); + simplePerceptionModel.initialize(topography,0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -109,7 +109,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0); + simplePerceptionModel.initialize(topography, 0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -131,7 +131,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0); + simplePerceptionModel.initialize(topography, 0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -157,7 +157,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0); + simplePerceptionModel.initialize(topography, 0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -179,7 +179,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography,0); + simplePerceptionModel.initialize(topography,0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -204,7 +204,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0); + simplePerceptionModel.initialize(topography, 0, attributesList); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); -- GitLab From e9896c18b6434b3889bc11d3aa9849e3ba5d869c Mon Sep 17 00:00:00 2001 From: Christina Date: Fri, 22 Apr 2022 16:27:17 +0200 Subject: [PATCH 20/49] remove attributes from models without attributes --- .../psychology/cognition/models/SimpleCognitionModel.java | 2 +- .../psychology/perception/models/SimplePerceptionModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 087459267..6450c3686 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 @@ -24,7 +24,7 @@ public class SimpleCognitionModel implements ICognitionModel { @Override public void initialize(Topography topography, List attributes) { this.topography = topography; - this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); + //this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); } @Override 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 b6acb5877..a799748dc 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 @@ -24,7 +24,7 @@ public class SimplePerceptionModel extends PerceptionModel { @Override public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { this.topography = topography; - this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); + //this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); } -- GitLab From 32293b1a6ecd43dc295d1bc7b38e2bd47d998b45 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 13:22:33 +0200 Subject: [PATCH 21/49] update scenario --- .../MigrationTests/scenarios/s2.scenario | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 1626c339e..53b934c7a 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -93,7 +93,7 @@ } }, "attributesSimulation" : { - "finishTime" : 500.0, + "finishTime" : 20.0, "simTimeStepLength" : 0.4, "realTimeSimTimeRatio" : 0.1, "writeSimulationData" : true, @@ -109,12 +109,16 @@ "psychologyLayer" : { "attributesModel" : { "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "argPerception" : 123, - "arg2Perception" : [ 1, 2, 3 ] + "priority" : { + "1" : "ChangeTarget", + "2" : "ChangeTargetScripted", + "3" : "Thread", + "4" : "Wait", + "5" : "WaitInArea", + "6" : "DistanceRecommendation" + } }, - "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : { - "argCognition" : 1.0 - } + "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : {} }, "perception" : "SimplePerceptionModel", "cognition" : "SimpleCognitionModel" @@ -218,7 +222,32 @@ } } }, - "stimulusInfos" : [ ], - "reactionProbabilities" : [ ] + "stimulusInfos" : [ { + "timeframe" : { + "startTime" : 0.0, + "endTime" : 10.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "stimuli" : [ { + "type" : "WaitInArea", + "id" : -1, + "area" : { + "x" : 0.0, + "y" : 0.0, + "width" : 10.0, + "height" : 10.0, + "type" : "RECTANGLE" + } + }, { + "type" : "ChangeTarget", + "id" : -1, + "newTargetIds" : [ 12 ] + } ] + } ], + "reactionProbabilities" : [ { + "stimulusId" : -1, + "reactionProbability" : 1.0 + } ] } -} \ No newline at end of file +} -- GitLab From 2493c1fe5078c4cd55f0c9725bdbc6e1de492511 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 14:16:12 +0200 Subject: [PATCH 22/49] update classnames --- Scenarios/MigrationTests/scenarios/s2.scenario | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 53b934c7a..ad0aaf749 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -118,10 +118,10 @@ "6" : "DistanceRecommendation" } }, - "org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel" : {} + "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : {} }, "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" + "cognition" : "ProbabilisticCognitionModel" } }, "topography" : { -- GitLab From fa8462201552f3d564fed4393f3d9426bcc23928 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 14:30:23 +0200 Subject: [PATCH 23/49] change attributes --- .../scenarios/emptyscenario.scenario | 122 ----------------- .../scenarios/perceptionOnly.scenario | 127 ------------------ .../models/ProbabilisticCognitionModel.java | 6 + .../models/SimpleCognitionModel.java | 2 +- .../models/SimplePerceptionModel.java | 24 +++- ...AttributesProbabilisticCognitionModel.java | 46 +++++++ .../AttributesSimpleCognitionModel.java | 4 +- .../AttributesSimplePerceptionModel.java | 28 +++- .../psychology/perception/types/Stimulus.java | 2 +- 9 files changed, 102 insertions(+), 259 deletions(-) delete mode 100644 Scenarios/MigrationTests/scenarios/emptyscenario.scenario delete mode 100644 Scenarios/MigrationTests/scenarios/perceptionOnly.scenario create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java diff --git a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario b/Scenarios/MigrationTests/scenarios/emptyscenario.scenario deleted file mode 100644 index e9c3b80a0..000000000 --- a/Scenarios/MigrationTests/scenarios/emptyscenario.scenario +++ /dev/null @@ -1,122 +0,0 @@ -{ - "name" : "emptyscenario", - "description" : "", - "release" : "2.2", - "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" : null, - "attributesModel" : { }, - "attributesSimulation" : { - "finishTime" : 500.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : -851834714596684454, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "attributesModel" : { }, - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "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" : [ ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "aerosolClouds" : [ ], - "droplets" : [ ], - "sources" : [ ], - "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" : [ ], - "reactionProbabilities" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario b/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario deleted file mode 100644 index 16f8ee927..000000000 --- a/Scenarios/MigrationTests/scenarios/perceptionOnly.scenario +++ /dev/null @@ -1,127 +0,0 @@ -{ - "name" : "perceptionOnly", - "description" : "", - "release" : "2.2", - "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" : null, - "attributesModel" : { }, - "attributesSimulation" : { - "finishTime" : 500.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : -7838408672018301953, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "attributesModel" : { - "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "argPerception" : 123, - "arg2Perception" : [ 1, 2, 3 ] - } - }, - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "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" : [ ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "aerosolClouds" : [ ], - "droplets" : [ ], - "sources" : [ ], - "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" : [ ], - "reactionProbabilities" : [ ] - } -} \ No newline at end of file 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 6fc54ef4b..321de5177 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,7 +3,10 @@ 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.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; +import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.information.InformationState; import org.vadere.state.psychology.perception.types.*; @@ -21,10 +24,13 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private static Logger logger = Logger.getLogger(ProbabilisticCognitionModel.class); private RandomGenerator rng; + private AttributesProbabilisticCognitionModel attributesProbabilisticCognitionModel; @Override public void initialize(Topography topography, List attributes) { rng = new JDKRandomGenerator(0); //TODO: use seed from json? + this.attributesProbabilisticCognitionModel = Model.findAttributes(attributes, AttributesProbabilisticCognitionModel.class); + } @Override 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 6450c3686..087459267 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 @@ -24,7 +24,7 @@ public class SimpleCognitionModel implements ICognitionModel { @Override public void initialize(Topography topography, List attributes) { this.topography = topography; - //this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); + this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); } @Override 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 a799748dc..f73989fba 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 @@ -8,7 +8,9 @@ import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; +import java.util.TreeMap; import java.util.stream.Collectors; /** @@ -24,7 +26,7 @@ public class SimplePerceptionModel extends PerceptionModel { @Override public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { this.topography = topography; - //this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); + this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); } @@ -45,12 +47,24 @@ public class SimplePerceptionModel extends PerceptionModel { .collect(Collectors.toList()) .get(0); + LinkedList stimuliSorted = new LinkedList<>(); + // first element in stimuliSorted is the most important stimulus + for (String typeName : attributesSimplePerceptionModel.getSortedPriorityQueue().values()){ + 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 + stimuliSorted.add(mostImportantStimulus); + + + /* 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()); @@ -67,9 +81,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.getFirst(); + - return mostImportantStimulus; } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java new file mode 100644 index 000000000..09db78860 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java @@ -0,0 +1,46 @@ +package org.vadere.state.attributes.models.psychology; + +import org.jetbrains.annotations.NotNull; +import org.vadere.state.psychology.perception.types.ChangeTarget; +import org.vadere.state.psychology.perception.types.Stimulus; +import org.vadere.state.psychology.perception.types.Wait; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + +public class AttributesProbabilisticCognitionModel extends AttributesCognitionModel { + Map routeChoices; + + public AttributesProbabilisticCognitionModel(){ + this.routeChoices = getReactionBehavior(); + } + + public Map getReactionBehavior() { + Map map = new HashMap(); + + LinkedList targetIds = new LinkedList<>(); + targetIds.add(1); + targetIds.add(2); + + LinkedList targetProbabilities = new LinkedList<>(); + targetProbabilities.add(0.4); + targetProbabilities.add(0.6); + + String instruction = "use target [1]"; + Map reactionBehavior = getRouteChoice(instruction, targetIds, targetProbabilities); + + map.put(1, reactionBehavior); + return map; + } + + private Map getRouteChoice( String instruction, LinkedList targetIds, LinkedList targetProbabilities) { + Map reactionBehavior = new HashMap(); + reactionBehavior.put("instruction", instruction ); + reactionBehavior.put("targetIds", targetIds); + reactionBehavior.put("targetProbabilities", targetProbabilities); + return reactionBehavior; + } + + +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java index 9259b4cbd..499f9d92b 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java @@ -1,5 +1,7 @@ package org.vadere.state.attributes.models.psychology; public class AttributesSimpleCognitionModel extends AttributesCognitionModel { - double argCognition; + + + } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java index ec2cc7fb7..a8b154894 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java @@ -1,8 +1,30 @@ package org.vadere.state.attributes.models.psychology; -import java.util.LinkedList; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { - int argPerception; - LinkedList arg2Perception; + Map priority; + + public AttributesSimplePerceptionModel() { + this.priority = getDefaultRanking(); + } + + public Map getDefaultRanking() { + Map map = new HashMap(); + + map.put(2, "ChangeTargetScripted"); + map.put(1,"ChangeTarget"); + map.put(3, "Thread"); + map.put(4, "Wait"); + map.put(5, "WaitInArea"); + map.put(6, "DistanceRecommendation"); + + return map; + } + + public TreeMap getSortedPriorityQueue(){ + return new TreeMap<>(this.priority); + } } 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 e4e9fe403..b44f554c5 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java @@ -42,7 +42,7 @@ import java.util.List; }) // "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"}) public abstract class Stimulus implements Cloneable { // Member Variables -- GitLab From db034c37c70d871a3daee1c66f6fdf4cf2afe57b Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 15:38:11 +0200 Subject: [PATCH 24/49] add stimulus --- .../MigrationTests/scenarios/s2.scenario | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index ad0aaf749..dcf63bf2a 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -118,7 +118,14 @@ "6" : "DistanceRecommendation" } }, - "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : {} + "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { + "routeChoices" : { + "use target [1]" : { + "targetIds" : [ 1, 2 ], + "targetProbabilities" : [ 0.4, 0.6 ] + } + } + } }, "perception" : "SimplePerceptionModel", "cognition" : "ProbabilisticCognitionModel" @@ -230,19 +237,10 @@ "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "WaitInArea", - "id" : -1, - "area" : { - "x" : 0.0, - "y" : 0.0, - "width" : 10.0, - "height" : 10.0, - "type" : "RECTANGLE" - } - }, { - "type" : "ChangeTarget", + "type" : "InformationStimulus", "id" : -1, - "newTargetIds" : [ 12 ] + "information" : "use target [1]", + "obsolete_at" : 10.0 } ] } ], "reactionProbabilities" : [ { @@ -250,4 +248,4 @@ "reactionProbability" : 1.0 } ] } -} +} \ No newline at end of file -- GitLab From 12fad2e0f4aa134087358921d8fc3bd91cb63ce2 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 15:40:11 +0200 Subject: [PATCH 25/49] add info stimulus --- Scenarios/MigrationTests/scenarios/s2.scenario | 1 + 1 file changed, 1 insertion(+) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index dcf63bf2a..d5ddc333e 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -110,6 +110,7 @@ "attributesModel" : { "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { "priority" : { + "0" : "InformationStimulus", "1" : "ChangeTarget", "2" : "ChangeTargetScripted", "3" : "Thread", -- GitLab From 63320e7e384615c5b6bb296d7b24fed7eb72ccf0 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 16:51:17 +0200 Subject: [PATCH 26/49] generate random dist from config not stimulus --- .../MigrationTests/scenarios/s2.scenario | 2 +- .../models/ProbabilisticCognitionModel.java | 26 +++++++++++++++ ...AttributesProbabilisticCognitionModel.java | 33 ++++++++++++------- .../AttributesSimplePerceptionModel.java | 2 +- .../presettings/StimulusPresettings.java | 1 + .../perception/types/InformationStimulus.java | 4 +++ .../psychology/perception/types/Stimulus.java | 3 +- .../perception/types/StimulusFactory.java | 2 ++ 8 files changed, 58 insertions(+), 15 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index d5ddc333e..4190005d1 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -122,7 +122,7 @@ "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { "routeChoices" : { "use target [1]" : { - "targetIds" : [ 1, 2 ], + "targetIds" : [ 3, 4 ], "targetProbabilities" : [ 0.4, 0.6 ] } } 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 321de5177..63b90a5c8 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 @@ -41,6 +41,16 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { LinkedList oldStimuli = pedestrian.getPerceivedStimuli(); LinkedList newStimuli = pedestrian.getNextPerceivedStimuli(); + InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); + + if (!pedestrian.getKnowledgeBase().knowsAbout(information.getInformation())){ + + int targetId = getRouteChoice(information); + + } + + + if (!oldStimuli.equals(newStimuli)) { Stimulus mostImportantStimulus = drawStimulusFromRandomDistribution(newStimuli); pedestrian.setMostImportantStimulus(mostImportantStimulus); @@ -52,6 +62,22 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { } } + private int getRouteChoice(InformationStimulus information) { + + LinkedList targetIds = attributesProbabilisticCognitionModel.getTargetIds(information.getInformation()); + LinkedList targetProbs = attributesProbabilisticCognitionModel.getTargetProbabilities(information.getInformation()); + + + + EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, + IntStream.range(0, targetIds.size()).boxed().collect(Collectors.toList()).stream().mapToInt(i -> i).toArray(), + targetProbs.stream().mapToDouble(i -> i).toArray()); + + int indexDrawn = dist.sample(); + + return targetIds.get(indexDrawn); + } + protected boolean pedestrianCannotMove(Pedestrian pedestrian) { boolean cannotMove = false; diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java index 09db78860..992a26fbe 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java @@ -1,23 +1,19 @@ package org.vadere.state.attributes.models.psychology; -import org.jetbrains.annotations.NotNull; -import org.vadere.state.psychology.perception.types.ChangeTarget; -import org.vadere.state.psychology.perception.types.Stimulus; -import org.vadere.state.psychology.perception.types.Wait; - +import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; public class AttributesProbabilisticCognitionModel extends AttributesCognitionModel { - Map routeChoices; + Map routeChoices; public AttributesProbabilisticCognitionModel(){ this.routeChoices = getReactionBehavior(); } - public Map getReactionBehavior() { - Map map = new HashMap(); + public Map getReactionBehavior() { + Map map = new HashMap(); LinkedList targetIds = new LinkedList<>(); targetIds.add(1); @@ -30,17 +26,30 @@ public class AttributesProbabilisticCognitionModel extends AttributesCognitionMo String instruction = "use target [1]"; Map reactionBehavior = getRouteChoice(instruction, targetIds, targetProbabilities); - map.put(1, reactionBehavior); + map.put(instruction, reactionBehavior); return map; } - private Map getRouteChoice( String instruction, LinkedList targetIds, LinkedList targetProbabilities) { - Map reactionBehavior = new HashMap(); - reactionBehavior.put("instruction", instruction ); + public Map getRouteChoice( String instruction, LinkedList targetIds, LinkedList targetProbabilities) { + Map reactionBehavior = new HashMap<>(); + //reactionBehavior.put("instruction", instruction ); reactionBehavior.put("targetIds", targetIds); reactionBehavior.put("targetProbabilities", targetProbabilities); return reactionBehavior; } + public LinkedList getTargetIds(String information){ + LinkedList targets = new LinkedList<>(); + targets.addAll((Collection) routeChoices.get(information).get("targetIds")); + return targets; + } + + public LinkedList getTargetProbabilities(String information){ + LinkedList probs = new LinkedList<>(); + probs.addAll((Collection) routeChoices.get(information).get("targetProbabilities")); + return probs; + } + + } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java index a8b154894..c788c19a3 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java @@ -14,8 +14,8 @@ public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { public Map getDefaultRanking() { Map map = new HashMap(); - map.put(2, "ChangeTargetScripted"); map.put(1,"ChangeTarget"); + map.put(2, "ChangeTargetScripted"); map.put(3, "Thread"); map.put(4, "Wait"); map.put(5, "WaitInArea"); 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 1a1d2b6f3..b0169df8a 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java +++ b/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java @@ -31,6 +31,7 @@ public class StimulusPresettings { new ChangeTarget(), new ChangeTargetScripted(), new DistanceRecommendation(), + new InformationStimulus(), }; for (Stimulus stimulus : stimuliToUse) { 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 48d4ea74c..9eedea679 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java @@ -12,6 +12,10 @@ 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; 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 b44f554c5..65c15d104 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"}) +@JsonIgnoreProperties({"time", "perceptionProbability"}) 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 c6038f897..e9d1f235a 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/StimulusFactory.java @@ -24,6 +24,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; -- GitLab From 7a3cd3c8ac4963ad5018004a0733785ba017c167 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 25 Apr 2022 17:08:06 +0200 Subject: [PATCH 27/49] clean methods --- .../models/ProbabilisticCognitionModel.java | 21 ++++++------------ ...AttributesProbabilisticCognitionModel.java | 22 +++++++++---------- 2 files changed, 17 insertions(+), 26 deletions(-) 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 63b90a5c8..5947d8299 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 @@ -6,7 +6,6 @@ import org.apache.commons.math3.random.RandomGenerator; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.information.InformationState; import org.vadere.state.psychology.perception.types.*; @@ -44,12 +43,12 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); if (!pedestrian.getKnowledgeBase().knowsAbout(information.getInformation())){ - int targetId = getRouteChoice(information); - } - + //TODO add to knowlegebase + } + if (!oldStimuli.equals(newStimuli)) { Stimulus mostImportantStimulus = drawStimulusFromRandomDistribution(newStimuli); @@ -64,18 +63,12 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private int getRouteChoice(InformationStimulus information) { - LinkedList targetIds = attributesProbabilisticCognitionModel.getTargetIds(information.getInformation()); - LinkedList targetProbs = attributesProbabilisticCognitionModel.getTargetProbabilities(information.getInformation()); - + int[] targetIds = attributesProbabilisticCognitionModel.getTargetIds(information.getInformation()); + double[] targetProbabilities = attributesProbabilisticCognitionModel.getTargetProbabilities(information.getInformation()); + EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, targetIds, targetProbabilities); - EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, - IntStream.range(0, targetIds.size()).boxed().collect(Collectors.toList()).stream().mapToInt(i -> i).toArray(), - targetProbs.stream().mapToDouble(i -> i).toArray()); - - int indexDrawn = dist.sample(); - - return targetIds.get(indexDrawn); + return dist.sample(); } protected boolean pedestrianCannotMove(Pedestrian pedestrian) { diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java index 992a26fbe..4a845d41c 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java @@ -1,9 +1,6 @@ package org.vadere.state.attributes.models.psychology; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; +import java.util.*; public class AttributesProbabilisticCognitionModel extends AttributesCognitionModel { Map routeChoices; @@ -38,16 +35,17 @@ public class AttributesProbabilisticCognitionModel extends AttributesCognitionMo return reactionBehavior; } - public LinkedList getTargetIds(String information){ - LinkedList targets = new LinkedList<>(); - targets.addAll((Collection) routeChoices.get(information).get("targetIds")); - return targets; + + public int[] getTargetIds(String information){ + ArrayList al = (ArrayList) routeChoices.get(information).get("targetIds"); + int[] arr = al.stream().mapToInt(i -> i).toArray(); + return arr; } - public LinkedList getTargetProbabilities(String information){ - LinkedList probs = new LinkedList<>(); - probs.addAll((Collection) routeChoices.get(information).get("targetProbabilities")); - return probs; + public double[] getTargetProbabilities(String information){ + ArrayList al = (ArrayList) routeChoices.get(information).get("targetProbabilities"); + double[] arr = al.stream().mapToDouble(i -> i).toArray(); + return arr; } -- GitLab From 83b1b6bbd781ad2e7dc32418aed3e4418e1c0a76 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 11:25:19 +0200 Subject: [PATCH 28/49] use list instead of nested map --- .../MigrationTests/scenarios/s2.scenario | 51 ++++- .../helpers/CognitionModelBuilder.java | 5 +- .../ChangeTargetScriptedCognitionModel.java | 3 +- .../models/CooperativeCognitionModel.java | 3 +- .../models/CounterflowCognitionModel.java | 3 +- .../cognition/models/ICognitionModel.java | 3 +- .../models/ProbabilisticCognitionModel.java | 187 ++++++------------ .../models/SimpleCognitionModel.java | 4 +- .../SocialDistancingCognitionModel.java | 3 +- .../models/ThreatCognitionModel.java | 3 +- .../CounterflowCognitionModelTest.java | 10 +- .../cognition/SimpleCognitionModelTest.java | 2 +- .../models/CooperativeCognitionModelTest.java | 2 +- .../ProbabilisticCognitionModelTest.java | 6 +- .../models/ThreatCognitionModelTest.java | 18 +- ...AttributesProbabilisticCognitionModel.java | 49 +---- .../AttributesRouteChoiceDefinition.java | 40 ++++ 17 files changed, 188 insertions(+), 204 deletions(-) create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 4190005d1..6ab4a727f 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -120,12 +120,11 @@ } }, "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { - "routeChoices" : { - "use target [1]" : { - "targetIds" : [ 3, 4 ], - "targetProbabilities" : [ 0.4, 0.6 ] - } - } + "routeChoices" : [ { + "instruction" : "use target [1]", + "targetIds" : [ 1, 2 ], + "targetProbabilities" : [ 0.0, 1.0 ] + } ] } }, "perception" : "SimplePerceptionModel", @@ -148,7 +147,7 @@ "measurementAreas" : [ ], "stairs" : [ ], "targets" : [ { - "id" : 11, + "id" : 1, "absorbing" : true, "shape" : { "x" : 7.9, @@ -164,6 +163,40 @@ "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" : [ ], @@ -189,7 +222,7 @@ "spawnAtRandomPositions" : false, "spawnAtGridPositionsCA" : false, "useFreeSpaceOnly" : true, - "targetIds" : [ 11 ], + "targetIds" : [ 1 ], "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN", "attributesPedestrian" : null @@ -249,4 +282,4 @@ "reactionProbability" : 1.0 } ] } -} \ No newline at end of file +} 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 8c37d5f8a..50c830ab9 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 @@ -6,6 +6,7 @@ import org.vadere.state.attributes.Attributes; import org.vadere.util.reflection.DynamicClassInstantiator; import java.util.List; +import java.util.Random; /** * This class encapsulates the creation of a concrete {@link ICognitionModel} @@ -27,7 +28,9 @@ public class CognitionModelBuilder { ICognitionModel cognitionModel = instantiator.createObject(fullyQualifiedClassName); List attributes = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); - cognitionModel.initialize(scenarioStore.getTopography(), attributes); + + Random random = new Random(scenarioStore.getAttributesSimulation().getSimulationSeed()); + cognitionModel.initialize(scenarioStore.getTopography(), attributes, random); 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 d23e544ad..eecc15c40 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 @@ -9,6 +9,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; /** @@ -23,7 +24,7 @@ public class ChangeTargetScriptedCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; } 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 08e81bb57..afa38a7fc 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 @@ -8,6 +8,7 @@ import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; import java.util.List; +import java.util.Random; /** * The {@link CooperativeCognitionModel} makes a pedestrian cooperative if its @@ -23,7 +24,7 @@ public class CooperativeCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; } 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 36b09812f..c8d690569 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 @@ -8,6 +8,7 @@ import org.vadere.state.scenario.Topography; import java.util.Collection; import java.util.List; +import java.util.Random; /** * The {@link CounterflowCognitionModel} enables a pedestrian to evade if @@ -22,7 +23,7 @@ public class CounterflowCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; } 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 e7faabf97..5db86392a 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 @@ -9,6 +9,7 @@ import org.vadere.state.scenario.Topography; import java.util.Collection; import java.util.List; +import java.util.Random; /** * Interface for a cognition model. @@ -40,7 +41,7 @@ public interface ICognitionModel { * a model can acquire additional information about a pedestrian's surrounding * when evaluating pedestrian's cognition. */ - void initialize(Topography topography, List attributes); + void initialize(Topography topography, List attributes, Random random); /** * Usually, this method iterates over the pededestrians and calls 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 5947d8299..918d02b97 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,20 +3,21 @@ 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.simulator.models.Model; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; +import org.vadere.state.attributes.models.psychology.HelperAttributes.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.Target; 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; +import java.util.stream.Stream; public class ProbabilisticCognitionModel extends AProbabilisticModel { @@ -24,174 +25,104 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private RandomGenerator rng; private AttributesProbabilisticCognitionModel attributesProbabilisticCognitionModel; + private Topography topography; @Override - public void initialize(Topography topography, List attributes) { - rng = new JDKRandomGenerator(0); //TODO: use seed from json? + public void initialize(Topography topography, List attributes, Random random) { + this.rng = new JDKRandomGenerator(random.nextInt()); this.attributesProbabilisticCognitionModel = Model.findAttributes(attributes, AttributesProbabilisticCognitionModel.class); + this.topography = topography; + + checkModelAttributes(); } + @Override public void update(Collection pedestrians) { - for (Pedestrian pedestrian : pedestrians) { + //TODO how to consider groups? - LinkedList oldStimuli = pedestrian.getPerceivedStimuli(); - LinkedList newStimuli = pedestrian.getNextPerceivedStimuli(); + for (Pedestrian pedestrian : pedestrians) { InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); + String instruction = information.getInformation(); - if (!pedestrian.getKnowledgeBase().knowsAbout(information.getInformation())){ - int targetId = getRouteChoice(information); - - //TODO add to knowlegebase - - } - - - if (!oldStimuli.equals(newStimuli)) { - Stimulus mostImportantStimulus = drawStimulusFromRandomDistribution(newStimuli); - pedestrian.setMostImportantStimulus(mostImportantStimulus); - setInformationState(pedestrian, mostImportantStimulus,newStimuli); - applyAction(pedestrian); - } - pedestrian.setNextPerceivedStimuli(newStimuli); - setInformationStateGroupMember(pedestrian.getPedGroupMembers()); - } - } - - private int getRouteChoice(InformationStimulus information) { - - int[] targetIds = attributesProbabilisticCognitionModel.getTargetIds(information.getInformation()); - double[] targetProbabilities = attributesProbabilisticCognitionModel.getTargetProbabilities(information.getInformation()); - - EnumeratedIntegerDistribution dist = new EnumeratedIntegerDistribution(rng, targetIds, targetProbabilities); - - return dist.sample(); - } - - protected boolean pedestrianCannotMove(Pedestrian pedestrian) { - boolean cannotMove = false; - - FootstepHistory footstepHistory = pedestrian.getFootstepHistory(); - int requiredFootSteps = 2; - - if (footstepHistory.size() >= requiredFootSteps - && footstepHistory.getAverageSpeedInMeterPerSecond() <= 0.05) { - cannotMove = true; - } + if (!pedestrian.getKnowledgeBase().knowsAbout(instruction)) { - return cannotMove; - } - - 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()); + AttributesRouteChoiceDefinition attr = getFilteredAttributes(instruction); + LinkedList newTarget = getNewTarget(attr.getTargetIds(), attr.getTargetProbabilities()); + pedestrian.setTargets(newTarget); 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; + pedestrian.getKnowledgeBase().addInformation(new KnowledgeItem(instruction)); + pedestrian.setSelfCategory(SelfCategory.CHANGE_TARGET); } 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); - } } - 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); - } - } + public AttributesRouteChoiceDefinition getFilteredAttributes(String information) { - // 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; + } + private 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.getTargets().stream().map(target -> target.getId()).collect(Collectors.toList()); + 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 087459267..291d47e93 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 @@ -3,7 +3,6 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -11,6 +10,7 @@ import org.vadere.state.scenario.Topography; import java.util.Collection; import java.util.List; +import java.util.Random; /** * The {@link SimpleCognitionModel} just passes the perceived stimulus to the @@ -22,7 +22,7 @@ public class SimpleCognitionModel implements ICognitionModel { private AttributesSimpleCognitionModel attributesSimpleCognitionModel; @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); } 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 4d6635252..fc6bf026a 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 @@ -13,6 +13,7 @@ import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; import java.util.HashMap; import java.util.List; +import java.util.Random; /** * Suppose a distance recommendation (a {@link DistanceRecommendation}) occurred (keyword: social distancing). @@ -28,7 +29,7 @@ public class SocialDistancingCognitionModel implements ICognitionModel { private HashMap cloggingStartTimes = new HashMap<>(); @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { } @Override 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 92d6b70bb..33f971644 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 @@ -13,6 +13,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; /** @@ -31,7 +32,7 @@ public class ThreatCognitionModel implements ICognitionModel { private Topography topography; @Override - public void initialize(Topography topography, List attributes) { + public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; } 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 631372d04..184998fe7 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java @@ -91,7 +91,7 @@ public class CounterflowCognitionModelTest { Topography topography = createTopography(pedestrians); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes); + counterflowCognitionModel.initialize(topography, attributes, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -112,7 +112,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes); + counterflowCognitionModel.initialize(topography, attributes, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -133,7 +133,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(0.5,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes); + counterflowCognitionModel.initialize(topography, attributes, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -153,7 +153,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes); + counterflowCognitionModel.initialize(topography, attributes, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -174,7 +174,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes); + counterflowCognitionModel.initialize(topography, attributes, 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 7ad3ba55e..2db9fa67d 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java @@ -51,7 +51,7 @@ public class SimpleCognitionModelTest { } SimpleCognitionModel simpleCognitionModel = new SimpleCognitionModel(); - simpleCognitionModel.initialize(createTopography(), attributes); + simpleCognitionModel.initialize(createTopography(), attributes, 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 cd9511301..f0278015e 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 @@ -44,7 +44,7 @@ public class CooperativeCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography(), attributes); + modelUnderTest.initialize(new Topography(), attributes, 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 96de20809..f1f6bf1a7 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 @@ -79,7 +79,7 @@ public class ProbabilisticCognitionModelTest { stimuli.add(new Wait(time, prob3Is)); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography, attributes); + probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); for (Pedestrian pedestrian : pedestrians){ pedestrian.setPerceivedStimuli(new LinkedList<>()); @@ -125,7 +125,7 @@ public class ProbabilisticCognitionModelTest { ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography, attributes); + probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli); @@ -139,7 +139,7 @@ public class ProbabilisticCognitionModelTest { List pedestrians = createPedestrians(1); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography, attributes); + probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); 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 045f3ea49..c08ea30cc 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 @@ -70,7 +70,7 @@ public class ThreatCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography(), attributes); + modelUnderTest.initialize(new Topography(), attributes, new Random(0)); assertNotNull(privateTopographyField.get(modelUnderTest)); } catch (IllegalAccessException ex) { @@ -95,7 +95,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -111,7 +111,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -129,7 +129,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -151,7 +151,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -179,7 +179,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); modelUnderTest.update(pedestrians); @@ -205,7 +205,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); // The "Threat" stimulus is processed for the first time. // Subsequent stimuli will be "ElapsedTime". @@ -233,7 +233,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); pedestrian.setSelfCategory(SelfCategory.WAIT); modelUnderTest.update(pedestrians); @@ -276,7 +276,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes); + modelUnderTest.initialize(topography, attributes, new Random(0)); modelUnderTest.update(pedestrians); diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java index 4a845d41c..440ce69c1 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java @@ -1,53 +1,24 @@ package org.vadere.state.attributes.models.psychology; -import java.util.*; +import org.vadere.state.attributes.models.psychology.HelperAttributes.AttributesRouteChoiceDefinition; + +import java.util.LinkedList; +import java.util.List; public class AttributesProbabilisticCognitionModel extends AttributesCognitionModel { - Map routeChoices; + List routeChoices; public AttributesProbabilisticCognitionModel(){ - this.routeChoices = getReactionBehavior(); + routeChoices = new LinkedList<>(); } - public Map getReactionBehavior() { - Map map = new HashMap(); - - LinkedList targetIds = new LinkedList<>(); - targetIds.add(1); - targetIds.add(2); - - LinkedList targetProbabilities = new LinkedList<>(); - targetProbabilities.add(0.4); - targetProbabilities.add(0.6); - - String instruction = "use target [1]"; - Map reactionBehavior = getRouteChoice(instruction, targetIds, targetProbabilities); - - map.put(instruction, reactionBehavior); - return map; + public List getRouteChoices() { + return routeChoices; } - public Map getRouteChoice( String instruction, LinkedList targetIds, LinkedList targetProbabilities) { - Map reactionBehavior = new HashMap<>(); - //reactionBehavior.put("instruction", instruction ); - reactionBehavior.put("targetIds", targetIds); - reactionBehavior.put("targetProbabilities", targetProbabilities); - return reactionBehavior; + public void setRouteChoices(List routeChoices) { + this.routeChoices = routeChoices; } - public int[] getTargetIds(String information){ - ArrayList al = (ArrayList) routeChoices.get(information).get("targetIds"); - int[] arr = al.stream().mapToInt(i -> i).toArray(); - return arr; - } - - public double[] getTargetProbabilities(String information){ - ArrayList al = (ArrayList) routeChoices.get(information).get("targetProbabilities"); - double[] arr = al.stream().mapToDouble(i -> i).toArray(); - return arr; - } - - - } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java b/VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java new file mode 100644 index 000000000..286b0009f --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java @@ -0,0 +1,40 @@ +package org.vadere.state.attributes.models.psychology.HelperAttributes; + +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; + } +} -- GitLab From 4bddb45059991a85f4600e3ab0dd8bf755ca2696 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 12:07:09 +0200 Subject: [PATCH 29/49] remove unnecessary code --- Scenarios/MigrationTests/scenarios/s2.scenario | 12 +----------- .../AttributesSimpleCognitionModel.java | 1 - .../AttributesSimplePerceptionModel.java | 15 +++++++++------ .../perception/types/InformationStimulus.java | 15 +-------------- 4 files changed, 11 insertions(+), 32 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 6ab4a727f..50a9286e4 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -108,17 +108,7 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "attributesModel" : { - "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "priority" : { - "0" : "InformationStimulus", - "1" : "ChangeTarget", - "2" : "ChangeTargetScripted", - "3" : "Thread", - "4" : "Wait", - "5" : "WaitInArea", - "6" : "DistanceRecommendation" - } - }, + "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : {}, "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { "routeChoices" : [ { "instruction" : "use target [1]", diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java index 499f9d92b..9398d70ea 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java @@ -3,5 +3,4 @@ package org.vadere.state.attributes.models.psychology; public class AttributesSimpleCognitionModel extends AttributesCognitionModel { - } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java index c788c19a3..602925ac7 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java @@ -1,5 +1,7 @@ package org.vadere.state.attributes.models.psychology; +import org.vadere.state.psychology.perception.types.*; + import java.util.HashMap; import java.util.Map; import java.util.TreeMap; @@ -14,12 +16,13 @@ public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { public Map getDefaultRanking() { Map map = new HashMap(); - map.put(1,"ChangeTarget"); - map.put(2, "ChangeTargetScripted"); - map.put(3, "Thread"); - map.put(4, "Wait"); - map.put(5, "WaitInArea"); - map.put(6, "DistanceRecommendation"); + map.put(1, InformationStimulus.class.getSimpleName()); + map.put(2, ChangeTarget.class.getSimpleName()); + map.put(3, ChangeTargetScripted.class.getSimpleName()); + map.put(4, Thread.class.getSimpleName()); + map.put(5, Wait.class.getSimpleName()); + map.put(6, WaitInArea.class.getSimpleName()); + map.put(7, DistanceRecommendation.class.getSimpleName()); return map; } 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 9eedea679..492401a17 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java @@ -4,13 +4,10 @@ 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); @@ -19,25 +16,21 @@ public class InformationStimulus extends Stimulus { public InformationStimulus(String information) { super(0.0); this.information = information; - this.obsolete_at = -1; // never } public InformationStimulus(double time, double obsolete_at, String information) { super(time); this.information = information; - this.obsolete_at = obsolete_at; } public InformationStimulus(double time, double obsolete_at, 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; } @@ -47,11 +40,6 @@ public class InformationStimulus extends Stimulus { } - public double getObsolete_at() { - return obsolete_at; - } - - @Override public Stimulus clone() { return new InformationStimulus(this); @@ -64,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; } } -- GitLab From 6e60125cbf798bf7c62321dbece16591f5dfd3a4 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 14:38:49 +0200 Subject: [PATCH 30/49] add psychologyLayer attributes if missing --- .../json/TargetVersionV2_2.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) 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 index dc981c29a..ad8bfc7e8 100644 --- 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 @@ -3,8 +3,10 @@ package org.vadere.simulator.projects.migration.jsontranformation.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.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; @@ -12,24 +14,41 @@ 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::addNestedModelAttributesKeyInPsychologyLayer); + addPostHookFirst(this::addPsychologyLayerNodeIfMissing); + addPostHookLast(this::addNestedModelAttributesKeyInPsychologyLayer); addPostHookLast(this::sort); } + 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()) { -- GitLab From cd51ce577ebb64288eacec46e6fd3343d50d31ae Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 15:04:01 +0200 Subject: [PATCH 31/49] fix SimplePerceptionModelTest --- .../migration/jsontranformation/json/TargetVersionV2_2.java | 2 +- .../psychology/perception/SimplePerceptionModelTest.java | 3 ++- .../models/psychology/AttributesSimplePerceptionModel.java | 6 +++--- .../state/psychology/perception/types/StimulusFactory.java | 4 +++- 4 files changed, 9 insertions(+), 6 deletions(-) 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 index ad8bfc7e8..0cff0077b 100644 --- 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 @@ -15,7 +15,7 @@ import org.vadere.util.version.Version; public class TargetVersionV2_2 extends SimpleJsonTransformation { JacksonObjectMapper mapper = new JacksonObjectMapper(); - + public TargetVersionV2_2() { super(Version.V2_2); } 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 db38f6f09..f5095f048 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java @@ -3,6 +3,7 @@ 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.AttributesSimplePerceptionModel; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.psychology.perception.types.*; @@ -20,7 +21,7 @@ import static org.junit.Assert.*; public class SimplePerceptionModelTest { private static double ALLOWED_DOUBLE_ERROR = 10e-3; - private List attributesList = new LinkedList<>(); + private List attributesList = Collections.singletonList(new AttributesSimplePerceptionModel()); private List createPedestrians(int totalPedestrians) { diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java index 602925ac7..33f374389 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java @@ -17,9 +17,9 @@ public class AttributesSimplePerceptionModel extends AttributesPerceptionModel { Map map = new HashMap(); map.put(1, InformationStimulus.class.getSimpleName()); - map.put(2, ChangeTarget.class.getSimpleName()); - map.put(3, ChangeTargetScripted.class.getSimpleName()); - map.put(4, Thread.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()); 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 e9d1f235a..b3a5a85ba 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(); -- GitLab From 4cc74ab26df30257b607e09e5aafc657a855d1b8 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 17:31:17 +0200 Subject: [PATCH 32/49] WIP update ProbabilisticCongtionModelTest --- .../models/ProbabilisticCognitionModel.java | 27 ++++-- .../models/SimpleCognitionModel.java | 4 - .../ProbabilisticCognitionModelTest.java | 94 ++++++++++++++----- .../AttributesSimpleCognitionModel.java | 6 -- .../org/vadere/state/scenario/Topography.java | 4 + 5 files changed, 91 insertions(+), 44 deletions(-) delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java 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 918d02b97..660bb207b 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 @@ -45,18 +45,24 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { for (Pedestrian pedestrian : pedestrians) { - InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); - String instruction = information.getInformation(); + Stimulus stimulus = pedestrian.getMostImportantStimulus(); - if (!pedestrian.getKnowledgeBase().knowsAbout(instruction)) { + if (stimulus instanceof InformationStimulus) { - AttributesRouteChoiceDefinition attr = getFilteredAttributes(instruction); - LinkedList newTarget = getNewTarget(attr.getTargetIds(), attr.getTargetProbabilities()); - pedestrian.setTargets(newTarget); - pedestrian.setNextTargetListIndex(0); + InformationStimulus information = (InformationStimulus) pedestrian.getMostImportantStimulus(); + String instruction = information.getInformation(); + + if (!pedestrian.getKnowledgeBase().knowsAbout(instruction)) { + + AttributesRouteChoiceDefinition attr = getFilteredAttributes(instruction); + LinkedList newTarget = getNewTarget(attr.getTargetIds(), attr.getTargetProbabilities()); + pedestrian.setTargets(newTarget); + pedestrian.setNextTargetListIndex(0); + + pedestrian.getKnowledgeBase().addInformation(new KnowledgeItem(instruction)); + pedestrian.setSelfCategory(SelfCategory.CHANGE_TARGET); + } - pedestrian.getKnowledgeBase().addInformation(new KnowledgeItem(instruction)); - pedestrian.setSelfCategory(SelfCategory.CHANGE_TARGET); } else { pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED); } @@ -116,7 +122,8 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { } private void checkIfTargetIdsValid(LinkedList targetIds) { - List targetIdsTopography = topography.getTargets().stream().map(target -> target.getId()).collect(Collectors.toList()); + + 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 291d47e93..ba0e26820 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,8 +1,6 @@ package org.vadere.simulator.control.psychology.cognition.models; -import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -19,12 +17,10 @@ import java.util.Random; public class SimpleCognitionModel implements ICognitionModel { private Topography topography; - private AttributesSimpleCognitionModel attributesSimpleCognitionModel; @Override public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; - this.attributesSimpleCognitionModel = Model.findAttributes(attributes, AttributesSimpleCognitionModel.class); } @Override 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 f1f6bf1a7..117e73a87 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,28 +2,72 @@ 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.simulator.projects.dataprocessing.ProcessorManager; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; +import org.vadere.state.attributes.models.psychology.HelperAttributes.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.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.*; +import java.util.stream.Collectors; import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; + public class ProbabilisticCognitionModelTest { - private List attributes = new LinkedList<>(); + 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<>(); @@ -53,7 +97,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; } @@ -65,36 +117,30 @@ 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, attributes, new Random(0)); - for (Pedestrian pedestrian : pedestrians){ - pedestrian.setPerceivedStimuli(new LinkedList<>()); - pedestrian.setNextPerceivedStimuli(stimuli); - } + + + LinkedList targetIds = probabilisticPerceptionModel.getFilteredAttributes("A").getTargetIds(); + LinkedList targetProbs = probabilisticPerceptionModel.getFilteredAttributes("A").getTargetProbabilities(); + 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; + 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; - assertTrue( Precision.equals(prob1, prob1Is, presicison)); - assertTrue( Precision.equals(prob2, prob2Is, presicison)); - assertTrue( Precision.equals(prob3, prob3Is, presicison)); + assertTrue( Precision.equals(targetProbs.get(0), prob1Is, presicison)); + assertTrue( Precision.equals(targetProbs.get(1), prob2Is, presicison)); } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java deleted file mode 100644 index 9398d70ea..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesSimpleCognitionModel extends AttributesCognitionModel { - - -} diff --git a/VadereState/src/org/vadere/state/scenario/Topography.java b/VadereState/src/org/vadere/state/scenario/Topography.java index fd1513487..8ffdaa5b8 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()); + } + } -- GitLab From c2234cb120d860fd1cc4475855725307d007c3d0 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 26 Apr 2022 17:39:20 +0200 Subject: [PATCH 33/49] WIP fix ProbabilicCOgnitionModelTest --- .../models/ProbabilisticCognitionModel.java | 2 + .../ProbabilisticCognitionModelTest.java | 95 ++----------------- 2 files changed, 9 insertions(+), 88 deletions(-) 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 660bb207b..934ef0ce4 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 @@ -61,6 +61,8 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { pedestrian.getKnowledgeBase().addInformation(new KnowledgeItem(instruction)); pedestrian.setSelfCategory(SelfCategory.CHANGE_TARGET); + } else { + pedestrian.setSelfCategory(SelfCategory.TARGET_ORIENTED); } } else { 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 117e73a87..17b977afe 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 @@ -11,6 +11,7 @@ import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; import org.vadere.state.attributes.models.psychology.HelperAttributes.AttributesRouteChoiceDefinition; import org.vadere.state.attributes.scenario.AttributesAgent; +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; @@ -134,50 +135,15 @@ public class ProbabilisticCognitionModelTest { LinkedList targetProbs = probabilisticPerceptionModel.getFilteredAttributes("A").getTargetProbabilities(); - 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; assertTrue( Precision.equals(targetProbs.get(0), prob1Is, presicison)); assertTrue( Precision.equals(targetProbs.get(1), prob2Is, presicison)); - - } - - @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")); - } } - 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, attributes, new Random(0)); - pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); - - updateStimuli(pedestrians, probabilisticPerceptionModel, stimuli); - - } - @Test public void testRecurring() { @@ -186,65 +152,18 @@ public class ProbabilisticCognitionModelTest { ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); - 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)); - - 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 } -- GitLab From 9099409dd31192c8a6c59e392d4b5a7dac0e95a4 Mon Sep 17 00:00:00 2001 From: Christina Date: Wed, 27 Apr 2022 10:16:46 +0200 Subject: [PATCH 34/49] add stimulusprovider --- .../models/InformationStimulusProvider.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java 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 000000000..5662fcd3a --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java @@ -0,0 +1,32 @@ +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 java.util.Random; + + +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(instruction); + } + + + + private String readSocialDistanceFromJson(JSONObject command) { + return command.getString("instruction"); + } + + +} -- GitLab From 8331db40ab390d505562978f703f3dd8b6e62183 Mon Sep 17 00:00:00 2001 From: Christina Date: Wed, 27 Apr 2022 17:09:38 +0200 Subject: [PATCH 35/49] add time constraint --- .../models/InformationStimulusProvider.java | 31 ++++++++++++++++++- .../perception/StimulusController.java | 4 +-- .../models/SimplePerceptionModel.java | 16 +++++----- .../perception/types/InformationStimulus.java | 4 +-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java b/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java index 5662fcd3a..6109d1356 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java +++ b/VadereSimulator/src/org/vadere/simulator/control/external/models/InformationStimulusProvider.java @@ -4,8 +4,12 @@ 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 { @@ -19,9 +23,34 @@ public class InformationStimulusProvider extends ControlModel { @Override protected Stimulus getStimulusFromJsonCommand(JSONObject command, int stimulusId, double timeCommandExecuted) { String instruction = readSocialDistanceFromJson(command); - return new InformationStimulus(instruction); + 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) { 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 724f76c2d..3f7f7685e 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java @@ -94,7 +94,7 @@ public class StimulusController { } private void setReactionProbability(final List stimuli) { - for (Stimulus stimulus : stimuli){ + /*for (Stimulus stimulus : stimuli){ if (!(stimulus instanceof ElapsedTime)){ if (reactionProbabilities.containsKey(stimulus.getId())){ stimulus.setPerceptionProbability(reactionProbabilities.get(stimulus.getId())); @@ -103,7 +103,7 @@ public class StimulusController { throw new RuntimeException("Stimulus id = "+ stimulus.getId() + " is not defined in perceptionLayer/reactionProbabilities." ); } } - } + }*/ } 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 f73989fba..0566bf000 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 @@ -7,10 +7,7 @@ import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.TreeMap; +import java.util.*; import java.util.stream.Collectors; /** @@ -48,15 +45,20 @@ public class SimplePerceptionModel extends PerceptionModel { .get(0); LinkedList stimuliSorted = new LinkedList<>(); + stimuliSorted.add(mostImportantStimulus); + // first element in stimuliSorted is the most important stimulus - for (String typeName : attributesSimplePerceptionModel.getSortedPriorityQueue().values()){ + + List attr = attributesSimplePerceptionModel.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 - stimuliSorted.add(mostImportantStimulus); + /* depracted @@ -83,7 +85,7 @@ public class SimplePerceptionModel extends PerceptionModel { } else if(true){} */ - return stimuliSorted.getFirst(); + return stimuliSorted.getLast(); } 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 492401a17..0bdc8c7ae 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/InformationStimulus.java @@ -18,12 +18,12 @@ public class InformationStimulus extends Stimulus { this.information = information; } - public InformationStimulus(double time, double obsolete_at, String information) { + public InformationStimulus(double time, String information) { super(time); this.information = information; } - 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; } -- GitLab From 13984b7a6cc69f020fe634ccfd9ba60ee900fe73 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 9 May 2022 11:53:24 +0200 Subject: [PATCH 36/49] change migration --- .../MigrationTests/scenarios/aaa.scenario | 264 +++++++++++++++++ .../MigrationTests/scenarios/s2.scenario | 14 +- .../scenarios/s2_clone_1.scenario | 274 ++++++++++++++++++ .../helpers/PerceptionModelBuilder.java | 13 + .../perception/models/IPerceptionModel.java | 5 + .../models/MultiPerceptionModel.java | 16 + .../perception/models/PerceptionModel.java | 2 + .../models/SimplePerceptionModel.java | 18 +- .../org/vadere/simulator/models/Model.java | 3 + .../AttributesMultiPerceptionModel.java | 5 + 10 files changed, 606 insertions(+), 8 deletions(-) create mode 100644 Scenarios/MigrationTests/scenarios/aaa.scenario create mode 100644 Scenarios/MigrationTests/scenarios/s2_clone_1.scenario create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java diff --git a/Scenarios/MigrationTests/scenarios/aaa.scenario b/Scenarios/MigrationTests/scenarios/aaa.scenario new file mode 100644 index 000000000..b028990c5 --- /dev/null +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -0,0 +1,264 @@ +{ + "name" : "aaa", + "description" : "", + "release" : "2.1", + "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" : "MultiPerceptionModel", + "cognition" : "ProbabilisticCognitionModel" + } + }, + "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" : 0.0, + "endTime" : 10.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "stimuli" : [ { + "type" : "InformationStimulus", + "id" : -1, + "information" : "use target [1]" + } ] + } ], + "reactionProbabilities" : [ { + "stimulusId" : -1, + "reactionProbability" : 1.0 + } ] + } +} diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario index 50a9286e4..72effb281 100644 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ b/Scenarios/MigrationTests/scenarios/s2.scenario @@ -108,7 +108,14 @@ "usePsychologyLayer" : true, "psychologyLayer" : { "attributesModel" : { - "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : {}, + "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { + "priority" : { + "11" : "InformationStimulus", + "21" : "ChangeTargetScripted", + "31" : "ChangeTarget", + "41" : "Threat" + } + }, "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { "routeChoices" : [ { "instruction" : "use target [1]", @@ -263,8 +270,7 @@ "stimuli" : [ { "type" : "InformationStimulus", "id" : -1, - "information" : "use target [1]", - "obsolete_at" : 10.0 + "information" : "use target [1]" } ] } ], "reactionProbabilities" : [ { @@ -272,4 +278,4 @@ "reactionProbability" : 1.0 } ] } -} +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario b/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario new file mode 100644 index 000000000..b53d1c80e --- /dev/null +++ b/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario @@ -0,0 +1,274 @@ +{ + "name" : "s2_clone_1", + "description" : "", + "release" : "2.2", + "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" : { + "attributesModel" : { + "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { + "routeChoices" : [ { + "instruction" : "use target [1]", + "targetIds" : [ 1, 2 ], + "targetProbabilities" : [ 0.0, 1.0 ] + } ] + }, + "org.vadere.state.attributes.models.psychology.AttributesMultiPerceptionModel" : { } + }, + "perception" : "MultiPerceptionModel", + "cognition" : "ProbabilisticCognitionModel" + } + }, + "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" : 0.0, + "endTime" : 10.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "stimuli" : [ { + "type" : "InformationStimulus", + "id" : -1, + "information" : "use target [1]" + } ] + } ], + "reactionProbabilities" : [ { + "stimulusId" : -1, + "reactionProbability" : 1.0 + } ] + } +} 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 58d85c210..cdef27411 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,8 +1,12 @@ 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.exceptions.AttributesNotFoundException; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; +import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.scenario.Topography; import org.vadere.util.reflection.DynamicClassInstantiator; @@ -32,6 +36,15 @@ public class PerceptionModelBuilder { List attributesList = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); perceptionModel.initialize(topography, simTimeStepLength, attributesList); + + try { + AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); + perceptionModel.setAttributes(attributes); + } catch (AttributesNotFoundException e) { + e.printStackTrace(); + } + + 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 12580e637..cb0af256f 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.psychology.perception.types.ElapsedTime; import org.vadere.state.psychology.perception.types.Stimulus; import org.vadere.state.scenario.Pedestrian; @@ -44,5 +45,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 371987020..709a9b616 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,6 +1,8 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesMultiPerceptionModel; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -16,11 +18,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, List attributesList) { this.topography = topography; + this.attributes = new AttributesMultiPerceptionModel(); + } @Override @@ -35,5 +40,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 d20d345e9..71b21a69a 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,7 +1,9 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; +import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.psychology.information.InformationState; import org.vadere.state.psychology.perception.types.ElapsedTime; import org.vadere.state.psychology.perception.types.Stimulus; 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 0566bf000..42e4011e8 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,7 +1,7 @@ package org.vadere.simulator.control.psychology.perception.models; -import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -17,13 +17,13 @@ import java.util.stream.Collectors; */ public class SimplePerceptionModel extends PerceptionModel { - private AttributesSimplePerceptionModel attributesSimplePerceptionModel; + private AttributesSimplePerceptionModel attributes; private Topography topography; @Override public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { this.topography = topography; - this.attributesSimplePerceptionModel = Model.findAttributes(attributesList, AttributesSimplePerceptionModel.class); + this.attributes = new AttributesSimplePerceptionModel(); } @@ -35,6 +35,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 @@ -49,7 +59,7 @@ public class SimplePerceptionModel extends PerceptionModel { // first element in stimuliSorted is the most important stimulus - List attr = attributesSimplePerceptionModel.getSortedPriorityQueue().values().stream().collect(Collectors.toList()); + List attr = attributes.getSortedPriorityQueue().values().stream().collect(Collectors.toList()); Collections.reverse(attr); for (String typeName : attr){ Stimulus stimulus = StimulusFactory.stringToStimulus(typeName); diff --git a/VadereSimulator/src/org/vadere/simulator/models/Model.java b/VadereSimulator/src/org/vadere/simulator/models/Model.java index 280c4e439..bb3b08dd2 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/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java new file mode 100644 index 000000000..3a62282f1 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java @@ -0,0 +1,5 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesMultiPerceptionModel extends AttributesPerceptionModel { + +} -- GitLab From f1e0e42791848a7b13d749ca06536b3d9a29fb42 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 9 May 2022 14:30:23 +0200 Subject: [PATCH 37/49] before restructuring --- .../models/ChangeTargetScriptedCognitionModel.java | 3 +++ .../cognition/models/CooperativeCognitionModel.java | 3 +++ .../cognition/models/CounterflowCognitionModel.java | 3 +++ .../models/ProbabilisticCognitionModel.java | 2 +- .../cognition/models/SimpleCognitionModel.java | 3 +++ .../models/SocialDistancingCognitionModel.java | 3 +++ .../cognition/models/ThreatCognitionModel.java | 3 +++ .../perception/helpers/PerceptionModelBuilder.java | 3 ++- .../jsontranformation/json/TargetVersionV2_2.java | 13 ++++++++++++- ...ttributesChangeTargetScriptedCognitionModel.java | 4 ++++ .../AttributesCooperativeCognitionModel.java | 4 ++++ .../AttributesCounterflowCognitionModel.java | 4 ++++ .../psychology/AttributesSimpleCognitionModel.java | 4 ++++ .../AttributesSocialDistancingCognitionModel.java | 4 ++++ .../psychology/AttributesThreatCognitionModel.java | 4 ++++ 15 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java 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 eecc15c40..ca9f145e9 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesChangeTargetScriptedCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ChangeTargetScripted; import org.vadere.state.scenario.Pedestrian; @@ -22,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, List attributes, Random random) { this.topography = topography; + this.attributes = new AttributesChangeTargetScriptedCognitionModel(); } @Override 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 afa38a7fc..34253b8cb 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesCooperativeCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -22,10 +23,12 @@ import java.util.Random; public class CooperativeCognitionModel implements ICognitionModel { private Topography topography; + private AttributesCooperativeCognitionModel attributes; @Override public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; + this.attributes = new AttributesCooperativeCognitionModel(); } @Override 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 c8d690569..ce9baf5fd 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesCounterflowCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; @@ -21,10 +22,12 @@ import java.util.Random; public class CounterflowCognitionModel implements ICognitionModel { private Topography topography; + private AttributesCounterflowCognitionModel attributes; @Override public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; + this.attributes = new AttributesCounterflowCognitionModel(); } @Override 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 934ef0ce4..d648b1607 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 @@ -30,7 +30,7 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { @Override public void initialize(Topography topography, List attributes, Random random) { this.rng = new JDKRandomGenerator(random.nextInt()); - this.attributesProbabilisticCognitionModel = Model.findAttributes(attributes, AttributesProbabilisticCognitionModel.class); + this.attributesProbabilisticCognitionModel = new AttributesProbabilisticCognitionModel(); this.topography = topography; checkModelAttributes(); 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 ba0e26820..bcf8ee28d 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; import org.vadere.state.scenario.Pedestrian; @@ -17,10 +18,12 @@ import java.util.Random; public class SimpleCognitionModel implements ICognitionModel { private Topography topography; + private AttributesSimpleCognitionModel attributes; @Override public void initialize(Topography topography, List attributes, Random random) { this.topography = topography; + this.attributes = new AttributesSimpleCognitionModel(); } @Override 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 fc6bf026a..c42f0a0e7 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesSocialDistancingCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.DistanceRecommendation; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -27,9 +28,11 @@ import java.util.Random; public class SocialDistancingCognitionModel implements ICognitionModel { private HashMap cloggingStartTimes = new HashMap<>(); + private AttributesSocialDistancingCognitionModel attributes; @Override public void initialize(Topography topography, List attributes, Random random) { + this.attributes = new AttributesSocialDistancingCognitionModel(); } @Override 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 33f971644..89080450d 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.AttributesThreatCognitionModel; import org.vadere.state.psychology.cognition.GroupMembership; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ElapsedTime; @@ -30,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, List attributes, Random random) { this.topography = topography; + this.attributes = new AttributesThreatCognitionModel(); } @Override 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 cdef27411..c965cc85a 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 @@ -41,10 +41,11 @@ public class PerceptionModelBuilder { AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); perceptionModel.setAttributes(attributes); } catch (AttributesNotFoundException e) { - e.printStackTrace(); + //e.printStackTrace(); } + return perceptionModel; } 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 index 0cff0077b..6c1a6bca1 100644 --- 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 @@ -52,7 +52,11 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { ObjectNode psychologyLayer = (ObjectNode) node.at(psychologyLayerKey); if (path(psychologyLayer, keyMissing).isMissingNode()) { - psychologyLayer.put(keyMissing, mapper.createObjectNode()); // add empty node + 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 + "."); } @@ -60,5 +64,12 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { return node; } + private String extracted(ObjectNode psychologyLayer, String key) { + + String path = "org.vadere.state.attributes.models.psychology.Attributes"; + + return path + psychologyLayer.get(key).toString().replace("\"", ""); + } + } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java new file mode 100644 index 000000000..46ea33b80 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesChangeTargetScriptedCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java new file mode 100644 index 000000000..dd3bd3158 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesCooperativeCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java new file mode 100644 index 000000000..e5030fa6a --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesCounterflowCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java new file mode 100644 index 000000000..f73b44017 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesSimpleCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java new file mode 100644 index 000000000..0f0e80727 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesSocialDistancingCognitionModel { +} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java new file mode 100644 index 000000000..b7d715217 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology; + +public class AttributesThreatCognitionModel { +} -- GitLab From d637633e4dfe27b9f1d2fac3ff4b1a94d9e08f15 Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 9 May 2022 15:01:43 +0200 Subject: [PATCH 38/49] moved files --- .../MigrationTests/scenarios/aaa.scenario | 13 +- .../MigrationTests/scenarios/s2.scenario | 281 ------------------ .../scenarios/s2_clone_1.scenario | 274 ----------------- .../ChangeTargetScriptedCognitionModel.java | 2 +- .../models/CooperativeCognitionModel.java | 2 +- .../models/CounterflowCognitionModel.java | 2 +- .../models/ProbabilisticCognitionModel.java | 7 +- .../models/SimpleCognitionModel.java | 2 +- .../SocialDistancingCognitionModel.java | 2 +- .../models/ThreatCognitionModel.java | 2 +- .../helpers/PerceptionModelBuilder.java | 3 +- .../perception/models/IPerceptionModel.java | 2 +- .../models/MultiPerceptionModel.java | 4 +- .../perception/models/PerceptionModel.java | 12 - .../models/SimplePerceptionModel.java | 4 +- .../json/TargetVersionV2_2.java | 3 +- .../ProbabilisticCognitionModelTest.java | 6 +- .../perception/SimplePerceptionModelTest.java | 2 +- .../attributes/AttributesPsychology.java | 3 - .../attributes/AttributesPsychologyLayer.java | 31 +- ...tesChangeTargetScriptedCognitionModel.java | 4 - .../AttributesCooperativeCognitionModel.java | 4 - .../AttributesCounterflowCognitionModel.java | 4 - .../AttributesSimpleCognitionModel.java | 4 - ...ributesSocialDistancingCognitionModel.java | 4 - .../AttributesThreatCognitionModel.java | 4 - ...tesChangeTargetScriptedCognitionModel.java | 4 + .../AttributesCognitionModel.java | 2 +- .../AttributesCooperativeCognitionModel.java | 4 + .../AttributesCounterflowCognitionModel.java | 4 + ...AttributesProbabilisticCognitionModel.java | 4 +- .../AttributesRouteChoiceDefinition.java | 2 +- .../AttributesSimpleCognitionModel.java | 4 + ...ributesSocialDistancingCognitionModel.java | 4 + .../AttributesThreatCognitionModel.java | 4 + .../AttributesMultiPerceptionModel.java | 2 +- .../AttributesPerceptionModel.java | 2 +- .../AttributesSimplePerceptionModel.java | 2 +- 38 files changed, 70 insertions(+), 649 deletions(-) delete mode 100644 Scenarios/MigrationTests/scenarios/s2.scenario delete mode 100644 Scenarios/MigrationTests/scenarios/s2_clone_1.scenario delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java delete mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesChangeTargetScriptedCognitionModel.java rename VadereState/src/org/vadere/state/attributes/models/psychology/{ => cognition}/AttributesCognitionModel.java (64%) create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCooperativeCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCounterflowCognitionModel.java rename VadereState/src/org/vadere/state/attributes/models/psychology/{ => cognition}/AttributesProbabilisticCognitionModel.java (77%) rename VadereState/src/org/vadere/state/attributes/models/psychology/{HelperAttributes => cognition}/AttributesRouteChoiceDefinition.java (93%) create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSimpleCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesThreatCognitionModel.java rename VadereState/src/org/vadere/state/attributes/models/psychology/{ => perception}/AttributesMultiPerceptionModel.java (56%) rename VadereState/src/org/vadere/state/attributes/models/psychology/{ => perception}/AttributesPerceptionModel.java (64%) rename VadereState/src/org/vadere/state/attributes/models/psychology/{ => perception}/AttributesSimplePerceptionModel.java (93%) diff --git a/Scenarios/MigrationTests/scenarios/aaa.scenario b/Scenarios/MigrationTests/scenarios/aaa.scenario index b028990c5..09660a226 100644 --- a/Scenarios/MigrationTests/scenarios/aaa.scenario +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -1,7 +1,8 @@ { "name" : "aaa", "description" : "", - "release" : "2.1", + "release" : "2.2", + "commithash" : "f1e0e42791848a7b13d749ca06536b3d9a29fb42", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,7 +109,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" : { @@ -261,4 +268,4 @@ "reactionProbability" : 1.0 } ] } -} +} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/s2.scenario b/Scenarios/MigrationTests/scenarios/s2.scenario deleted file mode 100644 index 72effb281..000000000 --- a/Scenarios/MigrationTests/scenarios/s2.scenario +++ /dev/null @@ -1,281 +0,0 @@ -{ - "name" : "s2", - "description" : "", - "release" : "2.2", - "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" : { - "attributesModel" : { - "org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel" : { - "priority" : { - "11" : "InformationStimulus", - "21" : "ChangeTargetScripted", - "31" : "ChangeTarget", - "41" : "Threat" - } - }, - "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { - "routeChoices" : [ { - "instruction" : "use target [1]", - "targetIds" : [ 1, 2 ], - "targetProbabilities" : [ 0.0, 1.0 ] - } ] - } - }, - "perception" : "SimplePerceptionModel", - "cognition" : "ProbabilisticCognitionModel" - } - }, - "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" : 0.0, - "endTime" : 10.0, - "repeat" : false, - "waitTimeBetweenRepetition" : 0.0 - }, - "stimuli" : [ { - "type" : "InformationStimulus", - "id" : -1, - "information" : "use target [1]" - } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 - } ] - } -} \ No newline at end of file diff --git a/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario b/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario deleted file mode 100644 index b53d1c80e..000000000 --- a/Scenarios/MigrationTests/scenarios/s2_clone_1.scenario +++ /dev/null @@ -1,274 +0,0 @@ -{ - "name" : "s2_clone_1", - "description" : "", - "release" : "2.2", - "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" : { - "attributesModel" : { - "org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel" : { - "routeChoices" : [ { - "instruction" : "use target [1]", - "targetIds" : [ 1, 2 ], - "targetProbabilities" : [ 0.0, 1.0 ] - } ] - }, - "org.vadere.state.attributes.models.psychology.AttributesMultiPerceptionModel" : { } - }, - "perception" : "MultiPerceptionModel", - "cognition" : "ProbabilisticCognitionModel" - } - }, - "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" : 0.0, - "endTime" : 10.0, - "repeat" : false, - "waitTimeBetweenRepetition" : 0.0 - }, - "stimuli" : [ { - "type" : "InformationStimulus", - "id" : -1, - "information" : "use target [1]" - } ] - } ], - "reactionProbabilities" : [ { - "stimulusId" : -1, - "reactionProbability" : 1.0 - } ] - } -} 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 ca9f145e9..4d3293d51 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,7 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesChangeTargetScriptedCognitionModel; +import org.vadere.state.attributes.models.psychology.cognition.AttributesChangeTargetScriptedCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.ChangeTargetScripted; import org.vadere.state.scenario.Pedestrian; 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 34253b8cb..d6d2707f5 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,7 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesCooperativeCognitionModel; +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; 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 ce9baf5fd..ee2e93cbb 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 @@ -2,7 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesCounterflowCognitionModel; +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; 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 d648b1607..847a16c77 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 @@ -4,20 +4,17 @@ 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.simulator.models.Model; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; -import org.vadere.state.attributes.models.psychology.HelperAttributes.AttributesRouteChoiceDefinition; +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.perception.types.*; import org.vadere.state.scenario.Pedestrian; -import org.vadere.state.scenario.Target; import org.vadere.state.scenario.Topography; import org.vadere.util.logging.Logger; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; public class ProbabilisticCognitionModel extends AProbabilisticModel { 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 bcf8ee28d..9221a3d52 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,7 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesSimpleCognitionModel; +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; 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 c42f0a0e7..6b52ed6f0 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,7 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesSocialDistancingCognitionModel; +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; 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 89080450d..bb42389cc 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 @@ -2,7 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesThreatCognitionModel; +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; 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 c965cc85a..1f67c29b0 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 @@ -5,8 +5,7 @@ import org.vadere.simulator.models.Model; import org.vadere.simulator.projects.ScenarioStore; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.exceptions.AttributesNotFoundException; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.state.scenario.Topography; import org.vadere.util.reflection.DynamicClassInstantiator; 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 cb0af256f..ee51c5ecd 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 @@ -2,7 +2,7 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; +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; 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 709a9b616..6c867c377 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,8 +1,8 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesMultiPerceptionModel; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; +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; 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 71b21a69a..750f7e53d 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,17 +1,5 @@ package org.vadere.simulator.control.psychology.perception.models; -import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; -import org.vadere.state.attributes.scenario.AttributesAgent; -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; -import java.util.List; - 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 42e4011e8..f1146523a 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,8 +1,8 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; -import org.vadere.state.attributes.models.psychology.AttributesSimplePerceptionModel; +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; 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 index 6c1a6bca1..32c03c674 100644 --- 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 @@ -57,6 +57,7 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { attributesNode.put(extracted(psychologyLayer, "cognition"), mapper.createObjectNode()); psychologyLayer.put(keyMissing, attributesNode); // add empty node + } else { throw new MigrationException("Key " + keyMissing + " not allowed under " + psychologyLayerKey + "."); } @@ -66,7 +67,7 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { private String extracted(ObjectNode psychologyLayer, String key) { - String path = "org.vadere.state.attributes.models.psychology.Attributes"; + String path = "org.vadere.state.attributes.models.psychology."+ key +".Attributes"; return path + psychologyLayer.get(key).toString().replace("\"", ""); } 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 17b977afe..0e7d702bf 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 @@ -6,10 +6,9 @@ import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.models.psychology.AttributesProbabilisticCognitionModel; -import org.vadere.state.attributes.models.psychology.HelperAttributes.AttributesRouteChoiceDefinition; +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.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.*; @@ -18,7 +17,6 @@ import org.vadere.state.scenario.Topography; import java.util.*; -import java.util.stream.Collectors; import static org.junit.Assert.*; import static org.mockito.Mockito.mock; 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 f5095f048..b68568981 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java @@ -3,7 +3,7 @@ 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.AttributesSimplePerceptionModel; +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.*; diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java index f48a63e36..d2355d92c 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychology.java @@ -1,9 +1,6 @@ package org.vadere.state.attributes; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; - import java.util.Objects; -import java.util.Random; /** * This class encapsulates psychology-related simulation attributes. diff --git a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java index 76c1e5d88..e56cd72f4 100644 --- a/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java +++ b/VadereState/src/org/vadere/state/attributes/AttributesPsychologyLayer.java @@ -1,11 +1,6 @@ package org.vadere.state.attributes; -import org.vadere.state.attributes.models.psychology.AttributesCognitionModel; -import org.vadere.state.attributes.models.psychology.AttributesPerceptionModel; - import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * This class beautifies the JSON content by mapping @@ -19,21 +14,6 @@ public class AttributesPsychologyLayer { public static final String DEFAULT_COGNITION_MODEL = "SimpleCognitionModel"; - - //public AttributesPerceptionModel perceptionModelAttributes; - //public AttributesCognitionModel cognitionModelAttributes; - - public List getAttributesModel() { - return attributesModel; - } - - public void setAttributesModel(List attributesModel) { - this.attributesModel = attributesModel; - } - - public List attributesModel; - - // Variables // Both should reference to concrete "IPerception" and "ICognition" // implementations! We do not reference them here to avoid cyclic @@ -41,6 +21,8 @@ public class AttributesPsychologyLayer { private String perception; private String cognition; + public List attributesModel; + // Constructors public AttributesPsychologyLayer() { this(DEFAULT_PERCEPTION_MODEL, DEFAULT_COGNITION_MODEL, new ArrayList<>()); @@ -86,5 +68,14 @@ public class AttributesPsychologyLayer { } + public List getAttributesModel() { + return attributesModel; + } + + public void setAttributesModel(List attributesModel) { + this.attributesModel = attributesModel; + } + + } diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java deleted file mode 100644 index 46ea33b80..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesChangeTargetScriptedCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesChangeTargetScriptedCognitionModel { -} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java deleted file mode 100644 index dd3bd3158..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCooperativeCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesCooperativeCognitionModel { -} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java deleted file mode 100644 index e5030fa6a..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCounterflowCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesCounterflowCognitionModel { -} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java deleted file mode 100644 index f73b44017..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimpleCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesSimpleCognitionModel { -} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java deleted file mode 100644 index 0f0e80727..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSocialDistancingCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesSocialDistancingCognitionModel { -} diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java deleted file mode 100644 index b7d715217..000000000 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesThreatCognitionModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.vadere.state.attributes.models.psychology; - -public class AttributesThreatCognitionModel { -} 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 000000000..c6e07f34c --- /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/AttributesCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java similarity index 64% rename from VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java index 94f6f1679..d9b58fcb2 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesCognitionModel.java @@ -1,4 +1,4 @@ -package org.vadere.state.attributes.models.psychology; +package org.vadere.state.attributes.models.psychology.cognition; import org.vadere.state.attributes.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 000000000..9ec602678 --- /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 000000000..de0791dd2 --- /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/AttributesProbabilisticCognitionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java similarity index 77% rename from VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java index 440ce69c1..94ea9b5df 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesProbabilisticCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesProbabilisticCognitionModel.java @@ -1,6 +1,4 @@ -package org.vadere.state.attributes.models.psychology; - -import org.vadere.state.attributes.models.psychology.HelperAttributes.AttributesRouteChoiceDefinition; +package org.vadere.state.attributes.models.psychology.cognition; import java.util.LinkedList; import java.util.List; diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java similarity index 93% rename from VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java index 286b0009f..001ef83e9 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/HelperAttributes/AttributesRouteChoiceDefinition.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesRouteChoiceDefinition.java @@ -1,4 +1,4 @@ -package org.vadere.state.attributes.models.psychology.HelperAttributes; +package org.vadere.state.attributes.models.psychology.cognition; import java.util.LinkedList; 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 000000000..e79022346 --- /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 000000000..dd380148d --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java @@ -0,0 +1,4 @@ +package org.vadere.state.attributes.models.psychology.cognition; + +public class AttributesSocialDistancingCognitionModel extends AttributesCognitionModel { +} 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 000000000..bd782d8db --- /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/AttributesMultiPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java similarity index 56% rename from VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java index 3a62282f1..5c908617e 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesMultiPerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesMultiPerceptionModel.java @@ -1,4 +1,4 @@ -package org.vadere.state.attributes.models.psychology; +package org.vadere.state.attributes.models.psychology.perception; public class AttributesMultiPerceptionModel extends AttributesPerceptionModel { diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java similarity index 64% rename from VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java index a94131ded..7cf330f62 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesPerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesPerceptionModel.java @@ -1,4 +1,4 @@ -package org.vadere.state.attributes.models.psychology; +package org.vadere.state.attributes.models.psychology.perception; import org.vadere.state.attributes.Attributes; diff --git a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java similarity index 93% rename from VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java rename to VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java index 33f374389..41a1a1823 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/AttributesSimplePerceptionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/perception/AttributesSimplePerceptionModel.java @@ -1,4 +1,4 @@ -package org.vadere.state.attributes.models.psychology; +package org.vadere.state.attributes.models.psychology.perception; import org.vadere.state.psychology.perception.types.*; -- GitLab From 599101580e21a2dc5cac1dcf58f3ade2e343155d Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 9 May 2022 16:41:26 +0200 Subject: [PATCH 39/49] WIP make attributes available --- .../MigrationTests/scenarios/aaa.scenario | 35 +++++++++++----- .../SocialDistancingCognitionModel.java | 11 +++++ .../simulator/models/osm/PedestrianOSM.java | 15 ++++++- .../ICombinedPotentialStrategy.java | 1 + .../PedestrianRepulsionStrategy.java | 22 ++++++---- .../AttributesCombinedPotentialStrategy.java | 8 ++++ ...sPedestrianRepulsionPotentialStrategy.java | 41 +++++++++++++++++++ ...ributesSocialDistancingCognitionModel.java | 37 +++++++++++++++++ 8 files changed, 150 insertions(+), 20 deletions(-) create mode 100644 VadereState/src/org/vadere/state/attributes/models/AttributesCombinedPotentialStrategy.java create mode 100644 VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java diff --git a/Scenarios/MigrationTests/scenarios/aaa.scenario b/Scenarios/MigrationTests/scenarios/aaa.scenario index 09660a226..8588365cb 100644 --- a/Scenarios/MigrationTests/scenarios/aaa.scenario +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -2,7 +2,6 @@ "name" : "aaa", "description" : "", "release" : "2.2", - "commithash" : "f1e0e42791848a7b13d749ca06536b3d9a29fb42", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,12 +107,25 @@ "attributesPsychology" : { "usePsychologyLayer" : true, "psychologyLayer" : { - "perception" : "MultiPerceptionModel", - "cognition" : "ProbabilisticCognitionModel", + "perception" : "SimplePerceptionModel", + "cognition" : "SocialDistancingCognitionModel", "attributesModel" : { - "org.vadere.state.attributes.models.psychology.perception.AttributesMultiPerceptionModel" : { }, - "org.vadere.state.attributes.models.psychology.cognition.AttributesProbabilisticCognitionModel" : { - "routeChoices" : [ ] + "org.vadere.state.attributes.models.psychology.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.2345, + "repulsionIntercept" : 0.5555, + "minDistance" : 1.25, + "maxDistance" : 2.0 } } } @@ -252,19 +264,20 @@ }, "stimulusInfos" : [ { "timeframe" : { - "startTime" : 0.0, + "startTime" : 1.0, "endTime" : 10.0, "repeat" : false, "waitTimeBetweenRepetition" : 0.0 }, "stimuli" : [ { - "type" : "InformationStimulus", - "id" : -1, - "information" : "use target [1]" + "type" : "DistanceRecommendation", + "id" : 1, + "socialDistance" : 1.5, + "cloggingTimeAllowedInSecs" : 5.0 } ] } ], "reactionProbabilities" : [ { - "stimulusId" : -1, + "stimulusId" : 1, "reactionProbability" : 1.0 } ] } 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 6b52ed6f0..6193967f8 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,6 +1,9 @@ package org.vadere.simulator.control.psychology.cognition.models; +import org.vadere.simulator.models.osm.PedestrianOSM; +import org.vadere.simulator.models.potential.combinedPotentials.PedestrianRepulsionStrategy; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.AttributesPedestrianRepulsionPotentialStrategy; import org.vadere.state.attributes.models.psychology.cognition.AttributesSocialDistancingCognitionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.DistanceRecommendation; @@ -45,6 +48,14 @@ 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.setMaxDistance(this.attributes.getMaxDistance()); + attr.setMinDistance(this.attributes.getMinDistance()); + attr.setRepulsionIntercept(this.attributes.getRepulsionIntercept()); + attr.setRepulsionFactor(this.attributes.getRepulsionFactor()); + ped.setCombinedPotentialStrategyAttributes(attr); } } } diff --git a/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java b/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java index f491bebde..e253c94eb 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 ee802dbe5..84fdeacd4 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 f372f4dcf..a49832225 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java +++ b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java @@ -5,6 +5,7 @@ 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; @@ -25,11 +26,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 +77,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 +86,8 @@ 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; + //TODO repulsion + return getAttributes().getRepulsionFactor() *socialDistance - getAttributes().getRepulsionIntercept(); } /** @@ -92,10 +100,10 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { private boolean isSocialDistanceInRange(double socialDistance) { // additional check (already checked in ScenarioChecker!) - return (socialDistance >= 1.25 && socialDistance <= 2.0); + return (socialDistance >= getAttributes().getMinDistance() && socialDistance <= getAttributes().getMaxDistance()); } - - - + public AttributesPedestrianRepulsionPotentialStrategy getAttributes() { + return attributes; + } } 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 000000000..3914ad424 --- /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/AttributesPedestrianRepulsionPotentialStrategy.java b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java new file mode 100644 index 000000000..2dd4fe381 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java @@ -0,0 +1,41 @@ +package org.vadere.state.attributes.models; + +public class AttributesPedestrianRepulsionPotentialStrategy extends AttributesCombinedPotentialStrategy { + + private double repulsionFactor = 1.6444; + private double repulsionIntercept = 0.4845; + private double minDistance = 1.25; + private double maxDistance = 2.0; + + public double getMaxDistance() { + return maxDistance; + } + + public void setMaxDistance(double maxDistance) { + this.maxDistance = maxDistance; + } + + 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 getRepulsionFactor() { + return repulsionFactor; + } + + public void setRepulsionFactor(double repulsionFactor) { + this.repulsionFactor = repulsionFactor; + } +} 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 index dd380148d..11b15b83e 100644 --- a/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java +++ b/VadereState/src/org/vadere/state/attributes/models/psychology/cognition/AttributesSocialDistancingCognitionModel.java @@ -1,4 +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; + } } -- GitLab From e02589bfa2139670ad3a9e117d29ba64689d65ad Mon Sep 17 00:00:00 2001 From: Christina Date: Mon, 9 May 2022 16:56:22 +0200 Subject: [PATCH 40/49] add getters and setters to cognitionmodel --- .../cognition/helpers/CognitionModelBuilder.java | 8 ++++++++ .../models/ChangeTargetScriptedCognitionModel.java | 12 ++++++++++++ .../cognition/models/CooperativeCognitionModel.java | 12 ++++++++++++ .../cognition/models/CounterflowCognitionModel.java | 13 +++++++++++++ .../cognition/models/ICognitionModel.java | 6 ++++++ .../models/ProbabilisticCognitionModel.java | 10 ++++++++++ .../cognition/models/SimpleCognitionModel.java | 11 +++++++++++ .../models/SocialDistancingCognitionModel.java | 12 ++++++++++++ .../cognition/models/ThreatCognitionModel.java | 11 +++++++++++ .../perception/helpers/PerceptionModelBuilder.java | 8 ++------ 10 files changed, 97 insertions(+), 6 deletions(-) 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 50c830ab9..cb5cdc0f4 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,8 +1,11 @@ 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.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.util.reflection.DynamicClassInstantiator; import java.util.List; @@ -32,6 +35,11 @@ public class CognitionModelBuilder { Random random = new Random(scenarioStore.getAttributesSimulation().getSimulationSeed()); cognitionModel.initialize(scenarioStore.getTopography(), attributes, 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 4d3293d51..5f0e64824 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; 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; @@ -46,6 +47,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 d6d2707f5..e0667bb2a 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +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; @@ -43,6 +44,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 ee2e93cbb..c3db50da2 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; +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; @@ -49,4 +50,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 5db86392a..bd1010331 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 @@ -2,6 +2,8 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.models.Model; import org.vadere.state.attributes.Attributes; +import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; +import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.state.psychology.cognition.SelfCategory; import org.vadere.state.psychology.perception.types.Threat; import org.vadere.state.scenario.Pedestrian; @@ -54,4 +56,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 847a16c77..0974d89fd 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 @@ -5,6 +5,7 @@ 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.Attributes; +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; @@ -21,6 +22,15 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private static Logger logger = Logger.getLogger(ProbabilisticCognitionModel.class); private RandomGenerator rng; + + public AttributesProbabilisticCognitionModel getAttributes() { + return attributesProbabilisticCognitionModel; + } + + public void setAttributes(AttributesCognitionModel attributesProbabilisticCognitionModel) { + this.attributesProbabilisticCognitionModel = (AttributesProbabilisticCognitionModel) attributesProbabilisticCognitionModel; + } + private AttributesProbabilisticCognitionModel attributesProbabilisticCognitionModel; private Topography topography; 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 9221a3d52..3876c9731 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,6 +1,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.state.attributes.Attributes; +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.*; @@ -51,4 +52,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 6193967f8..5cbb16183 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 @@ -4,6 +4,7 @@ import org.vadere.simulator.models.osm.PedestrianOSM; import org.vadere.simulator.models.potential.combinedPotentials.PedestrianRepulsionStrategy; import org.vadere.state.attributes.Attributes; 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; @@ -60,6 +61,17 @@ public class SocialDistancingCognitionModel implements ICognitionModel { } } + @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 bb42389cc..7bfa33c97 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 @@ -2,6 +2,7 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; import org.vadere.state.attributes.Attributes; +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; @@ -53,6 +54,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/helpers/PerceptionModelBuilder.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/helpers/PerceptionModelBuilder.java index 1f67c29b0..ee0bc981d 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 @@ -36,12 +36,8 @@ public class PerceptionModelBuilder { perceptionModel.initialize(topography, simTimeStepLength, attributesList); - try { - AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); - perceptionModel.setAttributes(attributes); - } catch (AttributesNotFoundException e) { - //e.printStackTrace(); - } + AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); + perceptionModel.setAttributes(attributes); -- GitLab From 50023e33bb0a15810f2527a622638fce631c69fc Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 11:21:41 +0200 Subject: [PATCH 41/49] old version --- .../MigrationTests/scenarios/aaa.scenario | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/Scenarios/MigrationTests/scenarios/aaa.scenario b/Scenarios/MigrationTests/scenarios/aaa.scenario index 8588365cb..8ba6f7905 100644 --- a/Scenarios/MigrationTests/scenarios/aaa.scenario +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -1,7 +1,7 @@ { "name" : "aaa", "description" : "", - "release" : "2.2", + "release" : "2.1", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,26 +108,7 @@ "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.2345, - "repulsionIntercept" : 0.5555, - "minDistance" : 1.25, - "maxDistance" : 2.0 - } - } + "cognition" : "SocialDistancingCognitionModel" } }, "topography" : { @@ -281,4 +262,4 @@ "reactionProbability" : 1.0 } ] } -} \ No newline at end of file +} -- GitLab From 1e0301564a2188978451b4e4072a1c0db55e5c29 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 15:13:31 +0200 Subject: [PATCH 42/49] update migration --- .../json/TargetVersionV2_2.java | 33 +++++++++++++++++++ .../perception/json/StimulusInfoStore.java | 13 +------- .../psychology/perception/types/Stimulus.java | 2 +- 3 files changed, 35 insertions(+), 13 deletions(-) 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 index 32c03c674..c9fa2c580 100644 --- 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 @@ -1,6 +1,7 @@ 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; @@ -24,9 +25,40 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { 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 stimulusInfos = "/scenario/stimulusInfos"; + + ArrayNode psychologyLayer = (ArrayNode) node.at(stimulusInfos); + + 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"; @@ -73,4 +105,5 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { } + } 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 94690328d..503040fb9 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); @@ -85,9 +76,7 @@ public class StimulusInfoStore { 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. ObjectMapper mapper = new JacksonObjectMapper(); 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 65c15d104..1fadb0a30 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java +++ b/VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java @@ -43,7 +43,7 @@ import java.util.List; }) // "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 -- GitLab From 0adbde61299064d3c5e88e0e5f82de4c0c5188e6 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 15:33:53 +0200 Subject: [PATCH 43/49] remove reactionProbs from files --- .../commandHandler/VadereCommandHandler.java | 2 -- .../perception/StimulusController.java | 33 +------------------ .../json/TargetVersionV1_16.java | 26 ++++++++------- .../json/TargetVersionV2_2.java | 2 +- .../perception/StimulusControllerTest.java | 5 --- .../perception/json/StimulusInfoStore.java | 2 +- .../presettings/StimulusPresettings.java | 1 - .../vadere/state/util/StateJsonConverter.java | 8 ----- 8 files changed, 18 insertions(+), 61 deletions(-) diff --git a/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java b/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java index bc02d5a09..7507090a3 100644 --- a/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java +++ b/VadereManager/src/org/vadere/manager/traci/commandHandler/VadereCommandHandler.java @@ -137,8 +137,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/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java index 3f7f7685e..c533c4124 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java +++ b/VadereSimulator/src/org/vadere/simulator/control/psychology/perception/StimulusController.java @@ -28,8 +28,6 @@ public class StimulusController { private List recurringStimuli; - - private HashMap reactionProbabilities; private HashMap> pedSpecificStimuli; @@ -44,7 +42,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 +54,6 @@ public class StimulusController { } public List getOneTimeStimuli() { return oneTimeStimuli; } public List getRecurringStimuli() { return recurringStimuli; } - public HashMap getReactionProbabilities() { return reactionProbabilities; } // Setters @@ -66,10 +62,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 +80,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 +204,6 @@ public class StimulusController { public void setPedSpecificDynamicStimulus(Pedestrian ped, StimulusInfo stimulusInfo){ - setReactionProbability(stimulusInfo.getStimuli()); List stimulusInfos = new ArrayList<>(); if (pedSpecificStimuli.containsKey(ped)) { @@ -354,15 +332,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/projects/migration/jsontranformation/json/TargetVersionV1_16.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_16.java index 1a83731af..ed2c7d2ba 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 @@ -4,6 +4,7 @@ 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.json.JSONArray; import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; import org.vadere.simulator.projects.migration.MigrationException; import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; @@ -24,6 +25,9 @@ import static org.vadere.state.util.StateJsonConverter.serializeStimuliToNode; @MigrationTransformation(targetVersionLabel = "1.16") public class TargetVersionV1_16 extends SimpleJsonTransformation { + JacksonObjectMapper mapper = new JacksonObjectMapper(); + + public TargetVersionV1_16(){ super(Version.V1_16); } @@ -43,23 +47,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 +78,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 index c9fa2c580..089d10e7e 100644 --- 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 @@ -38,7 +38,7 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { if (!path(scenarioNode, key).isMissingNode()) { ((ObjectNode) scenarioNode).remove(key); } - + return node; } 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 edd7abab4..262588a11 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java @@ -60,7 +60,6 @@ public class StimulusControllerTest { StimulusInfoStore stimulusInfoStore = new StimulusInfoStore(); stimulusInfoStore.setStimulusInfos(stimulusInfos); - stimulusInfoStore.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); return stimulusInfoStore; } @@ -68,7 +67,6 @@ public class StimulusControllerTest { private StimulusInfoStore getStimulusInfoStore(List stimulusList){ StimulusInfoStore store = new StimulusInfoStore(); store.setStimulusInfos(stimulusList); - store.setReactionProbabilities(Collections.singletonList(new ReactionProbability())); return store; } @@ -477,7 +475,6 @@ public class StimulusControllerTest { // 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(); @@ -511,7 +508,6 @@ public class StimulusControllerTest { // 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) @@ -640,7 +636,6 @@ public class StimulusControllerTest { ); StimulusInfoStore store = getStimulusInfoStore(Collections.singletonList((stimulusInfo1))); - store.setReactionProbabilities(Collections.singletonList(new ReactionProbability(expectedProbVal))); StimulusController stimulusController = new StimulusController(getScenarioStore(store)); List stimuli = stimulusController.getStimuliForTime(time); 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 503040fb9..7af09081d 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java +++ b/VadereState/src/org/vadere/state/psychology/perception/json/StimulusInfoStore.java @@ -76,7 +76,7 @@ public class StimulusInfoStore { StimulusInfoStore stimulusInfoStore = new StimulusInfoStore(); stimulusInfoStore.setStimulusInfos(stimulusInfos); - + // Use annotations at stimulus classes to specify how JSON <-> Java mapping should look like. // "VShape" are mapped by "JacksonObjectMapper" implementation. ObjectMapper mapper = new JacksonObjectMapper(); 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 b0169df8a..9b7fa277b 100644 --- a/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java +++ b/VadereState/src/org/vadere/state/psychology/perception/presettings/StimulusPresettings.java @@ -50,7 +50,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/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 2d822d56d..8f9ca56d6 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -221,14 +221,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; -- GitLab From 41d116387e4c5a94febdbeb7300f8058ddb3ccce Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 15:44:44 +0200 Subject: [PATCH 44/49] update migration --- .../migration/jsontranformation/json/TargetVersionV2_2.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 089d10e7e..2b2aa2dba 100644 --- 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 @@ -38,7 +38,7 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { if (!path(scenarioNode, key).isMissingNode()) { ((ObjectNode) scenarioNode).remove(key); } - + return node; } @@ -100,7 +100,6 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { private String extracted(ObjectNode psychologyLayer, String key) { String path = "org.vadere.state.attributes.models.psychology."+ key +".Attributes"; - return path + psychologyLayer.get(key).toString().replace("\"", ""); } -- GitLab From 0d47c6c96fa7d1ac93e472b73684293ca92a7222 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 16:35:14 +0200 Subject: [PATCH 45/49] clean interface --- .../helpers/CognitionModelBuilder.java | 3 +- .../ChangeTargetScriptedCognitionModel.java | 3 +- .../models/CooperativeCognitionModel.java | 4 +- .../models/CounterflowCognitionModel.java | 4 +- .../cognition/models/ICognitionModel.java | 5 +- .../models/ProbabilisticCognitionModel.java | 6 +- .../models/SimpleCognitionModel.java | 4 +- .../SocialDistancingCognitionModel.java | 13 ++- .../models/ThreatCognitionModel.java | 3 +- .../helpers/PerceptionModelBuilder.java | 3 +- .../perception/models/IPerceptionModel.java | 3 +- .../models/MultiPerceptionModel.java | 3 +- .../models/SimplePerceptionModel.java | 3 +- .../PedestrianRepulsionStrategy.java | 8 +- .../json/TargetVersionV2_2.java | 17 ++-- .../CounterflowCognitionModelTest.java | 10 +-- .../cognition/SimpleCognitionModelTest.java | 2 +- .../models/CooperativeCognitionModelTest.java | 2 +- .../ProbabilisticCognitionModelTest.java | 6 +- .../models/ThreatCognitionModelTest.java | 18 ++-- .../perception/SimplePerceptionModelTest.java | 12 +-- .../perception/StimulusControllerTest.java | 85 ------------------- ...sPedestrianRepulsionPotentialStrategy.java | 51 ++++++----- 23 files changed, 89 insertions(+), 179 deletions(-) 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 cb5cdc0f4..cf538516c 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 @@ -5,7 +5,6 @@ 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.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.util.reflection.DynamicClassInstantiator; import java.util.List; @@ -33,7 +32,7 @@ public class CognitionModelBuilder { List attributes = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); Random random = new Random(scenarioStore.getAttributesSimulation().getSimulationSeed()); - cognitionModel.initialize(scenarioStore.getTopography(), attributes, random); + cognitionModel.initialize(scenarioStore.getTopography(), random); List attributesList = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); 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 5f0e64824..46bbaed09 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,6 +1,5 @@ package org.vadere.simulator.control.psychology.cognition.models; -import org.vadere.state.attributes.Attributes; 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; @@ -27,7 +26,7 @@ public class ChangeTargetScriptedCognitionModel implements ICognitionModel { private AttributesChangeTargetScriptedCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.topography = topography; this.attributes = new AttributesChangeTargetScriptedCognitionModel(); } 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 e0667bb2a..d6eb8100d 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,6 +1,5 @@ package org.vadere.simulator.control.psychology.cognition.models; -import org.vadere.state.attributes.Attributes; 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; @@ -9,7 +8,6 @@ import org.vadere.state.scenario.Topography; import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; -import java.util.List; import java.util.Random; /** @@ -27,7 +25,7 @@ public class CooperativeCognitionModel implements ICognitionModel { private AttributesCooperativeCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.topography = topography; this.attributes = new AttributesCooperativeCognitionModel(); } 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 c3db50da2..6c24c87b8 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,7 +1,6 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; -import org.vadere.state.attributes.Attributes; 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; @@ -9,7 +8,6 @@ import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.Collection; -import java.util.List; import java.util.Random; /** @@ -26,7 +24,7 @@ public class CounterflowCognitionModel implements ICognitionModel { private AttributesCounterflowCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.topography = topography; this.attributes = new AttributesCounterflowCognitionModel(); } 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 bd1010331..b38a6ca6b 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,16 +1,13 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.models.Model; -import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.models.psychology.cognition.AttributesCognitionModel; -import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; 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.List; import java.util.Random; /** @@ -43,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, List attributes, Random random); + void initialize(Topography topography, Random random); /** * Usually, this method iterates over the pededestrians and calls 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 0974d89fd..595aeac22 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 @@ -4,7 +4,6 @@ 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.Attributes; 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; @@ -35,7 +34,7 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { private Topography topography; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.rng = new JDKRandomGenerator(random.nextInt()); this.attributesProbabilisticCognitionModel = new AttributesProbabilisticCognitionModel(); this.topography = topography; @@ -79,7 +78,6 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { } } - public AttributesRouteChoiceDefinition getFilteredAttributes(String information) { List routeChoices = attributesProbabilisticCognitionModel.getRouteChoices(); @@ -98,7 +96,7 @@ public class ProbabilisticCognitionModel extends AProbabilisticModel { } - private LinkedList getNewTarget(LinkedList targetIdList, LinkedList targetProbabilityList) { + public LinkedList getNewTarget(LinkedList targetIdList, LinkedList targetProbabilityList) { int[] targetIds = targetIdList.stream().mapToInt(i -> i).toArray(); double[] targetProbabilities = targetProbabilityList.stream().mapToDouble(i -> i).toArray(); 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 3876c9731..5e142de0b 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,6 +1,5 @@ package org.vadere.simulator.control.psychology.cognition.models; -import org.vadere.state.attributes.Attributes; 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; @@ -9,7 +8,6 @@ import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Topography; import java.util.Collection; -import java.util.List; import java.util.Random; /** @@ -22,7 +20,7 @@ public class SimpleCognitionModel implements ICognitionModel { private AttributesSimpleCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.topography = topography; this.attributes = new AttributesSimpleCognitionModel(); } 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 5cbb16183..e948d6d20 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,8 +1,6 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.models.osm.PedestrianOSM; -import org.vadere.simulator.models.potential.combinedPotentials.PedestrianRepulsionStrategy; -import org.vadere.state.attributes.Attributes; 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; @@ -17,7 +15,6 @@ import org.vadere.state.simulation.FootstepHistory; import java.util.Collection; import java.util.HashMap; -import java.util.List; import java.util.Random; /** @@ -35,7 +32,7 @@ public class SocialDistancingCognitionModel implements ICognitionModel { private AttributesSocialDistancingCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.attributes = new AttributesSocialDistancingCognitionModel(); } @@ -52,10 +49,10 @@ public class SocialDistancingCognitionModel implements ICognitionModel { PedestrianOSM ped = (PedestrianOSM) pedestrian; AttributesPedestrianRepulsionPotentialStrategy attr = new AttributesPedestrianRepulsionPotentialStrategy(); - attr.setMaxDistance(this.attributes.getMaxDistance()); - attr.setMinDistance(this.attributes.getMinDistance()); - attr.setRepulsionIntercept(this.attributes.getRepulsionIntercept()); - attr.setRepulsionFactor(this.attributes.getRepulsionFactor()); + attr.setSocialDistanceUpperBound(this.attributes.getMaxDistance()); + attr.setSocialDistanceLowerBound(this.attributes.getMinDistance()); + attr.setPersonalSpaceWidthIntercept(this.attributes.getRepulsionIntercept()); + attr.setPersonalSpaceWidthFactor(this.attributes.getRepulsionFactor()); ped.setCombinedPotentialStrategyAttributes(attr); } } 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 7bfa33c97..4cb697910 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,7 +1,6 @@ package org.vadere.simulator.control.psychology.cognition.models; import org.vadere.simulator.utils.topography.TopographyHelper; -import org.vadere.state.attributes.Attributes; 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; @@ -35,7 +34,7 @@ public class ThreatCognitionModel implements ICognitionModel { private AttributesThreatCognitionModel attributes; @Override - public void initialize(Topography topography, List attributes, Random random) { + public void initialize(Topography topography, Random random) { this.topography = topography; this.attributes = new AttributesThreatCognitionModel(); } 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 ee0bc981d..e50990594 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 @@ -4,7 +4,6 @@ import org.vadere.simulator.control.psychology.perception.models.IPerceptionMode import org.vadere.simulator.models.Model; import org.vadere.simulator.projects.ScenarioStore; import org.vadere.state.attributes.Attributes; -import org.vadere.state.attributes.exceptions.AttributesNotFoundException; import org.vadere.state.attributes.models.psychology.perception.AttributesPerceptionModel; import org.vadere.state.scenario.Topography; import org.vadere.util.reflection.DynamicClassInstantiator; @@ -34,7 +33,7 @@ public class PerceptionModelBuilder { double simTimeStepLength = scenarioStore.getAttributesSimulation().getSimTimeStepLength(); List attributesList = scenarioStore.getAttributesPsychology().getPsychologyLayer().getAttributesModel(); - perceptionModel.initialize(topography, simTimeStepLength, attributesList); + perceptionModel.initialize(topography, simTimeStepLength); AttributesPerceptionModel attributes = Model.findAttributes(attributesList, perceptionModel.getAttributes().getClass()); perceptionModel.setAttributes(attributes); 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 ee51c5ecd..a09f7027d 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,7 +1,6 @@ package org.vadere.simulator.control.psychology.perception.models; import org.vadere.simulator.models.Model; -import org.vadere.state.attributes.Attributes; 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; @@ -33,7 +32,7 @@ public interface IPerceptionModel { * a model can acquire additional information about a pedestrian's surrounding * when evaluating pedestrian's perception. */ - void initialize(Topography topography, final double simTimeStepLengh, List attributesList); + void initialize(Topography topography, final double simTimeStepLengh); /** 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 6c867c377..20d496f0e 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,6 +1,5 @@ package org.vadere.simulator.control.psychology.perception.models; -import org.vadere.state.attributes.Attributes; 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.*; @@ -22,7 +21,7 @@ public class MultiPerceptionModel extends PerceptionModel { @Override - public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { + public void initialize(Topography topography, final double simTimeStepLengh) { this.topography = topography; this.attributes = new AttributesMultiPerceptionModel(); 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 f1146523a..de375c6c9 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,6 +1,5 @@ package org.vadere.simulator.control.psychology.perception.models; -import org.vadere.state.attributes.Attributes; 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.*; @@ -21,7 +20,7 @@ public class SimplePerceptionModel extends PerceptionModel { private Topography topography; @Override - public void initialize(Topography topography, final double simTimeStepLengh, List attributesList) { + public void initialize(Topography topography, final double simTimeStepLengh) { this.topography = topography; this.attributes = new AttributesSimplePerceptionModel(); } 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 a49832225..1f90ea7f0 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java +++ b/VadereSimulator/src/org/vadere/simulator/models/potential/combinedPotentials/PedestrianRepulsionStrategy.java @@ -11,7 +11,6 @@ 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; /** @@ -86,8 +85,7 @@ public class PedestrianRepulsionStrategy implements ICombinedPotentialStrategy { * We use a fixed corridor width c=2 in this implementation. * **/ private double getPersonalSpaceFromSocialDistance(double socialDistance) { - //TODO repulsion - return getAttributes().getRepulsionFactor() *socialDistance - getAttributes().getRepulsionIntercept(); + return getAttributes().getPersonalSpaceWidthFactor() *socialDistance - getAttributes().getPersonalSpaceWidthIntercept(); } /** @@ -95,12 +93,12 @@ 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 >= getAttributes().getMinDistance() && socialDistance <= getAttributes().getMaxDistance()); + return (socialDistance >= getAttributes().getSocialDistanceLowerBound() && socialDistance <= getAttributes().getSocialDistanceUpperBound()); } public AttributesPedestrianRepulsionPotentialStrategy getAttributes() { 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 index 2b2aa2dba..749bee8d6 100644 --- 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 @@ -44,15 +44,20 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { private JsonNode removeStimulusIds(JsonNode node) { - String stimulusInfos = "/scenario/stimulusInfos"; + String key = "stimulusInfos"; + JsonNode scenarioNode = node.get("scenario"); + + if (!path(scenarioNode, "stimulusInfos").isMissingNode()) { - ArrayNode psychologyLayer = (ArrayNode) node.at(stimulusInfos); + ArrayNode psychologyLayer = (ArrayNode) scenarioNode.get(key); - for (JsonNode entry : psychologyLayer){ - ArrayNode stimuli = (ArrayNode) entry.get("stimuli"); - for (JsonNode stimulus : stimuli){ - ((ObjectNode) stimulus).remove("id"); + for (JsonNode entry : psychologyLayer){ + ArrayNode stimuli = (ArrayNode) entry.get("stimuli"); + for (JsonNode stimulus : stimuli){ + ((ObjectNode) stimulus).remove("id"); + } } + } return node; 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 184998fe7..aebbecda3 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/CounterflowCognitionModelTest.java @@ -91,7 +91,7 @@ public class CounterflowCognitionModelTest { Topography topography = createTopography(pedestrians); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes, new Random(0)); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -112,7 +112,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes, new Random(0)); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -133,7 +133,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(0.5,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes, new Random(0)); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -153,7 +153,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes, new Random(0)); + counterflowCognitionModel.initialize(topography, new Random(0)); counterflowCognitionModel.update(pedestrians); @@ -174,7 +174,7 @@ public class CounterflowCognitionModelTest { movePedestrian(pedestrians.get(1), new VPoint(2,0), topography); CounterflowCognitionModel counterflowCognitionModel = new CounterflowCognitionModel(); - counterflowCognitionModel.initialize(topography, attributes, new Random(0)); + 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 2db9fa67d..c36abd2e3 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/cognition/SimpleCognitionModelTest.java @@ -51,7 +51,7 @@ public class SimpleCognitionModelTest { } SimpleCognitionModel simpleCognitionModel = new SimpleCognitionModel(); - simpleCognitionModel.initialize(createTopography(), attributes, new Random(0)); + 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 f0278015e..304a39f98 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 @@ -44,7 +44,7 @@ public class CooperativeCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography(), attributes, new Random(0)); + 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 0e7d702bf..992c90182 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 @@ -125,7 +125,8 @@ public class ProbabilisticCognitionModelTest { pedestrians.stream().forEach(ped -> ped.setMostImportantStimulus(new InformationStimulus("A"))); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); + probabilisticPerceptionModel.initialize(topography, new Random(0)); + probabilisticPerceptionModel.setAttributes(attr); @@ -149,7 +150,8 @@ public class ProbabilisticCognitionModelTest { List pedestrians = createPedestrians(1); ProbabilisticCognitionModel probabilisticPerceptionModel = new ProbabilisticCognitionModel(); - probabilisticPerceptionModel.initialize(topography, attributes, new Random(0)); + probabilisticPerceptionModel.initialize(topography, new Random(0)); + probabilisticPerceptionModel.setAttributes(this.attributesProbabilisticCognitionModel); pedestrians.stream().forEach(ped -> ped.setMostImportantStimulus(new InformationStimulus("A"))); 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 c08ea30cc..67e06ec09 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 @@ -70,7 +70,7 @@ public class ThreatCognitionModelTest { privateTopographyField.setAccessible(true); assertNull(privateTopographyField.get(modelUnderTest)); - modelUnderTest.initialize(new Topography(), attributes, new Random(0)); + modelUnderTest.initialize(new Topography(), new Random(0)); assertNotNull(privateTopographyField.get(modelUnderTest)); } catch (IllegalAccessException ex) { @@ -95,7 +95,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -111,7 +111,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -129,7 +129,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -151,7 +151,7 @@ public class ThreatCognitionModelTest { initializeTopography(); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); Threat threatStimulus = new Threat(); pedestrian.setMostImportantStimulus(threatStimulus); @@ -179,7 +179,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); modelUnderTest.update(pedestrians); @@ -205,7 +205,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); // The "Threat" stimulus is processed for the first time. // Subsequent stimuli will be "ElapsedTime". @@ -233,7 +233,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + modelUnderTest.initialize(topography, new Random(0)); pedestrian.setSelfCategory(SelfCategory.WAIT); modelUnderTest.update(pedestrians); @@ -276,7 +276,7 @@ public class ThreatCognitionModelTest { topography.addElement(pedestrian); ThreatCognitionModel modelUnderTest = new ThreatCognitionModel(); - modelUnderTest.initialize(topography, attributes, new Random(0)); + 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 b68568981..abec1a8f4 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/SimplePerceptionModelTest.java @@ -88,7 +88,7 @@ public class SimplePerceptionModelTest { List stimuli = createElapsedTimeStimuli(1); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography,0, attributesList); + simplePerceptionModel.initialize(topography,0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -110,7 +110,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0, attributesList); + simplePerceptionModel.initialize(topography, 0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -132,7 +132,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0, attributesList); + simplePerceptionModel.initialize(topography, 0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -158,7 +158,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0, attributesList); + simplePerceptionModel.initialize(topography, 0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -180,7 +180,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography,0, attributesList); + simplePerceptionModel.initialize(topography,0); pedestrians.forEach(pedestrian -> assertNull(pedestrian.getMostImportantStimulus())); @@ -205,7 +205,7 @@ public class SimplePerceptionModelTest { stimuli.add(expectedStimulus); SimplePerceptionModel simplePerceptionModel = new SimplePerceptionModel(); - simplePerceptionModel.initialize(topography, 0, attributesList); + 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 262588a11..8b70e1b69 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java @@ -457,70 +457,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)))); - - 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.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(){ @@ -625,27 +561,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))); - 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/models/AttributesPedestrianRepulsionPotentialStrategy.java b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java index 2dd4fe381..5534e344d 100644 --- a/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java +++ b/VadereState/src/org/vadere/state/attributes/models/AttributesPedestrianRepulsionPotentialStrategy.java @@ -2,40 +2,51 @@ package org.vadere.state.attributes.models; public class AttributesPedestrianRepulsionPotentialStrategy extends AttributesCombinedPotentialStrategy { - private double repulsionFactor = 1.6444; - private double repulsionIntercept = 0.4845; - private double minDistance = 1.25; - private double maxDistance = 2.0; + /* Parameter values, see Mayr, Koester: Social distancing with the Optimal Steps Model*/ - public double getMaxDistance() { - return maxDistance; + 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 setMaxDistance(double maxDistance) { - this.maxDistance = maxDistance; + public void setPersonalSpaceWidthIntercept(double personalSpaceWidthIntercept) { + this.personalSpaceWidthIntercept = personalSpaceWidthIntercept; } - public double getRepulsionIntercept() { - return repulsionIntercept; + public double getSocialDistanceLowerBound() { + return socialDistanceLowerBound; } - public void setRepulsionIntercept(double repulsionIntercept) { - this.repulsionIntercept = repulsionIntercept; + public void setSocialDistanceLowerBound(double socialDistanceLowerBound) { + this.socialDistanceLowerBound = socialDistanceLowerBound; } - public double getMinDistance() { - return minDistance; + public double getPersonalSpaceWidthFactor() { + return personalSpaceWidthFactor; } - public void setMinDistance(double minDistance) { - this.minDistance = minDistance; + public void setPersonalSpaceWidthFactor(double personalSpaceWidthFactor) { + this.personalSpaceWidthFactor = personalSpaceWidthFactor; } - public double getRepulsionFactor() { - return repulsionFactor; + public double getPersonalSpaceStrength() { + return personalSpaceStrength; } - public void setRepulsionFactor(double repulsionFactor) { - this.repulsionFactor = repulsionFactor; + public void setPersonalSpaceStrength(double personalSpaceStrength) { + this.personalSpaceStrength = personalSpaceStrength; } } -- GitLab From af7a3ef52d293a808945bd11357de59e4afce058 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 17:54:03 +0200 Subject: [PATCH 46/49] add warning --- .../projects/migration/incident/helper/MigrationUtil.java | 5 +++++ 1 file changed, 5 insertions(+) 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 30b80e65e..91f02ffdc 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,6 +142,11 @@ public class MigrationUtil { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) { boolean hasTreeMarker = treeMarker.stream().anyMatch(m -> dir.resolve(m).toFile().exists()); + + if (dir.toString().contains(IOUtils.LEGACY_DIR)){ + throw new RuntimeException("Skip directory: " + dir); + } + if (ignoreDirs.contains(dir.getFileName().toString())) { // skip ignored directories-trees. return FileVisitResult.SKIP_SUBTREE; } else if (hasTreeMarker) { // skip directory tree if treeMarker is present. -- GitLab From d9d2b99fc786eb7cd6932d373880911fde7d8471 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 10 May 2022 18:07:10 +0200 Subject: [PATCH 47/49] throw error if legacy folder exists --- .../migration/incident/helper/MigrationUtil.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 91f02ffdc..f5c5252ac 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 @@ -143,13 +143,14 @@ public class MigrationUtil { boolean hasTreeMarker = treeMarker.stream().anyMatch(m -> dir.resolve(m).toFile().exists()); - if (dir.toString().contains(IOUtils.LEGACY_DIR)){ - throw new RuntimeException("Skip directory: " + dir); - } - 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; } -- GitLab From 40aa10b5012170eff14567428d0182ed7980b2c0 Mon Sep 17 00:00:00 2001 From: Christina Date: Wed, 11 May 2022 10:00:44 +0200 Subject: [PATCH 48/49] migrate scenarios --- .../examples/scenarios/bottleneckA.scenario | 23 +++++++++++--- .../examples/scenarios/bottleneckB.scenario | 23 +++++++++++--- .../bottleneckB_socialDistancing.scenario | 23 +++++++++++--- .../examples/scenarios/closeContact.scenario | 23 +++++++++++--- .../examples/scenarios/passageway.scenario | 23 +++++++++++--- .../examples/scenarios/queue.scenario | 23 +++++++++++--- ...hamner-2020-life_postvis_template.scenario | 23 +++++++++++--- .../hamner-2020-life_template.scenario | 23 +++++++++++--- .../scenarios/lu-2020-life.scenario | 23 +++++++++++--- .../miller-2020-life_template.scenario | 23 +++++++++++--- .../01-Kaiserslautern-Gro\303\237.scenario" | 23 +++++++++++--- .../02-Kaiserslautern-Mittel.scenario | 23 +++++++++++--- .../03-Kaiserslautern-Klein.scenario | 23 +++++++++++--- .../scenarios/RichardWagnerStrasse.scenario | 23 +++++++++++--- .../RichardWagnerStrasseScaled.scenario | 23 +++++++++++--- ...treet-Pollichstrasse-Narrowed-GNM.scenario | 25 ++++++++++----- ...treet-Pollichstrasse-Narrowed-OSM.scenario | 23 +++++++++++--- ...et-Pollichstrasse-NotNarrowed-GNM.scenario | 23 +++++++++++--- ...et-Pollichstrasse-NotNarrowed-OSM.scenario | 23 +++++++++++--- ...chardWagnerStrasse-OSM-1200agents.scenario | 23 +++++++++++--- ...ichardWagnerStrasse-OSM-400agents.scenario | 23 +++++++++++--- ...ichardWagnerStrasse-OSM-800agents.scenario | 23 +++++++++++--- .../scenarios/hm_stairs.scenario | 23 +++++++++++--- .../chicken_floorfield_ok_GPU_event.scenario | 23 +++++++++++--- ...hicken_floorfield_ok_GPU_parallel.scenario | 23 +++++++++++--- .../scenarios/DenseCrowd.scenario | 23 +++++++++++--- .../DenseCrowd_withoutGroups.scenario | 23 +++++++++++--- ...rowd_withoutGroups_fineTargetGrid.scenario | 23 +++++++++++--- ...eCrowd_withoutGroups_largeTargets.scenario | 23 +++++++++++--- ...houtGroups_largeTargets_2_waiting.scenario | 23 +++++++++++--- ...seCrowd_withoutGroups_moreTargets.scenario | 23 +++++++++++--- ...thoutGroups_moreTargets_1_waiting.scenario | 23 +++++++++++--- ...thoutGroups_moreTargets_3_waiting.scenario | 23 +++++++++++--- ...thoutGroups_moreTargets_6_waiting.scenario | 23 +++++++++++--- ...arrowCorridor_3_targets_1_waiting.scenario | 23 +++++++++++--- ...arrowCorridor_3_targets_2_waiting.scenario | 23 +++++++++++--- ...rdinationTask_3_targets_2_waiting.scenario | 23 +++++++++++--- ...k_3_targets_2_waiting_with_runner.scenario | 23 +++++++++++--- .../scenarios/test.scenario | 23 +++++++++++--- .../MWE_groups_target_changer.scenario | 23 +++++++++++--- .../scenarios/bridge_coordinates_kai.scenario | 23 +++++++++++--- .../scenarios/s2ucre_dynamic_groups.scenario | 23 +++++++++++--- .../scenarios/s2ucre_dynamic_waiting.scenario | 23 +++++++++++--- ...ucre_dynamic_waiting_less_targets.scenario | 23 +++++++++++--- ...namic_waiting_less_targets_groups.scenario | 23 +++++++++++--- .../scenarios/s2ucre_static_groups.scenario | 23 +++++++++++--- .../scenarios/s2ucre_static_simple.scenario | 23 +++++++++++--- .../scenarios/s2ucre_static_waiting.scenario | 23 +++++++++++--- ...2ucre_static_waiting_less_targets.scenario | 23 +++++++++++--- ...tatic_waiting_less_targets_groups.scenario | 23 +++++++++++--- .../scenarios/bottleneck_2m.scenario | 23 +++++++++++--- ...imulation-GroupBehavior_no_groups.scenario | 23 +++++++++++--- .../group_OSM_1Source1Place_noGroup.scenario | 23 +++++++++++--- ...group_OSM_1Source2Places_noGroups.scenario | 23 +++++++++++--- .../scenarios/bus_station.scenario | 23 +++++++++++--- .../Demos/roVer/scenarios/mf_base.scenario | 23 +++++++++++--- .../roVer/scenarios/mf_detailed.scenario | 23 +++++++++++--- .../roVer/scenarios/mf_underground.scenario | 23 +++++++++++--- .../roVer/scenarios/roVerTest001.scenario | 23 +++++++++++--- .../roVer/scenarios/roVerTest002.scenario | 23 +++++++++++--- .../roVer/scenarios/scenario001.scenario | 23 +++++++++++--- .../roVer/scenarios/scenario002.scenario | 23 +++++++++++--- .../scenarios/separation_slow_fast.scenario | 23 +++++++++++--- .../spawn_agents_time_series.scenario | 23 +++++++++++--- .../scenarios/Liddle_osm_v4.scenario | 23 +++++++++++--- .../scenarios/counterflow.scenario | 23 +++++++++++--- .../scenarios/supermarket_basic.scenario | 24 ++++++++++---- .../MigrationTests/scenarios/aaa.scenario | 31 ++++++++++++++----- .../scenarios/groupBaseScenario.scenario | 24 ++++++++++---- ...group_OSM_CGM_density_flow_2group.scenario | 23 +++++++++++--- ...SM_CGM_density_flow_2group_sparse.scenario | 23 +++++++++++--- ...group_OSM_CGM_density_flow_3group.scenario | 23 +++++++++++--- ...SM_CGM_density_flow_3group_sparse.scenario | 23 +++++++++++--- ...group_OSM_CGM_density_flow_4group.scenario | 23 +++++++++++--- ...SM_CGM_density_flow_4group_sparse.scenario | 23 +++++++++++--- ...group_OSM_CGM_density_flow_5group.scenario | 23 +++++++++++--- ...SM_CGM_density_flow_5group_sparse.scenario | 23 +++++++++++--- .../scenarios/groupBaseScenario.scenario | 24 ++++++++++---- ...inStepSize_0_11_ignore_free_space.scenario | 23 +++++++++++--- .../osm_calibration_minStepSize_0_17.scenario | 23 +++++++++++--- .../osm_calibration_minStepSize_0_25.scenario | 23 +++++++++++--- .../osm_calibration_minStepSize_0_35.scenario | 23 +++++++++++--- ...sm_calibration_minStepSize_0_4625.scenario | 23 +++++++++++--- ...alibration_minStepSize_0_4625_p18.scenario | 23 +++++++++++--- ...calibration_minStepSize_0_4625_p4.scenario | 23 +++++++++++--- .../osm_calibration_sivers_2016b.scenario | 23 +++++++++++--- .../scenarios/C-050-180-180.scenario | 23 +++++++++++--- .../scenarios/C-050-180-180_GNM.scenario | 23 +++++++++++--- .../scenarios/C-050-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/C-060-180-180.scenario | 23 +++++++++++--- .../scenarios/C-060-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/C-070-180-180.scenario | 23 +++++++++++--- .../scenarios/C-070-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/C-100-180-180.scenario | 23 +++++++++++--- .../scenarios/C-100-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/C-145-180-180.scenario | 23 +++++++++++--- .../scenarios/C-145-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/C-180-180-070.scenario | 23 +++++++++++--- .../scenarios/C-180-180-070_Q.scenario | 23 +++++++++++--- .../scenarios/C-180-180-070_UNIT.scenario | 23 +++++++++++--- .../scenarios/C-180-180-070_default.scenario | 23 +++++++++++--- .../scenarios/C-180-180-070_ramp.scenario | 23 +++++++++++--- .../scenarios/C-180-180-095.scenario | 23 +++++++++++--- .../scenarios/C-180-180-095_Q.scenario | 23 +++++++++++--- .../scenarios/C-180-180-120.scenario | 23 +++++++++++--- .../scenarios/C-180-180-120_Q.scenario | 23 +++++++++++--- .../scenarios/C-180-180-180.scenario | 23 +++++++++++--- .../scenarios/C-180-180-180_Q.scenario | 23 +++++++++++--- .../scenarios/T-240-050-240.scenario | 23 +++++++++++--- .../scenarios/T-240-050-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-050-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-060-240.scenario | 23 +++++++++++--- .../scenarios/T-240-060-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-060-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-080-240.scenario | 23 +++++++++++--- .../scenarios/T-240-080-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-080-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-100-240.scenario | 23 +++++++++++--- .../scenarios/T-240-100-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-100-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-120-240.scenario | 23 +++++++++++--- .../scenarios/T-240-120-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-120-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-150-240.scenario | 23 +++++++++++--- .../scenarios/T-240-150-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-150-240_OSM.scenario | 23 +++++++++++--- .../scenarios/T-240-240-240.scenario | 23 +++++++++++--- .../scenarios/T-240-240-240_BHM.scenario | 23 +++++++++++--- .../scenarios/T-240-240-240_OSM.scenario | 23 +++++++++++--- .../BHM-FloorFieldTest-Labyrinth.scenario | 23 +++++++++++--- .../BHM-FloorFieldTest-TwoObstacles.scenario | 23 +++++++++++--- ...orField-CounterflowCognitionModel.scenario | 23 +++++++++++--- ...ridor-BHM-Defaults-WithFloorField.scenario | 23 +++++++++++--- .../scenarios/Corridor-BHM-Defaults.scenario | 23 +++++++++++--- ...orField-CounterflowCognitionModel.scenario | 23 +++++++++++--- ...2006c-BHM-Defaults-WithFloorField.scenario | 23 +++++++++++--- .../TestCA/scenarios/basic_2_density.scenario | 23 +++++++++++--- .../TestCA/scenarios/bottleneck.scenario | 23 +++++++++++--- ...chicken_floorfield_displaced_fail.scenario | 23 +++++++++++--- .../scenarios/chicken_floorfield_ok.scenario | 23 +++++++++++--- ...orner_waiting_time_processor_test.scenario | 23 +++++++++++--- .../scenarios/multiple_sources.scenario | 23 +++++++++++--- .../TestCA/scenarios/narrow_passage.scenario | 23 +++++++++++--- .../TestCA/scenarios/regular_wall.scenario | 23 +++++++++++--- .../scenarios/rimea_01_pathway.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_050_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_075_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_100_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_125_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_470_h.scenario | 23 +++++++++++--- .../TestCA/scenarios/rimea_05_react.scenario | 23 +++++++++++--- .../TestCA/scenarios/rimea_06_corner.scenario | 23 +++++++++++--- .../TestCA/scenarios/rimea_07_speeds.scenario | 23 +++++++++++--- .../rimea_08_parameter_variation.scenario | 23 +++++++++++--- ...imea_08_parameter_variation_part1.scenario | 23 +++++++++++--- .../rimea_09_public_room_2_exits.scenario | 23 +++++++++++--- .../rimea_09_public_room_4_exits.scenario | 23 +++++++++++--- .../scenarios/rimea_10_pathfinding.scenario | 23 +++++++++++--- .../rimea_11_exit_selection.scenario | 23 +++++++++++--- .../scenarios/rimea_12_evacuation.scenario | 23 +++++++++++--- .../scenarios/rimea_14_select_route.scenario | 23 +++++++++++--- .../TestCA/scenarios/see_small_wall.scenario | 23 +++++++++++--- .../TestCA/scenarios/thick_wall.scenario | 23 +++++++++++--- .../TestCA/scenarios/thin_wall.scenario | 23 +++++++++++--- .../thin_wall_and_closer_source.scenario | 23 +++++++++++--- .../scenarios/basic_1_chicken_gnm1.scenario | 23 +++++++++++--- .../basic_1_chicken_gnm1_displaced.scenario | 23 +++++++++++--- .../scenarios/basic_1_chicken_gnm2.scenario | 23 +++++++++++--- .../scenarios/basic_2_density_gnm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_1_wall_gnm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_2_wall_gnm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_3_wall_gnm1.scenario | 23 +++++++++++--- .../scenarios/basic_4_1_wall_gnm1.scenario | 23 +++++++++++--- .../scenarios/basic_4_2_wall_gnm1.scenario | 23 +++++++++++--- .../scenarios/rimea_01_pathway_gnm1.scenario | 23 +++++++++++--- .../rimea_04_flow_gnm1_025_h.scenario | 23 +++++++++++--- .../rimea_04_flow_gnm1_050_h.scenario | 23 +++++++++++--- .../rimea_04_flow_gnm1_075_h.scenario | 23 +++++++++++--- .../rimea_04_flow_gnm1_100_h.scenario | 23 +++++++++++--- .../rimea_04_flow_gnm1_125_h.scenario | 23 +++++++++++--- .../scenarios/rimea_05_react_gnm1.scenario | 23 +++++++++++--- .../scenarios/rimea_06_corner_gnm1.scenario | 23 +++++++++++--- .../scenarios/rimea_07_speeds_gnm1.scenario | 23 +++++++++++--- .../rimea_09_publicRoom_gnm1_2.scenario | 23 +++++++++++--- .../rimea_09_publicRoom_gnm1_4.scenario | 23 +++++++++++--- .../rimea_10_pathfinding_gnm1.scenario | 23 +++++++++++--- .../rimea_11_exitSelection_gnm1.scenario | 23 +++++++++++--- .../rimea_12_evacuation_gnm1.scenario | 23 +++++++++++--- .../scenarios/rimea_13_stairs_gnm1.scenario | 23 +++++++++++--- .../rimea_14_selectRoute_gnm1.scenario | 23 +++++++++++--- .../basic_2_density_discrete_ca.scenario | 23 +++++++++++--- .../scenarios/basic_2_density_pso.scenario | 23 +++++++++++--- .../chicken_floorfield_displaced_ok.scenario | 23 +++++++++++--- .../scenarios/chicken_floorfield_ok.scenario | 23 +++++++++++--- ...orner_waiting_time_processor_test.scenario | 23 +++++++++++--- .../narrow_passage_discrete_CA_fail.scenario | 23 +++++++++++--- .../narrow_passage_nelder_mead_ok.scenario | 23 +++++++++++--- .../scenarios/narrow_passage_pso_ok.scenario | 23 +++++++++++--- ...g_dynamic_floorfield_visual_check.scenario | 23 +++++++++++--- .../regular_wall_discrete_ok.scenario | 23 +++++++++++--- .../regular_wall_nelder_mead_ok.scenario | 23 +++++++++++--- .../scenarios/regular_wall_pso_ok.scenario | 23 +++++++++++--- ...a_01_pathway_discrete_brute_force.scenario | 23 +++++++++++--- .../rimea_01_pathway_discrete_ca.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_025_d.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_025_up.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_050_d.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_050_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_050_up.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_075_d.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_075_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_075_up.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_100_d.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_100_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_100_up.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_125_d.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_125_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_125_up.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_470_h.scenario | 23 +++++++++++--- .../rimea_04_flow_osm1_550_up.scenario | 23 +++++++++++--- .../TestOSM/scenarios/rimea_05_react.scenario | 23 +++++++++++--- .../scenarios/rimea_06_corner.scenario | 23 +++++++++++--- .../rimea_07_speeds_discrete_ca.scenario | 23 +++++++++++--- .../rimea_07_speeds_nelder_mead.scenario | 23 +++++++++++--- .../scenarios/rimea_07_speeds_pso.scenario | 23 +++++++++++--- .../rimea_08_parameter_variation.scenario | 23 +++++++++++--- ...9_public_room_2_exits_nelder_mead.scenario | 23 +++++++++++--- .../rimea_09_public_room_2_exits_pso.scenario | 23 +++++++++++--- ...9_public_room_4_exits_nelder_mead.scenario | 23 +++++++++++--- .../rimea_09_public_room_4_exits_pso.scenario | 23 +++++++++++--- .../scenarios/rimea_10_pathfinding.scenario | 23 +++++++++++--- ...mea_11_exit_selection_nelder_mead.scenario | 23 +++++++++++--- .../rimea_11_exit_selection_pso.scenario | 23 +++++++++++--- .../rimea_12_evacuation_nelder_mead.scenario | 23 +++++++++++--- .../rimea_12_evacuation_pso.scenario | 23 +++++++++++--- .../rimea_13_stairs_long_nelder_mead.scenario | 23 +++++++++++--- .../rimea_13_stairs_long_pso.scenario | 23 +++++++++++--- .../rimea_13_stairs_nelder_mead.scenario | 23 +++++++++++--- .../scenarios/rimea_13_stairs_pso.scenario | 23 +++++++++++--- ...rimea_14_select_route_nelder_mead.scenario | 23 +++++++++++--- .../rimea_14_select_route_pso.scenario | 23 +++++++++++--- .../see_small_wall_nelder_mead_ok.scenario | 23 +++++++++++--- .../see_small_wall_pso_fail.scenario | 23 +++++++++++--- .../scenarios/thick_wall_discrete_ok.scenario | 23 +++++++++++--- .../thick_wall_nelder_mead_ok.scenario | 23 +++++++++++--- .../scenarios/thick_wall_pso_ok.scenario | 23 +++++++++++--- ...closer_source_discrete_could_fail.scenario | 23 +++++++++++--- ..._and_closer_source_nelder_mead_ok.scenario | 23 +++++++++++--- ..._and_closer_source_pso_could_fail.scenario | 23 +++++++++++--- .../scenarios/thin_wall_discrete_ok.scenario | 23 +++++++++++--- .../thin_wall_nelder_mead_ok.scenario | 23 +++++++++++--- .../scenarios/thin_wall_pso_ok.scenario | 23 +++++++++++--- .../VadereSimulation-GroupBehavior.scenario | 23 +++++++++++--- .../group_OSM_1Source1Place.scenario | 23 +++++++++++--- .../group_OSM_1Source2Places.scenario | 23 +++++++++++--- .../group_OSM_2Sources1Place.scenario | 23 +++++++++++--- ..._2Sources1Place_2Group_and_3Group.scenario | 23 +++++++++++--- ...OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario | 23 +++++++++++--- ..._4Source4Place_v2_EVD_2G_3G_4G_5G.scenario | 23 +++++++++++--- ..._4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario | 23 +++++++++++--- .../group_OSM_CGM_classroom_1group.scenario | 23 +++++++++++--- .../group_OSM_CGM_classroom_2group.scenario | 23 +++++++++++--- .../group_OSM_CGM_classroom_3group.scenario | 23 +++++++++++--- .../group_OSM_CGM_classroom_4group.scenario | 23 +++++++++++--- .../group_OSM_CGM_labratory_15group.scenario | 23 +++++++++++--- .../group_OSM_CGM_labratory_1group.scenario | 23 +++++++++++--- .../group_OSM_CGM_labratory_25group.scenario | 23 +++++++++++--- .../group_OSM_CGM_labratory_2group.scenario | 23 +++++++++++--- .../group_OSM_CGM_labratory_4group.scenario | 23 +++++++++++--- .../group_OSM_long_corr_2Group.scenario | 23 +++++++++++--- .../group_OSM_long_corr_3Group.scenario | 23 +++++++++++--- .../group_OSM_long_corr_4Group.scenario | 23 +++++++++++--- .../group_OSM_target_changer.scenario | 23 +++++++++++--- .../basic_5_1_roadReachTarget_ovm1.scenario | 23 +++++++++++--- .../basic_5_2_roadReachTarget_ovm1.scenario | 23 +++++++++++--- .../scenarios/testtrafficlight.scenario | 23 +++++++++++--- ...ment-OSMEventDriven-PsychDisabled.scenario | 23 +++++++++++--- ...iment-OSMEventDriven-PsychEnabled.scenario | 23 +++++++++++--- ...sychEnabled-PersonalSpacedAdapted.scenario | 23 +++++++++++--- ...riment-OSMSequential-PsychEnabled.scenario | 23 +++++++++++--- ...ifiedExperiment-SFM-PsychDisabled.scenario | 23 +++++++++++--- ...iment-OSMEventDriven-PsychEnabled.scenario | 23 +++++++++++--- ...rFlow-OSMSequential-PsychDisabled.scenario | 23 +++++++++++--- ...erFlow-OSMSequential-PsychEnabled.scenario | 23 +++++++++++--- ...-PsychEnabled-SearchRadiusAdapted.scenario | 23 +++++++++++--- ...alFlow-OSMSequential-PsychEnabled.scenario | 23 +++++++++++--- ...cken-OSMEventDriven-PsychDisabled.scenario | 23 +++++++++++--- ...icken-OSMEventDriven-PsychEnabled.scenario | 23 +++++++++++--- ...tion-OSMEventDriven-PsychDisabled.scenario | 23 +++++++++++--- ...ction-OSMEventDriven-PsychEnabled.scenario | 23 +++++++++++--- ...15-ThreatShort-SelfCatThreatModel.scenario | 25 ++++++++++----- .../16-ThreatLong-SelfCatThreatModel.scenario | 25 ++++++++++----- ...tatingBehavior-SelfCatThreatModel.scenario | 25 ++++++++++----- ...hangeTargetScriptedCognitionModel.scenario | 25 ++++++++++----- ...-SocialDistancing-OSMEventSDriven.scenario | 30 +++++++++++++----- ...ndation-SocialDistancing_clogging.scenario | 30 +++++++++++++----- .../21-Ped-SocialDistancing_1.5m.scenario | 30 +++++++++++++----- .../scenarios/21-Ped-normal_behavior.scenario | 30 +++++++++++++----- .../scenarios/01-Wait-OSMSequential.scenario | 27 ++++++++++------ .../scenarios/02-Wait-OSMEventDriven.scenario | 27 ++++++++++------ .../03-WaitRecurring-OSMSequential.scenario | 27 ++++++++++------ .../04-WaitInArea-OSMSequential.scenario | 25 ++++++++++----- .../scenarios/05-WaitInArea-BHM.scenario | 25 ++++++++++----- .../06-Threat-OSMSequential-OneAgent.scenario | 25 ++++++++++----- ...reat-OSMSequential-MultipleAgents.scenario | 25 ++++++++++----- ...SMSequential-OneAgent-OneObstacle.scenario | 25 ++++++++++----- ...Wait-Probabilistic-OSMEventDriven.scenario | 19 ++++++------ ...otChangeTargetIfProbabilityIsZero.scenario | 23 +++++++++++--- ...r-ChangesTargetIfProbabilityIsOne.scenario | 23 +++++++++++--- ...ChangesTargetIfProbabilityIsAHalf.scenario | 23 +++++++++++--- ...getChanger-SupportsListsOfTargets.scenario | 23 +++++++++++--- ...etChanger-CanCreateAListOfTargets.scenario | 23 +++++++++++--- ...getChanger-ChangesToDynamicTarget.scenario | 23 +++++++++++--- .../TestRSM/scenarios/Reynolds_test.scenario | 23 +++++++++++--- .../Reynolds_test_displaced.scenario | 23 +++++++++++--- .../scenarios/basic_1_chicken_sfm1.scenario | 23 +++++++++++--- .../basic_1_chicken_sfm1_displaced.scenario | 23 +++++++++++--- .../scenarios/basic_1_chicken_sfm2.scenario | 23 +++++++++++--- .../scenarios/basic_2_density_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_1_wall_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_2_wall_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_3_3_wall_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_4_1_wall_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_4_1_wall_sfm2.scenario | 23 +++++++++++--- .../scenarios/basic_4_2_wall_sfm1.scenario | 23 +++++++++++--- .../scenarios/basic_4_2_wall_sfm2.scenario | 23 +++++++++++--- .../scenarios/rimea_01_pathway_sfm1.scenario | 23 +++++++++++--- .../scenarios/rimea_01_pathway_sfm2.scenario | 23 +++++++++++--- .../rimea_04_flow_sfm1_025_h.scenario | 23 +++++++++++--- .../rimea_04_flow_sfm1_050_h.scenario | 23 +++++++++++--- .../rimea_04_flow_sfm1_075_h.scenario | 23 +++++++++++--- .../rimea_04_flow_sfm1_100_h.scenario | 23 +++++++++++--- .../rimea_04_flow_sfm1_125_h.scenario | 23 +++++++++++--- .../scenarios/rimea_05_react_sfm1.scenario | 23 +++++++++++--- .../scenarios/rimea_06_corner_sfm1.scenario | 23 +++++++++++--- .../scenarios/rimea_07_speeds_sfm1.scenario | 23 +++++++++++--- .../rimea_10_pathfinding_sfm1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_1_+1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_1_-1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_2_+1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_2_-1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_3_+1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_3_-1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_4_+1.scenario | 23 +++++++++++--- .../scenarios/stairs_diagonal_4_-1.scenario | 23 +++++++++++--- .../stairs_diagonal_both_1_2_+1.scenario | 23 +++++++++++--- .../stairs_diagonal_both_1_2_-1.scenario | 23 +++++++++++--- .../stairs_diagonal_both_3_4_+1.scenario | 23 +++++++++++--- .../stairs_diagonal_both_3_4_-1.scenario | 23 +++++++++++--- .../stairs_upward_direction_down_+1.scenario | 23 +++++++++++--- .../stairs_upward_direction_down_-1.scenario | 23 +++++++++++--- ...airs_upward_direction_to_right_+1.scenario | 23 +++++++++++--- ...airs_upward_direction_to_right_-1.scenario | 23 +++++++++++--- ...stairs_upward_direction_toleft_+1.scenario | 23 +++++++++++--- ...stairs_upward_direction_toleft_-1.scenario | 23 +++++++++++--- .../stairs_upward_direction_up_+1.scenario | 23 +++++++++++--- .../stairs_upward_direction_up_-1.scenario | 23 +++++++++++--- .../scenarios/counterflow.scenario | 23 +++++++++++--- .../scenarios/labyrinth.scenario | 23 +++++++++++--- ...mea_11_exit_selection_nelder_mead.scenario | 23 +++++++++++--- .../TestNelderMead/scenarios/s2ucre.scenario | 23 +++++++++++--- 361 files changed, 6501 insertions(+), 1869 deletions(-) diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario index dba0074e1..b18e45fd3 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 cb8783904..9c6748c6b 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 a61805493..4baf409ad 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 56fc4c8b4..a7534c9e8 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 548bb3749..cbb93bc15 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 8f69bcb4d..4a47e36f2 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 2859f010c..08faa30a6 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 06baa65ec..6353d1c44 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 35bf98e15..02445942d 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 42f6a0cbe..e6c92f931 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 5b5af0740..affdfac9d 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 0cb0a58d8..ea41a7ace 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 7c4ba2d0a..133b0f4ac 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 ff79bcc68..a91c057a7 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 4e83e8d38..8be2c61da 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 83066e3b3..526af1239 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 aa343b7bc..48c375a2d 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 e341bdba6..b11518f62 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 0b11ad143..d05b8e59b 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 2daea9277..d462a92bf 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 320dac506..46236f927 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 2c08d81e3..9b63c3844 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 dc039f27d..cb0f10e70 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 99b901763..ba2245393 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 45814ad06..e0ccc15db 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 c137628dc..ecbbb56ac 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 ff73444b1..89389a4a3 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 7040ea890..669ea7fd9 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 3f0e8ee5c..dd56e41c5 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 df70b5541..4368dbf80 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 32862aa6b..17bd9e073 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 e48f9027f..ed379d19a 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 9c5a126bc..9e773e02f 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 4201bfc52..5f73b0d23 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 b1c522672..e7b51655c 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 2d6d20f7c..7134a7aad 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 3c27dd65d..55f603b27 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 386e702a9..8cae5cf5d 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 a5a2f41b3..b16896cfd 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 39952209c..75ddf32cf 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 7fe2c7943..d84165896 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 d5e5dfafd..b7b017fc2 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 d2608db0b..872c848f5 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 1ea3cd8e8..c85fb3a1d 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 d2b0b92db..ce450ddee 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 92c707261..b08f7f2d2 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 446833dff..c3c653da0 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 9b518a157..b70ef817b 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 a7db204f2..f8f80250e 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 cf4a1a1dc..e7cd5a50a 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 100494e26..8246409d9 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 705279fb0..49eb55cce 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 7000531dd..076681aa3 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 0b6349a6d..813811f7b 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 f41825df6..573c1d271 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 5c408650b..f04d6c9ed 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 ef9a42727..411d13154 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 85ceca515..c0c83e648 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 93064bfd8..077d5e343 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 6bc19742a..989ec5c99 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 affe987bf..e0b247d05 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 85a45b048..9a5ffd1ad 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 72c023d6e..e582abf71 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 2cc1bfea2..e1924ea3c 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 ae3ce58d3..5d7f31e49 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 5ee0288e9..e30bfaf9b 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 4edbb9658..83e1293b2 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 index 8ba6f7905..1292cfa6c 100644 --- a/Scenarios/MigrationTests/scenarios/aaa.scenario +++ b/Scenarios/MigrationTests/scenarios/aaa.scenario @@ -1,7 +1,8 @@ { "name" : "aaa", "description" : "", - "release" : "2.1", + "release" : "2.2", + "commithash" : "af7a3ef52d293a808945bd11357de59e4afce058", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -108,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" : { @@ -252,14 +272,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/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario index 4a13630c7..50fd7bbf8 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 c605c7673..b3e87b79e 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 ac0ef5ed5..b3d6cc565 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 88180eb41..acd6a995d 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 13eb594f8..250468aeb 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 840ed2a59..45895109b 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 7f147ad17..e3cb911d1 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 b49976206..731d770b8 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 95d901d05..5b518dbf3 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 2d38454e1..0c4fa1464 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 499d03ad2..55f65ca19 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 d28703573..be3bdc99f 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 801bae761..a1c71d74a 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 6cbefc689..c18a333dd 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 67e0fb9fc..d94571ab0 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 043c42b0f..6edf58da1 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 98cc1c45a..5ce464905 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 7c9565fb0..804885183 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 4b680c835..ffe19e4ca 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 593757993..b2be728e5 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 6cd750df5..0c3778ff9 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 fb7efce9e..74c73961b 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 1be4b8515..3b91f5770 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 dccf535e3..d4b61abc3 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 0f904f390..9de1eed05 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 082310508..da4c3c83d 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 b6d1d1253..a8c740177 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 633464548..d2fa452d9 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 7f85ab5e3..c54fe20e8 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 3edf114dd..c6f0492a3 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 0ba087103..2be3a1d70 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 0f38f665f..9f8e30f1e 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 0ae6f4728..f28708fe8 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 9f4116c54..27e2b512b 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 01b3280a1..8cf49356c 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 9dd4f2f7f..63f58e5e6 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 e739efd8b..a13887eda 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 e53be134f..6f4d26b66 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 6301dec2c..6c97212d3 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 6698efba3..c29f12770 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 ce0f2b882..2445ea7e1 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 f15027151..6513efe47 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 5bf01ba6d..88981208e 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 01939bbe5..bc1849899 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 4b484e95a..5663a8975 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 c57d708ac..571fc6db4 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 a2ac6fd1b..f8b0fbc81 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 203c7d123..88c404c7f 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 0b1df10e5..748645486 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 171929529..9d1769774 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 467f7e7b0..58eba622e 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 dff99a242..193c2588b 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 c3f8e9435..f0d970001 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 f59b5fff6..d4ca00f9a 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 4545775a1..050c30d9b 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 7ac113c99..57b837bdf 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 447f90346..465a68e4e 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 30e2d742f..f3493d740 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 6efbd87c6..e5864d6d4 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 e8d59b0c2..64e53d6f8 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 099fcf7bc..d5cfa813d 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 01d3d5d46..f7a10a5a0 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 05cbbecbc..a6136da2c 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 80da7efa1..87c40e6f8 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 1c8d931e8..c0da10d8b 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 c8550060e..770a849f5 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 25252fcd4..724e90e8e 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 8f5a7ac56..837fe1ad4 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 3f6962792..c9921ddac 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 92bdd2e5a..7296a929c 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 0517f246c..fbc19ce1d 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 7ff747a80..783404cf2 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 62ff26138..32fbf46a2 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 fd775423d..c7c8ad52a 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 cdc3cce47..d5b01a6ea 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 a63c81640..56a4f228b 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 fbdfe60b2..528ceeca8 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 c6066a299..817d50dab 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 75585b4f2..d4eef4ea7 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 3f15c9fde..56f7a03b2 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 c33bbc957..e8a85a354 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 aeef85cec..fb740badd 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 c1e98acb9..ba674a88c 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 ff330511b..43225f63a 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 f84337611..4f73709e0 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 c243e7609..6c97e534b 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 f57bcc4eb..ddc3b1bcb 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 12f7debdd..7730ad85c 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 9dedff6e5..cd3b6ea70 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 7578d83a6..c36ea640c 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 fc8fe4d20..36feb883c 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 5eeabcde8..97c3a7490 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 9891668a1..34d9a0a67 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 17bf7de33..33ead9a0e 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 283d00c9e..700dfb232 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 f1bd9b799..8922c4459 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 77a64df23..307febadc 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 315a1044b..c8437d560 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 22e9b6a27..9231c37cc 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 c6d9f4a73..54680c09b 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 82682760c..ae80f1f72 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 be8698eba..2cb079347 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 364283265..553b5b619 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 a585e9a30..b37028a83 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 db7c41218..5115c1497 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 778386291..7195a3514 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 88aa91110..7db3673dd 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 19a9fdb8a..783dc0095 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 0727e6f6a..1d0107261 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 5669d04ae..6614b548d 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 a933e907d..1e7e0f3f2 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 ecfbeeac8..1e87f1573 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 ae1d37e60..68b17a7ab 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 448a9899a..8fcbcff26 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 322aacada..1684c182a 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 279b078ea..18e9a09c0 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 90990eb62..dd5032d18 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 27e88efc2..907029433 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 d53419450..7059933af 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 6b8dbe4a3..73e15f640 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 bd779fcb0..b2527bd4d 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 fbcf11a2d..5c935293b 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 b1db2e427..c22f5f1cd 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 98df38d30..74737dd77 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 3557a465a..4e3843ad4 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 e4fd97320..1240002bb 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 520813e0f..4369fc330 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 330f3ecdc..4076ca890 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 3d3566720..522809ac8 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 33733049e..81e91c271 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 4fc34848a..3fb6387fb 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 a6cabbc4c..ecef0402f 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 91705a6a1..0cdd71da1 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 73c191b86..86d063fc3 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 c84bbef6f..eab19e0be 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 7e23196e1..e5f9834db 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 c5155dff8..9a7e01dd1 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 92558cd60..b5ed5fe9a 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 474b1aa32..6463e33bc 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 5531de450..a1cc0acf1 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 1139805ec..9234e370f 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 35b1a3549..b63af8249 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 9a976bed7..86a4ebcb0 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 9b5b56c8a..ca530a662 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 075a1051c..b1a44f146 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 263b48d22..f6d0e11ea 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 28a3aa40b..d67e33f9e 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 6e7c28e18..b5c22d724 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 8812db9b5..ea63388d8 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 f4a34a8c5..b13cf24cd 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 fda9edfa1..1fbd13b67 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 1deb67887..9fca3d025 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 dee563aba..c534dc4b0 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 0a4956eb4..75b919d81 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 477415673..759ecc676 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 109361d66..2c56fc2e6 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 8522bdaf2..a68dfe0a3 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 1afe96455..8767ef108 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 12b87f6fc..a4dc1c7b0 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 9a2c3f206..666d429bc 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 d49380012..b76e31b94 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 58d84cf3b..529eb49a8 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 69289aee8..716f8fa9e 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 8466ab98d..6987b8527 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 aa9c98625..ebfe0168f 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 b2c0b0975..0fc7d9c1f 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 14e946e5f..61fdfc6c0 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 041531212..fa90d318a 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 ea7b0a8df..c0ab83b77 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 e08658bf9..08e276a2e 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 d4c0ff476..00fd641e0 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 97ae5120b..c89646cfc 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 9f6de576e..a42e95c45 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 a4d0d7e12..2951dba1a 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 c3475a6d1..6c99fcbce 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 c1b35d253..b96c0f988 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 f4f52d548..e9539e3a4 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 68d759337..628bea857 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 12680c2d8..44a2f332e 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 b997a9e01..11cde8b10 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 f03508cfa..6aa399937 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 17e47d5bd..0db6ce6f3 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 ca5865052..ae8abbf34 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 acd0e5d51..8fb64f001 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 531009375..a2341a2e1 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 d131d0bd9..f6f6b5065 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 8e1333d81..39c36a851 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 0d933e856..995901618 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 f3a366427..3b86e517b 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 f6a068add..c2f9d3ca5 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 4d99f91ac..9970e71d9 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 d86ae5ff3..019bc5689 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 8ffb341d4..8e76ac618 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 68259557c..9b6910d83 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 895e00767..b4eef44a1 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 c41a15a5d..49a64b3f8 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 b16ab9fb4..3365cc326 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 a9e825399..019cd391a 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 84c999dd9..7f714efab 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 6392480f4..b712a8d0a 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 fe03c6883..e7cab2466 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 b47f29cb1..3abf5a012 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 eccc7b8f0..5d893e962 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 41901dc3f..5e1ab7213 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 d9e5cae04..d99352c3b 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 d4fe9cd5d..813043bcf 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 9135f5097..e5b7d7279 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 7619fd9ba..77ad1f4a4 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 ca22dcf82..877ff5661 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 2439fcc34..8723c3864 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 1775dc58f..3bf23dc95 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 68e73a3ea..0cfe1e06d 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 7900f6ad3..7b1f96fe9 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 5846fe4b2..7c55c683e 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 a62157bf1..52ccf8fe4 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 6db2fe8ed..1e5f7d5ed 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 0e582bd87..5fc6ff344 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 6077090ba..f01f9dabe 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 1724310c6..f2ecbacc2 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 06d44398a..b17dcdb04 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 5909cd7c4..74bfa131f 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 f48bc6066..2c4ee6ec3 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 9bf1fa2ed..123cb96aa 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 9568480c4..31c93083f 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 dc39f0e3d..759ab40f5 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 ec8ff9724..cd11e8f46 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", -