Commit Graph
51 Commits
Author SHA1 Message Date
Fabian 915ffbe928 Added more tests 2022-09-30 15:07:48 +02:00
Fabian 6e4be06ffd Added more tests 2022-09-26 16:11:41 +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
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
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
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
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
Fabian 2e6094982e readme udpated 2022-07-13 16:52:24 +02:00
Fabian c96802564e beerpong.py done flag fixed 2022-07-13 16:01:48 +02:00
Fabian 8d1c1b44bf renaming to fancy_gym 2022-07-13 15:10:43 +02:00
Fabian d64cb614fa fixed seeding and tests 2022-07-12 15:43:46 +02:00
Fabian 0339361656 renameing alr module and updating tests 2022-07-12 15:17:02 +02:00
Fabian 79c26681c9 examples updated 2022-07-12 14:33:20 +02:00
Fabian 993df10fad hopper throw seeding fixed 2022-07-12 14:18:01 +02:00
Fabian 5d4fc4d52f ant jump seeding fix 2022-07-12 14:16:20 +02:00
Fabian 8dba7f199b timeaware wrapper 2022-07-12 10:06:38 +02:00
Fabian 123915e4fa naming convention and running tests 2022-07-11 16:42:56 +02:00
Fabian ade83b5ae6 naming convention and running tests 2022-07-11 16:18:18 +02:00
Fabian fc00cf8a87 bugfixes 2022-07-07 10:47:04 +02:00
Fabian 78d48c4300 mp wrappers added 2022-07-06 09:19:21 +02:00
Fabian 9b2c330ebf mp wrapper beer pong 2022-07-06 09:18:41 +02:00
Fabian 3a989e179b remove two table tennis and Ball in cup envs 2022-07-06 09:10:31 +02:00
Fabian 6704c9d63a mp wrapper fixes 2022-07-06 09:05:35 +02:00
Fabian fea2ae7d11 current state 2022-06-30 17:33:05 +02:00
Fabian c3a8352c63 call on superclass for obs wrapper 2022-06-30 14:20:52 +02:00
Fabian 3273f455c5 wrappers updated 2022-06-30 14:08:54 +02:00
Fabian fb4b857fb5 Merge remote-tracking branch 'origin/clean_api' into clean_api 2022-06-29 16:30:51 +02:00
Fabian b200cf4b69 sequencing and replanning 2022-06-29 16:30:36 +02:00
Fabian 9b48fc9d48 todos 2022-06-29 12:25:40 +02:00
Fabian 02b8a65bab restructuring 2022-06-29 09:37:18 +02:00
Fabian Otto 9ad6fbe712 first clean up and some non working ideas sketched 2022-06-28 16:05:09 +02:00
Fabian a26b9f463b Merge branch 'master' into dev_new_mp_api
Conflicts:
	alr_envs/alr/__init__.py
2022-05-05 16:57:40 +02:00
Fabian bd4632af84 hole_reacher update 2022-05-05 16:54:39 +02:00
Fabian ad30e732c8 reacher adjustments 2022-05-05 16:53:56 +02:00
Fabian 1881c14a48 reacher adjustments 2022-05-05 16:48:59 +02:00
Fabian d313795cec reacher adjustments 2022-04-07 14:40:43 +02:00
Fabian c763f89d60 Merge remote-tracking branch 'origin/master' 2022-01-25 15:24:22 +01:00
Fabian 1f5a7b67f5 Added ALRReacherProMP 2022-01-25 15:23:57 +01:00
Fabian 89439f7532 updated incorrect angle normalization. 2021-03-22 15:25:22 +01:00