05.11., 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 3badcfaf authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Fixed "VariousStimuli" test scenarios

parent 10019335
......@@ -108,7 +108,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......
......@@ -108,7 +108,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......@@ -127,7 +127,7 @@
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"id" : 0,
"absorbing" : true,
"shape" : {
"radius" : 1.0,
......@@ -144,6 +144,23 @@
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
}, {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 0.7,
"y" : 1.0,
"width" : 0.5,
"height" : 3.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
......@@ -225,4 +242,4 @@
} ]
} ]
}
}
}
\ No newline at end of file
......@@ -108,7 +108,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......@@ -127,7 +127,7 @@
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"id" : 0,
"absorbing" : true,
"shape" : {
"radius" : 1.0,
......@@ -144,6 +144,23 @@
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
}, {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 0.7,
"y" : 1.0,
"width" : 0.5,
"height" : 3.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
......@@ -360,4 +377,4 @@
} ]
} ]
}
}
}
\ No newline at end of file
......@@ -108,7 +108,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......@@ -131,12 +131,12 @@
"height" : 1.2,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 2
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"id" : 0,
"absorbing" : true,
"shape" : {
"radius" : 1.0,
......@@ -153,13 +153,30 @@
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
}, {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 0.7,
"y" : 1.0,
"width" : 0.5,
"height" : 3.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ ],
"dynamicElements" : [ {
"attributes" : {
"id" : -1,
"id" : 3,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
......@@ -234,4 +251,4 @@
} ]
} ]
}
}
}
\ No newline at end of file
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "SimpleCognitionModel"
}
},
"topography" : {
......
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "SimpleCognitionModel"
}
},
"topography" : {
......
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "SimpleCognitionModel"
}
},
"topography" : {
......
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "SimpleCognitionModel"
}
},
"topography" : {
......
......@@ -118,7 +118,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "SimpleCognitionModel"
}
},
"topography" : {
......
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......
......@@ -134,7 +134,7 @@
"usePsychologyLayer" : true,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
"cognition" : "ThreatCognitionModel"
}
},
"topography" : {
......
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