Skip to content

GitLab

Commit ab02a3ef authored by Marion Goedel's avatar Marion Goedel
Browse files

Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop

parents 03b28bd9 2b9684d7
Pipeline #67761 passed with stages
in 58 minutes and 26 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 337 deletions
Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
View file @ ab02a3ef
......@@ -96,7 +96,15 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader
if __name__ == "__main__":
print("Output is only shown for failed scenarios!")
long_running_scenarios = ["TestSFM", "rimea_09", "rimea_11", "queueing"]
long_running_scenarios = [
"basic_4_1_wall_gnm1",
"queueing",
"rimea_09",
"rimea_11",
"TestSFM",
"thin_wall_and_closer_source_nelder_mead_ok",
"thin_wall_and_closer_source_pso_could_fail"
]
excluded_scenarios = ["TESTOVM", "output", "legacy"]
excluded_scenarios.extend(long_running_scenarios)
......
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 1
},
"topography" : {
"attributes" : {
......@@ -139,6 +138,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -148,8 +148,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm2",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......
VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_2_density_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -148,6 +147,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -157,8 +157,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_3_1_wall_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -121,6 +120,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,8 +130,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_3_2_wall_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -121,6 +120,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,8 +130,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_3_3_wall_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -121,6 +120,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,8 +130,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_4_1_wall_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 1
},
"topography" : {
"attributes" : {
......@@ -111,7 +110,7 @@
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
"spawnNumber" : 50,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
......@@ -121,6 +120,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,8 +130,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "basic_4_2_wall_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -121,6 +120,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,8 +130,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_025_h",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_050_h",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_075_h",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_100_h",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_125_h",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_05_react_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -130,6 +129,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -139,8 +139,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_06_corner_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -130,6 +129,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -139,8 +139,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_07_speeds_gnm1",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -112,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,8 +121,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_09_publicRoom_gnm1_2",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
......@@ -214,6 +213,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -223,8 +223,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
View file @ ab02a3ef
......@@ -2,7 +2,6 @@
"name" : "rimea_09_publicRoom_gnm1_4",
"description" : "",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -58,7 +57,7 @@