Fixed bug with new JucntionScenarioManager (#873)

Co-authored-by: Guillermo <g.loepzdiest@gmail.com>
carla-simulator · Mar 23, 2022 · 38cec5a · 38cec5a
1 parent e86b492
commit 38cec5a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/srunner/scenarios/actor_flow.py b/srunner/scenarios/actor_flow.py
@@ -103,7 +103,7 @@ def _create_behavior(self):
 
         sequence = py_trees.composites.Sequence()
         if self.route_mode:
-            sequence.add_child(JunctionScenarioManager('left', True, False, True))
+            sequence.add_child(JunctionScenarioManager('left', False))
 
             grp = GlobalRoutePlanner(CarlaDataProvider.get_map(), 2.0)
             route = grp.trace_route(source_wp.transform.location, sink_wp.transform.location)
@@ -208,7 +208,7 @@ def _create_behavior(self):
 
         sequence = py_trees.composites.Sequence()
         if self.route_mode:
-            sequence.add_child(JunctionScenarioManager('opposite', True, True, True))
+            sequence.add_child(JunctionScenarioManager('opposite', True))
             sequence.add_child(StopEntries())
         sequence.add_child(root)
 

diff --git a/srunner/scenarios/opposite_vehicle_taking_priority.py b/srunner/scenarios/opposite_vehicle_taking_priority.py
@@ -184,7 +184,7 @@ def _create_behavior(self):
 
         root = py_trees.composites.Sequence()
         if self.route_mode:
-            root.add_child(JunctionScenarioManager(self._direction, True, True, True))
+            root.add_child(JunctionScenarioManager(self._direction, True))
         root.add_child(ActorTransformSetter(self.other_actors[0], self._spawn_location))
         root.add_child(main_behavior)
         root.add_child(ActorDestroy(self.other_actors[0]))

diff --git a/srunner/scenarios/signalized_junction_left_turn.py b/srunner/scenarios/signalized_junction_left_turn.py
@@ -144,7 +144,7 @@ def _create_behavior(self):
 
         sequence = py_trees.composites.Sequence(name="SignalizedJunctionLeftTurn")
         if self.route_mode:
-            sequence.add_child(JunctionScenarioManager(self._direction, True, True, True))
+            sequence.add_child(JunctionScenarioManager(self._direction, True))
         sequence.add_child(root)
 
         return sequence

diff --git a/srunner/scenarios/signalized_junction_right_turn.py b/srunner/scenarios/signalized_junction_right_turn.py
@@ -144,7 +144,7 @@ def _create_behavior(self):
 
         sequence = py_trees.composites.Sequence(name="SignalizedJunctionRightTurn")
         if self.route_mode:
-            sequence.add_child(JunctionScenarioManager(self._direction, True, False, True))
+            sequence.add_child(JunctionScenarioManager(self._direction, False))
         sequence.add_child(root)
 
         return sequence