Skip to content

Commit

Permalink
Merge branch 'master' into code-quality
Browse files Browse the repository at this point in the history
  • Loading branch information
Daraan authored Dec 2, 2024
2 parents 843f371 + 26b643d commit 8009ef3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,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)
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scenario_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,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]:
Expand Down Expand Up @@ -676,4 +676,4 @@ def main():


if __name__ == "__main__":
sys.exit(main())
sys.exit(main())

0 comments on commit 8009ef3

Please sign in to comment.