Commit Graph

752 Commits

Author SHA1 Message Date
Hongyi Zhou
c457fbbfeb fix minor bugs & merge test branch 2022-10-24 22:01:56 +02:00
Hongyi Zhou
e3509f8be3 Merge remote-tracking branch 'alr/master' into mujoco_binding
# Conflicts:
#	fancy_gym/black_box/black_box_wrapper.py
2022-10-24 09:53:41 +02:00
Fabian
46824f5d41 Merge remote-tracking branch 'origin/44-added-tests-for-the-black-box-wrapper' into Add-ProDMP-envs 2022-10-24 09:38:27 +02:00
ottofabian
14615c10a6
Merge pull request #48 from ALRhub/44-added-tests-for-the-black-box-wrapper
44 added tests for the black box wrapper
2022-10-24 09:32:24 +02:00
Fabian
5ebd4225cc Adjusted Callable type hint 2022-10-24 09:24:12 +02:00
Fabian
ed645c2fbe added black box tests and bug fixes 2022-10-21 16:16:49 +02:00
Fabian
0c7ac838bf first updats to reacher and env creation 2022-10-20 10:10:44 +02:00
ottofabian
cde6a269d0
Update setup.py 2022-10-20 10:05:22 +02:00
HongyiZhou
f16a128d57 Merge remote-tracking branch 'origin/Add-ProDMP-envs' into mujoco_binding
# Conflicts:
#	fancy_gym/black_box/factory/basis_generator_factory.py
2022-10-18 15:03:06 +02:00
Fabian
bea6543d9b Added more tests 2022-10-18 08:51:10 +02:00
Hongyi Zhou
bdd51ba61f modified according to comments 2022-10-14 16:50:57 +02:00
Fabian
00f622e913 Added more tests 2022-10-14 14:02:12 +02:00
Hongyi Zhou
1fd4a1e848 resample the context if target is too near to the start position 2022-10-13 14:58:28 +02:00
Hongyi Zhou
eec171e04a prodmp box pushing works 2022-10-13 11:23:38 +02:00
Hongyi Zhou
187c5f5bb2 add ProDMP to register 2022-10-13 10:57:00 +02:00
xb1196@partner.kit.edu
d73c9bbdbf comment out plotting and fixed context codes 2022-10-12 17:06:36 +02:00
Hongyi Zhou
ad8201ea67 update infos of box pushing envs 2022-10-12 16:45:13 +02:00
Hongyi Zhou
38e8958ebd box pushing working with mujoco binding 2022-10-11 18:16:25 +02:00
Hongyi Zhou
5bfce45d9d box pushing with mujoco binding 2022-10-11 18:08:12 +02:00
Fabian
915ffbe928 Added more tests 2022-09-30 15:07:48 +02:00
ottofabian
14ac5f81c7
Update README.md 2022-09-28 10:21:39 +02:00
Fabian
6e4be06ffd Added more tests 2022-09-26 16:11:41 +02:00
ottofabian
ee4a46fad1
Merge pull request #43 from ALRhub/35-replace-native-unittest-with-pytest
35 replace native unittest with pytest
2022-09-26 09:57:13 +02:00
Fabian
19a7ffb158 reverted changes to examples 2022-09-26 09:55:59 +02:00
Fabian
932c5d6aea Merge remote-tracking branch 'origin/master'
Conflicts:
	fancy_gym/black_box/black_box_wrapper.py
2022-09-26 09:52:45 +02:00
Fabian
39815ad09a updated test to pytest 2022-09-26 09:46:53 +02:00
Fabian
756a9fb039 Merge branch '26-sequencingreplanning-feature-for-episode-based-environments'
Conflicts:
	fancy_gym/dmc/README.MD
	fancy_gym/dmc/manipulation/__init__.py
	fancy_gym/dmc/manipulation/reach_site/__init__.py
	fancy_gym/dmc/manipulation/reach_site/mp_wrapper.py
	fancy_gym/dmc/suite/__init__.py
	fancy_gym/dmc/suite/ball_in_cup/__init__.py
	fancy_gym/dmc/suite/ball_in_cup/mp_wrapper.py
	fancy_gym/dmc/suite/cartpole/__init__.py
	fancy_gym/dmc/suite/cartpole/mp_wrapper.py
	fancy_gym/dmc/suite/reacher/__init__.py
	fancy_gym/dmc/suite/reacher/mp_wrapper.py
	fancy_gym/envs/classic_control/README.MD
	fancy_gym/envs/classic_control/__init__.py
	fancy_gym/envs/classic_control/base_reacher/base_reacher.py
	fancy_gym/envs/classic_control/base_reacher/base_reacher_direct.py
	fancy_gym/envs/classic_control/base_reacher/base_reacher_torque.py
	fancy_gym/envs/classic_control/hole_reacher/__init__.py
	fancy_gym/envs/classic_control/hole_reacher/hole_reacher.py
	fancy_gym/envs/classic_control/hole_reacher/hr_dist_vel_acc_reward.py
	fancy_gym/envs/classic_control/hole_reacher/hr_simple_reward.py
	fancy_gym/envs/classic_control/hole_reacher/mp_wrapper.py
	fancy_gym/envs/classic_control/simple_reacher/__init__.py
	fancy_gym/envs/classic_control/simple_reacher/simple_reacher.py
	fancy_gym/envs/classic_control/utils.py
	fancy_gym/envs/classic_control/viapoint_reacher/__init__.py
	fancy_gym/envs/classic_control/viapoint_reacher/mp_wrapper.py
	fancy_gym/envs/classic_control/viapoint_reacher/viapoint_reacher.py
	fancy_gym/envs/mujoco/README.MD
	fancy_gym/envs/mujoco/beerpong/assets/beerpong.xml
	fancy_gym/envs/mujoco/beerpong/assets/beerpong_wo_cup.xml
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/base_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/base_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_dist_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_dist_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_med_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_med_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_prox_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_prox_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_prox_link_convex_decomposition_p3.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_finger_prox_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_palm_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_palm_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_palm_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_palm_link_convex_decomposition_p3.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/bhand_palm_link_convex_decomposition_p4.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split10.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split11.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split12.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split13.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split14.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split15.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split16.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split17.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split18.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split3.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split4.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split5.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split6.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split7.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split8.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/cup_split9.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/elbow_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/elbow_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/forearm_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/forearm_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/forearm_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_link_convex_decomposition_p3.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_pitch_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/shoulder_pitch_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/upper_arm_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/upper_arm_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/upper_arm_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_palm_link_convex.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_palm_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_pitch_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_pitch_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_pitch_link_convex_decomposition_p3.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_pitch_link_fine.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_yaw_link_convex_decomposition_p1.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_yaw_link_convex_decomposition_p2.stl
	fancy_gym/envs/mujoco/beerpong/assets/meshes/wam/wrist_yaw_link_fine.stl
	fancy_gym/envs/mujoco/hopper_throw/__init__.py
	fancy_gym/envs/mujoco/reacher/assets/reacher_5links.xml
	fancy_gym/envs/mujoco/reacher/assets/reacher_7links.xml
	fancy_gym/examples/examples_dmc.py
	fancy_gym/examples/examples_general.py
	fancy_gym/examples/examples_metaworld.py
	fancy_gym/meta/README.MD
	fancy_gym/meta/__init__.py
	fancy_gym/meta/goal_change_mp_wrapper.py
	fancy_gym/meta/goal_endeffector_change_mp_wrapper.py
	fancy_gym/meta/goal_object_change_mp_wrapper.py
	fancy_gym/meta/object_change_mp_wrapper.py
	fancy_gym/open_ai/README.MD
	fancy_gym/open_ai/deprecated_needs_gym_robotics/robotics/__init__.py
	fancy_gym/open_ai/deprecated_needs_gym_robotics/robotics/fetch/__init__.py
	fancy_gym/open_ai/deprecated_needs_gym_robotics/robotics/fetch/mp_wrapper.py
	fancy_gym/open_ai/mujoco/__init__.py
	fancy_gym/open_ai/mujoco/reacher_v2/__init__.py
	fancy_gym/utils/__init__.py
	test/test_dmc.py
2022-09-26 08:43:43 +02:00
Fabian
9651d9e213 updated test to pytest 2022-09-26 08:39:54 +02:00
Fabian
2875e07947 updated test to pytest 2022-09-23 09:40:35 +02:00
Fabian
536e78da23 cleaned up merge 2022-09-23 09:25:36 +02:00
ottofabian
a3466c3211
Update README.md
Updated gym website link
2022-09-23 09:09:37 +02:00
ottofabian
a4f696dee4
Merge pull request #42 from ALRhub/clean_api
Fancy_gym is born
2022-09-23 09:01:47 +02:00
ottofabian
eaedd58e73
Merge pull request #41 from ALRhub/26-sequencingreplanning-feature-for-episode-based-environments
Added sequencing and replanning feature for episode-based environments
2022-09-23 09:00:36 +02:00
Fabian
1ca14f1c93 updated for new set_duration function. 2022-09-20 11:17:20 +02:00
Fabian
bdea3badff updated for gym 0.25.1 2022-08-18 09:04:38 +02:00
ottofabian
491abece22
Update black_box_wrapper.py 2022-08-08 08:21:28 +02:00
ottofabian
b3762fb099
Update setup.py 2022-07-28 10:08:11 +02:00
Fabian
a5cac2dd0d Merge branch 'clean_api' into 26-sequencingreplanning-feature-for-episode-based-environments 2022-07-27 16:38:27 +02:00
Fabian
7957632eb0 minor bug fixes 2022-07-27 16:34:35 +02:00
ottofabian
623adaacd8
Update setup.py 2022-07-26 10:48:19 +02:00
Fabian
4aacd71ed3 minor bug fixes 2022-07-26 10:33:59 +02:00
Fabian
ce795669a9 minor bug fixes 2022-07-25 11:18:05 +02:00
Onur
5590318329 Merge remote-tracking branch 'origin/clean_api' into clean_api 2022-07-19 12:17:19 +02:00
Onur
3341cc6f73 fix body pos set bug in hj 2022-07-19 12:17:02 +02:00
Fabian
50d44b2989 reverted debug change for reacher 2022-07-15 09:07:37 +02:00
Fabian
e311ee137a minor bug fixes 2022-07-14 17:43:27 +02:00
Fabian
84386fd8e4 fixed imports 2022-07-14 15:19:39 +02:00
Fabian
855dba7fde fixed setup.py 2022-07-14 11:54:38 +02:00
ottofabian
2283f4416c
Update setup.py 2022-07-14 09:45:35 +02:00
ottofabian
55c5d1f89e
Update README.md 2022-07-14 09:39:54 +02:00