From 7e988758fe5ab90848521a4be2950ba8d7012ad2 Mon Sep 17 00:00:00 2001 From: Maximilian Huettenrauch Date: Wed, 24 Feb 2021 15:37:54 +0100 Subject: [PATCH] updates --- .../mujoco/ball_in_a_cup/assets/biac_base.xml | 4 +- .../mujoco/ball_in_a_cup/ball_in_a_cup.py | 10 +- .../ball_in_a_cup/ball_in_a_cup_reward.py | 16 +- alr_envs/mujoco/ball_in_a_cup/utils.py | 40 +++- alr_envs/mujoco/beerpong/__init__.py | 0 alr_envs/mujoco/beerpong/assets/beerpong.xml | 226 ++++++++++++++++++ alr_envs/mujoco/beerpong/beerpong.py | 143 +++++++++++ alr_envs/mujoco/beerpong/beerpong_reward.py | 124 ++++++++++ .../wam}/base_link_convex.stl | Bin .../meshes => meshes/wam}/base_link_fine.stl | Bin .../assets/meshes => meshes/wam}/cup.stl | Bin .../meshes => meshes/wam}/cup_split1.stl | Bin .../meshes => meshes/wam}/cup_split10.stl | Bin .../meshes => meshes/wam}/cup_split11.stl | Bin .../meshes => meshes/wam}/cup_split12.stl | Bin .../meshes => meshes/wam}/cup_split13.stl | Bin .../meshes => meshes/wam}/cup_split14.stl | Bin .../meshes => meshes/wam}/cup_split15.stl | Bin .../meshes => meshes/wam}/cup_split16.stl | Bin .../meshes => meshes/wam}/cup_split17.stl | Bin .../meshes => meshes/wam}/cup_split18.stl | Bin .../meshes => meshes/wam}/cup_split2.stl | Bin .../meshes => meshes/wam}/cup_split3.stl | Bin .../meshes => meshes/wam}/cup_split4.stl | Bin .../meshes => meshes/wam}/cup_split5.stl | Bin .../meshes => meshes/wam}/cup_split6.stl | Bin .../meshes => meshes/wam}/cup_split7.stl | Bin .../meshes => meshes/wam}/cup_split8.stl | Bin .../meshes => meshes/wam}/cup_split9.stl | Bin .../wam}/elbow_link_convex.stl | Bin .../meshes => meshes/wam}/elbow_link_fine.stl | Bin .../forearm_link_convex_decomposition_p1.stl | Bin .../forearm_link_convex_decomposition_p2.stl | Bin .../wam}/forearm_link_fine.stl | Bin .../shoulder_link_convex_decomposition_p1.stl | Bin .../shoulder_link_convex_decomposition_p2.stl | Bin .../shoulder_link_convex_decomposition_p3.stl | Bin .../wam}/shoulder_link_fine.stl | Bin .../wam}/shoulder_pitch_link_convex.stl | Bin .../wam}/shoulder_pitch_link_fine.stl | Bin ...upper_arm_link_convex_decomposition_p1.stl | Bin ...upper_arm_link_convex_decomposition_p2.stl | Bin .../wam}/upper_arm_link_fine.stl | Bin .../wam}/wrist_palm_link_convex.stl | Bin .../wam}/wrist_palm_link_fine.stl | Bin ...ist_pitch_link_convex_decomposition_p1.stl | Bin ...ist_pitch_link_convex_decomposition_p2.stl | Bin ...ist_pitch_link_convex_decomposition_p3.stl | Bin .../wam}/wrist_pitch_link_fine.stl | Bin ...wrist_yaw_link_convex_decomposition_p1.stl | Bin ...wrist_yaw_link_convex_decomposition_p2.stl | Bin .../wam}/wrist_yaw_link_fine.stl | Bin 52 files changed, 550 insertions(+), 13 deletions(-) create mode 100644 alr_envs/mujoco/beerpong/__init__.py create mode 100644 alr_envs/mujoco/beerpong/assets/beerpong.xml create mode 100644 alr_envs/mujoco/beerpong/beerpong.py create mode 100644 alr_envs/mujoco/beerpong/beerpong_reward.py rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/base_link_convex.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/base_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split10.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split11.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split12.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split13.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split14.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split15.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split16.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split17.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split18.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split3.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split4.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split5.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split6.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split7.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split8.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/cup_split9.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/elbow_link_convex.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/elbow_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/forearm_link_convex_decomposition_p1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/forearm_link_convex_decomposition_p2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/forearm_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_link_convex_decomposition_p1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_link_convex_decomposition_p2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_link_convex_decomposition_p3.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_pitch_link_convex.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/shoulder_pitch_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/upper_arm_link_convex_decomposition_p1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/upper_arm_link_convex_decomposition_p2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/upper_arm_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_palm_link_convex.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_palm_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_pitch_link_convex_decomposition_p1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_pitch_link_convex_decomposition_p2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_pitch_link_convex_decomposition_p3.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_pitch_link_fine.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_yaw_link_convex_decomposition_p1.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_yaw_link_convex_decomposition_p2.stl (100%) rename alr_envs/mujoco/{ball_in_a_cup/assets/meshes => meshes/wam}/wrist_yaw_link_fine.stl (100%) diff --git a/alr_envs/mujoco/ball_in_a_cup/assets/biac_base.xml b/alr_envs/mujoco/ball_in_a_cup/assets/biac_base.xml index 490c853..33fbb9d 100644 --- a/alr_envs/mujoco/ball_in_a_cup/assets/biac_base.xml +++ b/alr_envs/mujoco/ball_in_a_cup/assets/biac_base.xml @@ -1,5 +1,5 @@ - +