Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
290ae70a
Commit
290ae70a
authored
Jun 04, 2020
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into dev/MeshPlotting
parents
2714cffd
d77a1a8d
Pipeline
#266629
passed with stages
in 127 minutes and 27 seconds
Changes
6
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
112 additions
and
899 deletions
+112
-899
Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario
...Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario
+3
-3
Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario
...arios/s2ucre_dynamic_waiting_less_targets_groups.scenario
+1
-1
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario
...rios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario
+36
-5
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_stairs_waiting.scenario
...os/S2UCRE/scenarios/s2ucre_static_stairs_waiting.scenario
+0
-812
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario
...CRE/scenarios/s2ucre_static_waiting_less_targets.scenario
+71
-77
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario
...narios/s2ucre_static_waiting_less_targets_groups.scenario
+1
-1
No files found.
Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario
View file @
290ae70a
...
...
@@ -99,7 +99,7 @@
"attributesSimulation" : {
"finishTime" : 500.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.
1
,
"realTimeSimTimeRatio" : 0.
2
,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
...
...
@@ -157,7 +157,7 @@
"height" : 2.1,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTime" :
1
0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
...
...
@@ -208,7 +208,7 @@
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 3 ],
"groupSizeDistribution" : [ 0.
2, 0.6, 0.1
, 0.1 ],
"groupSizeDistribution" : [ 0.
5, 0.5, 0.0
, 0.1 ],
"dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ],
...
...
Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario
View file @
290ae70a
...
...
@@ -62,7 +62,7 @@
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" :
3.5
,
"obstacleDensityWeight" :
2.0
,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
...
...
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario
View file @
290ae70a
...
...
@@ -61,8 +61,8 @@
"cacheDir" : "",
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "
UNIT
",
"obstacleDensityWeight" :
3.5
,
"type" : "
OBSTACLES
",
"obstacleDensityWeight" :
0.3
,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
...
...
@@ -307,7 +307,7 @@
}
} ],
"targets" : [ {
"id" :
1
,
"id" :
2
,
"absorbing" : true,
"shape" : {
"type" : "POLYGON",
...
...
@@ -381,7 +381,7 @@
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" :
4
,
"spawnNumber" :
2
,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 200.0,
...
...
@@ -389,7 +389,38 @@
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 0.2, 0.6, 0.1, 0.1 ],
"groupSizeDistribution" : [ 0.1, 0.3, 0.3, 0.2, 0.1 ],
"dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, {
"id" : 6,
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 23.5,
"y" : 49.5
}, {
"x" : 23.5,
"y" : 46.0
}, {
"x" : 33.1,
"y" : 46.0
}, {
"x" : 34.96,
"y" : 49.5
} ]
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 2,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 200.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 0.1, 0.3, 0.3, 0.2, 0.1 ],
"dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ],
...
...
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_stairs_waiting.scenario
deleted
100644 → 0
View file @
2714cffd
This diff is collapsed.
Click to expand it.
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario
View file @
290ae70a
...
...
@@ -102,7 +102,7 @@
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" :
5
0.0,
"width" :
4
0.0,
"height" : 50.0
},
"boundingBoxWidth" : 0.5,
...
...
@@ -179,10 +179,7 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 49.5,
"y" : 42.50668004900217
}, {
"x" : 49.5,
"x" : 39.5,
"y" : 49.5
}, {
"x" : 35.0,
...
...
@@ -203,11 +200,8 @@
"x" : 34.0,
"y" : 0.5
}, {
"x" :
4
9.5,
"x" :
3
9.5,
"y" : 0.5
}, {
"x" : 49.5,
"y" : 5.936819093301892
} ]
},
"id" : 1
...
...
@@ -390,11 +384,11 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 21.
010790275986494
,
"y" : 1
0
.9817920099541
"x" : 21.
35
,
"y" : 1
1
.9817920099541
}, {
"x" : 2
0.591772163127747
,
"y" : 1
1
.191301066383476
"x" : 2
1.0
,
"y" : 1
2
.191301066383476
}, {
"x" : 30.333943287093724,
"y" : 40.94158707935486
...
...
@@ -442,17 +436,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 2
8.05470964448629
,
"y" : 32.
1
"x" : 2
7.59572110981215
,
"y" : 32.
531925106398724
}, {
"x" : 21.
44285351378531
,
"y" : 3
8.0
"x" : 21.
92020158984668
,
"y" : 3
7.59639785139872
}, {
"x" : 2
1.572497751642192
,
"y" : 3
8.2
"x" : 2
2.031486286316593
,
"y" : 3
7.76807489360211
}, {
"x" : 2
8.184353882343178
,
"y" : 32.
3
"x" : 2
7.707005806282062
,
"y" : 32.
70360214860211
} ]
},
"reachDistance" : 0.3,
...
...
@@ -464,17 +458,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 2
7.439446014333257
,
"y" : 28.
285981700079258
"x" : 2
6.4
,
"y" : 28.
76583413402359
}, {
"x" : 2
0.516322240376294
,
"y" : 34.
66978655463252
"x" : 2
1.035818063599688
,
"y" : 34.
21113803183719
}, {
"x" : 2
0.6605539856670
6,
"y" : 34.
81401829992329
"x" : 2
1.1588458977384
6,
"y" : 34.
33416586597596
}, {
"x" : 2
7.58367775962403
,
"y" : 28.
43021344537003
"x" : 2
6.55
,
"y" : 28.
888861968162367
} ]
},
"reachDistance" : 0.3,
...
...
@@ -486,17 +480,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 2
5.486634085766024
,
"y" : 2
4.2736920027948
03
"x" : 2
4.885354903217365
,
"y" : 2
5.0129905697702
03
}, {
"x" :
19.464312459212408
,
"y" : 3
1.208835176007327
"x" :
20.189569160702
,
"y" : 3
0.420530793375065
}, {
"x" :
19.62789284634321
,
"y" : 3
1.37241556313813
4
"x" :
20.31711772042307
,
"y" : 3
0.5480793530961
4
}, {
"x" : 25.
783622615467696
,
"y" : 2
4.42218626764563
"x" : 25.
116925813896508
,
"y" : 2
5.128776025109765
} ]
},
"reachDistance" : 0.3,
...
...
@@ -508,17 +502,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 28.
870142404485026
,
"y" : 36.
3
"x" : 28.
297727260115597
,
"y" : 36.
84630908567894
}, {
"x" : 22.
12557986285388
,
"y" : 4
2.197088668076134
"x" : 22.
860684684954602
,
"y" : 4
1.600171468883275
}, {
"x" : 2
2.58283834025259
7,
"y" : 4
2.23462847644043
"x" : 2
3.22929774089771
7,
"y" : 4
1.63043370384369
}, {
"x" : 29.
783408945102963
,
"y" : 36.
0
"x" : 29.
033945366651064
,
"y" : 36.
60446793401341
} ]
},
"reachDistance" : 0.3,
...
...
@@ -530,17 +524,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 15.
0
,
"y" : 1
4.1
"x" : 15.
634497775611411
,
"y" : 1
3.74942251791075
}, {
"x" : 15.
1
,
"y" : 1
4.2
"x" : 15.
713747928509028
,
"y" : 1
3.828672670808366
}, {
"x" : 21.
3
,
"y" : 10.
6
"x" : 21.
1
,
"y" : 10.
975667166494198
}, {
"x" : 21.
25
,
"y" : 10.
5
"x" : 21.
0
,
"y" : 10.
896417013596583
} ]
},
"reachDistance" : 0.3,
...
...
@@ -552,17 +546,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 2
4.6
,
"y" :
19.8
"x" : 2
3.76944034179448
,
"y" :
20.72968424052916
}, {
"x" : 1
8.3
,
"y" : 2
6.4
"x" : 1
9.10710546641564
,
"y" : 2
5.614035062354606
}, {
"x" : 1
8.5
,
"y" : 2
6.
7
"x" : 1
9.255116097380046
,
"y" : 2
5.83605100880121
7
}, {
"x" : 2
4.7
,
"y" : 20.
1
"x" : 2
3.843445657276682
,
"y" : 20.
95170018697577
} ]
},
"reachDistance" : 0.3,
...
...
@@ -574,17 +568,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 2
2.262999925516617
,
"y" : 14.
042403212776234
"x" : 2
1.688139768064744
,
"y" : 14.
602062605134757
}, {
"x" : 1
6.741663364019423
,
"y" : 1
9.05399091833302
"x" : 1
7.406095132531206
,
"y" : 1
8.488774094474955
}, {
"x" : 1
6.841273409781802
,
"y" : 1
9.25321100985778
6
"x" : 1
7.483347199553613
,
"y" : 1
8.64327822851977
6
}, {
"x" : 2
2.462220017041382
,
"y" : 14.
241623304301
"x" : 2
1.842643902109565
,
"y" : 14.
756566739179574
} ]
},
"reachDistance" : 0.3,
...
...
@@ -596,17 +590,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 22.
86047995471745
,
"y" : 1
6.59554945886502
"x" : 22.
482542681969914
,
"y" : 1
7.061895214242636
}, {
"x" : 1
7.78047055488165
3,
"y" : 22.
49198894081728
6
"x" : 1
8.22302339622199
3,
"y" : 22.
0059800994857
6
}, {
"x" : 1
7.871185008450148
,
"y" : 22.
673417847954276
"x" : 1
8.299086240610347
,
"y" : 22.
158105788262468
}, {
"x" : 2
3.041908861854445
,
"y" : 1
6.776978366002012
"x" : 2
2.634668370746628
,
"y" : 1
7.214020903019346
} ]
},
"reachDistance" : 0.3,
...
...
Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario
View file @
290ae70a
...
...
@@ -81,7 +81,7 @@
"attributesSimulation" : {
"finishTime" : 500.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.
0
,
"realTimeSimTimeRatio" : 0.
1
,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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