Merge branch 'master' into deprecate_detpmp

# Conflicts:
#	README.md
#	alr_envs/alr/__init__.py
This commit is contained in:
Maximilian Huettenrauch
2021-12-01 16:34:18 +01:00
42 changed files with 1277 additions and 165 deletions
@@ -106,7 +106,7 @@ class HoleReacherEnv(BaseReacherDirectEnv):
# self._tmp_hole_depth,
self.end_effector - self._goal,
self._steps
])
]).astype(np.float32)
def _get_line_points(self, num_points_per_link=1):
theta = self._joint_angles[:, None]
@@ -73,7 +73,7 @@ class SimpleReacherEnv(BaseReacherTorqueEnv):
self._angle_velocity,
self.end_effector - self._goal,
self._steps
])
]).astype(np.float32)
def _generate_goal(self):
@@ -110,7 +110,7 @@ class ViaPointReacherEnv(BaseReacherDirectEnv):
self.end_effector - self._via_point,
self.end_effector - self._goal,
self._steps
])
]).astype(np.float32)
def _check_collisions(self) -> bool:
return self._check_self_collision()