Commit bf7ce0f2 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

update the AttributeAgents values to the values in weidmann-1993 and...

update the AttributeAgents values to the values in weidmann-1993 and seitz-2016c for all model test scenarios.
parent 670dd3e7
Pipeline #58899 passed with stage
in 47 seconds
......@@ -126,8 +126,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.7,
"maximumSpeed" : 2.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -3033,9 +3033,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -218,9 +218,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -209,9 +209,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -738,9 +738,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -197,9 +197,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -162,8 +162,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -157,9 +157,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -157,9 +157,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -207,9 +207,9 @@
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,86 +2,11 @@
"name" : "basic_1_chicken_sfm1",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"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"
}
} ],
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
......@@ -204,6 +129,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
......@@ -217,8 +143,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,86 +2,11 @@
"name" : "basic_1_chicken_sfm2",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"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"
}
} ],
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
......@@ -204,6 +129,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
......@@ -217,8 +143,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,56 +2,11 @@
"name" : "basic_2_density_sfm1",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "densityTest" ],
"attributes" : {
"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" : 100.0,
"minEvacuationTime" : 0.0,
"minEvacuationTimeMean" : 0.0,
"expectFailure" : false
},
"errorTime" : -1.0,
"columnNames" : [ ],
"clazz" : "PedestrianEvacuationTimeTest"
}
} ],
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
......@@ -183,6 +138,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
......@@ -196,8 +152,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,56 +2,11 @@
"name" : "basic_3_1_wall_sfm1",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"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"
}
} ],
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
......@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
......@@ -169,8 +125,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,56 +2,11 @@
"name" : "basic_3_2_wall_sfm1",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"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"
}
} ],
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.sfm.SocialForceModel",
"attributesModel" : {
......@@ -156,6 +111,7 @@
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
......@@ -169,8 +125,8 @@
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
......
......@@ -2,76 +2,11 @@
"name" : "basic_3_3_wall_sfm1",
"description" : "",
"release" : "0.2",
"processWriters" : [ {
"formatString" : "%s",
"columnNames" : [ "waitingTimeTest" ],
"attributes" : {
"startTime" : 0.0,
"endTime" : 1.7976931348623157E308
},
"dataProcessor" : {
"pedestrianWaitingTimeProcessor" : {
"attributes" : {
"waitingArea" : {
"x" : 9.0,