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
6c627813
Commit
6c627813
authored
Apr 08, 2019
by
Stefan Schuhbaeck
Browse files
Merge branch 'measurementAreaRefactorProcessors_rebased' into 'master'
Measurement area refactor processors rebased See merge request
!55
parents
dcffc7d3
83cb5e48
Pipeline
#103785
passed with stages
in 137 minutes and 9 seconds
Changes
296
Pipelines
1
Show whitespace changes
Inline
Side-by-side
VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
View file @
6c627813
{
"name" : "rimea_11_exitSelection_gnm1",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -144,6 +144,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
View file @
6c627813
{
"name" : "rimea_12_evacuation_gnm1",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -108,6 +108,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
View file @
6c627813
{
"name" : "rimea_13_stairs_gnm1",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -90,6 +90,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ {
"shape" : {
"x" : 15.0,
...
...
VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
View file @
6c627813
{
"name" : "rimea_14_selectRoute_gnm1",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -126,6 +126,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ {
"shape" : {
"x" : 10.0,
...
...
VadereModelTests/TestNonWorkingFeatures/scenarios/cooperative_behavior_agents_get_stuck.scenario
View file @
6c627813
{
"name" : "cooperative_behavior_agents_get_stuck",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -34,7 +33,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...
...
@@ -59,23 +59,23 @@
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"optimizationType" : "DISCRETE",
"varyStepDirection" : false,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"minStepLength" : 0.4625,
"minimumStepLength" : false,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -112,6 +112,7 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
@@ -148,6 +149,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
"shape" : {
...
...
@@ -189,6 +191,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -198,6 +201,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
...
...
@@ -213,8 +217,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
View file @
6c627813
{
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
View file @
6c627813
{
"name" : "basic_2_density_pso",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
View file @
6c627813
{
"name" : "chicken_floorfield_displaced_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -28,13 +28,7 @@
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
...
...
@@ -160,7 +154,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
View file @
6c627813
{
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -28,13 +28,7 @@
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
...
...
@@ -170,7 +164,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
View file @
6c627813
{
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -25,13 +25,7 @@
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
...
...
@@ -161,7 +155,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
View file @
6c627813
{
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
View file @
6c627813
{
"name" : "narrow_passage_nelder_mead_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
View file @
6c627813
{
"name" : "narrow_passage_pso_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
View file @
6c627813
{
"name" : "queueing_dynamic_floorfield_visual_check",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
View file @
6c627813
{
"name" : "regular_wall_discrete_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -17,13 +17,7 @@
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...
...
@@ -213,7 +207,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
View file @
6c627813
{
"name" : "regular_wall_nelder_mead_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -17,13 +17,7 @@
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...
...
@@ -213,7 +207,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
View file @
6c627813
{
"name" : "regular_wall_pso_ok",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -17,13 +17,7 @@
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...
...
@@ -141,7 +135,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
View file @
6c627813
{
"name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
View file @
6c627813
{
"name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
View file @
6c627813
{
"name" : "rimea_04_flow_osm1_025_d",
"description" : "",
"release" : "0.
7
",
"release" : "0.
8
",
"processWriters" : {
"files" : [ ],
"processors" : [ {
...
...
Prev
1
2
3
4
5
6
7
…
15
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