Commit Graph

390 Commits

Author SHA1 Message Date
Fabian
5c8ba41e04 updated for new mp_pytorch 2023-03-21 15:27:11 +01:00
Fabian
8f07770a2f Merge remote-tracking branch 'origin/Add-ProDMP-envs' into Add-ProDMP-envs 2023-03-13 10:52:07 +01:00
ottofabian
0781077bde
Update base_metaworld_mp_wrapper.py 2023-02-14 10:05:05 +01:00
Fabian
176fb087af Merge remote-tracking branch 'origin/master' into Add-ProDMP-envs
# Conflicts:
#	fancy_gym/black_box/black_box_wrapper.py
#	fancy_gym/meta/__init__.py
2023-01-25 09:30:53 +01:00
Fabian
8903c2dc9f updated for new mp_pytorch 2023-01-25 09:20:36 +01:00
Fabian
3facda996c Merge remote-tracking branch 'origin/dev_new_mp_api_bp_frameskip' into Add-ProDMP-envs
# Conflicts:
#	alr_envs/alr/__init__.py
#	alr_envs/alr/mujoco/reacher/alr_reacher.py
#	alr_envs/alr/mujoco/reacher/new_mp_wrapper.py
2023-01-25 08:53:05 +01:00
ottofabian
a8808a758a
Update setup.py 2023-01-17 11:18:30 +01:00
ottofabian
8e91e32737
Merge pull request #60 from ALRhub/59-update-to-new-mp_pytorch-version
updated for new mp-pytorch version
2023-01-17 09:51:56 +01:00
Fabian
03b930d7dd updated for new mp-pytorch version 2023-01-17 09:50:55 +01:00
Fabian
5cbefb2b11 updated setup.py 2022-12-05 14:07:45 +01:00
ottofabian
61626135ff
Merge pull request #55 from HongyiZhouCN/fix_bugs_for_replanning
Fix bugs for replanning
2022-11-28 13:53:08 +01:00
Hongyi Zhou
e7d2454e30 make if condition better 2022-11-28 10:49:05 +01:00
Hongyi Zhou
bb94c9c707 typos 2022-11-27 01:26:18 +01:00
Hongyi Zhou
bf0de5f54d set boundary condition to None at reset() & end replanning if env is done 2022-11-27 01:25:31 +01:00
ottofabian
42863cee1c
Merge pull request #46 from HongyiZhouCN/mujoco_binding
Adding ProDMP support and Box pushing
2022-11-25 14:37:44 +01:00
Hongyi Zhou
833f0735ea delete import torch in black box wrapper 2022-11-25 13:31:05 +01:00
Hongyi Zhou
a9ad1b5287 minor update: create local variables for current pos/vel 2022-11-21 10:17:56 +01:00
Hongyi Zhou
9539ba1424 fix some typos 2022-11-20 22:00:02 +01:00
Hongyi Zhou
2674bf80fe update according to reviews opinion & fix bugs in box pushing IK 2022-11-20 21:56:32 +01:00
ottofabian
ca5800fa3d
Update setup.py 2022-11-15 13:55:56 +01:00
Hongyi Zhou
fc3051bf57 minor updates 2022-11-14 17:48:15 +01:00
Hongyi Zhou
be14b21fff update test suite for replanning envs 2022-11-14 17:39:46 +01:00
Hongyi Zhou
7e3ec7a2ef set default max_planning_times to None 2022-11-13 17:59:12 +01:00
Hongyi Zhou
104b909296 delete hacky experimental codes & add tests to test_black_box 2022-11-13 16:59:13 +01:00
Hongyi Zhou
60e18d2964 add prodmp to test_black_box 2022-11-09 17:54:34 +01:00
Hongyi Zhou
ffe48dfb57 change back infos to default setting 2022-11-09 12:49:17 +01:00
Hongyi Zhou
fd4f9ae0bc add tests for replanning env & adapt observation space for box pushing & add max_planning_times to replanning tasks 2022-11-01 22:51:43 +01:00
Hongyi Zhou
4f9b1fad25 learn goal with auto scale basis 2022-10-31 22:37:13 +01:00
Hongyi Zhou
83eb8f7f64 use auto scale basis 2022-10-31 16:33:47 +01:00
Hongyi Zhou
cd2b679e9b use observation mask for replanning 2022-10-31 13:52:40 +01:00
Hongyi Zhou
61c1b76e29 use auto scaling feature of MP_Pytorch 2022-10-31 13:18:05 +01:00
Hongyi Zhou
524bbf352e delete the replanning times counter 2022-10-27 02:01:51 +02:00
Hongyi Zhou
288ebedd50 learn only basis weight 2022-10-26 22:54:35 +02:00
Hongyi Zhou
e49d1563fe hacky codes, only learn the weight basis params 2022-10-26 22:46:53 +02:00
Hongyi Zhou
be6137ec81 updates 2022-10-26 15:18:37 +02:00
Hongyi Zhou
a8ffa791b8 change mp configs for box pushing & add joint states to observation 2022-10-26 14:04:53 +02:00
Hongyi Zhou
4d67bfdaa7 use current pos as condition 2022-10-26 11:11:52 +02:00
Hongyi Zhou
a1d96e6016 use desired point as boundary condition 2022-10-25 22:15:30 +02:00
Hongyi Zhou
556bfd0b35 add weights scaling for box pushing replanning 2022-10-25 20:10:59 +02:00
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
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