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
1d700175
Commit
1d700175
authored
May 28, 2019
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.lrz.de/vadere/vadere
parents
f8eb5465
6c4a8c5f
Pipeline
#117347
passed with stages
in 120 minutes and 55 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
55 additions
and
31 deletions
+55
-31
VadereModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario
...ios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario
...rios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario
...perimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario
+6
-4
VadereModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario
...arios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario
+6
-4
VadereModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario
...os/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario
...cenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario
...scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario
...Flow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario
...narios/09-OriginalExperimentSetup-OSMEventDriven.scenario
+7
-5
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByHeight.scenario
...scenarios/TestSpeedInAreaProcessor-SpeedByHeight.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByTrajectory.scenario
...arios/TestSpeedInAreaProcessor-SpeedByTrajectory.scenario
+4
-2
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByWidth.scenario
.../scenarios/TestSpeedInAreaProcessor-SpeedByWidth.scenario
+4
-2
No files found.
VadereModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -706,4 +708,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -706,4 +708,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -102,7 +104,7 @@
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" :
tru
e,
"useFixedSeed" :
fals
e,
"fixedSeed" : 6138355022448163583,
"simulationSeed" : 0,
"useSalientBehavior" : true
...
...
@@ -155,7 +157,7 @@
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" :
fals
e,
"spawnAtRandomPositions" :
tru
e,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
...
...
@@ -706,4 +708,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -102,7 +104,7 @@
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" :
tru
e,
"useFixedSeed" :
fals
e,
"fixedSeed" : 6138355022448163583,
"simulationSeed" : 0,
"useSalientBehavior" : true
...
...
@@ -155,7 +157,7 @@
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" :
fals
e,
"spawnAtRandomPositions" :
tru
e,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
...
...
@@ -706,4 +708,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -199,4 +201,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -236,4 +238,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -236,4 +238,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario
View file @
1d700175
...
...
@@ -90,7 +90,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -236,4 +238,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario
View file @
1d700175
...
...
@@ -111,7 +111,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -123,7 +125,7 @@
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" :
tru
e,
"useFixedSeed" :
fals
e,
"fixedSeed" : -7548557034348592525,
"simulationSeed" : 0,
"useSalientBehavior" : true
...
...
@@ -200,9 +202,9 @@
"sources" : [ {
"id" : -1,
"shape" : {
"x" :
2.0
,
"x" :
1.5
,
"y" : 0.5,
"width" :
1
.0,
"width" :
2
.0,
"height" : 0.5,
"type" : "RECTANGLE"
},
...
...
@@ -763,4 +765,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByHeight.scenario
View file @
1d700175
...
...
@@ -96,7 +96,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -233,4 +235,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByTrajectory.scenario
View file @
1d700175
...
...
@@ -96,7 +96,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -233,4 +235,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByWidth.scenario
View file @
1d700175
...
...
@@ -96,7 +96,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -233,4 +235,4 @@
},
"eventInfos" : [ ]
}
}
}
\ No newline at end of file
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