diff --git a/src/environments/environments/CarBlockEnvironment.py b/src/environments/environments/CarBlockEnvironment.py index 5fbf1ec3..b26533fa 100644 --- a/src/environments/environments/CarBlockEnvironment.py +++ b/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: diff --git a/src/environments/environments/CarTrack1Environment.py b/src/environments/environments/CarTrack1Environment.py index d14bbfa0..909fba74 100644 --- a/src/environments/environments/CarTrack1Environment.py +++ b/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 """ diff --git a/src/environments/environments/CarTrack2Environment.py b/src/environments/environments/CarTrack2Environment.py index ce6aeb0c..a0c9a496 100644 --- a/src/environments/environments/CarTrack2Environment.py +++ b/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 """ diff --git a/src/environments/environments/CarTrackParentEnvironment.py b/src/environments/environments/CarTrackGeneralEnvironment.py similarity index 97% rename from src/environments/environments/CarTrackParentEnvironment.py rename to src/environments/environments/CarTrackGeneralEnvironment.py index 7ae48a19..db412260 100644 --- a/src/environments/environments/CarTrackParentEnvironment.py +++ b/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: diff --git a/src/environments/environments/CarTrackOriginalEnvironment.py b/src/environments/environments/CarTrackOriginalEnvironment.py index 69fb6fde..eeb5ee32 100644 --- a/src/environments/environments/CarTrackOriginalEnvironment.py +++ b/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 """ diff --git a/src/environments/environments/CarWallEnvironment.py b/src/environments/environments/CarWallEnvironment.py index f61c81f7..9dcefce1 100644 --- a/src/environments/environments/CarWallEnvironment.py +++ b/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: diff --git a/src/environments/environments/ParentCarEnvironment.py b/src/environments/environments/GeneralCarEnvironment.py similarity index 99% rename from src/environments/environments/ParentCarEnvironment.py rename to src/environments/environments/GeneralCarEnvironment.py index 4135e23e..1963c659 100644 --- a/src/environments/environments/ParentCarEnvironment.py +++ b/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')