Merge pull request #65 from UoA-CARES/Rename-the-environments

Rename the environments

src/environments/environments/CarBlockEnvironment.py

@@ -6,10 +6,10 @@
 from rclpy import Future
 from sensor_msgs.msg import LaserScan
 
-from environments.ParentCarEnvironment import ParentCarEnvironment
+from environments.GeneralCarEnvironment import GeneralCarEnvironment
 
 
-class CarBlockEnvironment(ParentCarEnvironment):
+class CarBlockEnvironment(GeneralCarEnvironment):
     """
     CarWall Reinforcement Learning Environment:
 

src/environments/environments/CarTrack1Environment.py

@@ -1,7 +1,7 @@
-from environments.CarTrackParentEnvironment import CarTrackParentEnvironment
+from environments.CarTrackGeneralEnvironment import CarTrackGeneralEnvironment
 
 
-class CarTrack1Environment(CarTrackParentEnvironment):
+class CarTrack1Environment(CarTrackGeneralEnvironment):
     """
     track1.sdf
     """

src/environments/environments/CarTrack2Environment.py

@@ -1,7 +1,7 @@
-from environments.CarTrackParentEnvironment import CarTrackParentEnvironment
+from environments.CarTrackGeneralEnvironment import CarTrackGeneralEnvironment
 
 
-class CarTrack2Environment(CarTrackParentEnvironment):
+class CarTrack2Environment(CarTrackGeneralEnvironment):
     """
     track2.sdf
     """

src/environments/environments/CarTrackParentEnvironment.py → src/environments/environments/CarTrackGeneralEnvironment.py

@@ -6,10 +6,10 @@
 from sensor_msgs.msg import LaserScan
 
 from environment_interfaces.srv import Reset
-from environments.ParentCarEnvironment import ParentCarEnvironment
+from environments.GeneralCarEnvironment import GeneralCarEnvironment
 
 
-class CarTrackParentEnvironment(ParentCarEnvironment):
+class CarTrackGeneralEnvironment(GeneralCarEnvironment):
     """
     CarTrack Reinforcement Learning Environment:
 

src/environments/environments/CarTrackOriginalEnvironment.py

@@ -1,7 +1,7 @@
-from environments.CarTrackParentEnvironment import CarTrackParentEnvironment
+from environments.CarTrackGeneralEnvironment import CarTrackGeneralEnvironment
 
 
-class CarTrackOriginalEnvironment(CarTrackParentEnvironment):
+class CarTrackOriginalEnvironment(CarTrackGeneralEnvironment):
     """
     track_original.sdf
     """

src/environments/environments/CarWallEnvironment.py

@@ -6,10 +6,10 @@
 from rclpy import Future
 from sensor_msgs.msg import LaserScan
 
-from environments.ParentCarEnvironment import ParentCarEnvironment
+from environments.GeneralCarEnvironment import GeneralCarEnvironment
 
 
-class CarWallEnvironment(ParentCarEnvironment):
+class CarWallEnvironment(GeneralCarEnvironment):
     """
     CarWall Reinforcement Learning Environment:
 

src/environments/environments/ParentCarEnvironment.py → src/environments/environments/GeneralCarEnvironment.py

@@ -12,7 +12,7 @@
 from environment_interfaces.srv import Reset
 
 
-class ParentCarEnvironment(Node):
+class GeneralCarEnvironment(Node):
     def __init__(self, env_name, car_name, reward_range, max_steps, collision_range, step_length):
         super().__init__(env_name + '_environment')