From 45f62b20dd1cdf83a642d966a29f07d289a989a8 Mon Sep 17 00:00:00 2001 From: Maxime Ellerbach Date: Mon, 15 Feb 2021 17:24:47 +0100 Subject: [PATCH 1/3] added the minimonaco map --- examples/genetic_alg/simple_gen_driver.py | 3 ++- examples/gym_test.py | 3 ++- examples/reinforcement_learning/ddqn.py | 3 ++- examples/reinforcement_learning/ppo_train.py | 3 ++- examples/test_cam_config.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/examples/genetic_alg/simple_gen_driver.py b/examples/genetic_alg/simple_gen_driver.py index ddbd14266..9e21c9e8f 100755 --- a/examples/genetic_alg/simple_gen_driver.py +++ b/examples/genetic_alg/simple_gen_driver.py @@ -197,7 +197,8 @@ 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" ] parser = argparse.ArgumentParser(description='simple_gen_driver') diff --git a/examples/gym_test.py b/examples/gym_test.py index 3731f0185..fff7c8276 100755 --- a/examples/gym_test.py +++ b/examples/gym_test.py @@ -68,7 +68,8 @@ 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" ] parser = argparse.ArgumentParser(description='gym_test') diff --git a/examples/reinforcement_learning/ddqn.py b/examples/reinforcement_learning/ddqn.py index 07e2b06ff..d893e69dc 100755 --- a/examples/reinforcement_learning/ddqn.py +++ b/examples/reinforcement_learning/ddqn.py @@ -340,7 +340,8 @@ 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" ] parser = argparse.ArgumentParser(description='ddqn') diff --git a/examples/reinforcement_learning/ppo_train.py b/examples/reinforcement_learning/ppo_train.py index dd1eb3947..9c2c0cd6b 100644 --- a/examples/reinforcement_learning/ppo_train.py +++ b/examples/reinforcement_learning/ppo_train.py @@ -44,7 +44,8 @@ def _init(): "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0" ] parser = argparse.ArgumentParser(description='ppo_train') diff --git a/examples/test_cam_config.py b/examples/test_cam_config.py index 790c6680a..418868a32 100644 --- a/examples/test_cam_config.py +++ b/examples/test_cam_config.py @@ -18,7 +18,8 @@ "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0" ] parser = argparse.ArgumentParser(description='gym_test') From 833cfc77577aee1432abfc8010286ba7e0be35b5 Mon Sep 17 00:00:00 2001 From: Maxime Ellerbach Date: Mon, 15 Feb 2021 17:25:07 +0100 Subject: [PATCH 2/3] added mini_monaco map --- README.rst | 5 +++++ gym_donkeycar/__init__.py | 7 ++++++- gym_donkeycar/envs/donkey_env.py | 6 ++++++ tests/test_gym_donkeycar.py | 3 ++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 06e0e0d29..bb31177c1 100644 --- a/README.rst +++ b/README.rst @@ -99,6 +99,7 @@ Environments * "donkey-generated-track-v0" * "donkey-roboracingleague-track-v0" * "donkey-waveshare-v0" +* "donkey-minimonaco-track-v0" Credits @@ -110,6 +111,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/gym_donkeycar/__init__.py b/gym_donkeycar/__init__.py index 9bb363bba..5fef60d7b 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) register( id='donkey-generated-roads-v0', @@ -47,3 +47,8 @@ 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', +) diff --git a/gym_donkeycar/envs/donkey_env.py b/gym_donkeycar/envs/donkey_env.py index 8ad2d88f7..6b0444a7b 100755 --- a/gym_donkeycar/envs/donkey_env.py +++ b/gym_donkeycar/envs/donkey_env.py @@ -174,3 +174,9 @@ 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) diff --git a/tests/test_gym_donkeycar.py b/tests/test_gym_donkeycar.py index 4d5383fef..e78aee361 100644 --- a/tests/test_gym_donkeycar.py +++ b/tests/test_gym_donkeycar.py @@ -15,7 +15,8 @@ "donkey-avc-sparkfun-v0", "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", - "donkey-waveshare-v0" + "donkey-waveshare-v0", + "donkey-minimonaco-track-v0" ] def test_load_gyms(mocker): From 67cfe862c066154bdc911b9559617e562001d83a Mon Sep 17 00:00:00 2001 From: Maxime Ellerbach Date: Fri, 19 Feb 2021 16:45:06 +0100 Subject: [PATCH 3/3] Added Warren track --- README.rst | 1 + examples/genetic_alg/simple_gen_driver.py | 3 ++- examples/gym_test.py | 3 ++- examples/reinforcement_learning/ddqn.py | 3 ++- examples/reinforcement_learning/ppo_train.py | 3 ++- examples/test_cam_config.py | 3 ++- gym_donkeycar/__init__.py | 7 ++++++- gym_donkeycar/envs/donkey_env.py | 6 ++++++ tests/test_gym_donkeycar.py | 3 ++- 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index bb31177c1..e76dc00b7 100644 --- a/README.rst +++ b/README.rst @@ -100,6 +100,7 @@ Environments * "donkey-roboracingleague-track-v0" * "donkey-waveshare-v0" * "donkey-minimonaco-track-v0" +* "donkey-warren-track-v0" Credits diff --git a/examples/genetic_alg/simple_gen_driver.py b/examples/genetic_alg/simple_gen_driver.py index 9e21c9e8f..30a150b86 100755 --- a/examples/genetic_alg/simple_gen_driver.py +++ b/examples/genetic_alg/simple_gen_driver.py @@ -198,7 +198,8 @@ def on_agents_finished(self): "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-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 fff7c8276..624d82b91 100755 --- a/examples/gym_test.py +++ b/examples/gym_test.py @@ -69,7 +69,8 @@ def exit_scene(env): "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-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 d893e69dc..135cf645e 100755 --- a/examples/reinforcement_learning/ddqn.py +++ b/examples/reinforcement_learning/ddqn.py @@ -341,7 +341,8 @@ def signal_handler(signal, frame): "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-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 9c2c0cd6b..d257870e8 100644 --- a/examples/reinforcement_learning/ppo_train.py +++ b/examples/reinforcement_learning/ppo_train.py @@ -45,7 +45,8 @@ def _init(): "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-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 418868a32..e0e9a6312 100644 --- a/examples/test_cam_config.py +++ b/examples/test_cam_config.py @@ -19,7 +19,8 @@ "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-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 5fef60d7b..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, MiniMonacoEnv) + WaveshareEnv, MiniMonacoEnv, WarrenTrackEnv) register( id='donkey-generated-roads-v0', @@ -52,3 +52,8 @@ 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 6b0444a7b..440356d08 100755 --- a/gym_donkeycar/envs/donkey_env.py +++ b/gym_donkeycar/envs/donkey_env.py @@ -180,3 +180,9 @@ 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 e78aee361..a4966e3c1 100644 --- a/tests/test_gym_donkeycar.py +++ b/tests/test_gym_donkeycar.py @@ -16,7 +16,8 @@ "donkey-generated-track-v0", "donkey-roboracingleague-track-v0", "donkey-waveshare-v0", - "donkey-minimonaco-track-v0" + "donkey-minimonaco-track-v0", + "donkey-warren-track-v0" ] def test_load_gyms(mocker):