Commit Graph

699 Commits

Author SHA1 Message Date
hongyi.zhou
ffa8c9bddb update weight scaling for bbrl-prodmp tt 2023-04-06 15:57:39 +02:00
hongyi.zhou
7f38292937 add disable goal & relative goal to tt prodmp 2023-04-06 13:29:43 +02:00
hongyi.zhou
2add522298 minor update 2023-04-06 11:41:55 +02:00
hongyi.zhou
59af1bbf8a minor update 2023-04-06 11:41:05 +02:00
hongyi.zhou
89833164dd enable autoscale for prodmp 2023-04-06 09:49:20 +02:00
hongyi.zhou
56d46c9ffc add prodmp for table tennis 2023-04-06 09:46:55 +02:00
ottofabian
93705d5f14
Update __init__.py 2023-03-24 09:40:11 +01:00
ottofabian
8948505f06
Merge pull request #64 from ALRhub/Add-ProDMP-envs
Add prodmp metaworld envs
2023-03-21 15:29:31 +01:00
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
Hongyi Zhou
b415be4b4d update mp_params for box pushing and tt 2023-03-12 12:27:44 +01:00
ottofabian
0781077bde
Update base_metaworld_mp_wrapper.py 2023-02-14 10:05:05 +01:00
ottofabian
3de774b7d4
Merge pull request #57 from rubenjacob/fix_missing_package_data
Fix package data to include all xml and stl files
2023-02-14 09:43:00 +01:00
hongyi.zhou
344c11d67a updates according to changes request 2023-01-27 17:50:14 +01:00
hongyi.zhou
67f684cf14 Merge branch 'master' into 55-table-tennis-dev 2023-01-27 14:38:25 +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
c53924d9fc updated to new API, so tests still failing 2023-01-17 08:27:29 +01:00
Fabian
ec2063aa0b updated tests for dm_control 2023-01-12 17:36:33 +01:00
Fabian
9ebc021ae0 updated dm_control envs to use shimmy 2023-01-12 17:23:56 +01:00
Fabian
ed724046f3 updated custom tasks to new api 2023-01-12 17:22:45 +01:00
Fabian
fbe3ef4a4b updated examples to new api, 2023-01-12 17:21:56 +01:00
rubenjacob
c448ad591b fix package data to include all xml and stl files 2022-12-08 23:08:22 +01:00
Fabian
5cbefb2b11 updated setup.py 2022-12-05 14:07:45 +01:00
Hongyi Zhou
811c5df3d1 delete debugging codes 2022-12-01 14:45:13 +01:00
Hongyi Zhou
ca8787f449 minor updates 2022-12-01 14:34:53 +01:00
Hongyi Zhou
a1d660d7ae Merge branch 'tt_cluster_debug' into 55-table-tennis-dev
# Conflicts:
#	fancy_gym/black_box/black_box_wrapper.py
#	fancy_gym/envs/mujoco/box_pushing/box_pushing_env.py
#	fancy_gym/envs/mujoco/table_tennis/mp_wrapper.py
2022-12-01 14:25:22 +01:00
Hongyi Zhou
5750f6eb3d add replan name tag to replan envs & delete redundant settings 2022-12-01 14:23:57 +01:00
Hongyi Zhou
5744d339ac change time limits for tt to 350 2022-12-01 14:04:11 +01:00
Hongyi Zhou
fa9a35d470 fix typos 2022-12-01 13:33:24 +01:00
Hongyi Zhou
fe2d8fec91 delete unused argument 2022-12-01 13:22:45 +01:00
Hongyi Zhou
55df1e0ef6 fix minor bug 2022-12-01 13:16:37 +01:00
Hongyi Zhou
a9a1d05497 merge master into table-tennis-dev branch 2022-12-01 11:46:09 +01:00
Hongyi Zhou
3a502ce831 Merge branch 'master' into tt_cluster_debug
# Conflicts:
#	fancy_gym/black_box/black_box_wrapper.py
2022-12-01 11:35:38 +01:00
Hongyi Zhou
f376772c22 add invalid trajectory callback & invalid traj return & register all 3 variantes of table tennis tasks 2022-12-01 11:28:03 +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
Hongyi Zhou
28aa430fd2 fix minor bugs 2022-11-25 22:38:21 +01:00
Hongyi Zhou
2735e0bf24 add contextual obs option to invalid trajectory callback 2022-11-25 22:34:46 +01:00
Hongyi Zhou
c242c32a41 Merge branch 'master' into tt_cluster_debug
# Conflicts:
#	fancy_gym/black_box/black_box_wrapper.py
#	fancy_gym/envs/__init__.py
#	fancy_gym/examples/examples_movement_primitives.py
2022-11-25 17:16:26 +01:00
xb1196@partner.kit.edu
932431a120 temporal saving 2022-11-25 16:02:52 +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
b883ad63b7 using artifical wind field 2022-11-24 16:50:57 +01:00