Commit Graph

58 Commits

Author SHA1 Message Date
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
Hongyi Zhou
e7d2454e30 make if condition better 2022-11-28 10:49:05 +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
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
2674bf80fe update according to reviews opinion & fix bugs in box pushing IK 2022-11-20 21:56:32 +01:00
Hongyi Zhou
d4e844ac45 goal switching 2022-11-16 19:45:58 +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
b1581634e0 enable max planning times flag 2022-11-09 21:23:35 +01:00
Hongyi Zhou
ffe48dfb57 change back infos to default setting 2022-11-09 12:49:17 +01:00
Hongyi Zhou
99a514026f table tennis 4D replanning works git add .git add . 2022-11-09 10:42:36 +01:00
Hongyi Zhou
b9c2348855 check time validity before pos validity 2022-11-08 13:57:32 +01:00
Hongyi Zhou
d384e6e764 temporal updates 2022-11-08 10:15:43 +01:00
Hongyi Zhou
2a39a72af0 update promp's config 2022-11-06 23:42:55 +01:00
Hongyi Zhou
7d16b420c1 add tau, delay bound and update context range 2022-11-05 15:56:59 +01:00
Hongyi Zhou
5a547d85f9 updates 2022-11-04 21:22:32 +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
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
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
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
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
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
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
Fabian
915ffbe928 Added more tests 2022-09-30 15:07:48 +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
1ca14f1c93 updated for new set_duration function. 2022-09-20 11:17:20 +02:00