Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
0a32826c
Commit
0a32826c
authored
Nov 02, 2017
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update flip on the gpu: update kernels
parent
06405f10
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
969 additions
and
73 deletions
+969
-73
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
...odelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
+75
-13
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
...odelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
+72
-0
VadereModelTests/TestOSM/scenarios/queueing_floor_field_osm1.scenario
...ests/TestOSM/scenarios/queueing_floor_field_osm1.scenario
+250
-0
VadereUtils/resources/DistMeshDouble.cl
VadereUtils/resources/DistMeshDouble.cl
+68
-60
No files found.
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
View file @
0a32826c
...
...
@@ -5,22 +5,12 @@
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "/Users/bzoennchen/Development/workspaces/hmRepo/GitLab/vadere/VadereModelTests/TestOSM/output/basic_1_chicken_osm1_2017-10-2
0_17-13-42.805
/out.txt",
"processors" : [ 1
, 2
]
"filename" : "/Users/bzoennchen/Development/workspaces/hmRepo/GitLab/vadere/VadereModelTests/TestOSM/output/basic_1_chicken_osm1_2017-10-2
6_09-12-02.222
/out.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityGaussianProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityGaussianProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 2,
"scale" : 10.0,
"standardDerivation" : 0.7,
"obstacleDensity" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" :
2
"id" :
1
} ],
"isTimestamped" : true
},
...
...
@@ -123,6 +113,78 @@
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 35.0001,
"y" : -1.0E-4
}, {
"x" : 35.0001,
"y" : 0.5001
}, {
"x" : -1.0E-4,
"y" : 0.5001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 35.0001,
"y" : -1.0E-4
}, {
"x" : 35.0001,
"y" : 60.0001
}, {
"x" : 34.4999,
"y" : 60.0001
}, {
"x" : 34.4999,
"y" : -1.0E-4
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 35.0001,
"y" : 60.0001
}, {
"x" : -1.0E-4,
"y" : 60.0001
}, {
"x" : -1.0E-4,
"y" : 59.4999
}, {
"x" : 35.0001,
"y" : 59.4999
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 60.0001
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 0.5001,
"y" : -1.0E-4
}, {
"x" : 0.5001,
"y" : 60.0001
} ]
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @
0a32826c
...
...
@@ -123,6 +123,78 @@
} ]
},
"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 @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
View file @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
View file @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
View file @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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" : 1.0001
}, {
"x" : -1.0E-4,
"y" : 1.0001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
}, {
"x" : 20.0001,
"y" : 10.0001
}, {
"x" : 18.9999,
"y" : 10.0001
}, {
"x" : 18.9999,
"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" : 8.9999
}, {
"x" : 20.0001,
"y" : 8.9999
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 1.0001,
"y" : -1.0E-4
}, {
"x" : 1.0001,
"y" : 10.0001
} ]
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
View file @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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" : 1.0001
}, {
"x" : -1.0E-4,
"y" : 1.0001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
}, {
"x" : 20.0001,
"y" : 10.0001
}, {
"x" : 18.9999,
"y" : 10.0001
}, {
"x" : 18.9999,
"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" : 8.9999
}, {
"x" : 20.0001,
"y" : 8.9999
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 1.0001,
"y" : -1.0E-4
}, {
"x" : 1.0001,
"y" : 10.0001
} ]
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
...
...
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
View file @
0a32826c
...
...
@@ -88,6 +88,78 @@
"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" : 1.0001
}, {
"x" : -1.0E-4,
"y" : 1.0001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
}, {
"x" : 20.0001,
"y" : 10.0001
}, {
"x" : 18.9999,
"y" : 10.0001
}, {
"x" : 18.9999,
"y" : -1.0E-4
} ]