Merge pull request #215 from aws-deepracer-community/develop_version_3

Adding new CW and CCW definitions Lars Circuit and A-Z

README.md

@@ -2,7 +2,7 @@
 
 ## Announcement
 
-14th May 2023: Version 3.2.22 is now available with the new clockwise version of the Po-Chun Speedway (replaces faulty release 3.2.21)
+8th June 2023: Version 3.2.23 is now available with the new clockwise and counter-clockwise versions of the Lars Circuit (for the June virtual circuit qualifier) and A to Z Speedway (for racing in-person at summits)
 
 ## Introduction
 
@@ -34,6 +34,7 @@ See its sibling product [Deep Racer Framework](https://github.com/dmh23/deep_rac
 * [Troubleshooting](docs/trouble_shooting.md)
 
 ## Old Announcements
+* 14th May 2023: Version 3.2.22 is now available with the new clockwise version of the Po-Chun Speedway (replaces faulty release 3.2.21)
 * 14th May 2023: Version 3.2.21 has been withdrawn due to a defect
 * 1st April 2023: Version 3.2.20 is now available with the new clockwise version of the Cosmic Circuit track.
 * 18th March 2023: Version 3.2.19 is now available with updated track names and waypoints

src/main/version.py

@@ -6,4 +6,4 @@
 # Copyright (c) 2021 dmh23
 #
 
-VERSION = "3.2.21"
+VERSION = "3.2.23"

src/personalize/configuration/personal_track_annotations.py

@@ -81,6 +81,10 @@
 
 lars_circuit_annotations = []
 
+lars_circuit_cw_annotations = []
+
+lars_circuit_ccw_annotations = []
+
 kuei_raceway_annotations = []
 
 kuei_super_raceway_annotations = []
@@ -105,6 +109,10 @@
 
 a_to_z_speedway_annotations = []
 
+a_to_z_speedway_cw_annotations = []
+
+a_to_z_speedway_ccw_annotations = []
+
 playa_raceway_annotations = []
 
 playa_super_raceway_annotations = []

src/tracks/a_to_z_speedway_ccw_track.py

@@ -0,0 +1,55 @@
+#
+# DeepRacer Guru
+#
+# Version 3.0 onwards
+#
+# Copyright (c) 2021 dmh23
+#
+
+from src.tracks.track import Track
+import src.personalize.configuration.personal_track_annotations as config
+
+
+class AtoZSpeedwayCounterClockwiseTrack(Track):
+    def __init__(self):
+        super().__init__()
+
+        self._ui_name = "A to Z Speedway (Counter Clockwise)"
+        self._ui_description = "It’s easier for an agent to navigate this extra wide version of re:Invent 2018. Use it to get started with object avoidance and head-to-head race training."
+        self._ui_length_in_m = 16.64  # metres
+        self._ui_width_in_cm = 107  # centimetres
+        self._world_name = "reInvent2019_wide_ccw"
+        self._track_sector_dividers = [12, 25, 39]
+        self._annotations = config.a_to_z_speedway_ccw_annotations
+        self._track_width = 1.06
+
+        self._track_waypoints = [(-1.5631937393628625, -1.7127034267468297), (-1.4331960082054138, -1.7134714722633362),
+                                 (-1.3032157660936146, -1.7157378924710731), (-1.1253629922866821, -1.7188390493392944),
+                                 (-0.8175443112850189, -1.7249464392662048), (-0.5097001492977142, -1.7295820713043213),
+                                 (-0.201825849711895, -1.7312034964561462), (0.10604457929730415, -1.7289384603500366),
+                                 (0.4138401001691818, -1.7219515442848206), (0.7216196358203888, -1.7139079570770264),
+                                 (1.0294640064239502, -1.716476023197174), (1.3371499776840228, -1.7276674509048462),
+                                 (1.644849956035614, -1.7382839918136597), (1.9527320265769958, -1.739330530166626),
+                                 (2.259827971458435, -1.7179455161094666), (2.5605125427246094, -1.6528614163398743),
+                                 (2.8324469327926636, -1.5099865198135376), (3.0210800170898438, -1.269048035144806),
+                                 (3.10150146484375, -0.9722187221050262), (3.1014784574508667, -0.6637385189533234),
+                                 (3.0077455043792725, -0.37140828743577003), (2.796640992164612, -0.1499529480934143),
+                                 (2.5144959688186646, -0.02768014371395111), (2.2114568948745728, 0.025833189487457275),
+                                 (1.9039725065231323, 0.040637850761413574), (1.5961444973945642, 0.0352336168289185),
+                                 (1.2884730100631714, 0.023170679807662964), (0.980621874332428, 0.021714359521865845),
+                                 (0.6805993318557739, 0.08212563395500183), (0.40854643657803535, 0.22438546270132065),
+                                 (0.19385813921689987, 0.44363632798194885),
+                                 (-0.0009860396385192871, 0.6817393600940704),
+                                 (-0.20325328409671725, 0.9134732484817498), (-0.38603404723107815, 1.161222666501999),
+                                 (-0.5803010612726212, 1.3999419808387756), (-0.8098951280117035, 1.6042075753211975),
+                                 (-1.0922887921333313, 1.7215245366096497), (-1.3993719816207886, 1.739562451839447),
+                                 (-1.7071920037269592, 1.7341314554214478), (-2.0150150060653687, 1.728919506072998),
+                                 (-2.3228334188461304, 1.7239354848861694), (-2.627469539642334, 1.6833074688911438),
+                                 (-2.8934309482574463, 1.535109519958496), (-3.0544005632400513, 1.274802029132843),
+                                 (-3.1103440523147583, 0.9740120470523834), (-3.0714324712753296, 0.6690250933170319),
+                                 (-3.0017623901367188, 0.36914824694395065), (-2.9277485609054565, 0.07029552944004536),
+                                 (-2.863024950027466, -0.2306772544980049), (-2.8091835975646973, -0.5338163822889328),
+                                 (-2.752152442932129, -0.8363606929779053), (-2.675971508026123, -1.1345840394496918),
+                                 (-2.5541579723358154, -1.4168829917907715), (-2.343748450279236, -1.6384539604187012),
+                                 (-2.048972964286804, -1.7157055735588074), (-1.741078495979309, -1.7116524577140808),
+                                 (-1.5631937393628625, -1.7127034267468297)]

src/tracks/a_to_z_speedway_cw_track.py

@@ -0,0 +1,55 @@
+#
+# DeepRacer Guru
+#
+# Version 3.0 onwards
+#
+# Copyright (c) 2021 dmh23
+#
+
+from src.tracks.track import Track
+import src.personalize.configuration.personal_track_annotations as config
+
+
+class AtoZSpeedwayClockwiseTrack(Track):
+    def __init__(self):
+        super().__init__()
+
+        self._ui_name = "A to Z Speedway (Clockwise)"
+        self._ui_description = "It’s easier for an agent to navigate this extra wide version of re:Invent 2018. Use it to get started with object avoidance and head-to-head race training."
+        self._ui_length_in_m = 16.64  # metres
+        self._ui_width_in_cm = 107  # centimetres
+        self._world_name = "reInvent2019_wide_cw"
+        self._track_sector_dividers = [19, 33, 46]
+        self._annotations = config.a_to_z_speedway_cw_annotations
+        self._track_width = 1.06
+
+        self._track_waypoints = [(-1.3032157660936146, -1.7157378924710731), (-1.4331960082054138, -1.7134714722633362),
+                                 (-1.5631937393628625, -1.7127034267468297), (-1.741078495979309, -1.7116524577140808),
+                                 (-2.048972964286804, -1.7157055735588074), (-2.343748450279236, -1.6384539604187012),
+                                 (-2.5541579723358154, -1.4168829917907715), (-2.675971508026123, -1.1345840394496918),
+                                 (-2.752152442932129, -0.8363606929779053), (-2.8091835975646973, -0.5338163822889328),
+                                 (-2.863024950027466, -0.2306772544980049), (-2.9277485609054565, 0.07029552944004536),
+                                 (-3.0017623901367188, 0.36914824694395065), (-3.0714324712753296, 0.6690250933170319),
+                                 (-3.1103440523147583, 0.9740120470523834), (-3.0544005632400513, 1.274802029132843),
+                                 (-2.8934309482574463, 1.535109519958496), (-2.627469539642334, 1.6833074688911438),
+                                 (-2.3228334188461304, 1.7239354848861694), (-2.0150150060653687, 1.728919506072998),
+                                 (-1.7071920037269592, 1.7341314554214478), (-1.3993719816207886, 1.739562451839447),
+                                 (-1.0922887921333313, 1.7215245366096497), (-0.8098951280117035, 1.6042075753211975),
+                                 (-0.5803010612726212, 1.3999419808387756), (-0.38603404723107815, 1.161222666501999),
+                                 (-0.20325328409671725, 0.9134732484817498),
+                                 (-0.0009860396385192871, 0.6817393600940704),
+                                 (0.19385813921689987, 0.44363632798194885), (0.40854643657803535, 0.22438546270132065),
+                                 (0.6805993318557739, 0.08212563395500183), (0.980621874332428, 0.021714359521865845),
+                                 (1.2884730100631714, 0.023170679807662964), (1.5961444973945642, 0.0352336168289185),
+                                 (1.9039725065231323, 0.040637850761413574), (2.2114568948745728, 0.025833189487457275),
+                                 (2.5144959688186646, -0.02768014371395111), (2.796640992164612, -0.1499529480934143),
+                                 (3.0077455043792725, -0.37140828743577003), (3.1014784574508667, -0.6637385189533234),
+                                 (3.10150146484375, -0.9722187221050262), (3.0210800170898438, -1.269048035144806),
+                                 (2.8324469327926636, -1.5099865198135376), (2.5605125427246094, -1.6528614163398743),
+                                 (2.259827971458435, -1.7179455161094666), (1.9527320265769958, -1.739330530166626),
+                                 (1.644849956035614, -1.7382839918136597), (1.3371499776840228, -1.7276674509048462),
+                                 (1.0294640064239502, -1.716476023197174), (0.7216196358203888, -1.7139079570770264),
+                                 (0.4138401001691818, -1.7219515442848206), (0.10604457929730415, -1.7289384603500366),
+                                 (-0.201825849711895, -1.7312034964561462), (-0.5097001492977142, -1.7295820713043213),
+                                 (-0.8175443112850189, -1.7249464392662048), (-1.1253629922866821, -1.7188390493392944),
+                                 (-1.3032157660936146, -1.7157378924710731)]

src/tracks/a_to_z_speedway_track.py

@@ -14,7 +14,7 @@ class AtoZSpeedwayTrack(Track):
     def __init__(self):
         super().__init__()
 
-        self._ui_name = "A to Z Speedway"
+        self._ui_name = "A to Z Speedway (Original)"
         self._ui_description = "It’s easier for an agent to navigate this extra wide version of re:Invent 2018. Use it to get started with object avoidance and head-to-head race training."
         self._ui_length_in_m = 16.64  # metres
         self._ui_width_in_cm = 107  # centimetres