merge master into table-tennis-dev branch

This commit is contained in:
Hongyi Zhou
2022-12-01 11:46:09 +01:00
parent 3a502ce831
commit a9a1d05497
2 changed files with 11 additions and 14 deletions
@@ -161,16 +161,16 @@ if __name__ == '__main__':
# ProMP
# example_mp("HoleReacherProMP-v0", seed=10, iterations=5, render=render)
# example_mp("BoxPushingTemporalSparseProMP-v0", seed=10, iterations=1, render=render)
# example_mp("TableTennis4DProMP-v0", seed=10, iterations=20, render=render)
# example_mp("TableTennisWindProMP-v0", seed=10, iterations=20, render=render)
# example_mp("TableTennisGoalSwitchingProMP-v0", seed=10, iterations=20, render=render)
example_mp("BoxPushingTemporalSparseProMP-v0", seed=10, iterations=1, render=render)
example_mp("TableTennis4DProMP-v0", seed=10, iterations=20, render=render)
example_mp("TableTennisWindProMP-v0", seed=10, iterations=20, render=render)
example_mp("TableTennisGoalSwitchingProMP-v0", seed=10, iterations=20, render=render)
# ProDMP
# example_mp("BoxPushingDenseReplanProDMP-v0", seed=10, iterations=4, render=render)
example_mp("TableTennis4DProDMP-v0", seed=10, iterations=2000, render=render)
# example_mp("TableTennisWindProDMP-v0", seed=10, iterations=20, render=render)
# example_mp("TableTennisGoalSwitchingProDMP-v0", seed=10, iterations=20, render=render)
example_mp("BoxPushingDenseReplanProDMP-v0", seed=10, iterations=4, render=render)
example_mp("TableTennis4DProDMP-v0", seed=10, iterations=20, render=render)
example_mp("TableTennisWindProDMP-v0", seed=10, iterations=20, render=render)
example_mp("TableTennisGoalSwitchingProDMP-v0", seed=10, iterations=20, render=render)
# Altered basis functions
# obs1 = example_custom_mp("Reacher5dProMP-v0", seed=10, iterations=1, render=render)