05.11., 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 86ddc46c authored by Benedikt Zoennchen's avatar Benedikt Zoennchen

update migration assistent such that one can choose from based on which...

update migration assistent such that one can choose from based on which version a project should be reimigrated.
parent 0878707a
...@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Set language ...@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Set language
ProjectView.mntmEnglishLocale.text=English ProjectView.mntmEnglishLocale.text=English
ProjectView.mntmGermanLocale.text=German ProjectView.mntmGermanLocale.text=German
ProjectView.mntmReapplyMigration.text=Remigrate project and open... ProjectView.mntmReapplyMigration.text=Remigrate project and open...
ProjectView.chooseMigrationBaseDialog.text=Choose the version of this project
ProjectView.chooseMigrationBaseDialog.title=Migration
ProjectView.chooseMigrationBaseDialog.defaultOption=automatic
SaveBeforeClosing.text=Do you want to save the current project before closing? SaveBeforeClosing.text=Do you want to save the current project before closing?
SaveBeforeClosing.unsavedChanges.text=Unsaved changes: SaveBeforeClosing.unsavedChanges.text=Unsaved changes:
......
...@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Sprache \u00E4ndern ...@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Sprache \u00E4ndern
ProjectView.mntmEnglishLocale.text=Englisch ProjectView.mntmEnglishLocale.text=Englisch
ProjectView.mntmGermanLocale.text=Deutsch ProjectView.mntmGermanLocale.text=Deutsch
ProjectView.mntmReapplyMigration.text=Projekt remigrieren und \u00F6ffnen... ProjectView.mntmReapplyMigration.text=Projekt remigrieren und \u00F6ffnen...
ProjectView.chooseMigrationBaseDialog.text=W\u00c4hlen Sie die Version dieses Projekts
ProjectView.chooseMigrationBaseDialog.title=Migration
ProjectView.chooseMigrationBaseDialog.defaultOption=Automatisch
SaveBeforeClosing.text=Aktuelles Projekt vor dem Beenden speichern? SaveBeforeClosing.text=Aktuelles Projekt vor dem Beenden speichern?
SaveBeforeClosing.unsavedChanges.text=Ungespeicherte \u00c4nderungen: SaveBeforeClosing.unsavedChanges.text=Ungespeicherte \u00c4nderungen:
......
...@@ -2,6 +2,7 @@ package org.vadere.gui.projectview.control; ...@@ -2,6 +2,7 @@ package org.vadere.gui.projectview.control;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.vadere.gui.components.utils.Messages;
import org.vadere.gui.projectview.VadereApplication; import org.vadere.gui.projectview.VadereApplication;
import org.vadere.gui.projectview.model.ProjectViewModel; import org.vadere.gui.projectview.model.ProjectViewModel;
import org.vadere.gui.projectview.view.ProjectView; import org.vadere.gui.projectview.view.ProjectView;
...@@ -47,12 +48,31 @@ public class ActionLoadProject extends AbstractAction { ...@@ -47,12 +48,31 @@ public class ActionLoadProject extends AbstractAction {
if (projectFilePath != null) { if (projectFilePath != null) {
Object[] options = new Object[Version.values().length+1];
System.arraycopy(Version.values(),0,options, 0, Version.values().length);
options[options.length-1] = Messages.getString("ProjectView.chooseMigrationBaseDialog.defaultOption");
//TODO: [refactoring]: static call which has side-effect to the following call!
if (isRemigrationLoading) { if (isRemigrationLoading) {
MigrationAssistant.setReapplyLatestMigrationFlag(); Object option = JOptionPane.showInputDialog(null,
Messages.getString("ProjectView.chooseMigrationBaseDialog.text"),
Messages.getString("ProjectView.chooseMigrationBaseDialog.title"),
JOptionPane.INFORMATION_MESSAGE, null,
options, options[options.length-1]);
if(option.equals(options[options.length-1])) {
MigrationAssistant.setReapplyLatestMigrationFlag();
}
else {
Version version = (Version)option;
MigrationAssistant.setReapplyLatestMigrationFlag(version);
}
} }
// 3. load project // 3. load project
loadProjectByPath(model, projectFilePath); loadProjectByPath(model, projectFilePath);
} else { } else {
logger.info(String.format("user canceled load project.")); logger.info(String.format("user canceled load project."));
} }
......
{ {
"name" : "Neues_Szenario", "name" : "Neues_Szenario",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "ac1cfdef557c6e70025958f499627fc593ed9269",
"attributeshash" : "146a0a64e733fed65c5ac9559aea5e52866289b0",
"processWriters" : [ ], "processWriters" : [ ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel", "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesOVM" : { "org.vadere.state.attributes.models.AttributesOVM" : {
...@@ -383,7 +381,6 @@ ...@@ -383,7 +381,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -402,7 +399,6 @@ ...@@ -402,7 +399,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -421,7 +417,6 @@ ...@@ -421,7 +417,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -440,7 +435,6 @@ ...@@ -440,7 +435,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
......
{ {
"name" : "basic_5_1_roadReachTarget_ovm1", "name" : "basic_5_1_roadReachTarget_ovm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "2370344deee6f5863df968ff1df5173a5cb902b9",
"attributeshash" : "1aea03066d9702ce81ed938e143b0a518daced0d",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s %s %s %s %s %s %s %s %s %s %s %s", "formatString" : "%s %s %s %s %s %s %s %s %s %s %s %s",
"columnNames" : [ "sourceId", "vx", "vy", "dx", "targetId", "dy", "x", "y", "step", "time", "id", "speed" ], "columnNames" : [ "sourceId", "vx", "vy", "dx", "targetId", "dy", "x", "y", "step", "time", "id", "speed" ],
...@@ -47,7 +45,7 @@ ...@@ -47,7 +45,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel", "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesOVM" : { "org.vadere.state.attributes.models.AttributesOVM" : {
...@@ -136,9 +134,8 @@ ...@@ -136,9 +134,8 @@
"height" : 4.0, "height" : 4.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 2.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 2.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 60.0, "endTime" : 60.0,
......
{ {
"name" : "basic_5_2_roadReachTarget_ovm1", "name" : "basic_5_2_roadReachTarget_ovm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "a73a189c7ee0fc46c4593cac89a785639a48a327",
"attributeshash" : "85431a1c845fd08e1d8fb23b75fa13032a02567f",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s %s %s %s %s %s %s %s %s %s %s %s", "formatString" : "%s %s %s %s %s %s %s %s %s %s %s %s",
"columnNames" : [ "sourceId", "vx", "vy", "dx", "targetId", "dy", "x", "y", "step", "time", "id", "speed" ], "columnNames" : [ "sourceId", "vx", "vy", "dx", "targetId", "dy", "x", "y", "step", "time", "id", "speed" ],
...@@ -47,7 +45,7 @@ ...@@ -47,7 +45,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel", "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesOVM" : { "org.vadere.state.attributes.models.AttributesOVM" : {
...@@ -153,9 +151,8 @@ ...@@ -153,9 +151,8 @@
"height" : 4.0, "height" : 4.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 2.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 2.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 60.0, "endTime" : 60.0,
......
{ {
"name" : "kreuzung_beispiel", "name" : "kreuzung_beispiel",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "d5b33611f248b560d123cb7700691a3108554a09",
"attributeshash" : "146a0a64e733fed65c5ac9559aea5e52866289b0",
"processWriters" : [ ], "processWriters" : [ ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel", "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesOVM" : { "org.vadere.state.attributes.models.AttributesOVM" : {
...@@ -383,7 +381,6 @@ ...@@ -383,7 +381,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -402,7 +399,6 @@ ...@@ -402,7 +399,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -421,7 +417,6 @@ ...@@ -421,7 +417,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
...@@ -440,7 +435,6 @@ ...@@ -440,7 +435,6 @@
"height" : 0.03, "height" : 0.03,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 1, "spawnNumber" : 1,
......
{ {
"name" : "testtrafficlight", "name" : "testtrafficlight",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "3a43d25b7f32b87eb28b2c836106e7854c1ede37",
"attributeshash" : "2f8bd261d0d5d20fcb2da3a6c142c3074aeeef89",
"processWriters" : [ ], "processWriters" : [ ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialCompact" : { "org.vadere.state.attributes.models.AttributesPotentialCompact" : {
...@@ -123,9 +121,8 @@ ...@@ -123,9 +121,8 @@
"height" : 1.1, "height" : 1.1,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 30.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 30.0 ],
"spawnNumber" : 2, "spawnNumber" : 2,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 1000.0, "endTime" : 1000.0,
......
{ {
"name" : "basic_1_chicken_gnm1", "name" : "basic_1_chicken_gnm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "cde764736cfb41b5cd5e4ff40e0adfca0fee6370",
"attributeshash" : "648a5814a72180425a31465c1dcb13c1adeab05e",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ], "columnNames" : [ "waitingTimeTest" ],
...@@ -84,7 +82,7 @@ ...@@ -84,7 +82,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -203,7 +201,6 @@ ...@@ -203,7 +201,6 @@
"height" : 5.0, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
......
{ {
"name" : "basic_1_chicken_gnm2", "name" : "basic_1_chicken_gnm2",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "cde764736cfb41b5cd5e4ff40e0adfca0fee6370",
"attributeshash" : "4f5a79f01ebcf45404e8b4e1bc1740095ca96bf0",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ], "columnNames" : [ "waitingTimeTest" ],
...@@ -84,7 +82,7 @@ ...@@ -84,7 +82,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -203,7 +201,6 @@ ...@@ -203,7 +201,6 @@
"height" : 5.0, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
......
{ {
"name" : "basic_2_density_gnm1", "name" : "basic_2_density_gnm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "033539da8c31611622e76d2566fc5b54d18870fa",
"attributeshash" : "648a5814a72180425a31465c1dcb13c1adeab05e",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "densityTest" ], "columnNames" : [ "densityTest" ],
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -182,7 +180,6 @@ ...@@ -182,7 +180,6 @@
"height" : 10.0, "height" : 10.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
......
{ {
"name" : "basic_3_1_wall_gnm1", "name" : "basic_3_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "df6ff0d4156017c282f37e80e0435f972c049827",
"attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ], "columnNames" : [ "waitingTimeTest" ],
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -155,7 +153,6 @@ ...@@ -155,7 +153,6 @@
"height" : 5.0, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
......
{ {
"name" : "basic_3_2_wall_gnm1", "name" : "basic_3_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "77ae0f32c9f316a3a9590b44b966566a0101ec06",
"attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ], "columnNames" : [ "waitingTimeTest" ],
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -155,7 +153,6 @@ ...@@ -155,7 +153,6 @@
"height" : 5.0, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
......
{ {
"name" : "basic_3_3_wall_gnm1", "name" : "basic_3_3_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.1", "release" : "0.2",
"topographyhash" : "100397af83428c5d8bae5453ddfec5a66eb77c5e",
"attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
"processWriters" : [ { "processWriters" : [ {
"formatString" : "%s", "formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ], "columnNames" : [ "waitingTimeTest" ],
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
"clazz" : "PedestrianEvacuationTimeTest" "clazz" : "PedestrianEvacuationTimeTest"
} }
} ], } ],
"vadere" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
...@@ -155,7 +153,6 @@ ...@@ -155,7 +153,6 @@
"height" : 5.0, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
......