Skip to content

GitLab

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

triangulation updates

parent 12bd1b70
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 44 deletions
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @ b20d4dda
......@@ -84,16 +84,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 9.0,
"y" : 12.0
"y" : 12.0,
"identifier" : -1
}, {
"x" : 9.0,
"y" : 10.0
"y" : 10.0,
"identifier" : -1
}, {
"x" : 30.0,
"y" : 7.0
"y" : 7.0,
"identifier" : -1
}, {
"x" : 30.0,
"y" : 12.0
"y" : 12.0,
"identifier" : -1
} ]
},
"id" : -1
......@@ -102,16 +106,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 9.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}, {
"x" : 9.0,
"y" : 2.0
"y" : 2.0,
"identifier" : -1
}, {
"x" : 30.0,
"y" : 5.0
"y" : 5.0,
"identifier" : -1
}, {
"x" : 30.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
} ]
},
"id" : -1
......
VadereModelTests/TestOSM/scenarios/rimea_02_stairs_osm1.scenario
View file @ b20d4dda
......@@ -146,7 +146,8 @@
"treadCount" : 1,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_03_stairs_osm1.scenario
View file @ b20d4dda
......@@ -146,7 +146,8 @@
"treadCount" : 1,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 100,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
View file @ b20d4dda
......@@ -92,7 +92,8 @@
"treadCount" : 133,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm1.scenario
View file @ b20d4dda
......@@ -3,8 +3,15 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "out.trajectories",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
} ],
"isTimestamped" : true
},
"scenario" : {
......
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm2.scenario
View file @ b20d4dda
......@@ -142,11 +142,13 @@
"targetIds" : [ 1 ],
"position" : {
"x" : 4.3,
"y" : 4.6
"y" : 4.6,
"identifier" : -1
},
"velocity" : {
"x" : 0.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
},
"nextTargetListIndex" : -1,
"freeFlowSpeed" : 1.34,
......
VadereModelTests/TestOSM/scenarios/rimea_08_parameter_osm1.scenario
View file @ b20d4dda
......@@ -1568,7 +1568,8 @@
"treadCount" : 13,
"upwardDirection" : {
"x" : -1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
}, {
"shape" : {
......@@ -1582,7 +1583,8 @@
"treadCount" : 13,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_09_publicRoom_osm1_2.scenario
View file @ b20d4dda
......@@ -160,28 +160,36 @@
"type" : "POLYGON",
"points" : [ {
"x" : 31.0,
"y" : 27.0
"y" : 27.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 27.0
"y" : 27.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 29.0
"y" : 29.0,
"identifier" : -1
}, {
"x" : 33.0,
"y" : 29.0
"y" : 29.0,
"identifier" : -1
}, {
"x" : 33.0,
"y" : 2.0
"y" : 2.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 2.0
"y" : 2.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 4.0
"y" : 4.0,
"identifier" : -1
}, {
"x" : 31.0,
"y" : 4.0
"y" : 4.0,
"identifier" : -1
} ]
},
"waitingTime" : 0.0,
......
VadereModelTests/TestOSM/scenarios/rimea_09_publicRoom_osm1_4.scenario
View file @ b20d4dda
......@@ -151,28 +151,36 @@
"type" : "POLYGON",
"points" : [ {
"x" : 31.0,
"y" : 27.0
"y" : 27.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 27.0
"y" : 27.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 29.0
"y" : 29.0,
"identifier" : -1
}, {
"x" : 33.0,
"y" : 29.0
"y" : 29.0,
"identifier" : -1
}, {
"x" : 33.0,
"y" : 2.0
"y" : 2.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 2.0
"y" : 2.0,
"identifier" : -1
}, {
"x" : 2.0,
"y" : 4.0
"y" : 4.0,
"identifier" : -1
}, {
"x" : 31.0,
"y" : 4.0
"y" : 4.0,
"identifier" : -1
} ]
},
"waitingTime" : 0.0,
......
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_osm1_a.scenario
View file @ b20d4dda
......@@ -110,7 +110,8 @@
"treadCount" : 15,
"upwardDirection" : {
"x" : 1.0,
"y" : 0.0
"y" : 0.0,
"identifier" : -1
}
} ],
"targets" : [ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment