Rename mujoco env classes and files for consistency

rail-berkeley · Feb 9, 2019 · 99e3498 · 99e3498
1 parent 6ea9149
commit 99e3498
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 5 deletions.
diff --git a/softlearning/environments/gym/mujoco/__init__.py b/softlearning/environments/gym/mujoco/__init__.py
diff --git a/...arning/environments/gym/mujoco/ant_env.py → softlearning/environments/gym/mujoco/ant.py b/...arning/environments/gym/mujoco/ant_env.py → softlearning/environments/gym/mujoco/ant.py
diff --git a/...vironments/gym/mujoco/half_cheetah_env.py → ...g/environments/gym/mujoco/half_cheetah.py b/...vironments/gym/mujoco/half_cheetah_env.py → ...g/environments/gym/mujoco/half_cheetah.py
diff --git a/...ing/environments/gym/mujoco/hopper_env.py → ...earning/environments/gym/mujoco/hopper.py b/...ing/environments/gym/mujoco/hopper_env.py → ...earning/environments/gym/mujoco/hopper.py
diff --git a/...g/environments/gym/mujoco/humanoid_env.py → ...rning/environments/gym/mujoco/humanoid.py b/...g/environments/gym/mujoco/humanoid_env.py → ...rning/environments/gym/mujoco/humanoid.py
diff --git a/...g/environments/gym/mujoco/image_pusher.py → ...nvironments/gym/mujoco/image_pusher_2d.py b/...g/environments/gym/mujoco/image_pusher.py → ...nvironments/gym/mujoco/image_pusher_2d.py
@@ -4,7 +4,7 @@
 from .pusher_2d_env import Pusher2dEnv
 
 
-class ImagePusherEnv(Pusher2dEnv):
+class ImagePusher2dEnv(Pusher2dEnv):
     def __init__(self, image_shape, *args, **kwargs):
         self._Serializable__initialize(locals())
         self.image_shape = image_shape
@@ -24,7 +24,7 @@ def _get_obs(self):
     def step(self, action):
         """Step, computing reward from 'true' observations and not images."""
 
-        reward_observations = super(ImagePusherEnv, self)._get_obs()
+        reward_observations = super(ImagePusher2dEnv, self)._get_obs()
         reward, info = self.compute_reward(reward_observations, action)
 
         self.do_simulation(action, self.frame_skip)
@@ -43,7 +43,7 @@ def viewer_setup(self):
         self.viewer.cam.trackbodyid = -1
 
 
-class ImageForkReacherEnv(ImagePusherEnv):
+class ImageForkReacher2dEnv(ImagePusher2dEnv):
     def __init__(self,
                  arm_goal_distance_cost_coeff,
                  arm_object_distance_cost_coeff,
@@ -54,7 +54,7 @@ def __init__(self,
         self._arm_goal_distance_cost_coeff = arm_goal_distance_cost_coeff
         self._arm_object_distance_cost_coeff = arm_object_distance_cost_coeff
 
-        super(ImageForkReacherEnv, self).__init__(*args, **kwargs)
+        super(ImageForkReacher2dEnv, self).__init__(*args, **kwargs)
 
     def compute_reward(self, observations, actions):
         is_batch = True
@@ -135,7 +135,7 @@ def reset_model(self):
         return self._get_obs()
 
 
-class BlindForkReacherEnv(ImageForkReacherEnv):
+class BlindForkReacher2dEnv(ImageForkReacher2dEnv):
     def _get_obs(self):
         return np.concatenate([
             self.sim.data.qpos.flat[self.JOINT_INDS],

diff --git a/.../environments/gym/mujoco/pusher_2d_env.py → ...ning/environments/gym/mujoco/pusher_2d.py b/.../environments/gym/mujoco/pusher_2d_env.py → ...ning/environments/gym/mujoco/pusher_2d.py
diff --git a/...ng/environments/gym/mujoco/swimmer_env.py → ...arning/environments/gym/mujoco/swimmer.py b/...ng/environments/gym/mujoco/swimmer_env.py → ...arning/environments/gym/mujoco/swimmer.py
diff --git a/...g/environments/gym/mujoco/walker2d_env.py → ...rning/environments/gym/mujoco/walker2d.py b/...g/environments/gym/mujoco/walker2d_env.py → ...rning/environments/gym/mujoco/walker2d.py