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.

VadereGui/resources/messages.properties

@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Set language
 ProjectView.mntmEnglishLocale.text=English
 ProjectView.mntmGermanLocale.text=German
 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.unsavedChanges.text=Unsaved changes:

VadereGui/resources/messages_de_DE.properties

@@ -99,6 +99,9 @@ ProjectView.mntmLanguageChoiceMenu.text=Sprache \u00E4ndern
 ProjectView.mntmEnglishLocale.text=Englisch
 ProjectView.mntmGermanLocale.text=Deutsch
 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.unsavedChanges.text=Ungespeicherte \u00c4nderungen:

VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java

@@ -2,6 +2,7 @@ package org.vadere.gui.projectview.control;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
+import org.vadere.gui.components.utils.Messages;
 import org.vadere.gui.projectview.VadereApplication;
 import org.vadere.gui.projectview.model.ProjectViewModel;
 import org.vadere.gui.projectview.view.ProjectView;
@@ -47,12 +48,31 @@ public class ActionLoadProject extends AbstractAction {
 
 			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) {
-					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
 				loadProjectByPath(model, projectFilePath);
+
 			} else {
 				logger.info(String.format("user canceled load project."));
 			}

VadereModelTests/TESTOVM/scenarios/Neues_Szenario.scenario

 {
   "name" : "Neues_Szenario",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "ac1cfdef557c6e70025958f499627fc593ed9269",
-  "attributeshash" : "146a0a64e733fed65c5ac9559aea5e52866289b0",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOVM" : {
@@ -383,7 +381,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -402,7 +399,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -421,7 +417,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -440,7 +435,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,

VadereModelTests/TESTOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario

 {
   "name" : "basic_5_1_roadReachTarget_ovm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "2370344deee6f5863df968ff1df5173a5cb902b9",
-  "attributeshash" : "1aea03066d9702ce81ed938e143b0a518daced0d",
+  "release" : "0.2",
   "processWriters" : [ {
     "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" ],
@@ -47,7 +45,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOVM" : {
@@ -136,9 +134,8 @@
           "height" : 4.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 2.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
-        "distributionParameters" : [ 1.0 ],
+        "distributionParameters" : [ 2.0 ],
         "spawnNumber" : 1,
         "startTime" : 0.0,
         "endTime" : 60.0,

VadereModelTests/TESTOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario

 {
   "name" : "basic_5_2_roadReachTarget_ovm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "a73a189c7ee0fc46c4593cac89a785639a48a327",
-  "attributeshash" : "85431a1c845fd08e1d8fb23b75fa13032a02567f",
+  "release" : "0.2",
   "processWriters" : [ {
     "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" ],
@@ -47,7 +45,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOVM" : {
@@ -153,9 +151,8 @@
           "height" : 4.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 2.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
-        "distributionParameters" : [ 1.0 ],
+        "distributionParameters" : [ 2.0 ],
         "spawnNumber" : 1,
         "startTime" : 0.0,
         "endTime" : 60.0,

VadereModelTests/TESTOVM/scenarios/kreuzung_beispiel.scenario

 {
   "name" : "kreuzung_beispiel",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "d5b33611f248b560d123cb7700691a3108554a09",
-  "attributeshash" : "146a0a64e733fed65c5ac9559aea5e52866289b0",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOVM" : {
@@ -383,7 +381,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -402,7 +399,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -421,7 +417,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,
@@ -440,7 +435,6 @@
           "height" : 0.03,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 1,

VadereModelTests/TESTOVM/scenarios/testtrafficlight.scenario

 {
   "name" : "testtrafficlight",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "3a43d25b7f32b87eb28b2c836106e7854c1ede37",
-  "attributeshash" : "2f8bd261d0d5d20fcb2da3a6c142c3074aeeef89",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialCompact" : {
@@ -123,9 +121,8 @@
           "height" : 1.1,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 30.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
-        "distributionParameters" : [ 1.0 ],
+        "distributionParameters" : [ 30.0 ],
         "spawnNumber" : 2,
         "startTime" : 0.0,
         "endTime" : 1000.0,

VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario

 {
   "name" : "basic_1_chicken_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "cde764736cfb41b5cd5e4ff40e0adfca0fee6370",
-  "attributeshash" : "648a5814a72180425a31465c1dcb13c1adeab05e",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -84,7 +82,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -203,7 +201,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 200,

VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario

 {
   "name" : "basic_1_chicken_gnm2",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "cde764736cfb41b5cd5e4ff40e0adfca0fee6370",
-  "attributeshash" : "4f5a79f01ebcf45404e8b4e1bc1740095ca96bf0",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -84,7 +82,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -203,7 +201,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 200,

VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario

 {
   "name" : "basic_2_density_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "033539da8c31611622e76d2566fc5b54d18870fa",
-  "attributeshash" : "648a5814a72180425a31465c1dcb13c1adeab05e",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "densityTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -182,7 +180,6 @@
           "height" : 10.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 200,

VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario

 {
   "name" : "basic_3_1_wall_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "df6ff0d4156017c282f37e80e0435f972c049827",
-  "attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -155,7 +153,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 50,

VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario

 {
   "name" : "basic_3_2_wall_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "77ae0f32c9f316a3a9590b44b966566a0101ec06",
-  "attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -155,7 +153,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 50,

VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario

 {
   "name" : "basic_3_3_wall_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "100397af83428c5d8bae5453ddfec5a66eb77c5e",
-  "attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -155,7 +153,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 50,

VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario

 {
   "name" : "basic_4_1_wall_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "7f8cdb8eeae20e229965a735dbfcf43fcc8a59c5",
-  "attributeshash" : "6361b7f540016d14d148a408e8b6246a71d08d44",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -155,7 +153,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 200,

VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario

 {
   "name" : "basic_4_2_wall_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "5fc90d02be8a59ea3408bc65eb803dc8117184e7",
-  "attributeshash" : "34462d153a959a288d3ddb2d2b6969153139bd54",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "waitingTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianEvacuationTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -155,7 +153,6 @@
           "height" : 5.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 50,

VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario

 {
   "name" : "rimea_01_pathway_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "5a4523766dd5c78246918cda6671c9ef2bdcc4f3",
-  "attributeshash" : "2f7454c37a6089b9bdcb08b453f02fd4fe3ecf98",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "evacuationTimeTest" ],
@@ -35,7 +33,7 @@
       "clazz" : "PedestrianLastPositionProcessor"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -127,9 +125,8 @@
           "height" : 1.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 30.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
-        "distributionParameters" : [ 1.0 ],
+        "distributionParameters" : [ 30.0 ],
         "spawnNumber" : 1,
         "startTime" : 0.0,
         "endTime" : 1200.0,

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_025_h",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "f2d7f73e8409ac97aa6b3ab539d529284cecda7f",
-  "attributeshash" : "7b32bc9ad9cbd96f058355bb305680d03212cbb3",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -97,7 +95,6 @@
           "height" : 2.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 25,

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_050_h",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "37529a86b42cd73ca531388bdc0963836afe76a9",
-  "attributeshash" : "7b32bc9ad9cbd96f058355bb305680d03212cbb3",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -97,7 +95,6 @@
           "height" : 2.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 50,

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_075_h",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "fc420a9ff8db52039a2593397ad057df977a99ea",
-  "attributeshash" : "7b32bc9ad9cbd96f058355bb305680d03212cbb3",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -97,7 +95,6 @@
           "height" : 2.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 75,

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_100_h",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "5d8f3904564d818d63e6606a6d9e63a94b003c2c",
-  "attributeshash" : "7b32bc9ad9cbd96f058355bb305680d03212cbb3",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -97,7 +95,6 @@
           "height" : 2.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 100,

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_125_h",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "6f687cc2f3735ec605dfbb367a667342d0f60088",
-  "attributeshash" : "7b32bc9ad9cbd96f058355bb305680d03212cbb3",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -97,7 +95,6 @@
           "height" : 2.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 125,

VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario

 {
   "name" : "rimea_05_react_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "eeba5fbe296b72d9dca240ba9cc04bc924bacce8",
-  "attributeshash" : "bbe40f37f3349597117aa8209bb97fe097934787",
+  "release" : "0.2",
   "processWriters" : [ ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -115,7 +113,6 @@
           "height" : 4.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 10,

VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario

 {
   "name" : "rimea_06_corner_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "1438039afb5520d28837c2d7cdb0e2572c2ac829",
-  "attributeshash" : "19552ec5a5434ba517d6ea7cda811c932c87d91b",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "evacuationTimeTest" ],
@@ -54,7 +52,7 @@
       "clazz" : "PedestrianWaitingTimeTest"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -164,7 +162,6 @@
           "height" : 1.6,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 1.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
         "distributionParameters" : [ 1.0 ],
         "spawnNumber" : 20,

VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario

 {
   "name" : "rimea_07_speeds_gnm1",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "43feafada4a10775a493cf454fa4712f20b447e9",
-  "attributeshash" : "f9bda304904d2c0f38489d332c08325b311250bc",
+  "release" : "0.2",
   "processWriters" : [ {
     "formatString" : "%s",
     "columnNames" : [ "evacuationTimeTest" ],
@@ -58,7 +56,7 @@
       "clazz" : "PedestrianVelocityProcessor"
     }
   } ],
-  "vadere" : {
+  "scenario" : {
     "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
@@ -150,9 +148,8 @@
           "height" : 50.0,
           "type" : "RECTANGLE"
         },
-        "spawnDelay" : 20.0,
         "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
-        "distributionParameters" : [ 1.0 ],
+        "distributionParameters" : [ 20.0 ],
         "spawnNumber" : 1,
         "startTime" : 0.0,
         "endTime" : 1000.0,

VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario

 {
   "name" : "rimea_09_publicRoom_gnm1_2",
   "description" : "",
-  "release" : "0.1",
-  "topographyhash" : "67ca02c368d68648d95bbb7abaf3dda6156c892d",
-  "attributeshash" : "bb06d945206a783e7148ed12df152fa5acc16d2d",