From b404faa5791c6c3fee83a06c885f6938828d3e9b Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:00:30 +0100 Subject: [PATCH 1/7] remove strategyLayer from GUI --- VadereGui/resources/messages.properties | 1 - VadereGui/resources/messages_de_DE.properties | 1 - .../gui/projectview/view/AttributeType.java | 3 - .../gui/projectview/view/ScenarioPanel.java | 9 - .../vadere/gui/projectview/view/TextView.java | 4 - .../helpers/StrategyModelBuilder.java | 29 ---- .../strategy/models/IStrategyModel.java | 22 --- .../models/navigation/INavigationModel.java | 10 -- .../strategy/ReadSetControllerInputs.java | 137 ---------------- .../strategy/RouteChoiceThreeCorridors.java | 154 ------------------ 10 files changed, 370 deletions(-) delete mode 100644 VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java delete mode 100644 VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java delete mode 100644 VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java delete mode 100644 VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java delete mode 100644 VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java diff --git a/VadereGui/resources/messages.properties b/VadereGui/resources/messages.properties index ce16cc5b2..20dd5498f 100644 --- a/VadereGui/resources/messages.properties +++ b/VadereGui/resources/messages.properties @@ -384,7 +384,6 @@ Tab.Model.insertModelNameMenu.title=Insert model name Tab.Model.insertModelNameSubMenu.title=Main models Tab.Pedestrians.title=Pedestrians Tab.Psychology.title=Psychology -Tab.Strategy.title=Strategy Tab.Topography.title=Topography Tab.Perception.title=Perception Tab.OutputProcessors.title=Data output diff --git a/VadereGui/resources/messages_de_DE.properties b/VadereGui/resources/messages_de_DE.properties index ec0541cdf..12e9b739d 100644 --- a/VadereGui/resources/messages_de_DE.properties +++ b/VadereGui/resources/messages_de_DE.properties @@ -372,7 +372,6 @@ Tab.Model.insertModelNameMenu.title=Model-Name einf\u00fcgen Tab.Model.insertModelNameSubMenu.title=Hauptmodelle Tab.Pedestrians.title=Fu\u00dfg\u00e4nger Tab.Psychology.title=Psychologie -Tab.Strategy.title=Strategie Tab.Topography.title=Topographie Tab.Perception.title=Perzeption Tab.OutputProcessors.title=Datenausgabe diff --git a/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java b/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java index fe803c4dd..19483f8fb 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/AttributeType.java @@ -10,7 +10,6 @@ public enum AttributeType { public final static String scenarioAttributes = "scenario attributes"; public final static String carAttributes = "car attributes"; public final static String stimulusAttributes = "stimulus attributes"; - public final static String strategyAttributes = "strategy attributes"; public static AttributeType fromName(String name) { @@ -29,8 +28,6 @@ public enum AttributeType { return CAR; case stimulusAttributes: return PERCEPTION; - case strategyAttributes: - return STRATEGY; default: throw new IllegalArgumentException("name " + name + " does not match any attribute type."); } diff --git a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java index ab213d95c..1c8b4a404 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java @@ -39,7 +39,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro // tabs private List menusInTabs = new ArrayList<>(); private TextView attributesSimulationView; // Simulation tab - private TextView attributesStrategyFileView; // Strategy tab private TextView attributesModelView; // Model tab private TextView attributesPsychologyView; // Psychology tab private TextView topographyFileView; // Topography tab @@ -220,11 +219,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro perceptionFileView.isEditable(true); tabbedPane.addTab(Messages.getString("Tab.Perception.title"), perceptionFileView); - attributesStrategyFileView = - new TextView("ProjectView.defaultDirectoryAttributes", AttributeType.STRATEGY); - attributesStrategyFileView.isEditable(true); - tabbedPane.addTab(Messages.getString("Tab.Strategy.title"), attributesStrategyFileView); - dataProcessingGUIview = new DataProcessingView(model); tabbedPane.addTab(Messages.getString("Tab.OutputProcessors.title"), dataProcessingGUIview); @@ -318,9 +312,6 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro this.perceptionFileView.setVadereScenario(scenario); this.perceptionFileView.isEditable(isEditable); - this.attributesStrategyFileView.setVadereScenario(scenario); - this.attributesStrategyFileView.isEditable(isEditable); - this.dataProcessingGUIview.setVadereScenario(scenario); this.dataProcessingGUIview.isEditable(isEditable); } diff --git a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java index 83c6e47ac..d8890d542 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java @@ -200,10 +200,6 @@ public class TextView extends JPanel implements IJsonView { StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuli(json); currentScenario.getScenarioStore().setStimulusInfoStore(stimulusInfoStore); break; - case STRATEGY: - currentScenario - .setAttributesStrategy(StateJsonConverter.deserializeAttributesStrategyModel(json)); - break; default: throw new RuntimeException("attribute type not implemented."); } diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java deleted file mode 100644 index 59e8127fc..000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/helpers/StrategyModelBuilder.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.vadere.simulator.control.strategy.helpers; - - -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.simulator.projects.ScenarioStore; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.util.reflection.DynamicClassInstantiator; - -public class StrategyModelBuilder { - - public static final String JAVA_PACKAGE_SEPARATOR = "."; - - public static IStrategyModel instantiateModel(ScenarioStore scenarioStore) { - String simpleClassName = scenarioStore.getAttributesStrategyModel().getStrategyModel(); - if (simpleClassName != null) { - String classSearchPath = "org.vadere.simulator.models.strategy"; - String fullyQualifiedClassName = classSearchPath + JAVA_PACKAGE_SEPARATOR + simpleClassName; - - DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); - IStrategyModel strategyModel = instantiator.createObject(fullyQualifiedClassName); - - strategyModel.build(scenarioStore.getAttributesStrategyModel()); - return strategyModel; - } - else{ - return null; - } - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java deleted file mode 100644 index 5f583a299..000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/IStrategyModel.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.vadere.simulator.control.strategy.models; - -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.Topography; - -public interface IStrategyModel { - - /* - * @param pedestrians The pedestrians to update - */ - - - void update(double simTimeInSec, Topography top, ProcessorManager processorManager); - - void build(AttributesStrategyModel attr); - - void initialize(double simTimeInSec); - - V getStrategyInfoForDataProcessor(); - -} diff --git a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java b/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java deleted file mode 100644 index 48a7d7074..000000000 --- a/VadereSimulator/src/org/vadere/simulator/control/strategy/models/navigation/INavigationModel.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.vadere.simulator.control.strategy.models.navigation; - - -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.state.attributes.AttributesStrategyModel; - - -public interface INavigationModel extends IStrategyModel { - -} diff --git a/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java b/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java deleted file mode 100644 index 067937bc6..000000000 --- a/VadereSimulator/src/org/vadere/simulator/models/strategy/ReadSetControllerInputs.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.vadere.simulator.models.strategy; - -import org.vadere.simulator.control.strategy.models.navigation.INavigationModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.MeasurementArea; -import org.vadere.state.scenario.Pedestrian; -import org.vadere.state.scenario.Topography; -import org.vadere.util.logging.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.*; - -/** - * The ReadSetControllerInputs is directly connected to - * 1. the *.scenario file Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario - * 2 .the *.csv file Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv - * - * The ReadSetControllerInputs class serves as a simple script which allows to proceed - * external multidimensional controller input which can not be passed as a parameter. - * - * In the scenario, there are two corridors. - * The time dependent parameter "percentageLeft" controls how many agents use the left corridor. - * If percentageLeft=0, the agents use the right and shorter path only (default OSM behavior) - * If percentageLeft=1, the agents use the left corridor only. - * @author Christina Mayr - * @since 2020-08-28 - */ - - -public class ReadSetControllerInputs implements INavigationModel { - - private double[][] controllerInputs; - private int counter = 0; - private String filePath; - private ArrayList newAgents = new ArrayList(); - private ArrayList processedAgents = new ArrayList(); - double ratioReal = 0.0; - - private static Logger logger = Logger.getLogger(ReadSetControllerInputs.class); - - - @Override - public void initialize(double simTimeInSec) { - - String fileName = this.filePath; - - try { - this.controllerInputs = Files.lines(Paths.get(fileName)).map(s -> s.split(" ")).map(s -> Arrays.stream(s).mapToDouble(Double::parseDouble).toArray()).toArray(double[][]::new); - } catch (IOException e) { - e.printStackTrace(); - } - - } - - - public void update(double simTimeInSec, Topography top, ProcessorManager processorManager) { - - - double percentageLeft = controllerInputs[counter][1]; - getAgentsInControllerArea(top); - - - if ((!newAgents.isEmpty()) && (counter % 10 == 0)) { - - printAgentIds(simTimeInSec); - - int numberLeft = (int) (newAgents.size() * percentageLeft); - int numberRight = newAgents.size() - numberLeft; - ratioReal = numberLeft * 1.0 / newAgents.size(); - - LinkedList targets = new LinkedList(); - for (int i = 0; i < numberLeft; i++) { - targets.add(2001); - } - for (int i = 0; i < numberRight; i++) { - targets.add(2002); - } - - int c = 0; - for (Pedestrian pedestrian : newAgents) { - - LinkedList nextTargets = new LinkedList(); - nextTargets.add(targets.get(c)); - nextTargets.add(1); - pedestrian.setTargets(nextTargets); - c += 1; - } - - processedAgents.addAll(newAgents); - newAgents.clear(); - - } - - counter += 1; - - } - - private void printAgentIds(double simTimeInSec) { - - String info = "Time: " + String.format("%5.1fs", simTimeInSec) + ": Agents in control area: "; - - for (Pedestrian agent : newAgents) { - info += " " + agent.getId(); - } - logger.info(info); - } - - @Override - public void build(AttributesStrategyModel attr) { - filePath = attr.getArguments().get(0); // first element contains path to file - - } - - private void getAgentsInControllerArea(Topography topography) { - - MeasurementArea m = topography.getMeasurementArea(555); - Collection pedestrians = topography.getElements(Pedestrian.class); - - for (Pedestrian p : pedestrians) { - if (m.getShape().contains(p.getPosition())) { - if (!newAgents.contains(p) && !processedAgents.contains(p)) { - newAgents.add(p); - } - } - } - - } - - @Override - public Double getStrategyInfoForDataProcessor() { - return ratioReal; - } - -} diff --git a/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java b/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java deleted file mode 100644 index 25690c6c0..000000000 --- a/VadereSimulator/src/org/vadere/simulator/models/strategy/RouteChoiceThreeCorridors.java +++ /dev/null @@ -1,154 +0,0 @@ -package org.vadere.simulator.models.strategy; - -import com.github.cschen1205.fuzzylogic.FuzzySet; -import com.github.cschen1205.fuzzylogic.*; -import com.github.cschen1205.fuzzylogic.memberships.*; -import org.vadere.simulator.control.strategy.models.navigation.INavigationModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor; -import org.vadere.state.attributes.AttributesStrategyModel; -import org.vadere.state.scenario.Pedestrian; -import org.vadere.state.scenario.Topography; - -import java.util.*; -import java.util.stream.Collectors; - -// https://github.com/cschen1205/java-fuzzy-logic - - -public class RouteChoiceThreeCorridors implements INavigationModel { - - private RuleInferenceEngine rie; - private FuzzySet corridor; - private FuzzySet density; - private FuzzySet density1; - private FuzzySet density2; - private FuzzySet density3; - private AttributesStrategyModel attributesStrategyModel; - - - @Override - public void initialize(double simTimeInSec) { - - this.rie = new RuleInferenceEngine(); - - double dX = 0.05; - - corridor = new FuzzySet("corridor", 2001, 2004, dX); - corridor.addMembership("use3", new FuzzyReverseGrade(2001, 2002)); - corridor.addMembership("use2", new FuzzyTriangle(2001, 2002, 2003)); - corridor.addMembership("use1", new FuzzyTriangle(2002, 2003, 2004)); - corridor.addMembership("wait", new FuzzyGrade(2003, 2004)); - rie.addFuzzySet(corridor.getName(), corridor); - - density = new FuzzySet("density", 0, 5, dX); - density.addMembership("low", new FuzzyReverseGrade(0, 0.5)); - density.addMembership("high", new FuzzyGrade(0.4, 5)); - rie.addFuzzySet(density.getName(), density); - - density1 = new FuzzySet("density1", 0, 5, dX); - density1.addMembership("low", new FuzzyReverseGrade(0, 0.25)); - density1.addMembership("high", new FuzzyGrade(0.2, 5)); - rie.addFuzzySet(density1.getName(), density1); - - density2 = new FuzzySet("density2", -4, 4, dX); - density2.addMembership("low", new FuzzyReverseGrade(0, 0.25)); - density2.addMembership("high", new FuzzyGrade(0.2, 5)); - rie.addFuzzySet(density2.getName(), density2); - - - Rule rule; - String ruleName; - String[] d0 = {"high", "high", "high", "high", "low", "low", "low", "low"}; - String[] d1 = {"high", "high", "low", "low", "high", "high", "low", "low"}; - String[] d2 = {"high", "low", "high", "low", "high", "low", "high", "low"}; - String[] re = {"wait", "wait", "wait", "wait", "use3", "use2", "use1", "use1"}; - - - for (int i = 0; i < d0.length; i++) { - - ruleName = "Rule " + (i + 1); - rule = new Rule(ruleName); - - rule.addAntecedent(new Clause(density, "Is", d0[i])); - rule.addAntecedent(new Clause(density1, "Is", d1[i])); - rule.addAntecedent(new Clause(density2, "Is", d2[i])); - rule.setConsequent(new Clause(corridor, "Is", re[i])); - rie.addRule(rule); - } - - - } - - @Override - public Object getStrategyInfoForDataProcessor() { - return null; - } - - - public void update(double simTimeInSec, Topography top, ProcessorManager processorManager) { - - Collection pedestrians = top.getElements(Pedestrian.class); - - - if (simTimeInSec > 0.0) { - - - double densityC0 = getDensityFromDataProcessor(8, processorManager); - double densityC1 = getDensityFromDataProcessor(5, processorManager); - double densityC2 = getDensityFromDataProcessor(6, processorManager); - //double densityC3 = getDensityFromDataProcessor(7, processorManager); - - density.setX(densityC0); - density1.setX(densityC1); - density2.setX(densityC2); - rie.Infer(corridor); - - double targetD = corridor.getX(); - int target; - - if (Double.isNaN(targetD)) { - target = 2003; - } else { - target = (int) Math.round(targetD); - } - - LinkedList nextTargets = new LinkedList(); - nextTargets.add(target); - if (target == 2004) { - nextTargets.add(2001); - } - nextTargets.add(1); - - // System.out.println(simTimeInSec + " " + nextTargets + " \n"); - - List newAgents = pedestrians.stream().filter(p -> p.getFootstepHistory().getFootSteps().size() == 0).collect(Collectors.toList()); - for (Pedestrian pedestrian : newAgents) { - pedestrian.setTargets(nextTargets); - } - - } - - } - - @Override - public void build(AttributesStrategyModel attr) { - attributesStrategyModel = attr; - } - - - private double getDensityFromDataProcessor(int processorId, ProcessorManager processorManager) { - double density = -1.0; - if (processorManager != null) { - AreaDensityCountingProcessor a = (AreaDensityCountingProcessor) processorManager.getProcessor(processorId); - TreeMap data = (TreeMap) a.getData(); - double area = a.getMeasurementArea().asPolygon().getArea(); - if (data.size() > 0) { - density = (double) (Integer) data.lastEntry().getValue(); - density = density / area; - } - } - return density; - - } -} -- GitLab From 9462d65e6d65403fdc6012c740e9217c1d2a27ef Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:07:56 +0100 Subject: [PATCH 2/7] WIP remove part of dependencies --- .../vadere/TestProjectWriterAndReader.java | 1 - .../control/simulation/ScenarioRun.java | 5 +- .../control/simulation/Simulation.java | 30 ++------ .../control/simulation/SimulationState.java | 13 +--- .../vadere/simulator/projects/Scenario.java | 8 --- .../simulator/projects/ScenarioStore.java | 1 - .../processor/StrategyDataProcessor.java | 31 --------- .../AbstractJsonTransformation.java | 1 - .../json/TargetVersionV1_14.java | 7 -- .../StrategyModelDataProcessorCheck.java | 1 - .../attributes/AttributesStrategyModel.java | 69 ------------------- pom.xml | 5 -- 12 files changed, 8 insertions(+), 164 deletions(-) delete mode 100644 VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java delete mode 100644 VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java diff --git a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java index 1c7180439..71220154c 100644 --- a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java +++ b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java @@ -11,7 +11,6 @@ import org.vadere.simulator.projects.io.IOVadere; import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.models.AttributesFloorField; import org.vadere.state.attributes.models.AttributesOSM; import org.vadere.state.attributes.models.AttributesPotentialCompact; diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java index 131da8a9d..837d41126 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java @@ -17,11 +17,9 @@ import org.vadere.simulator.control.psychology.perception.models.IPerceptionMode import org.vadere.simulator.control.psychology.perception.helpers.PerceptionModelBuilder; import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.scenarioelements.TargetChangerController; -import org.vadere.simulator.control.strategy.helpers.StrategyModelBuilder; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.models.MainModelBuilder; import org.vadere.simulator.models.potential.solver.EikonalSolverCacheProvider; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.projects.Domain; import org.vadere.simulator.projects.RunnableFinishedListener; import org.vadere.simulator.projects.Scenario; @@ -180,7 +178,6 @@ public class ScenarioRun implements Runnable { IPerceptionModel perceptionModel = PerceptionModelBuilder.instantiateModel(scenarioStore); ICognitionModel cognitionModel = CognitionModelBuilder.instantiateModel(scenarioStore); - IStrategyModel strategyModel = StrategyModelBuilder.instantiateModel(scenarioStore); // ensure all elements have unique id before attributes are sealed @@ -194,7 +191,7 @@ public class ScenarioRun implements Runnable { passiveCallbacks, random, processorManager, simulationResult, remoteRunListeners, singleStepMode, - scenarioCache, strategyModel); + scenarioCache); } simulation.run(); diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java index cefd2b149..1c884bcff 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java @@ -5,7 +5,6 @@ import org.vadere.simulator.control.psychology.cognition.models.ICognitionModel; import org.vadere.simulator.control.psychology.perception.models.IPerceptionModel; import org.vadere.simulator.control.psychology.perception.StimulusController; import org.vadere.simulator.control.scenarioelements.*; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.models.DynamicElementFactory; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.models.Model; @@ -80,7 +79,6 @@ public class Simulation { private final MainModel mainModel; private final IPerceptionModel perceptionModel; private final ICognitionModel cognitionModel; - private final IStrategyModel strategyModel; /** Hold the topography in an extra field for convenience. */ private final Topography topography; @@ -98,13 +96,13 @@ public class Simulation { List passiveCallbacks, Random random, ProcessorManager processorManager, SimulationResult simulationResult, List remoteRunListeners, boolean singleStepMode, - ScenarioCache scenarioCache, IStrategyModel strategyModel) { + ScenarioCache scenarioCache) { this.name = name; this.mainModel = mainModel; this.perceptionModel = perceptionModel; this.cognitionModel = cognitionModel; - this.strategyModel = strategyModel; + this.scenarioStore = scenarioStore; this.attributesSimulation = scenarioStore.getAttributesSimulation(); @@ -213,9 +211,6 @@ public class Simulation { for (Model m : models) { m.preLoop(simTimeInSec); } - if (strategyModel != null){ - strategyModel.initialize(simTimeInSec); - } for (PassiveCallback c : passiveCallbacks) { c.preLoop(simTimeInSec); @@ -227,7 +222,7 @@ public class Simulation { } private void postLoop() { - simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel, strategyModel); + simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel); topographyController.postLoop(this.simTimeInSec); for (Model m : models) { @@ -286,7 +281,7 @@ public class Simulation { updateCallbacks(simTimeInSec); step++; - this.simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel, strategyModel); + this.simulationState = new SimulationState(name, topography, scenarioStore, simTimeInSec, step, mainModel); if (attributesSimulation.isWriteSimulationData()) { processorManager.update(this.simulationState); @@ -373,7 +368,7 @@ public class Simulation { } private SimulationState initialSimulationState() { - SimulationState state = new SimulationState(name, topography.clone(), scenarioStore, simTimeInSec, step, mainModel, strategyModel ); + SimulationState state = new SimulationState(name, topography.clone(), scenarioStore, simTimeInSec, step, mainModel); return state; } @@ -382,8 +377,6 @@ public class Simulation { updateScenarioElements(simTimeInSec); - updateStrategyLayer(simTimeInSec); - updatePsychologyLayer(simTimeInSec); updateLocomotionLayer(simTimeInSec); @@ -422,19 +415,6 @@ public class Simulation { topographyController.update(simTimeInSec); //rebuild CellGrid } - private void updateStrategyLayer(double simTimeInSec) { - - if (scenarioStore.getAttributesStrategyModel().isUseStrategyModel()) { - - if (simTimeInSec == startTimeInSec) { - strategyModel.update(simTimeInSec, topography, null); - } - strategyModel.update(simTimeInSec, topography, processorManager); - } - - - } - private void updatePsychologyLayer(double simTimeInSec) { Collection pedestrians = topography.getElements(Pedestrian.class); diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java index 31e94849b..ab9174102 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/SimulationState.java @@ -1,7 +1,6 @@ package org.vadere.simulator.control.simulation; import org.jetbrains.annotations.Nullable; -import org.vadere.simulator.control.strategy.models.IStrategyModel; import org.vadere.simulator.models.MainModel; import org.vadere.simulator.projects.ScenarioStore; import org.vadere.state.scenario.Topography; @@ -18,34 +17,30 @@ public class SimulationState { private final String name; private final MainModel mainModel; private boolean simStop = false; - private final IStrategyModel strategyModel; protected SimulationState(final String name, final Topography topography, final ScenarioStore scenarioStore, final double simTimeInSec, final int step, - @Nullable final MainModel mainModel, - final IStrategyModel strategyModel) { + @Nullable final MainModel mainModel) { this.name = name; this.topography = topography; this.simTimeInSec = simTimeInSec; this.step = step; this.scenarioStore = scenarioStore; this.mainModel = mainModel; - this.strategyModel = strategyModel; } @Deprecated public SimulationState(final Map pedestrianPositionMap, final Topography topography, - final double simTimeInSec, final int step, final IStrategyModel strategyModel) { + final double simTimeInSec, final int step) { this.name = ""; this.topography = topography; this.simTimeInSec = simTimeInSec; this.step = step; this.scenarioStore = null; this.mainModel = null; - this.strategyModel = null; } // public access to getters @@ -90,9 +85,5 @@ public class SimulationState { return simStop; } - public IStrategyModel getStrategyModel(){ - return strategyModel; - } - } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java b/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java index 2130990c5..2aceae55b 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/Scenario.java @@ -10,7 +10,6 @@ import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.scenario.Topography; import org.vadere.util.io.IOUtils; @@ -139,10 +138,6 @@ public class Scenario { return scenarioStore.getAttributesPsychology(); } - public AttributesStrategyModel getAttributesStrategyModel() { - return scenarioStore.getAttributesStrategyModel(); - } - public Topography getTopography() { return scenarioStore.getTopography(); } @@ -163,9 +158,6 @@ public class Scenario { this.scenarioStore.setAttributesPsychology(attributesPsychology); } - public void setAttributesStrategy(@NotNull final AttributesStrategyModel attributesStrategyModel) { - this.scenarioStore.setAttributesStrategyModel(attributesStrategyModel); - } public void setTopography(@NotNull final Topography topography) { scenarioStore.setTopography(topography); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java index d2ccbbc25..24a70a460 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java @@ -7,7 +7,6 @@ import org.vadere.simulator.projects.io.JsonConverter; import org.vadere.state.attributes.Attributes; import org.vadere.state.attributes.AttributesPsychology; import org.vadere.state.attributes.AttributesSimulation; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.attributes.scenario.AttributesCar; import org.vadere.state.psychology.perception.json.StimulusInfoStore; import org.vadere.state.scenario.Topography; diff --git a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java b/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java deleted file mode 100644 index 342129a61..000000000 --- a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyDataProcessor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.vadere.simulator.projects.dataprocessing.processor; - -import org.jetbrains.annotations.NotNull; -import org.vadere.annotation.factories.dataprocessors.DataProcessorClass; -import org.vadere.simulator.control.simulation.SimulationState; -import org.vadere.simulator.control.strategy.models.IStrategyModel; -import org.vadere.simulator.projects.dataprocessing.ProcessorManager; -import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey; -import org.vadere.state.attributes.processor.AttributesAreaProcessor; - -/** - * @author Christina Mayr - * - */ - -public abstract class StrategyDataProcessor extends DataProcessor { - - - protected StrategyDataProcessor(final String... headers) { - super(headers); - } - - @Override - public void init(final ProcessorManager manager) { - super.init(manager); - } - - public V getStrategyModelOutput(@NotNull SimulationState state) { - return (V) state.getStrategyModel().getStrategyInfoForDataProcessor(); - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java index f8263b1ef..964694365 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java @@ -3,7 +3,6 @@ package org.vadere.simulator.projects.migration.jsontranformation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.util.version.Version; import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.projects.io.JsonConverter; diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java index 7f3b0de80..654a75a0d 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java @@ -1,20 +1,13 @@ package org.vadere.simulator.projects.migration.jsontranformation.json; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; import org.vadere.simulator.projects.migration.MigrationException; import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; -import org.vadere.state.attributes.AttributesPsychology; -import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.util.StateJsonConverter; import org.vadere.util.version.Version; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Remove node "threatMemory" under "scenario.topography.dynamicElements.psychologyStatus" */ diff --git a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java index 6e6d7c519..28f28c59d 100644 --- a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java +++ b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java @@ -5,7 +5,6 @@ import org.vadere.simulator.projects.dataprocessing.processor.DataProcessor; import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerMessage; import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerReason; import org.vadere.simulator.utils.scenariochecker.checks.AbstractScenarioCheck; -import org.vadere.state.attributes.AttributesStrategyModel; import java.util.LinkedList; import java.util.List; diff --git a/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java b/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java deleted file mode 100644 index 61cad7624..000000000 --- a/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.vadere.state.attributes; - -import java.util.LinkedList; -import java.util.Objects; - -public class AttributesStrategyModel extends Attributes { - - /** - * Store the members of this class under this key in the JSON file. - */ - public static final String JSON_KEY = "attributesStrategy"; - - private boolean useStrategyModel; - private String strategyModel; - private LinkedList arguments = new LinkedList<>(); - private LinkedList requiredDataProcessorIds = new LinkedList<>(); - - - // Constructors - public AttributesStrategyModel(){ - this.useStrategyModel = false; - this.strategyModel = null; - this.arguments = new LinkedList<>(); - this.requiredDataProcessorIds = new LinkedList<>(); - } - - public AttributesStrategyModel(boolean useStrategyModel, String strategyModel, LinkedList arguments, LinkedList requiredDataProcessorIds) { - this.useStrategyModel = useStrategyModel; - this.strategyModel = strategyModel; - this.arguments = arguments; - this.requiredDataProcessorIds = requiredDataProcessorIds; - } - - // getter and setters - public String getStrategyModel() { - return strategyModel; - } - - public void setStrategyModel(String strategyModel) { - this.strategyModel = strategyModel; - } - - public boolean isUseStrategyModel() { - return useStrategyModel; - } - - public void setUseStrategyModel(boolean useStrategyModel) { - this.useStrategyModel = useStrategyModel; - } - - public LinkedList getArguments() { - return arguments; - } - - public void setArguments(LinkedList arguments) { - this.arguments = arguments; - } - - public LinkedList getRequiredDataProcessorIds() { - return requiredDataProcessorIds; - } - - public void setRequiredDataProcessorIds(LinkedList requiredDataProcessorIds) { - this.requiredDataProcessorIds = requiredDataProcessorIds; - } -} - - - diff --git a/pom.xml b/pom.xml index 415486b06..37788dd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -118,11 +118,6 @@ - - com.github.cschen1205 - java-fuzzy-logic - 1.0.1 - com.google.guava guava -- GitLab From 9975deca60f537ef1375cec74ea0cd877ea78a0a Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:13:53 +0100 Subject: [PATCH 3/7] WIP rm 2 --- .../gui/vadere/TestProjectWriterAndReader.java | 6 +++--- .../vadere/simulator/projects/ScenarioStore.java | 16 ++++------------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java index 71220154c..eb5a00831 100644 --- a/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java +++ b/VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java @@ -47,9 +47,9 @@ public class TestProjectWriterAndReader { attributes.add(new AttributesFloorField()); attributes.add(new AttributesPotentialOSM()); LinkedList tests = new LinkedList<>(); - tests.add(new Scenario(new ScenarioStore(testName + "1", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); - tests.add(new Scenario(new ScenarioStore(testName + "2", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); - tests.add(new Scenario(new ScenarioStore(testName + "3", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography(), new AttributesStrategyModel()))); + tests.add(new Scenario(new ScenarioStore(testName + "1", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); + tests.add(new Scenario(new ScenarioStore(testName + "2", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); + tests.add(new Scenario(new ScenarioStore(testName + "3", "", OptimalStepsModel.class.getName(), attributes, new AttributesSimulation(), new Topography()))); testProject = new VadereProject(testProjectName, tests, Paths.get(".")); } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java index 24a70a460..8b059a852 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/ScenarioStore.java @@ -34,24 +34,22 @@ public class ScenarioStore { private List attributesList; private AttributesSimulation attributesSimulation; private AttributesPsychology attributesPsychology; - private AttributesStrategyModel attributesStrategyModel; private Topography topography; private StimulusInfoStore stimulusInfoStore; public ScenarioStore(final String name, final String description, final String mainModel, final List attributesModel, - final AttributesSimulation attributesSimulation, final Topography topography, final AttributesStrategyModel attributesStrategyModel) { - this(name, description, mainModel, attributesModel, attributesSimulation, new AttributesPsychology(), topography, new StimulusInfoStore(), new AttributesStrategyModel()); + final AttributesSimulation attributesSimulation, final Topography topography) { + this(name, description, mainModel, attributesModel, attributesSimulation, new AttributesPsychology(), topography, new StimulusInfoStore()); } public ScenarioStore(final String name, final String description, final String mainModel, final List attributesModel, - final AttributesSimulation attributesSimulation, final AttributesPsychology attributesPsychology, final Topography topography, final StimulusInfoStore stimulusInfoStore, final AttributesStrategyModel attributesStrategyModel ) { + final AttributesSimulation attributesSimulation, final AttributesPsychology attributesPsychology, final Topography topography, final StimulusInfoStore stimulusInfoStore) { this.name = name; this.description = description; this.mainModel = mainModel; this.attributesList = attributesModel; this.attributesSimulation = attributesSimulation; this.attributesPsychology = attributesPsychology; - this.attributesStrategyModel = attributesStrategyModel; this.topography = topography; this.stimulusInfoStore = stimulusInfoStore; } @@ -67,7 +65,7 @@ public class ScenarioStore { } public ScenarioStore(final String name) { - this(name, "", null, new ArrayList<>(), new AttributesSimulation(), new Topography(), new AttributesStrategyModel()); + this(name, "", null, new ArrayList<>(), new AttributesSimulation(), new Topography()); } public AttributesCar getAttributesCar() { @@ -92,7 +90,6 @@ public class ScenarioStore { attributesList.forEach(a -> a.seal()); attributesSimulation.seal(); attributesPsychology.seal(); - attributesStrategyModel.seal(); getTopography().sealAllAttributes(); } @@ -112,9 +109,6 @@ public class ScenarioStore { this.attributesPsychology = attributesPsychology; } - public void setAttributesStrategyModel(final AttributesStrategyModel attributesStrategyModel) { - this.attributesStrategyModel = attributesStrategyModel; - } public void removeAttributesIf(@NotNull final Predicate predicate) { attributesList.removeIf(predicate); @@ -145,8 +139,6 @@ public class ScenarioStore { public AttributesPsychology getAttributesPsychology() { return attributesPsychology; } - public AttributesStrategyModel getAttributesStrategyModel() {return attributesStrategyModel;} - public List getAttributesList() { return attributesList; } -- GitLab From f633b99fa102d3725cb97b77ffb6e416e679e5a9 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:30:59 +0100 Subject: [PATCH 4/7] WIP changed --- .../scenarios/AbstractThreeCorridors.scenario | 403 ------- .../AbstractThreeCorridors_normal.scenario | 432 ------- .../TwoCorridors_forced_5050.scenario | 364 ------ .../TwoCorridors_forced_controller.scenario | 388 ------- .../TwoCorridors_forced_controller_input.csv | 1000 ----------------- .../scenarios/TwoCorridors_unforced.scenario | 364 ------ .../Demos/Density_controller/vadere.project | 1 - .../vadere/gui/projectview/view/TextView.java | 4 - .../control/simulation/OfflineSimulation.java | 2 +- .../StrategyControllerValuesRealized.java | 22 - .../simulator/projects/io/JsonConverter.java | 8 +- .../AbstractJsonTransformation.java | 1 + .../json/TargetVersionV1_14.java | 1 + .../scenariochecker/ScenarioChecker.java | 2 - .../StrategyModelDataProcessorCheck.java | 51 - .../attributes/AttributesStrategyModel.java | 69 ++ 16 files changed, 74 insertions(+), 3038 deletions(-) delete mode 100644 Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario delete mode 100644 Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario delete mode 100644 Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario delete mode 100644 Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario delete mode 100644 Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv delete mode 100644 Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario delete mode 100644 Scenarios/Demos/Density_controller/vadere.project delete mode 100644 VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java delete mode 100644 VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java create mode 100644 VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java diff --git a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario b/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario deleted file mode 100644 index 2f1ca1c7e..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors.scenario +++ /dev/null @@ -1,403 +0,0 @@ -{ - "name" : "AbstractThreeCorridors", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", - "filename" : "overlaps.csv", - "processors" : [ 3 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "overlapCount.txt", - "processors" : [ 4 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "densities.csv", - "processors" : [ 5, 6, 7, 8 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "id" : 2 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", - "id" : 3 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", - "id" : 4, - "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", - "attributes" : { - "pedestrianOverlapProcessorId" : 3 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2001 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2002 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 7, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2003 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - } ], - "isTimestamped" : false, - "isWriteMetaData" : false - }, - "scenario" : { - "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", - "attributesModel" : { - "org.vadere.state.attributes.models.AttributesOSM" : { - "stepCircleResolution" : 4, - "numberOfCircles" : 1, - "optimizationType" : "NELDER_MEAD", - "varyStepDirection" : true, - "movementType" : "ARBITRARY", - "stepLengthIntercept" : 0.4625, - "stepLengthSlopeSpeed" : 0.2345, - "stepLengthSD" : 0.036, - "movementThreshold" : 0.0, - "minStepLength" : 0.1, - "minimumStepLength" : true, - "maxStepDuration" : 1.7976931348623157E308, - "dynamicStepLength" : true, - "updateType" : "EVENT_DRIVEN", - "seeSmallWalls" : false, - "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", - "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", - "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ] - }, - "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { - "pedPotentialIntimateSpaceWidth" : 0.45, - "pedPotentialPersonalSpaceWidth" : 1.2, - "pedPotentialHeight" : 50.0, - "obstPotentialWidth" : 0.8, - "obstPotentialHeight" : 6.0, - "intimateSpaceFactor" : 1.2, - "personalSpacePower" : 1, - "intimateSpacePower" : 1 - }, - "org.vadere.state.attributes.models.AttributesFloorField" : { - "createMethod" : "HIGH_ACCURACY_FAST_MARCHING", - "potentialFieldResolution" : 0.1, - "obstacleGridPenalty" : 0.1, - "targetAttractionStrength" : 1.0, - "cacheType" : "NO_CACHE", - "cacheDir" : "", - "timeCostAttributes" : { - "standardDeviation" : 0.7, - "type" : "UNIT", - "obstacleDensityWeight" : 3.5, - "pedestrianSameTargetDensityWeight" : 3.5, - "pedestrianOtherTargetDensityWeight" : 3.5, - "pedestrianWeight" : 3.5, - "queueWidthLoading" : 1.0, - "pedestrianDynamicWeight" : 6.0, - "loadingType" : "CONSTANT", - "width" : 0.2, - "height" : 1.0 - } - } - }, - "attributesSimulation" : { - "finishTime" : 1000.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : true, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 80.0, - "height" : 50.5 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 35.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 5 - }, { - "shape" : { - "x" : 15.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.0, - "y" : 3.5, - "width" : 12.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 55.0, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 3.5 - }, { - "x" : 55.0, - "y" : 3.5 - } ] - }, - "id" : 8 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 73.5, - "y" : 40.0, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 12.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2001 - }, { - "shape" : { - "x" : 32.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2002 - }, { - "shape" : { - "x" : 52.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2003 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 78.5, - "y" : 40.0, - "width" : 1.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 12.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2003, - "absorbing" : false, - "shape" : { - "x" : 52.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2002, - "absorbing" : false, - "shape" : { - "x" : 32.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2004, - "absorbing" : false, - "shape" : { - "x" : 60.0, - "y" : 6.0, - "width" : 14.5, - "height" : 2.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 1, - "shape" : { - "x" : 74.5, - "y" : 0.5, - "width" : 5.0, - "height" : 7.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.NegativeExponentialDistribution", - "distributionParameters" : [ 2.0 ], - "spawnNumber" : 3, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 1000.0, - "spawnAtRandomPositions" : false, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "attributesPedestrian" : { - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0 - }, - "teleporter" : null, - "attributesCar" : { - "id" : -1, - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario b/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario deleted file mode 100644 index ca1304a0d..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/AbstractThreeCorridors_normal.scenario +++ /dev/null @@ -1,432 +0,0 @@ -{ - "name" : "AbstractThreeCorridors_normal", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", - "filename" : "overlaps.csv", - "processors" : [ 3 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "overlapCount.txt", - "processors" : [ 4 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "densities.csv", - "processors" : [ 5, 6, 7, 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", - "filename" : "pedestrianDensities.txt", - "processors" : [ 9, 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "id" : 2 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", - "id" : 3 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", - "id" : 4, - "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", - "attributes" : { - "pedestrianOverlapProcessorId" : 3 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2001 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2002 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 7, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 2003 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor", - "attributes" : { - "pedestrianPositionProcessorId" : 11, - "radius" : 1.5 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityGaussianProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityGaussianProcessor", - "attributes" : { - "pedestrianPositionProcessorId" : 11, - "scale" : 10.0, - "standardDeviation" : 0.7, - "obstacleDensity" : true - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", - "id" : 11, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianPositionProcessor", - "attributes" : { - "interpolate" : true - } - } ], - "isTimestamped" : false, - "isWriteMetaData" : false - }, - "scenario" : { - "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", - "attributesModel" : { - "org.vadere.state.attributes.models.AttributesOSM" : { - "stepCircleResolution" : 4, - "numberOfCircles" : 1, - "optimizationType" : "NELDER_MEAD", - "varyStepDirection" : true, - "movementType" : "ARBITRARY", - "stepLengthIntercept" : 0.4625, - "stepLengthSlopeSpeed" : 0.2345, - "stepLengthSD" : 0.036, - "movementThreshold" : 0.0, - "minStepLength" : 0.1, - "minimumStepLength" : true, - "maxStepDuration" : 1.7976931348623157E308, - "dynamicStepLength" : true, - "updateType" : "EVENT_DRIVEN", - "seeSmallWalls" : false, - "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", - "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", - "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ] - }, - "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { - "pedPotentialIntimateSpaceWidth" : 0.45, - "pedPotentialPersonalSpaceWidth" : 1.2, - "pedPotentialHeight" : 50.0, - "obstPotentialWidth" : 0.8, - "obstPotentialHeight" : 6.0, - "intimateSpaceFactor" : 1.2, - "personalSpacePower" : 1, - "intimateSpacePower" : 1 - }, - "org.vadere.state.attributes.models.AttributesFloorField" : { - "createMethod" : "HIGH_ACCURACY_FAST_MARCHING", - "potentialFieldResolution" : 0.1, - "obstacleGridPenalty" : 0.1, - "targetAttractionStrength" : 1.0, - "cacheType" : "NO_CACHE", - "cacheDir" : "", - "timeCostAttributes" : { - "standardDeviation" : 0.7, - "type" : "UNIT", - "obstacleDensityWeight" : 3.5, - "pedestrianSameTargetDensityWeight" : 3.5, - "pedestrianOtherTargetDensityWeight" : 3.5, - "pedestrianWeight" : 3.5, - "queueWidthLoading" : 1.0, - "pedestrianDynamicWeight" : 6.0, - "loadingType" : "CONSTANT", - "width" : 0.2, - "height" : 1.0 - } - } - }, - "attributesSimulation" : { - "finishTime" : 1000.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : true, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 80.0, - "height" : 50.5 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 35.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 5 - }, { - "shape" : { - "x" : 15.0, - "y" : 3.5, - "width" : 17.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.0, - "y" : 3.5, - "width" : 12.0, - "height" : 36.5, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 55.0, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 40.0 - }, { - "x" : 79.5, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 8.0 - }, { - "x" : 60.0, - "y" : 3.5 - }, { - "x" : 55.0, - "y" : 3.5 - } ] - }, - "id" : 8 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 68.5, - "y" : 40.0, - "width" : 10.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 12.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2001 - }, { - "shape" : { - "x" : 32.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2002 - }, { - "shape" : { - "x" : 52.0, - "y" : 11.0, - "width" : 3.0, - "height" : 25.0, - "type" : "RECTANGLE" - }, - "id" : 2003 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 78.5, - "y" : 40.0, - "width" : 1.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 12.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2003, - "absorbing" : false, - "shape" : { - "x" : 52.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2002, - "absorbing" : false, - "shape" : { - "x" : 32.0, - "y" : 10.0, - "width" : 3.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2004, - "absorbing" : false, - "shape" : { - "x" : 60.0, - "y" : 6.0, - "width" : 14.5, - "height" : 2.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 40.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 1, - "shape" : { - "x" : 74.5, - "y" : 0.5, - "width" : 5.0, - "height" : 7.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.NegativeExponentialDistribution", - "distributionParameters" : [ 2.0 ], - "spawnNumber" : 4, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 1000.0, - "spawnAtRandomPositions" : false, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "attributesPedestrian" : { - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0 - }, - "teleporter" : null, - "attributesCar" : { - "id" : -1, - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario deleted file mode 100644 index c6d2ce443..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_5050.scenario +++ /dev/null @@ -1,364 +0,0 @@ -{ - "name" : "TwoCorridors_forced_5050", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", - "filename" : "overlaps.csv", - "processors" : [ 3 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "overlapCount.txt", - "processors" : [ 4 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "id" : 2 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", - "id" : 3 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", - "id" : 4, - "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", - "attributes" : { - "pedestrianOverlapProcessorId" : 3 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - } ], - "isTimestamped" : true, - "isWriteMetaData" : false - }, - "scenario" : { - "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", - "attributesModel" : { - "org.vadere.state.attributes.models.AttributesOSM" : { - "stepCircleResolution" : 4, - "numberOfCircles" : 1, - "optimizationType" : "NELDER_MEAD", - "varyStepDirection" : true, - "movementType" : "ARBITRARY", - "stepLengthIntercept" : 0.4625, - "stepLengthSlopeSpeed" : 0.2345, - "stepLengthSD" : 0.036, - "movementThreshold" : 0.0, - "minStepLength" : 0.1, - "minimumStepLength" : true, - "maxStepDuration" : 1.7976931348623157E308, - "dynamicStepLength" : true, - "updateType" : "EVENT_DRIVEN", - "seeSmallWalls" : false, - "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", - "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", - "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ] - }, - "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { - "pedPotentialIntimateSpaceWidth" : 0.45, - "pedPotentialPersonalSpaceWidth" : 1.2, - "pedPotentialHeight" : 50.0, - "obstPotentialWidth" : 0.8, - "obstPotentialHeight" : 6.0, - "intimateSpaceFactor" : 1.2, - "personalSpacePower" : 1, - "intimateSpacePower" : 1 - }, - "org.vadere.state.attributes.models.AttributesFloorField" : { - "createMethod" : "HIGH_ACCURACY_FAST_MARCHING", - "potentialFieldResolution" : 0.1, - "obstacleGridPenalty" : 0.1, - "targetAttractionStrength" : 1.0, - "cacheType" : "NO_CACHE", - "cacheDir" : "", - "timeCostAttributes" : { - "standardDeviation" : 0.7, - "type" : "UNIT", - "obstacleDensityWeight" : 3.5, - "pedestrianSameTargetDensityWeight" : 3.5, - "pedestrianOtherTargetDensityWeight" : 3.5, - "pedestrianWeight" : 3.5, - "queueWidthLoading" : 1.0, - "pedestrianDynamicWeight" : 6.0, - "loadingType" : "CONSTANT", - "width" : 0.2, - "height" : 1.0 - } - } - }, - "attributesSimulation" : { - "finishTime" : 160.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 15.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 12.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "x" : 32.5, - "y" : 10.5, - "width" : 27.0, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 30.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 44.5, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 13.0, - "y" : 13.4, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2002, - "absorbing" : false, - "shape" : { - "x" : 30.5, - "y" : 13.6, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ { - "id" : 4, - "shape" : { - "x" : 39.5, - "y" : 0.5, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "reachDistance" : 0.0, - "changeAlgorithmType" : "SELECT_LIST", - "nextTarget" : [ 2001, 1 ], - "probabilityToChangeTarget" : [ 0.5 ] - } ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 44.5, - "y" : 0.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 100, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "attributesPedestrian" : { - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0 - }, - "teleporter" : null, - "attributesCar" : { - "id" : -1, - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario deleted file mode 100644 index 5598ab02e..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller.scenario +++ /dev/null @@ -1,388 +0,0 @@ -{ - "name" : "TwoCorridors_forced_controller", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", - "filename" : "overlaps.csv", - "processors" : [ 3 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "overlapCount.txt", - "processors" : [ 4 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "controllerOutput.txt", - "processors" : [ 11 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "id" : 2 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", - "id" : 3 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", - "id" : 4, - "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", - "attributes" : { - "pedestrianOverlapProcessorId" : 3 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.StrategyControllerValuesRealized", - "id" : 11 - } ], - "isTimestamped" : true, - "isWriteMetaData" : false - }, - "scenario" : { - "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", - "attributesModel" : { - "org.vadere.state.attributes.models.AttributesOSM" : { - "stepCircleResolution" : 4, - "numberOfCircles" : 1, - "optimizationType" : "NELDER_MEAD", - "varyStepDirection" : true, - "movementType" : "ARBITRARY", - "stepLengthIntercept" : 0.4625, - "stepLengthSlopeSpeed" : 0.2345, - "stepLengthSD" : 0.036, - "movementThreshold" : 0.0, - "minStepLength" : 0.1, - "minimumStepLength" : true, - "maxStepDuration" : 1.7976931348623157E308, - "dynamicStepLength" : true, - "updateType" : "EVENT_DRIVEN", - "seeSmallWalls" : false, - "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", - "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", - "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ] - }, - "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { - "pedPotentialIntimateSpaceWidth" : 0.45, - "pedPotentialPersonalSpaceWidth" : 1.2, - "pedPotentialHeight" : 50.0, - "obstPotentialWidth" : 0.8, - "obstPotentialHeight" : 6.0, - "intimateSpaceFactor" : 1.2, - "personalSpacePower" : 1, - "intimateSpacePower" : 1 - }, - "org.vadere.state.attributes.models.AttributesFloorField" : { - "createMethod" : "HIGH_ACCURACY_FAST_MARCHING", - "potentialFieldResolution" : 0.1, - "obstacleGridPenalty" : 0.1, - "targetAttractionStrength" : 1.0, - "cacheType" : "NO_CACHE", - "cacheDir" : "", - "timeCostAttributes" : { - "standardDeviation" : 0.7, - "type" : "UNIT", - "obstacleDensityWeight" : 3.5, - "pedestrianSameTargetDensityWeight" : 3.5, - "pedestrianOtherTargetDensityWeight" : 3.5, - "pedestrianWeight" : 3.5, - "queueWidthLoading" : 1.0, - "pedestrianDynamicWeight" : 6.0, - "loadingType" : "CONSTANT", - "width" : 0.2, - "height" : 1.0 - } - } - }, - "attributesSimulation" : { - "finishTime" : 200.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : true, - "strategyModel" : "ReadSetControllerInputs", - "arguments" : [ "Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv" ], - "requiredDataProcessorIds" : [ 10 ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 5.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 2.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "type" : "POLYGON", - "points" : [ { - "x" : 22.5, - "y" : 40.5 - }, { - "x" : 22.5, - "y" : 4.5 - }, { - "x" : 40.0, - "y" : 4.5 - }, { - "x" : 40.0, - "y" : 30.0 - }, { - "x" : 59.5, - "y" : 30.0 - }, { - "x" : 59.5, - "y" : 50.5 - }, { - "x" : 39.9, - "y" : 50.5 - }, { - "x" : 40.0, - "y" : 40.5 - } ] - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 20.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - }, { - "shape" : { - "x" : 27.9, - "y" : 0.5, - "width" : 10.0, - "height" : 4.0, - "type" : "RECTANGLE" - }, - "id" : 555 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 25.0, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 3.0, - "y" : 13.4, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2002, - "absorbing" : false, - "shape" : { - "x" : 20.5, - "y" : 13.6, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 40.0, - "y" : 10.5, - "width" : 19.5, - "height" : 19.5, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 250, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "attributesPedestrian" : { - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0 - }, - "teleporter" : null, - "attributesCar" : { - "id" : -1, - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv deleted file mode 100644 index 8ecfd4e52..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_forced_controller_input.csv +++ /dev/null @@ -1,1000 +0,0 @@ -0 0.6146005020908336 -1 0.6650485327222698 -2 0.33868604117396073 -3 0.5081440260356207 -4 0.2809676532131833 -5 0.43729746545966475 -6 0.29478304161180957 -7 0.259265165563503 -8 0.8359333402470007 -9 0.5688453012981368 -10 0.14684167244291757 -11 0.2916153293731746 -12 0.24733700865773356 -13 0.8561120905908465 -14 0.9614794660634766 -15 0.8506888018492919 -16 0.44241240243957436 -17 0.8262778513842619 -18 0.7373309015250838 -19 0.6217182722952229 -20 0.9401076442581188 -21 0.4246391264270659 -22 0.42864220501712635 -23 0.6761520678505538 -24 0.6692768935901807 -25 0.15341758108136905 -26 0.23663715844052668 -27 0.865785559626088 -28 0.9362170662762577 -29 0.4903688738061537 -30 0.08270712924724677 -31 0.7511892936315261 -32 0.97472973081431 -33 0.9036119183627821 -34 0.6834161883563786 -35 0.8721901893616636 -36 0.5783609583259169 -37 0.38332773525953234 -38 0.17953382870939238 -39 0.8526150296010738 -40 0.24030135903611316 -41 0.9850899795808634 -42 0.9167880905212168 -43 0.052404197879932335 -44 0.6993790492856935 -45 0.2926615516558956 -46 0.19198383423671217 -47 0.4510818011396218 -48 0.7835245728424779 -49 0.1361003894891566 -50 0.6725386498947766 -51 0.9939475483592074 -52 0.06286401979336653 -53 0.042641981686528885 -54 0.4438310227193817 -55 0.09201667086821119 -56 0.004517585958102255 -57 0.6280903733280018 -58 0.22368731395985253 -59 0.8124000438226147 -60 0.312010853206081 -61 0.10537875289450183 -62 0.99221825088738 -63 0.11263595542375637 -64 0.1634284357217789 -65 0.8012916277834085 -66 0.07269514890770223 -67 0.5937256026583363 -68 0.8548507993955851 -69 0.27383730367375136 -70 0.4600979375706774 -71 0.922061922754948 -72 0.09809592278111401 -73 0.5435453584356806 -74 0.3840312881623792 -75 0.30997816062809025 -76 0.8197931463846849 -77 0.38298617622158093 -78 0.688143972817824 -79 0.3763030390226625 -80 0.8557546908148563 -81 0.32487098158512007 -82 0.38129835266205114 -83 0.5884156093483849 -84 0.39179925625322076 -85 0.11493855769306649 -86 0.07564524937400496 -87 0.9201877339699558 -88 0.4336109723393837 -89 0.8718292775579153 -90 0.032944404470239275 -91 0.4027596694358895 -92 0.525654227047685 -93 0.35468720191682623 -94 0.3097732275482977 -95 0.23441435389167087 -96 0.37383675041769604 -97 0.7338318788555538 -98 0.10014256148516032 -99 0.6482374440169388 -100 0.26144854547194507 -101 0.9552095631816646 -102 0.11454880834549785 -103 0.2102047654239565 -104 0.9033993348825753 -105 0.6837094587472439 -106 0.9131763545156638 -107 0.4088644594547842 -108 0.9163151698080974 -109 0.04211742653714168 -110 0.33100865232393695 -111 0.21347932868477437 -112 0.5867003711190286 -113 0.9664780020271995 -114 0.14212626757444324 -115 0.3796465701505348 -116 0.8030165868369302 -117 0.37044649699828336 -118 0.681225676751774 -119 0.5336007612887247 -120 0.6204379858036239 -121 0.1983888028725973 -122 0.9045260774173043 -123 0.9997063746331719 -124 0.36103030353209276 -125 0.6271294908657041 -126 0.9132199292109082 -127 0.26116320321862796 -128 0.004349245896879794 -129 0.824223037754533 -130 0.00838729456923315 -131 0.25455650486450376 -132 0.48358104326665463 -133 0.690920740204652 -134 0.7124421290509609 -135 0.30944848030277605 -136 0.7121245274032394 -137 0.7557983199305711 -138 0.8135162378074436 -139 0.0036181033776572225 -140 0.14128947316406715 -141 0.4863571565054222 -142 0.9496807199716708 -143 0.8332490296489768 -144 0.7110792748068546 -145 0.6191346867818919 -146 0.5937738364566388 -147 0.9702405384058607 -148 0.22798417557950457 -149 0.7336208320510129 -150 0.33213983175609807 -151 0.8347259629980781 -152 0.5920223397012541 -153 0.9602201744695826 -154 0.9866143963161755 -155 0.6481920789734562 -156 0.03261142816796436 -157 0.11948946031893959 -158 0.17558745603583226 -159 0.1932862860280451 -160 0.49066445572567674 -161 0.8913649427731462 -162 0.7481356644236755 -163 0.2501885305396103 -164 0.5483489893448809 -165 0.3195740275306813 -166 0.46920697758109897 -167 0.6383266461083896 -168 0.5146171623566057 -169 0.9491827385937975 -170 0.23099537562221006 -171 0.8443233071698799 -172 0.7372235924675711 -173 0.586750486399601 -174 0.06267575417972149 -175 0.692682620193999 -176 0.7479144079775795 -177 0.11677478790115414 -178 0.246340207483434 -179 0.9276651435265092 -180 0.7282475933985066 -181 0.6729901916278033 -182 0.4205036440822575 -183 0.8785900988925225 -184 0.2607814424839735 -185 0.5872051136551484 -186 0.8783832546750349 -187 0.2316570413201009 -188 0.1715734309828092 -189 0.3135920590708339 -190 0.07597905126222537 -191 0.4749300649021928 -192 0.7962460196934528 -193 0.8902609695117507 -194 0.18909444938334874 -195 0.2966707648574253 -196 0.8450909609309223 -197 0.035674019411165436 -198 0.4877819467317872 -199 0.941384723480105 -200 0.3455425536814142 -201 0.31802889011712987 -202 0.044244012079533435 -203 0.9623505748708107 -204 0.09186383216035343 -205 0.9358735515606217 -206 0.049794149179148595 -207 0.8818935375334371 -208 0.0715372926315907 -209 0.592385361090094 -210 0.2403046080691763 -211 0.883106756909924 -212 0.41534566866042677 -213 0.5481387330549392 -214 0.7317235600481665 -215 0.3754869136839968 -216 0.5636140640941161 -217 0.4350325516620861 -218 0.4992285024636428 -219 0.16426171159459269 -220 0.015752657572718043 -221 0.6800233322443755 -222 0.7975646811529056 -223 0.42632517473480824 -224 0.29779841516929684 -225 0.31538032253069115 -226 0.3486721951146843 -227 0.22622312742629402 -228 0.8746376785885601 -229 0.5880759762398509 -230 0.0003048969217748221 -231 0.9402965375873874 -232 0.3779563686411783 -233 0.8428235498531924 -234 0.011103240029316841 -235 0.680786502472297 -236 0.8833430181497568 -237 0.37862494656749657 -238 0.7662274071991965 -239 0.4751099846551532 -240 0.7467130217585064 -241 0.2576972615646206 -242 0.9649529559941266 -243 0.317504408033803 -244 0.6752583346583367 -245 0.21685359427544493 -246 0.9444815560783576 -247 0.5741891578498426 -248 0.7574416027518425 -249 0.8082779655686915 -250 0.9808893998372075 -251 0.3416452577333946 -252 0.12427505207697176 -253 0.7071122369354768 -254 0.4842812890130189 -255 0.6789723577225433 -256 0.0788954949997357 -257 0.67015986855404 -258 0.532978974031281 -259 0.8219666300521072 -260 0.18132932873294527 -261 0.9010052672108977 -262 0.7891626119270135 -263 0.32412864868048974 -264 0.2042941377829206 -265 0.5335756887976593 -266 0.667560889516281 -267 0.860805809930749 -268 0.3040270125628408 -269 0.032647914531071076 -270 0.045307624009188974 -271 0.6247980981243938 -272 0.47119634593148163 -273 0.04151331800589908 -274 0.7284916602447619 -275 0.5132546204226095 -276 0.7475171535773633 -277 0.5172302890453766 -278 0.39229281085924106 -279 0.3317028625799824 -280 0.7167026742115853 -281 0.3863216684511477 -282 0.04013294796855771 -283 0.26130424416649545 -284 0.7275290823281491 -285 0.14255858319582437 -286 0.6490809958131433 -287 0.23659447628076147 -288 0.03910869712885745 -289 0.4641772706235857 -290 0.0022412143241005156 -291 0.7387899576808663 -292 0.9163989647890401 -293 0.7611050222487151 -294 0.7114623445179385 -295 0.8190146880622072 -296 0.2870956084571472 -297 0.2780315800125649 -298 0.20520211619467243 -299 0.8566735750118799 -300 0.6259406895898727 -301 0.6026473954303412 -302 0.160589640599614 -303 0.8359895011687967 -304 0.46470005588221597 -305 0.6243103026632111 -306 0.17396357954757324 -307 0.7048271581775711 -308 0.6417857740531511 -309 0.3816427994538153 -310 0.6662286669810613 -311 0.5658279307972103 -312 0.6676303592661204 -313 0.5825144262687565 -314 0.45432510407287374 -315 0.8173760807789158 -316 0.12086525479318211 -317 0.5855076088590764 -318 0.4789881934304213 -319 0.3869883388010731 -320 0.24278697531316962 -321 0.9761775227751434 -322 0.5328257579195391 -323 0.4736972681794521 -324 0.6125937720270216 -325 0.5311930852241517 -326 0.3659105526517117 -327 0.2967699315708078 -328 0.39121884671909324 -329 0.8365948686300527 -330 0.5362487043576193 -331 0.928135117231052 -332 0.4273179602972903 -333 0.16279823247696568 -334 0.7851789974166563 -335 0.11056733163755961 -336 0.9526183736682573 -337 0.4913085144237389 -338 0.11331186110956237 -339 0.47027187594884157 -340 0.72055130010026 -341 0.8948124144215575 -342 0.5830789705506002 -343 0.4225945696154748 -344 0.8885600200556465 -345 0.5183854246750503 -346 0.06413715196655656 -347 0.19048427357226094 -348 0.40682247765928403 -349 0.22829707845405167 -350 0.774589805339572 -351 0.2884518137670188 -352 0.10154255346452756 -353 0.6575517685730212 -354 0.5303588455192279 -355 0.8300407683155056 -356 0.1632526155641537 -357 0.6529916215796134 -358 0.15125789223842123 -359 0.7062108926298674 -360 0.38232268717012263 -361 0.9879682708172243 -362 0.05585188500465932 -363 0.016071714634469325 -364 0.5586852327244253 -365 0.8798964793766 -366 0.7245053865806828 -367 0.7536853692450781 -368 0.04797091220077632 -369 0.21807221620057682 -370 0.5180297574069261 -371 0.17348390398906632 -372 0.5643330468221551 -373 0.9334344850131515 -374 0.7274289795776246 -375 0.2704819468330595 -376 0.008927722689938244 -377 0.5256518061559697 -378 0.4072521670934499 -379 0.7461733977539089 -380 0.9632070122782046 -381 0.07290759600055918 -382 0.03878472174497283 -383 0.7365115719275168 -384 0.6894787949218665 -385 0.9132346669838214 -386 0.08338975817245409 -387 0.458829777718336 -388 0.6920834740199808 -389 0.8112760885149263 -390 0.20080672085450835 -391 0.3052875492206203 -392 0.9760653750859055 -393 0.3376732001841445 -394 0.3785434455240674 -395 0.6618552137287023 -396 0.808271671898461 -397 0.636084293679116 -398 0.5774255240410008 -399 0.5707091186183084 -400 0.7297847601039609 -401 0.22809302026040512 -402 0.012088275756925393 -403 0.38968985175754445 -404 0.530923902875921 -405 0.7528144195837548 -406 0.6024433298787157 -407 0.22586336958962583 -408 0.46946744737518564 -409 0.24433803162835 -410 0.34522466517245565 -411 0.5141666319886984 -412 0.04561061664952215 -413 0.5815996242617482 -414 0.6834761013858174 -415 0.6368755198971972 -416 0.49431535305069696 -417 0.3192984437508354 -418 0.22650139097870492 -419 0.5488325114845786 -420 0.3616552622770507 -421 0.7672404033170721 -422 0.43681702256736044 -423 0.2590991380635156 -424 0.29380962848732417 -425 0.24993996726119616 -426 0.7185741437598141 -427 0.7349667010974119 -428 0.485053675100966 -429 0.5301666500894326 -430 0.9532631000754033 -431 0.6778436850810353 -432 0.9264447259415625 -433 0.3443432929585798 -434 0.703772295599113 -435 0.42862724998876467 -436 0.5838357340472601 -437 0.41652079975250966 -438 0.44933349429061986 -439 0.37778083734873946 -440 0.5559013140560207 -441 0.8638807380016925 -442 0.3820141120759172 -443 0.8415143737544245 -444 0.10739563544476338 -445 0.9738364987440702 -446 0.7773710878089832 -447 0.7125875742540747 -448 0.23683647248701667 -449 0.2961692825543747 -450 0.6986600950948043 -451 0.30324260021691907 -452 0.15741023521736164 -453 0.2669604761239339 -454 0.7152771152519802 -455 0.8128849477096445 -456 0.12117019090026071 -457 0.8561488083188311 -458 0.5128012322526788 -459 0.11790215221442069 -460 0.40688269187756676 -461 0.24608099166925967 -462 0.007840146840067508 -463 0.7292005473710497 -464 0.9496585369074249 -465 0.6674992462928488 -466 0.2184772081800218 -467 0.23427553099609633 -468 0.4210037772638473 -469 0.63337416911428 -470 0.9829311403363387 -471 0.2266872677454177 -472 0.6234265849127177 -473 0.48081641775834516 -474 0.603853599426888 -475 0.8736687403391108 -476 0.13456700905459673 -477 0.15918483438904896 -478 0.5776251081992172 -479 0.7150590541773992 -480 0.8552002815973839 -481 0.11100272014400492 -482 0.3401499193828672 -483 0.6395184179165113 -484 0.39115755801866603 -485 0.9422951969462622 -486 0.9322979325904929 -487 0.9984259037325194 -488 0.7648380050888037 -489 0.7326549140160928 -490 0.458914284949519 -491 0.4070266671205989 -492 0.8335356575057142 -493 0.33972220389758667 -494 0.5400968988513073 -495 0.7983400094741095 -496 0.2884936537039643 -497 0.09416643073043562 -498 0.6412763941981754 -499 0.8153059729878798 -500 0.36276614300160415 -501 0.2135189361291565 -502 0.9591973103378493 -503 0.6504728184897635 -504 0.01407510152345981 -505 0.5631103524188633 -506 0.2958910015772761 -507 0.20597967500391168 -508 0.6902335385224573 -509 0.7228390931437262 -510 0.8128402335757849 -511 0.3015624734817134 -512 0.148239349063636 -513 0.5895586151712691 -514 0.18726033701635592 -515 0.8924520777983327 -516 0.7488104509858774 -517 0.43270729973958744 -518 0.506914146146703 -519 0.4208688059759784 -520 0.49682056424427823 -521 0.9774371479152311 -522 0.9206923275732642 -523 0.061365780880261456 -524 0.15417225336570473 -525 0.4547149660720362 -526 0.21885290109944866 -527 0.767434281527799 -528 0.7132007626218805 -529 0.6514820123143515 -530 0.8338718034884631 -531 0.058463052099115065 -532 0.7474125220892183 -533 0.564250147112778 -534 0.897760194628157 -535 0.9389767917720141 -536 0.5023267121095448 -537 0.5925587738967764 -538 0.6381831440215647 -539 0.3825525809699386 -540 0.06362921346282546 -541 0.7636187693718737 -542 0.012004033535306435 -543 0.7473393349494399 -544 0.3820779963934038 -545 0.309882174719992 -546 0.35030034832509915 -547 0.6905253240938567 -548 0.9690807471707394 -549 0.1319198229189601 -550 0.22553970975190463 -551 0.8077635883286303 -552 0.5891738249825738 -553 0.6732269819953789 -554 0.35681780585532163 -555 0.965633836362961 -556 0.40646268087795545 -557 0.5067731297649384 -558 0.9795536897212174 -559 0.3338036921855573 -560 0.27769333818682274 -561 0.9982109573679916 -562 0.8853078353892317 -563 0.5859510199664603 -564 0.28876392013095686 -565 0.4765624854297239 -566 0.7600030868070683 -567 0.03058798872042201 -568 0.5781089498544716 -569 0.7406118454572292 -570 0.7240535760817192 -571 0.6763677011887029 -572 0.25107787755385047 -573 0.013406475092380354 -574 0.3291511136024924 -575 0.5525727807976138 -576 0.43963775409927996 -577 0.044657832886989546 -578 0.6959572617015657 -579 0.7890371027271085 -580 0.906280706039855 -581 0.17928362564565203 -582 0.09588828345906364 -583 0.7609401379106291 -584 0.001572813166712983 -585 0.08180235818641624 -586 0.06907596630082824 -587 0.2641653093806875 -588 0.9202825623725778 -589 0.21627828043797326 -590 0.7314206064854518 -591 0.4447797336348318 -592 0.6961636682456007 -593 0.32451368166810646 -594 0.15174203064652347 -595 0.7208953299730961 -596 0.8938108957654243 -597 0.10750104125640947 -598 0.7543223593337812 -599 0.1854641540489892 -600 0.6429177543035923 -601 0.0019113891166390173 -602 0.5445960797721411 -603 0.2880971260404508 -604 0.8689028582466993 -605 0.945035262086271 -606 0.39212058981097087 -607 0.4610761696446807 -608 0.7685320483786504 -609 0.023428509013597387 -610 0.011744811283231127 -611 0.428560539709373 -612 0.6358979426692003 -613 0.07504757291033681 -614 0.24159926144088717 -615 0.9433050375949126 -616 0.4796867799480262 -617 0.2742107063857592 -618 0.19008542856089095 -619 0.5393433752674143 -620 0.1467116537695644 -621 0.2639132248803856 -622 0.88111289971593 -623 0.7403775176881694 -624 0.20998194551926497 -625 0.8754268301480604 -626 0.9132898887485146 -627 0.7501831050088281 -628 0.962552407619942 -629 0.6681920122396682 -630 0.7007031173760395 -631 0.6955429945601611 -632 0.47608500872481807 -633 0.182695114343028 -634 0.3627919331276991 -635 0.6441257352405059 -636 0.3147341784255945 -637 0.36756549421118423 -638 0.8739059695785523 -639 0.05938350174745732 -640 0.9173825268631555 -641 0.3747522938012636 -642 0.5560442523285786 -643 0.8429401714754235 -644 0.8404604605814956 -645 0.5887642964003782 -646 0.8981678198776912 -647 0.8082540057937418 -648 0.38014947469047056 -649 0.18721232627243367 -650 0.7708568624021838 -651 0.9175693802204626 -652 0.15424265491947398 -653 0.2990203787892868 -654 0.8753963490575494 -655 0.5507505845886737 -656 0.324301939221912 -657 0.8396653956821588 -658 0.9445883894354826 -659 0.07885848160057607 -660 0.8446492053306913 -661 0.4860135613090568 -662 0.7788444922220472 -663 0.14850555764802487 -664 0.477412287784455 -665 0.3526328236935945 -666 0.8386477953689166 -667 0.43162716008602175 -668 0.30537971197987235 -669 0.6104010033694522 -670 0.0031978713500798728 -671 0.15866167487023786 -672 0.4940400099373625 -673 0.9697733030921222 -674 0.7995368681576861 -675 0.8737047619072458 -676 0.4345036315303419 -677 0.7512146318270448 -678 0.888998678063122 -679 0.0170406445040443 -680 0.09409292310941608 -681 0.021560058712017938 -682 0.8137575059843485 -683 0.06392934020492913 -684 0.2965609800492517 -685 0.7582509048815675 -686 0.47714057077107797 -687 0.2386779495959186 -688 0.8100286279262591 -689 0.8884225073185965 -690 0.3283893789715192 -691 0.9589072968339333 -692 0.5978340293447107 -693 0.17780969541168068 -694 0.6811912196310966 -695 0.504249403937246 -696 0.12236524198912557 -697 0.4440597440475872 -698 0.6104564706737802 -699 0.912522275549739 -700 0.19820589586718074 -701 0.20044762126472626 -702 0.9059526999755747 -703 0.23353751185466143 -704 0.0917547059559074 -705 0.6475466659717812 -706 0.8901803231954843 -707 0.6486740504517915 -708 0.09784357595845872 -709 0.26059517781536456 -710 0.029462748622342216 -711 0.29054073290670546 -712 0.38507380791326407 -713 0.8144359087554227 -714 0.7316188575629038 -715 0.7463706174136694 -716 0.8057324235572229 -717 0.6729129012481737 -718 0.404583113944471 -719 0.6053260266564192 -720 0.7879625613926748 -721 0.26302835392848223 -722 0.8990688965241548 -723 0.6289375521647088 -724 0.6241769773509612 -725 0.9035363585595281 -726 0.32343192958312905 -727 0.8406914696811322 -728 0.7314714065779175 -729 0.06825950372738898 -730 0.14928465564579474 -731 0.3054367632710753 -732 0.05160128519426632 -733 0.4581635089267273 -734 0.8278255198825754 -735 0.03832156081257021 -736 0.5673939839751806 -737 0.9324164158745445 -738 0.7039221516151496 -739 0.845919995650345 -740 0.13244352486641986 -741 0.3918667158439785 -742 0.6206549288218728 -743 0.12990493375136725 -744 0.0225576441662515 -745 0.24866570290904488 -746 0.24144600856477938 -747 0.7538197043002414 -748 0.10209677601590572 -749 0.11143478122690342 -750 0.7821903921259422 -751 0.3942888474151761 -752 0.0618347741269063 -753 0.3151983905776057 -754 0.3309715499818612 -755 0.06238653582619158 -756 0.5926061013139098 -757 0.7981250545213003 -758 0.22790513673813995 -759 0.2246891717766586 -760 0.6535849194633997 -761 0.04647971339121948 -762 0.6869096503893598 -763 0.7017953305779028 -764 0.40864507705762265 -765 0.610659247284285 -766 0.8311193599023698 -767 0.19904517860343507 -768 0.15374041263988114 -769 0.2020621665909914 -770 0.5921761094816475 -771 0.9593115077484744 -772 0.6665140119096852 -773 0.857597141681306 -774 0.33225788188422567 -775 0.33793117082473545 -776 0.32704650668911306 -777 0.8865302549378776 -778 0.0709818003183238 -779 0.21724924723190997 -780 0.3080789116561514 -781 0.2143170347726231 -782 0.45131900934594293 -783 0.9120919940775968 -784 0.3141905923892572 -785 0.7091547629489223 -786 0.5568749891471545 -787 0.34973926658057597 -788 0.7757329362816435 -789 0.4002729707787839 -790 0.39733281230008355 -791 0.4272631901960915 -792 0.8978601850735832 -793 0.12377622798023125 -794 0.22924693458532697 -795 0.3674526662376072 -796 0.12191098019109037 -797 0.005951274386803096 -798 0.8891696873055005 -799 0.730054184400856 -800 0.8588032157161772 -801 0.42238188854754544 -802 0.6987185979699027 -803 0.919127751576854 -804 0.6417783712247874 -805 0.05971860302083898 -806 0.4371899490012827 -807 0.3319824163520646 -808 0.0834215790016426 -809 0.6796489430667242 -810 0.11381480090503682 -811 0.675867244979735 -812 0.4951978763832017 -813 0.8549319299446665 -814 0.9608560253280477 -815 0.439967542654383 -816 0.6786493415962902 -817 0.1419118322566515 -818 0.8609699528318758 -819 0.38564353527556283 -820 0.42497982034101867 -821 0.27886619921781597 -822 0.11652880251524755 -823 0.7747662858343326 -824 0.9074184132621106 -825 0.1312499890495724 -826 0.49810255511681245 -827 0.6162765657237362 -828 0.15352318207535376 -829 0.8813152934885556 -830 0.9740014698858462 -831 0.43385458041145497 -832 0.9754315273836498 -833 0.628814753474807 -834 0.4622845021790061 -835 0.7439396579358708 -836 0.43134464146590346 -837 0.21086416578823342 -838 0.032444895497195425 -839 0.6121849621463007 -840 0.684031530446989 -841 0.7748993638332198 -842 0.6609256172143887 -843 0.4244936438104321 -844 0.4295140093912041 -845 0.14404507265168598 -846 0.2015746249991921 -847 0.44399403395972825 -848 0.5871204620194638 -849 0.8610112784417061 -850 0.7725654128583747 -851 0.9255389475524322 -852 0.8290399954457885 -853 0.9308033993846286 -854 0.3299223109787075 -855 0.6258490271329071 -856 0.15731923128054814 -857 0.4842502167075543 -858 0.20252214367764332 -859 0.5549884040061428 -860 0.17750496220305634 -861 0.45857137154977934 -862 0.5337504180624256 -863 0.7106733413625976 -864 0.11466729829182942 -865 0.38215502441813254 -866 0.02644322324044346 -867 0.29757394094811407 -868 0.8257491430885802 -869 0.5464022802148416 -870 0.6160801518130258 -871 0.7525025389716961 -872 0.7699324154938205 -873 0.20839819437643092 -874 0.7116764112091769 -875 0.04212094583892523 -876 0.8537956405300061 -877 0.9788523321234054 -878 0.6581091163738675 -879 0.9902434988428545 -880 0.9043595873359431 -881 0.3861021432274948 -882 0.5202055497707494 -883 0.7833466666164538 -884 0.8554426332455726 -885 0.026139903158982958 -886 0.8222195834394732 -887 0.45354675033440717 -888 0.8536575220029834 -889 0.59120946251696 -890 0.8079667986061431 -891 0.6179563686810776 -892 0.8383579805838476 -893 0.7818529793831255 -894 0.6795808291259844 -895 0.7115019464000145 -896 0.7905440241322897 -897 0.9577406032273728 -898 0.26729535802337445 -899 0.045416079827629297 -900 0.6035515481418938 -901 0.116966848241288 -902 0.3157410680277358 -903 0.8497992441028535 -904 0.5297339685748053 -905 0.9150761584860208 -906 0.33640993834406974 -907 0.9362153702730684 -908 0.5997191182533554 -909 0.8931717346981315 -910 0.437625016920725 -911 0.1641119218090722 -912 0.3902671972084635 -913 0.5873096368736422 -914 0.8138169614254551 -915 0.36776204451445893 -916 0.8723916933420434 -917 0.9349552531668429 -918 0.7542542409923305 -919 0.8101728194622346 -920 0.6501632673777481 -921 0.7230195431497476 -922 0.7571382788904574 -923 0.1276967140851748 -924 0.4348635432593073 -925 0.3699206437762256 -926 0.47796872330880147 -927 0.9256334581414346 -928 0.9189495362278106 -929 0.6808834198719146 -930 0.7938200415441474 -931 0.932865927971997 -932 0.08642170445476494 -933 0.3973586649570371 -934 0.07733093809082303 -935 0.621400374319733 -936 0.8708009233351294 -937 0.3211348230266299 -938 0.7586436304075128 -939 0.9883246716130489 -940 0.7099568217949476 -941 0.3103233601917399 -942 0.7093898598092181 -943 0.4926191514912249 -944 0.29130574914660057 -945 0.8707830874936576 -946 0.5962175036310357 -947 0.7942934812125496 -948 0.18829103738976083 -949 0.18488401193730308 -950 0.9147956027466958 -951 0.28798350072026435 -952 0.7808601283330229 -953 0.7869551326381795 -954 0.10433172442974592 -955 0.9368722569605368 -956 0.006934105910896049 -957 0.4490255996053798 -958 0.9426115535116355 -959 0.05192688310084581 -960 0.2974386591413345 -961 0.13929297136295116 -962 0.9900046494188425 -963 0.34779750492585726 -964 0.19087116437155072 -965 0.2694569749489395 -966 0.09091999193751976 -967 0.755672506592075 -968 0.7137906888486424 -969 0.23355514233400632 -970 0.6162931391095195 -971 0.13941528245468937 -972 0.9499295887212055 -973 0.2978719942822655 -974 0.22467109773221228 -975 0.2752109340265576 -976 0.40097291056714457 -977 0.31178633932266064 -978 0.17145116022062645 -979 0.2001574380037373 -980 0.810927099425327 -981 0.5268867792103548 -982 0.7601393797568436 -983 0.9833598314391977 -984 0.18776831145153794 -985 0.9862140415410539 -986 0.15229350814092046 -987 0.6263866953148329 -988 0.10239326174650931 -989 0.8717390913235197 -990 0.05351030675150481 -991 0.654840992216953 -992 0.07938199145667268 -993 0.19930528368294131 -994 0.9508726671299931 -995 0.23506627966858606 -996 0.7579546003275489 -997 0.462407694114665 -998 0.44605299184138913 -999 0.8323424795734158 diff --git a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario b/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario deleted file mode 100644 index 428cb2427..000000000 --- a/Scenarios/Demos/Density_controller/scenarios/TwoCorridors_unforced.scenario +++ /dev/null @@ -1,364 +0,0 @@ -{ - "name" : "TwoCorridors_unforced", - "description" : "", - "release" : "1.14", - "processWriters" : { - "files" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", - "filename" : "postvis.traj", - "processors" : [ 1, 2 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", - "filename" : "overlaps.csv", - "processors" : [ 3 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "overlapCount.txt", - "processors" : [ 4 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "evacuationTime.txt", - "processors" : [ 5 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", - "filename" : "AreaDensityCounting.txt", - "processors" : [ 8 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepKeyIdOutputFile", - "filename" : "MeshDensityCounting.txt", - "processors" : [ 9 ] - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", - "filename" : "Mesh.txt", - "processors" : [ 10 ] - } ], - "processors" : [ { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor", - "id" : 1 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor", - "id" : 2 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", - "id" : 3 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", - "id" : 4, - "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", - "attributes" : { - "pedestrianOverlapProcessorId" : 3 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.EvacuationTimeProcessor", - "id" : 5, - "attributesType" : "org.vadere.state.attributes.processor.AttributesEvacuationTimeProcessor", - "attributes" : { - "pedestrianEvacuationTimeProcessorId" : 6 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", - "id" : 6, - "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor", - "attributes" : { - "pedestrianStartTimeProcessorId" : 7 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", - "id" : 7 - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityCountingProcessor", - "id" : 8, - "attributesType" : "org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor", - "attributes" : { - "measurementAreaId" : 1000 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshDensityCountingProcessor", - "id" : 9, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshDensityCountingProcessor", - "attributes" : { - "meshProcessorId" : 10 - } - }, { - "type" : "org.vadere.simulator.projects.dataprocessing.processor.MeshProcessor", - "id" : 10, - "attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor", - "attributes" : { - "measurementAreaId" : 1, - "edgeLength" : 1.5, - "displayMesh" : false - } - } ], - "isTimestamped" : true, - "isWriteMetaData" : false - }, - "scenario" : { - "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", - "attributesModel" : { - "org.vadere.state.attributes.models.AttributesOSM" : { - "stepCircleResolution" : 4, - "numberOfCircles" : 1, - "optimizationType" : "NELDER_MEAD", - "varyStepDirection" : true, - "movementType" : "ARBITRARY", - "stepLengthIntercept" : 0.4625, - "stepLengthSlopeSpeed" : 0.2345, - "stepLengthSD" : 0.036, - "movementThreshold" : 0.0, - "minStepLength" : 0.1, - "minimumStepLength" : true, - "maxStepDuration" : 1.7976931348623157E308, - "dynamicStepLength" : true, - "updateType" : "EVENT_DRIVEN", - "seeSmallWalls" : false, - "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", - "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", - "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ] - }, - "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { - "pedPotentialIntimateSpaceWidth" : 0.45, - "pedPotentialPersonalSpaceWidth" : 1.2, - "pedPotentialHeight" : 50.0, - "obstPotentialWidth" : 0.8, - "obstPotentialHeight" : 6.0, - "intimateSpaceFactor" : 1.2, - "personalSpacePower" : 1, - "intimateSpacePower" : 1 - }, - "org.vadere.state.attributes.models.AttributesFloorField" : { - "createMethod" : "HIGH_ACCURACY_FAST_MARCHING", - "potentialFieldResolution" : 0.1, - "obstacleGridPenalty" : 0.1, - "targetAttractionStrength" : 1.0, - "cacheType" : "NO_CACHE", - "cacheDir" : "", - "timeCostAttributes" : { - "standardDeviation" : 0.7, - "type" : "UNIT", - "obstacleDensityWeight" : 3.5, - "pedestrianSameTargetDensityWeight" : 3.5, - "pedestrianOtherTargetDensityWeight" : 3.5, - "pedestrianWeight" : 3.5, - "queueWidthLoading" : 1.0, - "pedestrianDynamicWeight" : 6.0, - "loadingType" : "CONSTANT", - "width" : 0.2, - "height" : 1.0 - } - } - }, - "attributesSimulation" : { - "finishTime" : 160.0, - "simTimeStepLength" : 0.4, - "realTimeSimTimeRatio" : 0.1, - "writeSimulationData" : true, - "visualizationEnabled" : true, - "printFPS" : false, - "digitsPerCoordinate" : 2, - "useFixedSeed" : false, - "fixedSeed" : 2617225706430579811, - "simulationSeed" : 0 - }, - "attributesPsychology" : { - "usePsychologyLayer" : false, - "psychologyLayer" : { - "perception" : "SimplePerceptionModel", - "cognition" : "SimpleCognitionModel" - } - }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : "RouteChoiceThreeCorridors", - "arguments" : [ ], - "requiredDataProcessorIds" : [ ] - }, - "topography" : { - "attributes" : { - "bounds" : { - "x" : 0.0, - "y" : 0.0, - "width" : 60.0, - "height" : 51.0 - }, - "boundingBoxWidth" : 0.5, - "bounded" : true, - "referenceCoordinateSystem" : null - }, - "obstacles" : [ { - "shape" : { - "x" : 15.0, - "y" : 10.5, - "width" : 15.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 6 - }, { - "shape" : { - "x" : 0.5, - "y" : 10.5, - "width" : 12.5, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 7 - }, { - "shape" : { - "x" : 32.5, - "y" : 10.5, - "width" : 27.0, - "height" : 30.0, - "type" : "RECTANGLE" - }, - "id" : 3 - } ], - "measurementAreas" : [ { - "shape" : { - "x" : 30.5, - "y" : 10.5, - "width" : 2.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "id" : 1000 - }, { - "shape" : { - "x" : 0.5, - "y" : 0.5, - "width" : 59.0, - "height" : 50.0, - "type" : "RECTANGLE" - }, - "id" : 1 - } ], - "stairs" : [ ], - "targets" : [ { - "id" : 1, - "absorbing" : true, - "shape" : { - "x" : 44.5, - "y" : 40.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2001, - "absorbing" : false, - "shape" : { - "x" : 13.0, - "y" : 13.4, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - }, { - "id" : 2002, - "absorbing" : false, - "shape" : { - "x" : 30.5, - "y" : 13.6, - "width" : 2.0, - "height" : 1.0, - "type" : "RECTANGLE" - }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 - } ], - "targetChangers" : [ { - "id" : 4, - "shape" : { - "x" : 39.5, - "y" : 0.5, - "width" : 5.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "reachDistance" : 0.0, - "changeAlgorithmType" : "SELECT_LIST", - "nextTarget" : [ 2001, 1 ], - "probabilityToChangeTarget" : [ 0.0 ] - } ], - "absorbingAreas" : [ ], - "sources" : [ { - "id" : 2, - "shape" : { - "x" : 44.5, - "y" : 0.5, - "width" : 15.0, - "height" : 10.0, - "type" : "RECTANGLE" - }, - "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", - "distributionParameters" : [ 1.0 ], - "spawnNumber" : 100, - "maxSpawnNumberTotal" : -1, - "startTime" : 0.0, - "endTime" : 0.0, - "spawnAtRandomPositions" : true, - "spawnAtGridPositionsCA" : false, - "useFreeSpaceOnly" : true, - "targetIds" : [ 2002, 1 ], - "groupSizeDistribution" : [ 1.0 ], - "dynamicElementType" : "PEDESTRIAN", - "attributesPedestrian" : null - } ], - "dynamicElements" : [ ], - "attributesPedestrian" : { - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0 - }, - "teleporter" : null, - "attributesCar" : { - "id" : -1, - "radius" : 0.2, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0, - "footstepHistorySize" : 4, - "searchRadius" : 1.0, - "walkingDirectionCalculation" : "BY_TARGET_CENTER", - "walkingDirectionSameIfAngleLessOrEqual" : 45.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - } - }, - "stimulusInfos" : [ ] - } -} \ No newline at end of file diff --git a/Scenarios/Demos/Density_controller/vadere.project b/Scenarios/Demos/Density_controller/vadere.project deleted file mode 100644 index ebe3534b3..000000000 --- a/Scenarios/Demos/Density_controller/vadere.project +++ /dev/null @@ -1 +0,0 @@ -plants_controller \ No newline at end of file diff --git a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java index d8890d542..5f35a8b21 100644 --- a/VadereGui/src/org/vadere/gui/projectview/view/TextView.java +++ b/VadereGui/src/org/vadere/gui/projectview/view/TextView.java @@ -302,10 +302,6 @@ public class TextView extends JPanel implements IJsonView { StimulusInfoStore stimulusInfoStore = scenario.getScenarioStore().getStimulusInfoStore(); textfileTextarea.setText(StateJsonConverter.serializeStimuli(stimulusInfoStore)); break; - case STRATEGY: - textfileTextarea - .setText(StateJsonConverter.serializeAttributesStrategyModel(scenario.getAttributesStrategyModel())); - break; default: throw new RuntimeException("attribute type not implemented."); } diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java index 67bd2279b..b6b70b8f4 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/OfflineSimulation.java @@ -66,7 +66,7 @@ public class OfflineSimulation { .map(t -> t.getAgent(step.getStepNumber())) .filter(opt -> opt.isPresent()).forEach(opt -> topography.addElement(opt.get())); return new SimulationState(vadere.getName(), topography, vadere.getScenarioStore(), - (step.getStepNumber()-1) * vadere.getAttributesSimulation().getSimTimeStepLength(), step.getStepNumber(), null, null); + (step.getStepNumber()-1) * vadere.getAttributesSimulation().getSimTimeStepLength(), step.getStepNumber(), null); } private void prepareOutput() { diff --git a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java b/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java deleted file mode 100644 index 77d6b2c4f..000000000 --- a/VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/StrategyControllerValuesRealized.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.vadere.simulator.projects.dataprocessing.processor; - -import org.vadere.annotation.factories.dataprocessors.DataProcessorClass; -import org.vadere.simulator.control.simulation.SimulationState; -import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey; - -/** - * @author Christina Mayr - */ -@DataProcessorClass() -public class StrategyControllerValuesRealized extends StrategyDataProcessor { - - - public StrategyControllerValuesRealized() { - super("RealizedValues"); - } - - @Override - protected void doUpdate(final SimulationState state) { - this.putValue(new TimestepKey(state.getStep()), getStrategyModelOutput(state)); - } -} diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index d06b9d119..15e611969 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -62,7 +62,7 @@ public class JsonConverter { ScenarioStore scenarioStore = new ScenarioStore(scenarioName, scenarioDescription, mainModel, attributesModel, attributesSimulation, attributesPsychology, - topography, stimulusInfoStore, attributesStrategyModel); + topography, stimulusInfoStore); Scenario scenarioRunManager = new Scenario(scenarioStore); scenarioRunManager.setDataProcessingJsonManager(DataProcessingJsonManager.deserializeFromNode(rootNode.get(DataProcessingJsonManager.DATAPROCCESSING_KEY))); @@ -115,8 +115,6 @@ public class JsonConverter { vadereNode.set(AttributesSimulation.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class)); vadereNode.set(AttributesPsychology.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class)); - vadereNode.set(AttributesStrategyModel.JSON_KEY, StateJsonConverter.convertValue(scenarioStore.getAttributesStrategyModel(), JsonNode.class)); - ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); vadereNode.set("topography", topographyNode); @@ -137,7 +135,6 @@ public class JsonConverter { JsonNode attributesSimulationNode = StateJsonConverter.convertValue(scenarioStore.getAttributesSimulation(), JsonNode.class); JsonNode attributesPsychologyNode = StateJsonConverter.convertValue(scenarioStore.getAttributesPsychology(), JsonNode.class); - ObjectNode attributesStrategyNode = StateJsonConverter.serializeAttributesStrategyModelToNode(scenarioStore.getAttributesStrategyModel()); ObjectNode attributesModelNode = StateJsonConverter.serializeAttributesModelToNode(scenarioStore.getAttributesList()); ObjectNode topographyNode = StateJsonConverter.serializeTopographyToNode(scenarioStore.getTopography()); ObjectNode stimulusNode = StateJsonConverter.serializeStimuliToNode(scenarioStore.getStimulusInfoStore()); @@ -153,8 +150,7 @@ public class JsonConverter { StateJsonConverter.deserializeAttributesSimulationFromNode(attributesSimulationNode), StateJsonConverter.deserializeAttributesPsychologyFromNode(attributesPsychologyNode), StateJsonConverter.deserializeTopographyFromNode(topographyNode), - StateJsonConverter.deserializeStimuliFromArrayNode(stimulusInfosArrayNode), - StateJsonConverter.deserializeAttributesStrategyModelFromNode(attributesStrategyNode) + StateJsonConverter.deserializeStimuliFromArrayNode(stimulusInfosArrayNode) ); } } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java index 964694365..f8263b1ef 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java @@ -3,6 +3,7 @@ package org.vadere.simulator.projects.migration.jsontranformation; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.util.version.Version; import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.projects.io.JsonConverter; diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java index 654a75a0d..b7c4b48ee 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_14.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; import org.vadere.simulator.projects.migration.MigrationException; import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.attributes.AttributesStrategyModel; import org.vadere.state.util.StateJsonConverter; import org.vadere.util.version.Version; diff --git a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java index a7e006d54..ccb3b67e6 100644 --- a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java +++ b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/ScenarioChecker.java @@ -5,7 +5,6 @@ import org.vadere.simulator.projects.Scenario; import org.vadere.simulator.utils.scenariochecker.checks.ScenarioCheckerTest; import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.CheckAreasInAreaDensityVoronoiProcessor; import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.DataProcessorsLinkedToMeasurementArea; -import org.vadere.simulator.utils.scenariochecker.checks.dataProcessors.StrategyModelDataProcessorCheck; import org.vadere.simulator.utils.scenariochecker.checks.models.CellularAutomatonSetupCheck; import org.vadere.simulator.utils.scenariochecker.checks.simulation.GroupSetupCheck; import org.vadere.simulator.utils.scenariochecker.checks.simulation.SimulationTimeStepLengthCheck; @@ -66,7 +65,6 @@ public class ScenarioChecker { ret.addAll(runCheck(new TopographyOffsetCheck())); ret.addAll(runCheck(new DataProcessorsLinkedToMeasurementArea())); ret.addAll(runCheck(new CheckAreasInAreaDensityVoronoiProcessor())); - ret.addAll(runCheck(new StrategyModelDataProcessorCheck())); ret.addAll(runCheck(new GroupSetupCheck())); ret.addAll(runCheck(new CellularAutomatonSetupCheck())); return ret; diff --git a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java b/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java deleted file mode 100644 index 28f28c59d..000000000 --- a/VadereSimulator/src/org/vadere/simulator/utils/scenariochecker/checks/dataProcessors/StrategyModelDataProcessorCheck.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.vadere.simulator.utils.scenariochecker.checks.dataProcessors; - -import org.vadere.simulator.projects.Scenario; -import org.vadere.simulator.projects.dataprocessing.processor.DataProcessor; -import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerMessage; -import org.vadere.simulator.utils.scenariochecker.ScenarioCheckerReason; -import org.vadere.simulator.utils.scenariochecker.checks.AbstractScenarioCheck; - -import java.util.LinkedList; -import java.util.List; -import java.util.PriorityQueue; - -/** - * @author Christina Mayr - * Warnings if data processors used in strategy model are not defined in data output - */ - -public class StrategyModelDataProcessorCheck extends AbstractScenarioCheck { - - @Override - public PriorityQueue runScenarioCheckerTest(Scenario scenario) { - PriorityQueue messages = new PriorityQueue<>(); - - AttributesStrategyModel attr = scenario.getScenarioStore().getAttributesStrategyModel(); - - - if (attr.isUseStrategyModel()) { - - - LinkedList requiredDataProcessorIds = attr.getRequiredDataProcessorIds(); - List> processors = scenario.getDataProcessingJsonManager().getDataProcessors(); - - - for (Integer i : requiredDataProcessorIds) { - - try { - DataProcessor p = processors.get(i - 1); // processor id = (index +1) - } catch (Exception e) { - messages.add(msgBuilder.dataProcessorAttrError() - .reason(ScenarioCheckerReason.DATAPROCESSOR_MISSING, - String.format(" [Strategy model requires data processor id: %d. Processor not defined.]", i)).build()); - } - - - } - - - } - return messages; - } -} diff --git a/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java b/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java new file mode 100644 index 000000000..61cad7624 --- /dev/null +++ b/VadereState/src/org/vadere/state/attributes/AttributesStrategyModel.java @@ -0,0 +1,69 @@ +package org.vadere.state.attributes; + +import java.util.LinkedList; +import java.util.Objects; + +public class AttributesStrategyModel extends Attributes { + + /** + * Store the members of this class under this key in the JSON file. + */ + public static final String JSON_KEY = "attributesStrategy"; + + private boolean useStrategyModel; + private String strategyModel; + private LinkedList arguments = new LinkedList<>(); + private LinkedList requiredDataProcessorIds = new LinkedList<>(); + + + // Constructors + public AttributesStrategyModel(){ + this.useStrategyModel = false; + this.strategyModel = null; + this.arguments = new LinkedList<>(); + this.requiredDataProcessorIds = new LinkedList<>(); + } + + public AttributesStrategyModel(boolean useStrategyModel, String strategyModel, LinkedList arguments, LinkedList requiredDataProcessorIds) { + this.useStrategyModel = useStrategyModel; + this.strategyModel = strategyModel; + this.arguments = arguments; + this.requiredDataProcessorIds = requiredDataProcessorIds; + } + + // getter and setters + public String getStrategyModel() { + return strategyModel; + } + + public void setStrategyModel(String strategyModel) { + this.strategyModel = strategyModel; + } + + public boolean isUseStrategyModel() { + return useStrategyModel; + } + + public void setUseStrategyModel(boolean useStrategyModel) { + this.useStrategyModel = useStrategyModel; + } + + public LinkedList getArguments() { + return arguments; + } + + public void setArguments(LinkedList arguments) { + this.arguments = arguments; + } + + public LinkedList getRequiredDataProcessorIds() { + return requiredDataProcessorIds; + } + + public void setRequiredDataProcessorIds(LinkedList requiredDataProcessorIds) { + this.requiredDataProcessorIds = requiredDataProcessorIds; + } +} + + + -- GitLab From a7400f95f4bf24655eb8a6cf2476d6d0d686b454 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:51:05 +0100 Subject: [PATCH 5/7] migrate scenario files --- .../simulator/projects/io/JsonConverter.java | 1 - .../AbstractJsonTransformation.java | 13 ++++++ .../json/TargetVersionV1_15.java | 45 +++++++++++++++++++ .../vadere/state/util/StateJsonConverter.java | 9 ---- .../src/org/vadere/util/version/Version.java | 3 +- 5 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java index 15e611969..38ef871d7 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java @@ -49,7 +49,6 @@ public class JsonConverter { AttributesSimulation attributesSimulation = StateJsonConverter.deserializeAttributesSimulationFromNode(scenarioNode.get(AttributesSimulation.JSON_KEY)); AttributesPsychology attributesPsychology = StateJsonConverter.deserializeAttributesPsychologyFromNode(scenarioNode.get(AttributesPsychology.JSON_KEY)); - AttributesStrategyModel attributesStrategyModel = StateJsonConverter.deserializeAttributesStrategyModelFromNode(scenarioNode.get(AttributesStrategyModel.JSON_KEY)); JsonNode attributesModelNode = scenarioNode.get("attributesModel"); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java index f8263b1ef..37d0c7d66 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/AbstractJsonTransformation.java @@ -149,6 +149,19 @@ public abstract class AbstractJsonTransformation implements JsonTransformation, return node; } + private JsonNode sort_since_V1_15(JsonNode node) { + LinkedHashMap source = (LinkedHashMap) StateJsonConverter.convertJsonNodeToObject(node); + LinkedHashMap sortedRoot = new LinkedHashMap<>(); + putObject(sortedRoot, source, "name"); + putObject(sortedRoot, source, "description"); + putObject(sortedRoot, source, "release"); + putObject(sortedRoot, source, "commithash"); + putObject(sortedRoot, source, "processWriters","files", "processors", "isTimestamped", "isWriteMetaData"); + putObject(sortedRoot, source, "scenario", "mainModel", "attributesModel", AttributesSimulation.JSON_KEY, AttributesPsychology.JSON_KEY, "topography", "stimulusInfos"); + + return StateJsonConverter.deserializeToNode(sortedRoot); + } + private JsonNode sort_since_V1_14(JsonNode node) { LinkedHashMap source = (LinkedHashMap) StateJsonConverter.convertJsonNodeToObject(node); LinkedHashMap sortedRoot = new LinkedHashMap<>(); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java new file mode 100644 index 000000000..9e5586e74 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV1_15.java @@ -0,0 +1,45 @@ +package org.vadere.simulator.projects.migration.jsontranformation.json; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.projects.migration.MigrationException; +import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.attributes.AttributesStrategyModel; +import org.vadere.state.util.StateJsonConverter; +import org.vadere.util.version.Version; + +/** + * Remove node "threatMemory" under "scenario.topography.dynamicElements.psychologyStatus" + */ +@MigrationTransformation(targetVersionLabel = "1.15") +public class TargetVersionV1_15 extends SimpleJsonTransformation { + + public TargetVersionV1_15(){ + super(Version.V1_15); + } + + @Override + protected void initDefaultHooks() { + addPostHookFirst(this::addStrategyLayer); + addPostHookLast(this::sort); + } + + public JsonNode addStrategyLayer(JsonNode node) throws MigrationException { + + String useStrategyModelKey = "attributesStrategy"; + + JsonNode scenarioNode = path(node, "scenario"); + + if (hasChild(scenarioNode, useStrategyModelKey)) { + + ObjectNode n = (ObjectNode) scenarioNode; + n.remove(useStrategyModelKey); + + } + + return node; + + } + +} diff --git a/VadereState/src/org/vadere/state/util/StateJsonConverter.java b/VadereState/src/org/vadere/state/util/StateJsonConverter.java index 72c28156e..373e4b598 100644 --- a/VadereState/src/org/vadere/state/util/StateJsonConverter.java +++ b/VadereState/src/org/vadere/state/util/StateJsonConverter.java @@ -129,15 +129,6 @@ public abstract class StateJsonConverter { return mapper.treeToValue(node, AttributesPsychology.class); } - public static AttributesStrategyModel deserializeAttributesStrategyModel(String json) throws IOException { - return deserializeObjectFromJson(json, AttributesStrategyModel.class); - } - - public static AttributesStrategyModel deserializeAttributesStrategyModelFromNode(JsonNode node) - throws JsonProcessingException { - return mapper.treeToValue(node, AttributesStrategyModel.class); - } - public static List deserializeAttributesListFromNode(JsonNode node) throws JsonProcessingException { DynamicClassInstantiator instantiator = new DynamicClassInstantiator<>(); List attributesList = new LinkedList<>(); diff --git a/VadereUtils/src/org/vadere/util/version/Version.java b/VadereUtils/src/org/vadere/util/version/Version.java index 0657e9a85..2dd35c19b 100644 --- a/VadereUtils/src/org/vadere/util/version/Version.java +++ b/VadereUtils/src/org/vadere/util/version/Version.java @@ -45,7 +45,8 @@ public enum Version { V1_11(1, 11), V1_12(1, 12), V1_13(1, 13), - V1_14(1,14); + V1_14(1,14), + V1_15(1,15); private static Logger logger = Logger.getLogger(Version.class); -- GitLab From dae13cc39db4e7c43de8eb959ef560cd7c0e0b91 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 11:59:28 +0100 Subject: [PATCH 6/7] migrate scenarios to V1.15 --- .../HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario | 6 +----- .../scenarios/01-Kaiserslautern-Gro\303\237.scenario" | 6 +----- .../scenarios/02-Kaiserslautern-Mittel.scenario | 6 +----- .../scenarios/03-Kaiserslautern-Klein.scenario | 6 +----- ...01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario | 6 +----- ...01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario | 6 +----- ...NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario | 6 +----- ...NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario | 6 +----- ...ianNumber-RichardWagnerStrasse-OSM-1200agents.scenario | 6 +----- ...rianNumber-RichardWagnerStrasse-OSM-400agents.scenario | 6 +----- ...rianNumber-RichardWagnerStrasse-OSM-800agents.scenario | 6 +----- .../scenarios/chicken_floorfield_ok_GPU_event.scenario | 6 +----- .../scenarios/chicken_floorfield_ok_GPU_parallel.scenario | 6 +----- .../ReinforcementLearning/scenarios/DenseCrowd.scenario | 6 +----- .../scenarios/DenseCrowd_withoutGroups.scenario | 6 +----- .../DenseCrowd_withoutGroups_fineTargetGrid.scenario | 6 +----- .../DenseCrowd_withoutGroups_largeTargets.scenario | 6 +----- ...nseCrowd_withoutGroups_largeTargets_2_waiting.scenario | 6 +----- .../DenseCrowd_withoutGroups_moreTargets.scenario | 6 +----- ...enseCrowd_withoutGroups_moreTargets_1_waiting.scenario | 6 +----- ...enseCrowd_withoutGroups_moreTargets_3_waiting.scenario | 6 +----- ...enseCrowd_withoutGroups_moreTargets_6_waiting.scenario | 6 +----- .../scenarios/NarrowCorridor_3_targets_1_waiting.scenario | 6 +----- .../scenarios/NarrowCorridor_3_targets_2_waiting.scenario | 6 +----- .../SimpleCoordinationTask_3_targets_2_waiting.scenario | 6 +----- ...rdinationTask_3_targets_2_waiting_with_runner.scenario | 6 +----- .../Demos/ReinforcementLearning/scenarios/test.scenario | 6 +----- .../scenarios/bottleneck_2m.scenario | 6 +----- .../VadereSimulation-GroupBehavior_no_groups.scenario | 6 +----- .../scenarios/group_OSM_1Source1Place_noGroup.scenario | 6 +----- .../scenarios/group_OSM_1Source2Places_noGroups.scenario | 6 +----- .../Demos/bus_station/scenarios/bus_station.scenario | 8 ++------ .../Demos/supermarket/scenarios/Liddle_osm_v4.scenario | 6 +----- .../Demos/supermarket/scenarios/counterflow.scenario | 6 +----- .../supermarket/scenarios/supermarket_basic.scenario | 6 +----- .../scenarios/groupBaseScenario.scenario | 6 +----- .../scenarios/group_OSM_CGM_density_flow_2group.scenario | 6 +----- .../group_OSM_CGM_density_flow_2group_sparse.scenario | 6 +----- .../scenarios/group_OSM_CGM_density_flow_3group.scenario | 6 +----- .../group_OSM_CGM_density_flow_3group_sparse.scenario | 6 +----- .../scenarios/group_OSM_CGM_density_flow_4group.scenario | 6 +----- .../group_OSM_CGM_density_flow_4group_sparse.scenario | 6 +----- .../scenarios/group_OSM_CGM_density_flow_5group.scenario | 6 +----- .../group_OSM_CGM_density_flow_5group_sparse.scenario | 6 +----- .../scenarios/groupBaseScenario.scenario | 6 +----- ...alibration_minStepSize_0_11_ignore_free_space.scenario | 6 +----- .../scenarios/osm_calibration_minStepSize_0_17.scenario | 6 +----- .../scenarios/osm_calibration_minStepSize_0_25.scenario | 6 +----- .../scenarios/osm_calibration_minStepSize_0_35.scenario | 6 +----- .../scenarios/osm_calibration_minStepSize_0_4625.scenario | 6 +----- .../osm_calibration_minStepSize_0_4625_p18.scenario | 6 +----- .../osm_calibration_minStepSize_0_4625_p4.scenario | 6 +----- .../scenarios/osm_calibration_sivers_2016b.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-050-180-180.scenario | 6 +----- .../scenarios/C-050-180-180_GNM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-060-180-180.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-070-180-180.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-100-180-180.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-145-180-180.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-070.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario | 6 +----- .../scenarios/C-180-180-070_UNIT.scenario | 6 +----- .../scenarios/C-180-180-070_default.scenario | 6 +----- .../scenarios/C-180-180-070_ramp.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-095.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-120.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-180.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-050-240.scenario | 6 +----- .../scenarios/T-240-050-240_BHM.scenario | 6 +----- .../scenarios/T-240-050-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-060-240.scenario | 6 +----- .../scenarios/T-240-060-240_BHM.scenario | 6 +----- .../scenarios/T-240-060-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-080-240.scenario | 6 +----- .../scenarios/T-240-080-240_BHM.scenario | 6 +----- .../scenarios/T-240-080-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-100-240.scenario | 6 +----- .../scenarios/T-240-100-240_BHM.scenario | 6 +----- .../scenarios/T-240-100-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-120-240.scenario | 6 +----- .../scenarios/T-240-120-240_BHM.scenario | 6 +----- .../scenarios/T-240-120-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-150-240.scenario | 6 +----- .../scenarios/T-240-150-240_BHM.scenario | 6 +----- .../scenarios/T-240-150-240_OSM.scenario | 6 +----- .../TestOSM_zhang-2011/scenarios/T-240-240-240.scenario | 6 +----- .../scenarios/T-240-240-240_BHM.scenario | 6 +----- .../scenarios/T-240-240-240_OSM.scenario | 6 +----- .../floor_field_navigation_test_displaced_ok.scenario | 6 +----- .../scenarios/floor_field_navigation_test_ok.scenario | 6 +----- .../ModelTests/TestCA/scenarios/basic_2_density.scenario | 6 +----- Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario | 6 +----- .../scenarios/chicken_floorfield_displaced_fail.scenario | 6 +----- .../TestCA/scenarios/chicken_floorfield_ok.scenario | 6 +----- .../scenarios/corner_waiting_time_processor_test.scenario | 6 +----- .../ModelTests/TestCA/scenarios/multiple_sources.scenario | 6 +----- .../ModelTests/TestCA/scenarios/narrow_passage.scenario | 6 +----- .../ModelTests/TestCA/scenarios/regular_wall.scenario | 6 +----- .../ModelTests/TestCA/scenarios/rimea_01_pathway.scenario | 6 +----- .../TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario | 6 +----- .../TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario | 6 +----- .../TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario | 6 +----- .../TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario | 6 +----- .../TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario | 6 +----- .../ModelTests/TestCA/scenarios/rimea_05_react.scenario | 6 +----- .../ModelTests/TestCA/scenarios/rimea_06_corner.scenario | 6 +----- .../ModelTests/TestCA/scenarios/rimea_07_speeds.scenario | 6 +----- .../scenarios/rimea_08_parameter_variation.scenario | 6 +----- .../scenarios/rimea_08_parameter_variation_part1.scenario | 6 +----- .../scenarios/rimea_09_public_room_2_exits.scenario | 6 +----- .../scenarios/rimea_09_public_room_4_exits.scenario | 6 +----- .../TestCA/scenarios/rimea_10_pathfinding.scenario | 6 +----- .../TestCA/scenarios/rimea_11_exit_selection.scenario | 6 +----- .../TestCA/scenarios/rimea_12_evacuation.scenario | 6 +----- .../TestCA/scenarios/rimea_14_select_route.scenario | 6 +----- .../ModelTests/TestCA/scenarios/see_small_wall.scenario | 6 +----- Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario | 6 +----- Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario | 6 +----- .../TestCA/scenarios/thin_wall_and_closer_source.scenario | 6 +----- .../TestGNM/scenarios/basic_1_chicken_gnm1.scenario | 6 +----- .../scenarios/basic_1_chicken_gnm1_displaced.scenario | 6 +----- .../TestGNM/scenarios/basic_1_chicken_gnm2.scenario | 6 +----- .../TestGNM/scenarios/basic_2_density_gnm1.scenario | 6 +----- .../TestGNM/scenarios/basic_3_1_wall_gnm1.scenario | 6 +----- .../TestGNM/scenarios/basic_3_2_wall_gnm1.scenario | 6 +----- .../TestGNM/scenarios/basic_3_3_wall_gnm1.scenario | 6 +----- .../TestGNM/scenarios/basic_4_1_wall_gnm1.scenario | 6 +----- .../TestGNM/scenarios/basic_4_2_wall_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_01_pathway_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario | 6 +----- .../TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario | 6 +----- .../TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario | 6 +----- .../TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario | 6 +----- .../TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario | 6 +----- .../TestGNM/scenarios/rimea_05_react_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_06_corner_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_07_speeds_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario | 6 +----- .../TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario | 6 +----- .../TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario | 6 +----- .../scenarios/rimea_11_exitSelection_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_13_stairs_gnm1.scenario | 6 +----- .../TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario | 6 +----- .../scenarios/VadereSimulation-GroupBehavior.scenario | 6 +----- .../scenarios/group_OSM_1Source1Place.scenario | 6 +----- .../scenarios/group_OSM_1Source2Places.scenario | 6 +----- .../scenarios/group_OSM_2Sources1Place.scenario | 6 +----- .../group_OSM_2Sources1Place_2Group_and_3Group.scenario | 6 +----- .../group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario | 6 +----- ...roup_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario | 6 +----- ...roup_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario | 6 +----- .../scenarios/group_OSM_CGM_classroom_1group.scenario | 6 +----- .../scenarios/group_OSM_CGM_classroom_2group.scenario | 6 +----- .../scenarios/group_OSM_CGM_classroom_3group.scenario | 6 +----- .../scenarios/group_OSM_CGM_classroom_4group.scenario | 6 +----- .../scenarios/group_OSM_CGM_labratory_15group.scenario | 6 +----- .../scenarios/group_OSM_CGM_labratory_1group.scenario | 6 +----- .../scenarios/group_OSM_CGM_labratory_25group.scenario | 6 +----- .../scenarios/group_OSM_CGM_labratory_2group.scenario | 6 +----- .../scenarios/group_OSM_CGM_labratory_4group.scenario | 6 +----- .../scenarios/group_OSM_long_corr_2Group.scenario | 6 +----- .../scenarios/group_OSM_long_corr_3Group.scenario | 6 +----- .../scenarios/group_OSM_long_corr_4Group.scenario | 6 +----- .../scenarios/basic_5_1_roadReachTarget_ovm1.scenario | 6 +----- .../scenarios/basic_5_2_roadReachTarget_ovm1.scenario | 6 +----- .../TestOVM/scenarios/testtrafficlight.scenario | 6 +----- ...lifiedExperiment-OSMEventDriven-PsychDisabled.scenario | 6 +----- ...liefiedExperiment-OSMEventDriven-PsychEnabled.scenario | 6 +----- ...ventDriven-PsychEnabled-PersonalSpacedAdapted.scenario | 6 +----- ...mplifiedExperiment-OSMSequential-PsychEnabled.scenario | 6 +----- .../05-SimplifiedExperiment-SFM-PsychDisabled.scenario | 6 +----- ...riginalExperiment-OSMEventDriven-PsychEnabled.scenario | 6 +----- .../07-CounterFlow-OSMSequential-PsychDisabled.scenario | 6 +----- .../08-CounterFlow-OSMSequential-PsychEnabled.scenario | 6 +----- ...SMSequential-PsychEnabled-SearchRadiusAdapted.scenario | 6 +----- ...UnidirectionalFlow-OSMSequential-PsychEnabled.scenario | 6 +----- ...unterFlowChicken-OSMEventDriven-PsychDisabled.scenario | 6 +----- ...ounterFlowChicken-OSMEventDriven-PsychEnabled.scenario | 6 +----- ...11-ExitSelection-OSMEventDriven-PsychDisabled.scenario | 6 +----- ...A11-ExitSelection-OSMEventDriven-PsychEnabled.scenario | 6 +----- .../scenarios/15-ThreatShort-SelfCatThreatModel.scenario | 6 +----- .../scenarios/16-ThreatLong-SelfCatThreatModel.scenario | 6 +----- ...7-Threat-ImitatingBehavior-SelfCatThreatModel.scenario | 6 +----- ...riptAgents-ChangeTargetScriptedCognitionModel.scenario | 6 +----- .../19-CounterFlow-CounterflowCognitionModel.scenario | 6 +----- .../Perception/scenarios/01-Wait-OSMSequential.scenario | 6 +----- .../Perception/scenarios/02-Wait-OSMEventDriven.scenario | 6 +----- .../scenarios/03-WaitRecurring-OSMSequential.scenario | 6 +----- .../scenarios/04-WaitInArea-OSMSequential.scenario | 6 +----- .../Perception/scenarios/05-WaitInArea-BHM.scenario | 6 +----- .../scenarios/06-Threat-OSMSequential-OneAgent.scenario | 6 +----- .../07-Threat-OSMSequential-MultipleAgents.scenario | 6 +----- .../08-Threat-OSMSequential-OneAgent-OneObstacle.scenario | 6 +----- ...hanger-DoesNotChangeTargetIfProbabilityIsZero.scenario | 6 +----- ...TargetChanger-ChangesTargetIfProbabilityIsOne.scenario | 6 +----- ...rgetChanger-ChangesTargetIfProbabilityIsAHalf.scenario | 6 +----- .../04-Test-TargetChanger-SupportsListsOfTargets.scenario | 6 +----- ...05-Test-TargetChanger-CanCreateAListOfTargets.scenario | 6 +----- .../06-Test-TargetChanger-ChangesToDynamicTarget.scenario | 6 +----- .../ModelTests/TestRSM/scenarios/Reynolds_test.scenario | 6 +----- .../TestRSM/scenarios/Reynolds_test_displaced.scenario | 6 +----- .../TestSFM/scenarios/basic_1_chicken_sfm1.scenario | 6 +----- .../scenarios/basic_1_chicken_sfm1_displaced.scenario | 6 +----- .../TestSFM/scenarios/basic_1_chicken_sfm2.scenario | 6 +----- .../TestSFM/scenarios/basic_2_density_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_3_1_wall_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_3_2_wall_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_3_3_wall_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_4_1_wall_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_4_1_wall_sfm2.scenario | 6 +----- .../TestSFM/scenarios/basic_4_2_wall_sfm1.scenario | 6 +----- .../TestSFM/scenarios/basic_4_2_wall_sfm2.scenario | 6 +----- .../TestSFM/scenarios/rimea_01_pathway_sfm1.scenario | 6 +----- .../TestSFM/scenarios/rimea_01_pathway_sfm2.scenario | 6 +----- .../TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario | 6 +----- .../TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario | 6 +----- .../TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario | 6 +----- .../TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario | 6 +----- .../TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario | 6 +----- .../TestSFM/scenarios/rimea_05_react_sfm1.scenario | 6 +----- .../TestSFM/scenarios/rimea_06_corner_sfm1.scenario | 6 +----- .../TestSFM/scenarios/rimea_07_speeds_sfm1.scenario | 6 +----- .../TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_1_+1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_1_-1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_2_+1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_2_-1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_3_+1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_3_-1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_4_+1.scenario | 6 +----- .../TestStairs/scenarios/stairs_diagonal_4_-1.scenario | 6 +----- .../scenarios/stairs_diagonal_both_1_2_+1.scenario | 6 +----- .../scenarios/stairs_diagonal_both_1_2_-1.scenario | 6 +----- .../scenarios/stairs_diagonal_both_3_4_+1.scenario | 6 +----- .../scenarios/stairs_diagonal_both_3_4_-1.scenario | 6 +----- .../scenarios/stairs_upward_direction_down_+1.scenario | 6 +----- .../scenarios/stairs_upward_direction_down_-1.scenario | 6 +----- .../stairs_upward_direction_to_right_+1.scenario | 6 +----- .../stairs_upward_direction_to_right_-1.scenario | 6 +----- .../scenarios/stairs_upward_direction_toleft_+1.scenario | 6 +----- .../scenarios/stairs_upward_direction_toleft_-1.scenario | 6 +----- .../scenarios/stairs_upward_direction_up_+1.scenario | 6 +----- .../scenarios/stairs_upward_direction_up_-1.scenario | 6 +----- .../TestNelderMead/scenarios/counterflow.scenario | 6 +----- .../TestNelderMead/scenarios/labyrinth.scenario | 6 +----- .../rimea_11_exit_selection_nelder_mead.scenario | 6 +----- .../TestNelderMead/scenarios/s2ucre.scenario | 6 +----- .../scenarios/BHM_Liddle_fixed_seed.scenario | 6 +----- .../scenarios/CA_basic_2_density.scenario | 6 +----- .../scenarios/GNM_basic_1_chicken.scenario | 6 +----- .../scenarios/bridge_timeCost_NAVIGATION.scenario | 6 +----- .../scenarios/bridge_timeCost_OBSTACLES.scenario | 6 +----- .../scenarios/bridge_timeCost_QUEUEING.scenario | 6 +----- .../scenarios/bridge_timeCost_UNIT.scenario | 6 +----- .../scenarios/complex_NAVIGATION_001.scenario | 6 +----- .../scenarios/complex_NAVIGATION_groups_001.scenario | 6 +----- .../scenarios/complex_UNIT_001.scenario | 6 +----- .../scenarios/complex_UNIT_groups_001.scenario | 6 +----- Tools/SUQController/tutorial/example.scenario | 6 +----- .../s2ucre/scenarios/bridge_coordinates_kai.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_navigation.scenario | 6 +----- .../bridge_coordinates_kai_navigation_random_pos.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_origin_0.scenario | 6 +----- .../bridge_coordinates_kai_origin_0_navigation.scenario | 6 +----- ...oordinates_kai_origin_0_navigation_random_pos.scenario | 6 +----- .../bridge_coordinates_kai_origin_0_random_pos.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_random_pos.scenario | 6 +----- .../tests/testData/s2ucre/scenarios/empty.scenario | 6 +----- .../scenarios/bridge_coordinates_kai.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_navigation.scenario | 6 +----- .../bridge_coordinates_kai_navigation_random_pos.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_origin_0.scenario | 6 +----- .../bridge_coordinates_kai_origin_0_navigation.scenario | 6 +----- ...oordinates_kai_origin_0_navigation_random_pos.scenario | 6 +----- .../bridge_coordinates_kai_origin_0_random_pos.scenario | 6 +----- .../scenarios/bridge_coordinates_kai_random_pos.scenario | 6 +----- .../tests/testData/s2ucreInvalid/scenarios/empty.scenario | 6 +----- VadereGui/testResources/test-scenario.scenario | 6 +----- .../data/ScenarioChecker/ScenarioCheckerTest.scenario | 6 +----- .../output/Test1_2019-09-23_17-25-51.21/Test1.scenario | 6 +----- .../output/Test2_2019-09-23_17-25-57.379/Test2.scenario | 6 +----- .../data/VTestMultiRun.bak/scenarios/Test1.scenario | 6 +----- .../data/VTestMultiRun.bak/scenarios/Test2.scenario | 6 +----- .../data/VTestMultiRun/scenarios/Test1.scenario | 6 +----- .../data/VTestMultiRun/scenarios/Test2.scenario | 6 +----- .../testResources/data/basic_1_chicken_osm1.scenario | 6 +----- VadereSimulator/testResources/data/cache/s001.scenario | 6 +----- VadereSimulator/testResources/data/cache/s002.scenario | 6 +----- VadereSimulator/testResources/data/cache/s003.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../output/testOutput2/test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../simpleProject.bak/scenarios/test_postvis.scenario | 6 +----- .../scenarios/warteschlange_ein_ziel.scenario | 6 +----- .../output/testOutput2/test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../test_postvis.scenario | 6 +----- .../data/simpleProject/scenarios/test_postvis.scenario | 6 +----- .../scenarios/warteschlange_ein_ziel.scenario | 6 +----- .../org/vadere/simulator/entrypoints/test.scenario | 6 +----- 332 files changed, 333 insertions(+), 1661 deletions(-) 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 d507aac03..3d140a3c9 100644 --- a/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario +++ b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario @@ -1,7 +1,7 @@ { "name" : "hm_stairs", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git "a/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" "b/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" index 4ecfd2605..387b9f816 100644 --- "a/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" +++ "b/Scenarios/Demos/Kaiserslautern/scenarios/01-Kaiserslautern-Gro\303\237.scenario" @@ -1,7 +1,7 @@ { "name" : "01-Kaiserslautern-Groß", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario b/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario index d9a836ea0..dae15a2ec 100644 --- a/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario +++ b/Scenarios/Demos/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario @@ -1,7 +1,7 @@ { "name" : "02-Kaiserslautern-Mittel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario b/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario index 66201637a..bb69e7fe6 100644 --- a/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario +++ b/Scenarios/Demos/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario @@ -1,7 +1,7 @@ { "name" : "03-Kaiserslautern-Klein", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario index 039430a15..9ced284ab 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario index 68e104877..a4ed12e8b 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario index 9ef0a19e2..cbb6aec46 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario index 09d80e59b..a3489d6d9 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario @@ -1,7 +1,7 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -133,10 +133,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario index 31f5acaba..bce8405dc 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario index e3564783a..4f8bd5bf4 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario index 522971b63..46917cb59 100644 --- a/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario +++ b/Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario @@ -1,7 +1,7 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario index a9d5ce003..ea2d62ec1 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok_GPU_event", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario index 1c823a00a..934d881c0 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok_GPU_parallel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario index 51d5cb2b8..dd0368a8c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario index 7ec1bc20e..b2f30bcf5 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario index 7bad5e46b..3be63a30f 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_fineTargetGrid", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario index f987758d8..63b541d9f 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario index 9a0da90ab..bf7153d4e 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario index efd833719..5481d4e4c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario index a1f8916a8..104092267 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_1_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario index 15bdf776f..e567524ba 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_3_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -95,10 +95,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario index b415afdb7..04f2dbbc8 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_6_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario index 09804be6d..42271c64d 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "NarrowCorridor_3_targets_1_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario index 4b3dfb86a..e86fc2d9a 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "NarrowCorridor_3_targets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario index 24c82c6a9..f942dba5a 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario @@ -1,7 +1,7 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario index 9f373e5f8..00755e04f 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario @@ -1,7 +1,7 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting_with_runner", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -104,10 +104,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario index 80cdbf897..74f4bdd93 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario @@ -1,7 +1,7 @@ { "name" : "test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario index c1f23e20f..0cf658e95 100644 --- a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario +++ b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario @@ -1,7 +1,7 @@ { "name" : "bottleneck_2m", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -192,10 +192,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario index 6a852b155..e98fc5943 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario @@ -1,7 +1,7 @@ { "name" : "VadereSimulation-GroupBehavior_no_groups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario index 9f64442c1..1723f3c61 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source1Place_noGroup", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario index b5481aa4c..1f2e4f7a4 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source2Places_noGroups", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario index 4e03b4a5b..c338eb001 100644 --- a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario +++ b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario @@ -1,7 +1,7 @@ { "name" : "bus_station", "description" : "Scenario used for TGF19 contribution", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { @@ -333,4 +329,4 @@ }, "stimulusInfos" : [ ] } -} +} \ No newline at end of file diff --git a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario index b177f9e38..d71e67e13 100644 --- a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario +++ b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario @@ -1,7 +1,7 @@ { "name" : "Liddle_osm_v4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario index d7977f9ab..2d8cc3dd4 100644 --- a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario +++ b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario @@ -1,7 +1,7 @@ { "name" : "counterflow", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario index 1400bbfa6..a3a271885 100644 --- a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario +++ b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario @@ -1,7 +1,7 @@ { "name" : "supermarket_basic", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -118,10 +118,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario index 1447b86e6..93f61600f 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario @@ -1,7 +1,7 @@ { "name" : "groupBaseScenario.scenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -286,10 +286,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario index be00ea42b..0a907c01f 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario index e0e0e154c..3f3e26674 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_2group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario index 3789cb3ea..fa8c735d6 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_3group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario index e83c98ebc..1ef4221d5 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_3group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario index 1c27d9f95..57b5f55c6 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario index 7f9444ac3..4c63154a6 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_4group_sparse", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario index 428a14246..53ca6203f 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_5group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -121,10 +121,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario index 0b6930e9d..32b4c6c69 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_density_flow_5group_sparse.scenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario index b8091c0da..793f6495f 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario @@ -1,7 +1,7 @@ { "name" : "g2_osm_calibration_minStepSize_0_11", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -230,10 +230,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario index 96938326c..8d43ba286 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_11_ignore_free_space", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario index 71fe8a3ea..2b8f511bd 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_17", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario index 7b21251f6..89cc1f984 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_25", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario index 0fa66a70c..09cdb9dd2 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_35", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario index ad78d5b42..c9d3d1c2a 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario index e15aadfac..b5f9fb47b 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625_p18", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario index 764c779d4..d6da09cd1 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_minStepSize_0_4625_p4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario index d9f8cc104..900c6abad 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario @@ -1,7 +1,7 @@ { "name" : "osm_calibration_sivers_2016b", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -189,10 +189,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario index a7706e865..c8a4d37db 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario index a76e8d50a..a4b40df47 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180_GNM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,10 +212,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario index 95d93bc6a..dd3862058 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-050-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario index b468c7005..8481b61f9 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-060-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario index f1f3d5c2e..dc91a69eb 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-060-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario index fe158f4a9..01de47f47 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-070-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario index 13ef206ff..f79f7f169 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-070-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario index 1731b4470..7737fcc84 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-100-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario index 54d68be04..f98f69328 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-100-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario index 0baab1b6b..1e147fff6 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-145-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario index 9d863a532..9bc5394b7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-145-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario index 96e2c77d3..6a6ccd7d4 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario index cd2972651..58f8d17fc 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario index 13815d76e..38440cf86 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_UNIT", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario index eac75ff05..af1a3ff48 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_default", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario index 37b4ffcd0..9cf7fdae9 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-070_ramp", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario index 15b2fc65d..e50a60bd6 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-095", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario index 52e123087..345723521 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-095_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario index 997e98020..3fe75638e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-120", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario index cd23d8c5b..36099a69b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-120_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario index 91258648e..8a1871f15 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-180", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario index c161d7ad6..255c5a2fa 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario @@ -1,7 +1,7 @@ { "name" : "C-180-180-180_Q", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -228,10 +228,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario index 6ecf81afa..98c588341 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario index 2adfdb775..68e32eebf 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario index 554cb767c..65811bf10 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-050-240_OSM_", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -284,10 +284,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario index 35b40fae1..13e10ff98 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario index 7113e6fad..ae370c280 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario index 3d9e7ea20..7a61c6fb7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-060-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario index d8cc6b6ff..8f83fb309 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario index cebea9b7b..24d9343cf 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario index ae911b805..ed5ab1fd2 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-080-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario index e6dbadc2e..0f88f17ec 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario index 660a43231..beb771888 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario index 64db78ca3..57dfd395a 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-100-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario index 81c29843a..058e7006a 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -284,10 +284,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario index 6062d9fb1..badbd683e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario index 832fc3ccd..a8b5fa58e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-120-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario index f8f5d0ad4..274e2fa96 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario index dab2cdb52..9562187eb 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario index 56897fc0d..1988c0678 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-150-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario index 74026ef54..701c3b152 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -280,10 +280,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario index 9e93a1a84..769294797 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240_BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -292,10 +292,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario index 9696262a3..b35f744cd 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario @@ -1,7 +1,7 @@ { "name" : "T-240-240-240_OSM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -287,10 +287,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario index b3b5044fa..a652c0098 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario @@ -1,7 +1,7 @@ { "name" : "floor_field_navigation_test_displaced_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,10 +98,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario index 82d2e5699..4c4ec1d0e 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario @@ -1,7 +1,7 @@ { "name" : "floor_field_navigation_test_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -98,10 +98,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario index d7e399145..5c76129b2 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario index e4e75ada7..47be242a7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario @@ -1,7 +1,7 @@ { "name" : "bottleneck", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -122,10 +122,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario index e88827d87..e13d009ee 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_displaced_fail", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario index 9e34f86c8..5570d3c63 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario @@ -1,7 +1,7 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario index 946701843..e4cc319e8 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario @@ -1,7 +1,7 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -126,10 +126,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario index 3eae94585..b830d23b8 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario @@ -1,7 +1,7 @@ { "name" : "multiple_sources", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -131,10 +131,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario index 234fb8d4c..68fabc3ce 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario @@ -1,7 +1,7 @@ { "name" : "narrow_passage", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -108,10 +108,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario index f339dc3e0..a68f8fd79 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario @@ -1,7 +1,7 @@ { "name" : "regular_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario index ac6098ed6..077db866f 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -144,10 +144,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario index 97dcf3690..085c2ebc6 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -208,10 +208,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario index 1d59e35a1..bc7a1949f 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario index 04e9aff71..e37fb8e1d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario index ed37ba9e7..609e7dce6 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario index d3d9cbbaa..050abf196 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -204,10 +204,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario index 9ce061903..f1edb88c7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario index 88be2f47b..16c273c8d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -139,10 +139,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario index 230527355..b459022ec 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -128,10 +128,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario index 7e9aae06e..42fb219f5 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario index 3d2c330ca..65dda49f6 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_08_parameter_variation_part1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario index fed0dc0ab..b3322e2e0 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_public_room_2_exits", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario index 468478eab..e34189590 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_public_room_4_exits", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario index b2502490a..26694344c 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -138,10 +138,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario index d3a3ed50f..525507174 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exit_selection", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario index 7672adfdf..94d6a9607 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_12_evacuation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario index 5e9dd58a9..92ee61667 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_14_select_route", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -107,10 +107,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario index 17f6b3fa4..c8faf0d04 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario @@ -1,7 +1,7 @@ { "name" : "see_small_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario index 648ff0876..9d770eede 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario @@ -1,7 +1,7 @@ { "name" : "thick_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario index 23865e9ad..c8d768fd4 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario @@ -1,7 +1,7 @@ { "name" : "thin_wall", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -132,10 +132,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario index 3bd4744e5..7b4ea05d7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario @@ -1,7 +1,7 @@ { "name" : "thin_wall_and_closer_source", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario index 7e191d415..9d59ecaf2 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario index 80ea47349..9a17fb516 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm1_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario index f79bdcf4d..0ccce91db 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_gnm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario index f293ffd69..7a8496778 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario index 86f223f1b..181758da5 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_1_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario index 79023d126..20f2781a8 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_2_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario index 54f688603..ff894c8f2 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_3_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario index 8b0892a68..95c566afb 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario index d66249d83..bd2b2c0ba 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario index 96bc79896..ca18b88c3 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario index 0db39a39a..470a36282 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_025_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario index 3a4900024..6dd59504f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario index 6958303b3..6a66aaf32 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario index 7e274ef0e..e0683fb0d 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario index eea3fc707..60af68ebc 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_gnm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario index 84bc32404..6d02d3606 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario index 84f728ccb..534e016ee 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario index 958f2a6ba..390865488 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario index e5442e713..49bf9172e 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_publicRoom_gnm1_2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario index bce52eda6..32332931b 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_09_publicRoom_gnm1_4", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario index eaa8f0ff4..ed9a90510 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario index c1db628af..aaef7fc3f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exitSelection_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario index c380ccee8..ac094d49a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_12_evacuation_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario index cc1724d48..2e12df83a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_13_stairs_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario index 798f69dcc..0546a0ed3 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_14_selectRoute_gnm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario index 1b2b591dc..00ef2976b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario @@ -1,7 +1,7 @@ { "name" : "VadereSimulation-GroupBehavior", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -107,10 +107,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario index b8f606771..93537ac9b 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source1Place", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -124,10 +124,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario index e96439baf..038b44c74 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_1Source2Places", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario index cdb060bf5..edd9f957d 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_2Sources1Place", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario index 58f100c61..027c52f3e 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_2Sources1Place_2Group_and_3Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario index 6e2ef07bb..13e7e48de 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_4Source4Place_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario index 9bc634f6a..6acd42dd9 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -110,10 +110,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario index 08782341c..8741659ba 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -110,10 +110,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario index 49be5b158..8c56d6d4f 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_1group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario index 25152192e..e21953891 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario index 11eae18f7..4e911241d 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_3group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario index f5219675c..3e783e4a0 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_classroom_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario index 931263cf9..97d3e9a94 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_15group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario index 53b5b19dd..b17750707 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_1group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario index be59b25db..6387c16d5 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_25group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario index 311d4bdb0..b889411a1 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_2group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario index 8a73fab97..765bd7e0f 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_CGM_labratory_4group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -142,10 +142,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario index 11086184e..deb022925 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_2Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario index b8dc2fce1..24617d8c4 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_3Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario index 81c23fb09..26174ce9a 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario @@ -1,7 +1,7 @@ { "name" : "group_OSM_long_corr_4Group", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario index 0d758b28e..41061b5ae 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_5_1_roadReachTarget_ovm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -68,10 +68,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario index d06a9f4dd..85e88fa40 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_5_2_roadReachTarget_ovm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -68,10 +68,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario index f3fa065a8..27123bc1d 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario @@ -1,7 +1,7 @@ { "name" : "testtrafficlight", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario index bfe50e42a..6a7f4ddea 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "01-SimplifiedExperiment-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario index 9b2c14215..b29a6c60f 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario index 2ca0e3abf..5b487a5ca 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario @@ -1,7 +1,7 @@ { "name" : "03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario index 3d7bc4a8d..083492abd 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "04-SimplifiedExperiment-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario index f03f3f5f5..09882695e 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "05-SimplifiedExperiment-SFM-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -102,10 +102,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario index 5aa467738..c523bc0ad 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario index 47dc20e96..fcbec29d0 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "07-CounterFlow-OSMSequential-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario index df5e1d4f4..5e98ce6bf 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "08-CounterFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario index 7dce8aea2..14847ac09 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario @@ -1,7 +1,7 @@ { "name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario index bb77a86e6..f07aa7931 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "10-UnidirectionalFlow-OSMSequential-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario index 9e374eb93..e1a695cd0 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "11-CounterFlowChicken-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario index eb8e5c304..970be696c 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "12-CounterFlowChicken-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario index c6f3ac83f..ae61fe2cc 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario @@ -1,7 +1,7 @@ { "name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario index fbb14495c..79fd4e68c 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario @@ -1,7 +1,7 @@ { "name" : "14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario index 70737f3fc..4dc066ad7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "15-ThreatShort-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario index f74ee0ead..ec1adeb6e 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "16-ThreatLong-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario index 1f2baf1c5..6ed211dc7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario @@ -1,7 +1,7 @@ { "name" : "17-Threat-ImitatingBehavior-SelfCatThreatModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -117,10 +117,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario index 98ac898ab..cfeca00ab 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario @@ -1,7 +1,7 @@ { "name" : "18-ScriptAgents-ChangeTargetScriptedCognitionModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "ChangeTargetScriptedCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario index eccd0f641..5c56663f9 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-CounterFlow-CounterflowCognitionModel.scenario @@ -1,7 +1,7 @@ { "name" : "19-CounterFlow-CounterflowCognitionModel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -114,10 +114,6 @@ "cognition" : "CounterflowCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario index 3181cb973..872e38272 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "01-Wait-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario index 91a4e6b4d..fbd22f7a1 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario @@ -1,7 +1,7 @@ { "name" : "02-Wait-OSMEventDriven", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario index ea7e1eb22..197d91b5f 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "03-WaitRecurring-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario index e3b55628a..0597cdd6a 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario @@ -1,7 +1,7 @@ { "name" : "04-WaitInArea-OSMSequential", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario index 8bf94c59e..15df65055 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario @@ -1,7 +1,7 @@ { "name" : "05-WaitInArea-BHM", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -80,10 +80,6 @@ "cognition" : "SimpleCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario index ce74adccc..3fddc47dc 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/06-Threat-OSMSequential-OneAgent.scenario @@ -1,7 +1,7 @@ { "name" : "06-Threat-OSMSequential-OneAgent", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario index 7d44864db..ff9c0efd0 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/07-Threat-OSMSequential-MultipleAgents.scenario @@ -1,7 +1,7 @@ { "name" : "07-Threat-OSMSequential-MultipleAgents", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario index 44f4aad98..ed04786f1 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/08-Threat-OSMSequential-OneAgent-OneObstacle.scenario @@ -1,7 +1,7 @@ { "name" : "08-Threat-OSMSequential-OneAgent-OneObstacle", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "ThreatCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario index 738b7520a..051fa9ccf 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario @@ -1,7 +1,7 @@ { "name" : "01-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario index e5b2a6997..fa462a6c6 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario @@ -1,7 +1,7 @@ { "name" : "02-Test-TargetChanger-ChangesTargetIfProbabilityIsOne", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario index 337de6a2d..f76c4d681 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario @@ -1,7 +1,7 @@ { "name" : "03-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario index f92342a58..4ab1d5c0c 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/04-Test-TargetChanger-SupportsListsOfTargets.scenario @@ -1,7 +1,7 @@ { "name" : "04-Test-TargetChanger-SupportsListsOfTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario index 9632a307f..76442a839 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/05-Test-TargetChanger-CanCreateAListOfTargets.scenario @@ -1,7 +1,7 @@ { "name" : "05-Test-TargetChanger-CanCreateAListOfTargets", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario index 6b9b05692..68dd8515e 100644 --- a/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario +++ b/Scenarios/ModelTests/TestPsychology/ScenarioElements/scenarios/06-Test-TargetChanger-ChangesToDynamicTarget.scenario @@ -1,7 +1,7 @@ { "name" : "06-Test-TargetChanger-ChangesToDynamicTarget", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -111,10 +111,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario index 9910daf55..9f6106331 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario @@ -1,7 +1,7 @@ { "name" : "Reynolds_test", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario index 50fe55a2c..d2ef41da0 100644 --- a/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario +++ b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "Reynolds_test_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -78,10 +78,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario index 7510d10bb..7e54752b6 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario index 79a17118f..909e533d5 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm1_displaced", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario index 15a083b6b..739dc14a7 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario index 637db1a53..ab544b4b4 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -90,10 +90,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario index f442a600f..fd951f77b 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_1_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario index 990b2520b..132ace31f 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_2_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario index 558aef078..fd8656e82 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_3_3_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario index 3f2c218ce..2399d5b8d 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario index 0b3f09c7d..6297c9271 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_1_wall_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario index f0098d233..8ba9830e9 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario index 97f5d23db..559f36513 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "basic_4_2_wall_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario index 4cea6c9b8..f98c68c57 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario index 3d05e889a..349f4a448 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_01_pathway_sfm2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario index 4fa2d80ab..29ff2d9b4 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_025_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario index 60815bd1d..585da14b7 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_050_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario index 7222e23db..15fad0689 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_075_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario index e03bc4f0b..485b39586 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_100_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario index 432ab63c8..2d15ecd64 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_04_flow_sfm1_125_h", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario index 91240f847..197d348c2 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_05_react_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -71,10 +71,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario index dc82d55d5..ad67ea780 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_06_corner_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -103,10 +103,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario index c596e7690..d1c9e479f 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_07_speeds_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -85,10 +85,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario index d6dfe5219..2fb752910 100644 --- a/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario +++ b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_10_pathfinding_sfm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -105,10 +105,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario index 4246bdeef..db8ee0595 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_1_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario index 6a46e6d84..75f840770 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_1_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario index f275e271f..11636d850 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_2_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario index da4766196..619233522 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_2_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario index 232807d4d..463f29132 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_3_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario index 677a72b71..720ab63b0 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_3_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario index ef9024b31..8447d3477 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_4_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario index 09fd7c41d..843e43902 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_4_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario index 8f2106dde..c845e1091 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_1_2_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario index d8b5cad0e..8053c7818 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_1_2_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario index 541fb7cfe..378cff471 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_3_4_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario index 1ed93db7b..d2167acbe 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_diagonal_both_3_4_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario index d22d7ff77..114bd5cf9 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_down_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario index 5c375d47d..dea9086c6 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_down_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario index 7ae4902c5..9ee9a32f6 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_to_right_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario index 696e23678..cd4a8ba21 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_to_right_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario index 99af4e4eb..6d12c9ab4 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_toleft_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario index 35ce28eea..88d443d82 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_toleft_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario index 0eab9645c..813fad49d 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_up_+1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario index a46302eb5..4846a3524 100644 --- a/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario +++ b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario @@ -1,7 +1,7 @@ { "name" : "stairs_upward_direction_up_-1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario index f13287aa8..e94bcafa2 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario @@ -1,7 +1,7 @@ { "name" : "counterflow", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario index 9048b30b5..3a5253765 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario @@ -1,7 +1,7 @@ { "name" : "labyrinth", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario index 5d15e5160..3163ba2e5 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario @@ -1,7 +1,7 @@ { "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario index 206b33dfd..56b307c5a 100644 --- a/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario +++ b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario @@ -1,7 +1,7 @@ { "name" : "s2ucre", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ ], "processors" : [ { @@ -130,10 +130,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario index cca7d04d8..dd549265c 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/BHM_Liddle_fixed_seed.scenario @@ -1,7 +1,7 @@ { "name" : "BHM_Liddle_fixed_seed", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -108,10 +108,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario index 0a1abfac9..4204dd9e8 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/CA_basic_2_density.scenario @@ -1,7 +1,7 @@ { "name" : "CA_basic_2_density", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -129,10 +129,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario index 513c4d813..1c4ae70a0 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/GNM_basic_1_chicken.scenario @@ -1,7 +1,7 @@ { "name" : "GNM_basic_1_chicken", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -82,10 +82,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario index 25dff002b..d1aa59484 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_NAVIGATION", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario index 4e2a55228..148380fb9 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_OBSTACLES", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario index 4049d6aba..b04d64eba 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_QUEUEING", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario index f1549718c..7ccb0fa9d 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_timeCost_UNIT", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario index 8e729f038..d626a5c97 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_NAVIGATION_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario index a2240da56..68e0a4ae9 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_NAVIGATION_groups_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario index fb0aa773a..afb68de5a 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_UNIT_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario index 0d1cd389f..3b8e029bc 100644 --- a/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario +++ b/Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario @@ -1,7 +1,7 @@ { "name" : "complex_UNIT_groups_001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -119,10 +119,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/SUQController/tutorial/example.scenario b/Tools/SUQController/tutorial/example.scenario index 16c785604..21ec67817 100644 --- a/Tools/SUQController/tutorial/example.scenario +++ b/Tools/SUQController/tutorial/example.scenario @@ -1,7 +1,7 @@ { "name" : "basic_2_density_pso", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -102,10 +102,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario index d5d700db4..3ba41a212 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario index 8e51a81b7..6b0fd2919 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario index c99348c6c..a082873e3 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario index 9b6accfa6..b9a1b5167 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario index b8a503c23..58f9d05ab 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario index bfbfb9b4a..361f907c0 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario index 6444daa3f..434453883 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario index 2dff5b7fa..0f4102cb4 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/bridge_coordinates_kai_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario index 962098dea..3dfcab843 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/scenarios/empty.scenario @@ -1,7 +1,7 @@ { "name" : "empty", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario index d5d700db4..3ba41a212 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario index 8e51a81b7..6b0fd2919 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario index c99348c6c..a082873e3 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario index 9b6accfa6..b9a1b5167 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario index b8a503c23..58f9d05ab 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario index bfbfb9b4a..361f907c0 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_navigation_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario index 6444daa3f..434453883 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_origin_0_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_origin_0_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario index 2dff5b7fa..0f4102cb4 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/bridge_coordinates_kai_random_pos.scenario @@ -1,7 +1,7 @@ { "name" : "bridge_coordinates_kai_random_pos", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario index 962098dea..3dfcab843 100644 --- a/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario +++ b/Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucreInvalid/scenarios/empty.scenario @@ -1,7 +1,7 @@ { "name" : "empty", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereGui/testResources/test-scenario.scenario b/VadereGui/testResources/test-scenario.scenario index c5eb1fc8d..abbb73cd8 100644 --- a/VadereGui/testResources/test-scenario.scenario +++ b/VadereGui/testResources/test-scenario.scenario @@ -1,7 +1,7 @@ { "name" : "Neues_Szenario", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -239,10 +239,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario index b7ce6f413..de36274d9 100644 --- a/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario +++ b/VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario @@ -1,7 +1,7 @@ { "name" : "TopographyCheckerTest", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario index 83681c6af..d58bccfa5 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2019-09-23_17-25-51.21/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario index 069c85f48..8f4286acd 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test2_2019-09-23_17-25-57.379/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario index 7ccb9d834..cf1da87f3 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario index 816bbd38a..9ef4447b5 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -89,10 +89,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario index fe1fe06c4..5011e35b8 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario @@ -1,7 +1,7 @@ { "name" : "Test1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario index d3e193723..b5c9868f6 100644 --- a/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario +++ b/VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario @@ -1,7 +1,7 @@ { "name" : "Test2", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario index a1748eb94..1d2546b5c 100644 --- a/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario +++ b/VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -100,10 +100,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s001.scenario b/VadereSimulator/testResources/data/cache/s001.scenario index 24f8ebebd..3217857eb 100644 --- a/VadereSimulator/testResources/data/cache/s001.scenario +++ b/VadereSimulator/testResources/data/cache/s001.scenario @@ -1,7 +1,7 @@ { "name" : "s001", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s002.scenario b/VadereSimulator/testResources/data/cache/s002.scenario index e6d224988..22bd0f4c6 100644 --- a/VadereSimulator/testResources/data/cache/s002.scenario +++ b/VadereSimulator/testResources/data/cache/s002.scenario @@ -1,7 +1,7 @@ { "name" : "s002", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/cache/s003.scenario b/VadereSimulator/testResources/data/cache/s003.scenario index 65d13784c..b68a1743b 100644 --- a/VadereSimulator/testResources/data/cache/s003.scenario +++ b/VadereSimulator/testResources/data/cache/s003.scenario @@ -1,7 +1,7 @@ { "name" : "s002", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -115,10 +115,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario b/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario index 7a962917f..7a09485ee 100644 --- a/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario +++ b/VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -96,10 +96,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario index 2d55a56bb..8c3bd0d1e 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/testOutput2/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario index 38774fa45..0f0f47bd6 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario index a191b1964..eee0c2f88 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario index 983b86d4a..19f273d18 100644 --- a/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject.bak/scenarios/warteschlange_ein_ziel.scenario @@ -1,7 +1,7 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario index 2d55a56bb..8c3bd0d1e 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/testOutput2/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario index 38774fa45..0f0f47bd6 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-32-20.881/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-51.692/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-38-56.278/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-01.459/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-06.213/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-12.198/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-17.533/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-21.911/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-32.397/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-38.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-42.895/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.439/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario index 9d1a581a3..982fa66e4 100644 --- a/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/output/test_postvis_2019-09-23_17-39-48.470/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario index a191b1964..eee0c2f88 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario @@ -1,7 +1,7 @@ { "name" : "test_postvis", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -92,10 +92,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario index 983b86d4a..19f273d18 100644 --- a/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario +++ b/VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario @@ -1,7 +1,7 @@ { "name" : "warteschlange_ein_ziel", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -125,10 +125,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { diff --git a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario index 21fc845f2..30062a2dd 100644 --- a/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario +++ b/VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario @@ -1,7 +1,7 @@ { "name" : "basic_1_chicken_osm1", "description" : "", - "release" : "1.14", + "release" : "1.15", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -93,10 +93,6 @@ "cognition" : "CooperativeCognitionModel" } }, - "attributesStrategy" : { - "useStrategyModel" : false, - "strategyModel" : null - }, "topography" : { "attributes" : { "bounds" : { -- GitLab From fecd19351ff5aae14bfabc9fb20f0be65ac99f48 Mon Sep 17 00:00:00 2001 From: Christina Date: Tue, 27 Oct 2020 12:11:52 +0100 Subject: [PATCH 7/7] removed strategyModel fro UnitTest --- .../psychology/perception/StimulusControllerTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 f89820e47..1f3d2b978 100644 --- a/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/control/psychology/perception/StimulusControllerTest.java @@ -24,8 +24,7 @@ public class StimulusControllerTest { null, null, null, - store, - null); + store); } private ScenarioStore getScenarioStoreContainingRecurringStimulus(boolean isRecurring) { @@ -36,7 +35,7 @@ public class StimulusControllerTest { null, null, null, - getStimulusInfoStoreContainingRecurringStimulus(isRecurring), null); + getStimulusInfoStoreContainingRecurringStimulus(isRecurring)); } private StimulusInfoStore getStimulusInfoStoreContainingRecurringStimulus(boolean isRecurring) { @@ -119,7 +118,7 @@ public class StimulusControllerTest { null, null, null, - stimulusInfoStoreWithBothStimuli, null); + stimulusInfoStoreWithBothStimuli); StimulusController stimulusController = new StimulusController(scenarioStoreContainingOneTimeAndRecurringStimulus); -- GitLab