Skip to content

Commit

Permalink
BUGFIX: Kwargs wasn't being passed. So exterioceptions updates were m…
Browse files Browse the repository at this point in the history
…issing. Also removing duplicate files in finger and basic. Will update the submodule next
  • Loading branch information
vikashplus committed Mar 22, 2023
1 parent f0278cd commit 9dc71ca
Show file tree
Hide file tree
Showing 14 changed files with 76 additions and 237 deletions.
16 changes: 8 additions & 8 deletions robohive/envs/myo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.reach_v0:ReachEnvV0',
max_episode_steps=200,
kwargs={
'model_path': curr_dir+'/assets/finger/motor_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/motor_finger_v0.xml',
'target_reach_range': {'IFtip': ((0.2, 0.05, 0.20), (0.2, 0.05, 0.20)),},
'normalize_act': True,
'frame_skip': 5,
Expand All @@ -62,7 +62,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.reach_v0:ReachEnvV0',
max_episode_steps=200,
kwargs={
'model_path': curr_dir+'/assets/finger/motor_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/motor_finger_v0.xml',
'target_reach_range': {'IFtip': ((.1, -.1, .1), (0.27, .1, .3)),},
'normalize_act': True,
'frame_skip': 5,
Expand All @@ -72,7 +72,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.reach_v0:ReachEnvV0',
max_episode_steps=100,
kwargs={
'model_path': curr_dir+'/assets/finger/myo_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/myo_finger_v0.xml',
'target_reach_range': {'IFtip': ((0.2, 0.05, 0.20), (0.2, 0.05, 0.20)),},
'normalize_act': True,
}
Expand All @@ -81,7 +81,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.reach_v0:ReachEnvV0',
max_episode_steps=100,
kwargs={
'model_path': curr_dir+'/assets/finger/myo_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/myo_finger_v0.xml',
'target_reach_range': {'IFtip': ((.1, -.1, .1), (0.27, .1, .3)),},
'normalize_act': True,
}
Expand Down Expand Up @@ -160,7 +160,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.pose_v0:PoseEnvV0',
max_episode_steps=200,
kwargs={
'model_path': curr_dir+'/assets/finger/motor_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/motor_finger_v0.xml',
'target_jnt_range': {'IFadb':(0, 0),
'IFmcp':(0, 0),
'IFpip':(.75, .75),
Expand All @@ -175,7 +175,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.pose_v0:PoseEnvV0',
max_episode_steps=200,
kwargs={
'model_path': curr_dir+'/assets/finger/motor_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/motor_finger_v0.xml',
'target_jnt_range': {'IFadb':(-.2, .2),
'IFmcp':(-.4, 1),
'IFpip':(.1, 1),
Expand All @@ -190,7 +190,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.pose_v0:PoseEnvV0',
max_episode_steps=100,
kwargs={
'model_path': curr_dir+'/assets/finger/myo_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/myo_finger_v0.xml',
'target_jnt_range': {'IFadb':(0, 0),
'IFmcp':(0, 0),
'IFpip':(.75, .75),
Expand All @@ -204,7 +204,7 @@ def register_env_with_variants(id, entry_point, max_episode_steps, kwargs):
entry_point='robohive.envs.myo.pose_v0:PoseEnvV0',
max_episode_steps=100,
kwargs={
'model_path': curr_dir+'/assets/finger/myo_finger_v0.xml',
'model_path': curr_dir+'/../../sims/myo_sim/finger/myo_finger_v0.xml',
'target_jnt_range': {'IFadb':(-.2, .2),
'IFmcp':(-.4, 1),
'IFpip':(.1, 1),
Expand Down
7 changes: 7 additions & 0 deletions robohive/envs/myo/assets/arm/myo_elbow_1dof6muscles.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<mujoco model="Elbow joint with six muscle">
<!-- =================================================
Copyright 2020 Vikash Kumar
Model :: myo-elbow (MuJoCoV2.0)
Author :: Vikash Kumar (vikashplus@gmail.com)
source :: https://github.com/vikashplus
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -->

<include file="../../../../sims/myo_sim/elbow/assets/myo_elbow_assets.xml"/>
<include file="../../../../sims/myo_sim/elbow/assets/myo_elbow_1dof6muscles_body.xml"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<mujoco model="Elbow joint with single muscle">
<!-- =================================================
Copyright 2020 Vikash Kumar
Model :: myo-elbow (MuJoCoV2.0)
Author :: Vikash Kumar (vikashplus@gmail.com)
source :: https://github.com/vikashplus
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -->

<include file="../../../../sims/myo_sim/elbow/assets/myo_elbow_assets.xml"/>
<include file="../../../../sims/myo_sim/elbow/assets/myo_elbow_1dof6muscles_1dofexo_body.xml"/>
Expand Down
47 changes: 0 additions & 47 deletions robohive/envs/myo/assets/basic/myo_load.xml

This file was deleted.

133 changes: 0 additions & 133 deletions robohive/envs/myo/assets/finger/finger_v0.xml

This file was deleted.

17 changes: 0 additions & 17 deletions robohive/envs/myo/assets/finger/motor_finger_v0.xml

This file was deleted.

17 changes: 0 additions & 17 deletions robohive/envs/myo/assets/finger/myo_finger_v0.xml

This file was deleted.

9 changes: 8 additions & 1 deletion robohive/envs/myo/assets/hand/myo_hand_baoding.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<mujoco model="2nd hand model for baoding balls">
<mujoco model="MyoHand model for baoding balls">
<!-- =================================================
Copyright 2020 Vikash Kumar
Model :: MyoHand (MuJoCoV2.0)
Author :: Vikash Kumar (vikashplus@gmail.com)
source :: https://github.com/vikashplus
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -->

<include file="../../../../sims/myo_sim/hand/assets/myo_hand_assets.xml"/>
<include file="../../../../sims/myo_sim/hand/assets/myo_hand_body.xml"/>
Expand Down
9 changes: 8 additions & 1 deletion robohive/envs/myo/assets/hand/myo_hand_die.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<mujoco model="2nd hand model for object grasps">
<mujoco model="MyoHand model for object grasps">
<!-- =================================================
Copyright 2020 Vikash Kumar
Model :: MyoHand (MuJoCoV2.0)
Author :: Vikash Kumar (vikashplus@gmail.com)
source :: https://github.com/vikashplus
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -->

<include file="../../../../sims/myo_sim/hand/assets/myo_hand_assets.xml"/>
<include file="../../../../sims/myo_sim/hand/assets/myo_hand_body.xml"/>
Expand Down
10 changes: 8 additions & 2 deletions robohive/envs/myo/assets/hand/myo_hand_hold.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<mujoco model="2nd hand model for object grasps">
<mujoco model="MyoHand model for object grasps">
<!-- =================================================
Copyright 2020 Vikash Kumar
Model :: MyoHand (MuJoCoV2.0)
Author :: Vikash Kumar (vikashplus@gmail.com)
source :: https://github.com/vikashplus
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -->

<include file="../../../../sims/myo_sim/hand/assets/myo_hand_assets.xml"/>
<include file="../../../../sims/myo_sim/hand/assets/myo_hand_body.xml"/>
<include file="../../../../sims/myo_sim/scene/myosuite_scene.xml"/>
<compiler meshdir='../../../../sims/myo_sim/' texturedir='../../../../sims/myo_sim/'/>


<worldbody>
<site type="ellipsoid" name="goal" size=".025 .036 .030" pos="-.240 -.520 1.470" rgba="0 1 0 .2"/>

Expand Down
Loading

0 comments on commit 9dc71ca

Please sign in to comment.