From 5832584186adb203f485119703f51b9486486aa6 Mon Sep 17 00:00:00 2001 From: wanfeng <42433161+starrye@users.noreply.github.com> Date: Wed, 6 Nov 2024 22:56:04 +0800 Subject: [PATCH 1/3] Fix: Remove duplicate clean method calls (#1096) * [fix]rename compound_symbol.py * [fix]Remove duplicate clean method calls * Fix Atomic_behaviors AddActor Func No return status --- scenario_runner.py | 6 +++--- srunner/scenariomanager/scenarioatomics/atomic_behaviors.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scenario_runner.py b/scenario_runner.py index 5f0e8e79a..f3206e2b7 100755 --- a/scenario_runner.py +++ b/scenario_runner.py @@ -200,9 +200,9 @@ def _cleanup(self): except RuntimeError: sys.exit(-1) - self.manager.cleanup() + # self.manager.cleanup() - CarlaDataProvider.cleanup() + # CarlaDataProvider.cleanup() for i, _ in enumerate(self.ego_vehicles): if self.ego_vehicles[i]: @@ -660,4 +660,4 @@ def main(): if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file + sys.exit(main()) diff --git a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py index 56b03de0a..cd1a20fe3 100644 --- a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py +++ b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py @@ -4593,7 +4593,9 @@ def update(self): new_status = py_trees.common.Status.SUCCESS except: # pylint: disable=bare-except print("ActorSource unable to spawn actor") - + new_status = py_trees.common.Status.FAILURE + finally: + return new_status class SwitchWrongDirectionTest(AtomicBehavior): From 8d81641c66c0a1440b84420ab981c1ac9ae67fd4 Mon Sep 17 00:00:00 2001 From: Pablo Villanueva Domingo Date: Fri, 29 Nov 2024 13:11:08 +0100 Subject: [PATCH 2/3] Link documentation in README (#1129) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e6e47131..3cdbb40e9 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ You can use this system to prepare your agent for the CARLA Challenge. Scenarios can be defined through a Python interface, and with the newest version the scenario_runner also the upcoming [OpenSCENARIO](http://www.openscenario.org/) standard and [OpenSCENARIO 2.0](https://www.asam.net/standards/detail/openscenario/v200/) standard is supported. +[Read the documentation here](https://scenario-runner.readthedocs.io/en/latest/). + [![Scenario_Runner for CARLA](Docs/img/scenario_runner_video.png)](https://youtu.be/ChmF8IFagpo?t=68) Getting the ScenarioRunner @@ -40,7 +42,7 @@ Currently no build is required, as all code is in Python. Using the ScenarioRunner ------------------------ -Please take a look at our [Getting started](Docs/getting_scenariorunner.md) +Please take a look at our [Getting started](https://scenario-runner.readthedocs.io/en/latest/getting_scenariorunner/) documentation. Challenge Evaluation From 26b643d061692a36542bf038b1fa3ff0c0d37ae5 Mon Sep 17 00:00:00 2001 From: Pablo Villanueva Domingo Date: Mon, 2 Dec 2024 10:32:40 +0100 Subject: [PATCH 3/3] Include 0.9.14 carla release as compatible with scenario runner 0.9.13 (#1130) * Link documentation in README * Include 0.9.14 carla release as compatible with scenario runner 0.9.13 * Merge branch 'master' into docs_in_readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3cdbb40e9..7b3aae182 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ branch contains the latest fixes and features, and may be required to use the la It is important to also consider the release version that has to match the CARLA version. * [Version 0.9.15](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.15) and the 0.9.15 Branch: Compatible with [CARLA 0.9.15](https://github.com/carla-simulator/carla/releases/tag/0.9.15) -* [Version 0.9.13](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.13) and the 0.9.13 Branch: Compatible with [CARLA 0.9.13](https://github.com/carla-simulator/carla/releases/tag/0.9.13) +* [Version 0.9.13](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.13) and the 0.9.13 Branch: Compatible with [CARLA 0.9.13](https://github.com/carla-simulator/carla/releases/tag/0.9.13) and [CARLA 0.9.14](https://github.com/carla-simulator/carla/releases/tag/0.9.14) * [Version 0.9.12](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.12) and the 0.9.12 Branch: Compatible with [CARLA 0.9.12](https://github.com/carla-simulator/carla/releases/tag/0.9.12) * [Version 0.9.11](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.11) and the 0.9.11 Branch: Compatible with [CARLA 0.9.11](https://github.com/carla-simulator/carla/releases/tag/0.9.11) * [Version 0.9.10](https://github.com/carla-simulator/scenario_runner/releases/tag/v0.9.10) and the 0.9.10 Branch: Compatible with [CARLA 0.9.10](https://github.com/carla-simulator/carla/releases/tag/0.9.10)