Commit a6de409d authored by Benedikt Zoennchen's avatar Benedikt Zoennchen

modify and add new scenario to the model test package.

parent 23f7c8d9
...@@ -2,86 +2,11 @@ ...@@ -2,86 +2,11 @@
"name" : "basic_1_chicken_gnm1", "name" : "basic_1_chicken_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 23.5,
"width" : 15.0,
"height" : 7.5
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 10.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 190.0,
"maxEvacuationTimeMean" : 190.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : false
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -204,6 +129,7 @@ ...@@ -204,6 +129,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,86 +2,11 @@ ...@@ -2,86 +2,11 @@
"name" : "basic_1_chicken_gnm2", "name" : "basic_1_chicken_gnm2",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 100.0,
"maxWaitingTimeMean" : 100.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : true
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 23.5,
"width" : 15.0,
"height" : 7.5
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 30.0,
"maxWaitingTimeMean" : 30.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 190.0,
"maxEvacuationTimeMean" : 190.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -204,6 +129,7 @@ ...@@ -204,6 +129,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_2_density_gnm1", "name" : "basic_2_density_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "densityTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianDensityProcessor" : {
"densityProcessor" : {
"attributes" : {
"radius" : 1.5
},
"columnNames" : [ "x", "y", "circleDensity", "step", "time" ],
"clazz" : "DensityCountingProcessor"
},
"columnNames" : [ "circleDensity" ],
"clazz" : "PedestrianDensityProcessor"
},
"attributes" : {
"maxDensity" : 10.0,
"minDensity" : 0.0,
"maxMeanDensity" : 6.0,
"minMeanDensity" : 0.0,
"expectFailure" : false
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianDensityTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 100.0,
"maxEvacuationTimeMean" : 50.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -183,6 +138,7 @@ ...@@ -183,6 +138,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_3_1_wall_gnm1", "name" : "basic_3_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 1.0,
"maxEvacuationTimeMean" : 1.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -156,6 +111,7 @@ ...@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_3_2_wall_gnm1", "name" : "basic_3_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 1.0,
"maxEvacuationTimeMean" : 1.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -156,6 +111,7 @@ ...@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_3_3_wall_gnm1", "name" : "basic_3_3_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 1.0,
"maxEvacuationTimeMean" : 1.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -156,6 +111,7 @@ ...@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_4_1_wall_gnm1", "name" : "basic_4_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,
"minWaitingTimeMean" : 0.0,
"expectFailure" : false
},
"columnNames" : [ ],
"clazz" : "PedestrianWaitingTimeTest"
}
}, {
"formatString" : "%s",
"columnNames" : [ "evacuationTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"attributes" : {
"maxEvacuationTime" : 1.0,
"maxEvacuationTimeMean" : 1.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : true
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
...@@ -156,6 +111,7 @@ ...@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 200, "spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : true, "spawnAtRandomPositions" : true,
......
...@@ -2,56 +2,11 @@ ...@@ -2,56 +2,11 @@
"name" : "basic_4_2_wall_gnm1", "name" : "basic_4_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "0.2", "release" : "0.2",
"processWriters" : [ { "processWriters" : {
"formatString" : "%s", "files" : [ ],
"columnNames" : [ "waitingTimeTest" ], "processors" : [ ],
"attributes" : { "isTimestamped" : true
"startTime" : 0.0, },
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0
}
},
"columnNames" : [ "totalWaitingTime", "time", "id" ],
"clazz" : "PedestrianWaitingTimeProcessor"
},
"attributes" : {
"maxWaitingTime" : 0.0,
"maxWaitingTimeMean" : 0.0,
"minWaitingTime" : 0.0,