Skip to content

V
vadere
Commit 108e8601 authored by BZoennchen's avatar BZoennchen
Browse files
Options

remove duplcated boundaries of all model test scenarios.

parent 43181eb9
Pipeline #54055 passed with stage
    in 46 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 93 additions and 4855 deletions
    VadereModelTests/TESTOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario
    View file @ 108e8601
    ......@@ -2,49 +2,11 @@
    "name" : "basic_5_1_roadReachTarget_ovm1",
    "description" : "",
    "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" ],
    "attributes" : {
    "startTime" : 0.0,
    "endTime" : 1.7976931348623157E308
    },
    "dataProcessor" : {
    "attributes" : {
    "maxAcceptedVelocity" : 3.0,
    "backSteps" : 1,
    "onlyXDirection" : false
    },
    "pedestrianPositionProcessor" : {
    "attributes" : {
    "ignoreEqualPositions" : false
    },
    "columnNames" : [ "sourceId", "targetId", "x", "y", "step", "time", "id" ],
    "clazz" : "PedestrianPositionProcessor"
    },
    "columnNames" : [ ],
    "clazz" : "PedestrianVelocityProcessor"
    }
    }, {
    "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.ovm.OptimalVelocityModel",
    "attributesModel" : {
    ......@@ -137,6 +99,7 @@
    "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
    "distributionParameters" : [ 2.0 ],
    "spawnNumber" : 1,
    "maxSpawnNumberTotal" : -1,
    "startTime" : 0.0,
    "endTime" : 60.0,
    "spawnAtRandomPositions" : false,
    ......@@ -154,7 +117,22 @@
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0
    },
    "attributesCar" : null
    "attributesCar" : {
    "id" : -1,
    "radius" : 0.195,
    "densityDependentSpeed" : false,
    "speedDistributionMean" : 1.34,
    "speedDistributionStandardDeviation" : 0.0,
    "minimumSpeed" : 0.3,
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0,
    "length" : 4.5,
    "width" : 1.7,
    "direction" : {
    "x" : 1.0,
    "y" : 0.0
    }
    }
    }
    }
    }
    \ No newline at end of file
    VadereModelTests/TESTOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario
    View file @ 108e8601
    ......@@ -2,49 +2,11 @@
    "name" : "basic_5_2_roadReachTarget_ovm1",
    "description" : "",
    "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" ],
    "attributes" : {
    "startTime" : 0.0,
    "endTime" : 1.7976931348623157E308
    },
    "dataProcessor" : {
    "attributes" : {
    "maxAcceptedVelocity" : 3.0,
    "backSteps" : 1,
    "onlyXDirection" : false
    },
    "pedestrianPositionProcessor" : {
    "attributes" : {
    "ignoreEqualPositions" : false
    },
    "columnNames" : [ "sourceId", "targetId", "x", "y", "step", "time", "id" ],
    "clazz" : "PedestrianPositionProcessor"
    },
    "columnNames" : [ ],
    "clazz" : "PedestrianVelocityProcessor"
    }
    }, {
    "formatString" : "%s",
    "columnNames" : [ "evacuationTimeTest" ],
    "attributes" : {
    "startTime" : 0.0,
    "endTime" : 1.7976931348623157E308
    },
    "dataProcessor" : {
    "attributes" : {
    "maxEvacuationTime" : 270.0,
    "maxEvacuationTimeMean" : 270.0,
    "minEvacuationTime" : 150.0,
    "minEvacuationTimeMean" : 150.0,
    "expectFailure" : false
    },
    "errorTime" : -1.0,
    "columnNames" : [ ],
    "clazz" : "PedestrianEvacuationTimeTest"
    }
    } ],
    "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
    "isTimestamped" : true
    },
    "scenario" : {
    "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
    "attributesModel" : {
    ......@@ -154,6 +116,7 @@
    "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
    "distributionParameters" : [ 2.0 ],
    "spawnNumber" : 1,
    "maxSpawnNumberTotal" : -1,
    "startTime" : 0.0,
    "endTime" : 60.0,
    "spawnAtRandomPositions" : false,
    ......@@ -171,7 +134,22 @@
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0
    },
    "attributesCar" : null
    "attributesCar" : {
    "id" : -1,
    "radius" : 0.195,
    "densityDependentSpeed" : false,
    "speedDistributionMean" : 1.34,
    "speedDistributionStandardDeviation" : 0.0,
    "minimumSpeed" : 0.3,
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0,
    "length" : 4.5,
    "width" : 1.7,
    "direction" : {
    "x" : 1.0,
    "y" : 0.0
    }
    }
    }
    }
    }
    \ No newline at end of file
    VadereModelTests/TESTOVM/scenarios/testtrafficlight.scenario
    View file @ 108e8601
    ......@@ -2,7 +2,11 @@
    "name" : "testtrafficlight",
    "description" : "",
    "release" : "0.2",
    "processWriters" : [ ],
    "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
    "isTimestamped" : true
    },
    "scenario" : {
    "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
    "attributesModel" : {
    ......@@ -124,6 +128,7 @@
    "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
    "distributionParameters" : [ 30.0 ],
    "spawnNumber" : 2,
    "maxSpawnNumberTotal" : -1,
    "startTime" : 0.0,
    "endTime" : 1000.0,
    "spawnAtRandomPositions" : true,
    ......@@ -141,7 +146,22 @@
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0
    },
    "attributesCar" : null
    "attributesCar" : {
    "id" : -1,
    "radius" : 0.195,
    "densityDependentSpeed" : false,
    "speedDistributionMean" : 1.34,
    "speedDistributionStandardDeviation" : 0.0,
    "minimumSpeed" : 0.3,
    "maximumSpeed" : 3.0,
    "acceleration" : 2.0,
    "length" : 4.5,
    "width" : 1.7,
    "direction" : {
    "x" : 1.0,
    "y" : 0.0
    }
    }
    }
    }
    }
    \ No newline at end of file
    VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
    View file @ 108e8601
    ......@@ -116,222 +116,6 @@
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 11.4999
    }, {
    "x" : 38.0001,
    "y" : 11.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 12.0001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 11.4999
    }, {
    "x" : 38.0001,
    "y" : 11.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 12.0001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : -1.0E-4
    }, {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : 12.0001
    }, {
    "x" : 37.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 38.0001,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : 11.4999
    }, {
    "x" : 38.0001,
    "y" : 11.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 12.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 12.0001
    } ]
    },
    "id" : -1
    } ],
    "stairs" : [ ],
    "targets" : [ {
    ......
    VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
    View file @ 108e8601
    ......@@ -89,150 +89,6 @@
    "type" : "RECTANGLE"
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 9.4999
    }, {
    "x" : 20.0001,
    "y" : 9.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 10.0001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 9.4999
    }, {
    "x" : 20.0001,
    "y" : 9.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 10.0001
    } ]
    },
    "id" : -1
    } ],
    "stairs" : [ ],
    "targets" : [ {
    ......
    VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
    View file @ 108e8601
    ......@@ -89,150 +89,6 @@
    "type" : "RECTANGLE"
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 9.4999
    }, {
    "x" : 20.0001,
    "y" : 9.4999
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : -1.0E-4
    }, {
    "x" : 0.5001,
    "y" : 10.0001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : -1.0E-4,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 0.5001
    }, {
    "x" : -1.0E-4,
    "y" : 0.5001
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : -1.0E-4
    }, {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : 10.0001
    }, {
    "x" : 19.4999,
    "y" : -1.0E-4
    } ]
    },
    "id" : -1
    }, {
    "shape" : {
    "type" : "POLYGON",
    "points" : [ {
    "x" : 20.0001,
    "y" : 10.0001
    }, {
    "x" : -1.0E-4,
    "y" : 10.0001
    }, {