2.12.2021, 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
Browse files

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
{
"name" : "basic_4_1_wall_sfm1",
"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,
......
{
"name" : "basic_4_1_wall_sfm2",
"description" : "",
"release" : "0.1",
"topographyhash" : "7f8cdb8eeae20e229965a735dbfcf43fcc8a59c5",
"attributeshash" : "2cc46c66c4cf1aab0e2009bc248a06673f988e2f",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
......@@ -54,7 +52,7 @@
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -155,7 +153,6 @@
"height" : 5.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
......
{
"name" : "basic_4_2_wall_sfm1",
"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,
......
{
"name" : "basic_4_2_wall_sfm2",
"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,
......
{
"name" : "rimea_01_pathway_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "5a4523766dd5c78246918cda6671c9ef2bdcc4f3",
"attributeshash" : "da857819fc05cfe39c6946237e73f1e674b633fc",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
......@@ -24,7 +22,7 @@
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -116,9 +114,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,
......
{
"name" : "rimea_01_pathway_sfm2",
"description" : "",
"release" : "0.1",
"topographyhash" : "5a4523766dd5c78246918cda6671c9ef2bdcc4f3",
"attributeshash" : "da857819fc05cfe39c6946237e73f1e674b633fc",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
......@@ -24,7 +22,7 @@
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -116,9 +114,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,
......
{
"name" : "rimea_04_flow_sfm1_025_h",
"description" : "",
"release" : "0.1",
"topographyhash" : "f2d7f73e8409ac97aa6b3ab539d529284cecda7f",
"attributeshash" : "6c8eef339f24d23c24a76353850942bff1d634e8",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -97,7 +95,6 @@
"height" : 2.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 25,
......
{
"name" : "rimea_04_flow_sfm1_050_h",
"description" : "",
"release" : "0.1",
"topographyhash" : "37529a86b42cd73ca531388bdc0963836afe76a9",
"attributeshash" : "6c8eef339f24d23c24a76353850942bff1d634e8",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -97,7 +95,6 @@
"height" : 2.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 50,
......
{
"name" : "rimea_04_flow_sfm1_075_h",
"description" : "",
"release" : "0.1",
"topographyhash" : "fc420a9ff8db52039a2593397ad057df977a99ea",
"attributeshash" : "6c8eef339f24d23c24a76353850942bff1d634e8",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -97,7 +95,6 @@
"height" : 2.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 75,
......
{
"name" : "rimea_04_flow_sfm1_100_h",
"description" : "",
"release" : "0.1",
"topographyhash" : "5d8f3904564d818d63e6606a6d9e63a94b003c2c",
"attributeshash" : "6c8eef339f24d23c24a76353850942bff1d634e8",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -97,7 +95,6 @@
"height" : 2.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 100,
......
{
"name" : "rimea_04_flow_sfm1_125_h",
"description" : "",
"release" : "0.1",
"topographyhash" : "6f687cc2f3735ec605dfbb367a667342d0f60088",
"attributeshash" : "6c8eef339f24d23c24a76353850942bff1d634e8",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -97,7 +95,6 @@
"height" : 2.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 125,
......
{
"name" : "rimea_05_react_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "eeba5fbe296b72d9dca240ba9cc04bc924bacce8",
"attributeshash" : "443718038655ee07cd3d1e2269b6cbc07587ca2b",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -115,7 +113,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 10,
......
{
"name" : "rimea_06_corner_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "1438039afb5520d28837c2d7cdb0e2572c2ac829",
"attributeshash" : "4b0d5b02b0f6c0b79069bdf6bae25577263302f4",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
......@@ -54,7 +52,7 @@
"clazz" : "PedestrianWaitingTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -164,7 +162,6 @@
"height" : 1.6,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 20,
......
{
"name" : "rimea_07_speeds_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "da1d61825abf9afd88a1bd13f7137be19cea4224",
"attributeshash" : "b0f9d2f9e8246f2dd1a7249e2255097a9a4dd26e",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
......@@ -24,7 +22,7 @@
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -116,9 +114,8 @@
"height" : 50.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 20.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"distributionParameters" : [ 20.0 ],
"spawnNumber" : 10,
"startTime" : 0.0,
"endTime" : 100.0,
......
{
"name" : "rimea_09_publicRoom_sfm1_2",
"description" : "",
"release" : "0.1",
"topographyhash" : "67ca02c368d68648d95bbb7abaf3dda6156c892d",
"attributeshash" : "81201a51b45e47523928197eecd5eea1f0f7ce8b",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -199,7 +197,6 @@
"height" : 15.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 1000,
......
{
"name" : "rimea_09_publicRoom_sfm1_4",
"description" : "",
"release" : "0.1",
"topographyhash" : "08966b2db7102aef1cd3d85fe56e9f99a9e14b8e",
"attributeshash" : "81201a51b45e47523928197eecd5eea1f0f7ce8b",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -181,7 +179,6 @@
"height" : 15.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 1000,
......
{
"name" : "rimea_10_pathfinding_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "ca2072236c2fdb761e5b8d9fd2d15764d94841e2",
"attributeshash" : "81201a51b45e47523928197eecd5eea1f0f7ce8b",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s %s %s %s %s %s %s %s %s %s %s",
"columnNames" : [ "time", "id", "lastX", "lastY", "firstX", "firstY", "targetId", "sourceId", "startTime", "endTime", "evacTime" ],
......@@ -16,7 +14,7 @@
"clazz" : "PedestrianLastPositionProcessor"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -512,7 +510,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -531,7 +528,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -550,7 +546,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -569,7 +564,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -588,7 +582,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -607,7 +600,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -626,7 +618,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -645,7 +636,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -664,7 +654,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -683,7 +672,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -702,7 +690,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......@@ -721,7 +708,6 @@
"height" : 4.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
......
{
"name" : "rimea_11_exitSelection_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "388a836ae85a814e6f84d34f6d2509d6d319a1aa",
"attributeshash" : "81201a51b45e47523928197eecd5eea1f0f7ce8b",
"release" : "0.2",
"processWriters" : [ ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -169,7 +167,6 @@
"height" : 15.0,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 1000,
......
{
"name" : "rimea_12_evacuation_sfm1",
"description" : "",
"release" : "0.1",
"topographyhash" : "6df1a2e2049b77eb4efec2727906995a725fd6da",
"attributeshash" : "a37b0556d777c29673caaa1d913901bbe1b93c9d",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s %s %s",
"columnNames" : [ "densityTest" ],
......@@ -106,7 +104,7 @@
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"vadere" : {
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
......@@ -234,7 +232,6 @@
"height" : 9.6,
"type" : "RECTANGLE"
},
"spawnDelay" : 1.0,
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 150,
......
package org.vadere.simulator.entrypoints;
import org.jetbrains.annotations.NotNull;
import java.util.Optional;
/** Versions in strict order from oldest to newest. */
public enum Version {
......@@ -29,6 +33,19 @@ public enum Version {
public static Version latest() {
return values()[values().length - 1];
}
public static Optional<Version> getPrevious(@NotNull final Version successorVersion) {
Version prevVersion = null;
for(Version version : values()) {
if(successorVersion.equals(version)) {
return Optional.ofNullable(prevVersion);
}
prevVersion = version;
}
return Optional.empty();
}
@Override
public String toString() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment