diff --git a/README.rst b/README.rst index 06e0e0d29..e76dc00b7 100644 --- a/README.rst +++ b/README.rst @@ -99,6 +99,8 @@ Environments * "donkey-generated-track-v0" * "donkey-roboracingleague-track-v0" * "donkey-waveshare-v0" +* "donkey-minimonaco-track-v0" +* "donkey-warren-track-v0" Credits @@ -110,6 +112,10 @@ Tawn Kramer - https://github.com/tawnkramer/gym-donkeycar Roma Sokolkov - https://github.com/r7vme/gym-donkeycar cloned with permission from https://github.com/tawnkramer/sdsandbox +Maintainer + +Maxime Ellerbach - https://github.com/Maximellerbach/gym-donkeycar + Release Engineer .. _Leigh Johnson: https://github.com/leigh-johnson diff --git a/examples/genetic_alg/simple_gen_driver.py b/examples/genetic_alg/simple_gen_driver.py index ddbd14266..30a150b86 100755 --- a/examples/genetic_alg/simple_gen_driver.py +++ b/examples/genetic_alg/simple_gen_driver.py @@ -197,7 +197,9 @@ def on_agents_finished(self): "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] parser = argparse.ArgumentParser(description='simple_gen_driver') diff --git a/examples/gym_test.py b/examples/gym_test.py index 3731f0185..624d82b91 100755 --- a/examples/gym_test.py +++ b/examples/gym_test.py @@ -68,7 +68,9 @@ def exit_scene(env): "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] parser = argparse.ArgumentParser(description='gym_test') diff --git a/examples/reinforcement_learning/ddqn.py b/examples/reinforcement_learning/ddqn.py index 07e2b06ff..135cf645e 100755 --- a/examples/reinforcement_learning/ddqn.py +++ b/examples/reinforcement_learning/ddqn.py @@ -340,7 +340,9 @@ def signal_handler(signal, frame): "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] parser = argparse.ArgumentParser(description='ddqn') diff --git a/examples/reinforcement_learning/ppo_train.py b/examples/reinforcement_learning/ppo_train.py index dd1eb3947..d257870e8 100644 --- a/examples/reinforcement_learning/ppo_train.py +++ b/examples/reinforcement_learning/ppo_train.py @@ -44,7 +44,9 @@ def _init(): "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] parser = argparse.ArgumentParser(description='ppo_train') diff --git a/examples/test_cam_config.py b/examples/test_cam_config.py index 790c6680a..e0e9a6312 100644 --- a/examples/test_cam_config.py +++ b/examples/test_cam_config.py @@ -18,7 +18,9 @@ "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] parser = argparse.ArgumentParser(description='gym_test') diff --git a/gym_donkeycar/__init__.py b/gym_donkeycar/__init__.py index 9bb363bba..8a868656b 100644 --- a/gym_donkeycar/__init__.py +++ b/gym_donkeycar/__init__.py @@ -11,7 +11,7 @@ from .envs.donkey_env import (AvcSparkfunEnv, GeneratedRoadsEnv, GeneratedTrackEnv, MountainTrackEnv, RoboRacingLeagueTrackEnv, WarehouseEnv, - WaveshareEnv) + WaveshareEnv, MiniMonacoEnv, WarrenTrackEnv) register( id='donkey-generated-roads-v0', @@ -47,3 +47,13 @@ id='donkey-waveshare-v0', entry_point='gym_donkeycar.envs.donkey_env:WaveshareEnv', ) + +register( + id='donkey-minimonaco-track-v0', + entry_point='gym_donkeycar.envs.donkey_env:MiniMonacoEnv', +) + +register( + id='donkey-warren-track-v0', + entry_point='gym_donkeycar.envs.donkey_env:WarrenTrackEnv', +) diff --git a/gym_donkeycar/envs/donkey_env.py b/gym_donkeycar/envs/donkey_env.py index 8ad2d88f7..440356d08 100755 --- a/gym_donkeycar/envs/donkey_env.py +++ b/gym_donkeycar/envs/donkey_env.py @@ -174,3 +174,15 @@ class WaveshareEnv(DonkeyEnv): def __init__(self, *args, **kwargs): super(WaveshareEnv, self).__init__(level='waveshare', *args, **kwargs) + + +class MiniMonacoEnv(DonkeyEnv): + + def __init__(self, *args, **kwargs): + super(MiniMonacoEnv, self).__init__(level='mini_monaco', *args, **kwargs) + + +class WarrenTrackEnv(DonkeyEnv): + + def __init__(self, *args, **kwargs): + super(WarrenTrackEnv, self).__init__(level='warren', *args, **kwargs) diff --git a/tests/test_gym_donkeycar.py b/tests/test_gym_donkeycar.py index 4d5383fef..a4966e3c1 100644 --- a/tests/test_gym_donkeycar.py +++ b/tests/test_gym_donkeycar.py @@ -15,7 +15,9 @@ "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] def test_load_gyms(mocker):