Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
1ae05e2b
Commit
1ae05e2b
authored
Jul 09, 2019
by
Daniel Lehmberg
Browse files
Merge branch 'insert_missing_scenario_parameters' into 'master'
Insert missing scenario parameters See merge request
!74
parents
94115548
5fe8b381
Pipeline
#131189
passed with stages
in 114 minutes and 38 seconds
Changes
62
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -70,7 +69,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_pso",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -58,7 +57,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_displaced_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -69,7 +68,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -79,7 +78,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -61,7 +60,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "narrow_passage_nelder_mead_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "narrow_passage_pso_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -77,7 +76,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "queueing_dynamic_floorfield_visual_check",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -53,7 +52,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 5.0,
"pedestrianDynamicWeight" : 1.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "regular_wall_discrete_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "regular_wall_nelder_mead_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "regular_wall_pso_ok",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -68,7 +67,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -78,7 +77,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_d",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_025_up",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_050_d",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_050_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -150,7 +149,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_050_up",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
View file @
1ae05e2b
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_osm1_075_d",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment