diff --git a/python/examples/.cart_pulling.py.swp b/python/examples/.cart_pulling.py.swp deleted file mode 100644 index b7c97396aebcf2267653da4c60596a8c43fb31f2..0000000000000000000000000000000000000000 Binary files a/python/examples/.cart_pulling.py.swp and /dev/null differ diff --git a/python/examples/cart_pulling.py b/python/examples/cart_pulling.py index 66b33e798ae32937abc7fea661ea359407526c69..5687c6fe08ff5ad0c6bb92f2ddbe38f8b8b54e8a 100644 --- a/python/examples/cart_pulling.py +++ b/python/examples/cart_pulling.py @@ -117,7 +117,7 @@ def cartPullingControlLoop(args, robot : RobotManager, goal, solver_grasp, solve if robot.robot_name != "yumi": T_w_e = robot.getT_w_e() else: - T_w_e_l, T_w_e_right = robot.getT_w_e() + T_w_e_left, T_w_e_right = robot.getT_w_e() # we use binary as string representation (i don't want to deal with python's binary representation). # the reason for this is that then we don't have disgusting nested ifs diff --git a/python/ur_simple_control.egg-info/SOURCES.txt b/python/ur_simple_control.egg-info/SOURCES.txt index bf3ed08977ae3f5773625f56e8e8db1824a507a8..3780070e45f466b3f46fda3c2e6c4d8217f70215 100644 --- a/python/ur_simple_control.egg-info/SOURCES.txt +++ b/python/ur_simple_control.egg-info/SOURCES.txt @@ -22,7 +22,6 @@ examples/comparing_logs_example.py examples/crocoddyl_mpc.py examples/crocoddyl_ocp_clik.py examples/drawing_from_input_drawing.py -examples/heron_pls.py examples/joint_trajectory.csv examples/path_following_mpc.py examples/path_in_pixels.csv diff --git a/python/ur_simple_control/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/__pycache__/__init__.cpython-310.pyc index 013bf4c3c931ca6dca9274fbad730bf76f14dc35..81e8ebf8d6cc559fdd307bc77f8a665ed696259d 100644 Binary files a/python/ur_simple_control/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/__pycache__/managers.cpython-310.pyc b/python/ur_simple_control/__pycache__/managers.cpython-310.pyc index 3b476c272538d9a1f12c522c5ae7d32bfa054cde..eed3be955219812ee460e571bab51467135ce72f 100644 Binary files a/python/ur_simple_control/__pycache__/managers.cpython-310.pyc and b/python/ur_simple_control/__pycache__/managers.cpython-310.pyc differ diff --git a/python/ur_simple_control/basics/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/basics/__pycache__/__init__.cpython-310.pyc index 8edaa2f577ddfd74d815dee53f8265d38c0f2fca..a7316ce2482bd31d5f61d5ec5cc08a8d392a32b4 100644 Binary files a/python/ur_simple_control/basics/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/basics/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/basics/__pycache__/basics.cpython-310.pyc b/python/ur_simple_control/basics/__pycache__/basics.cpython-310.pyc index ecf89b920431584195c255ccc99637ca09fd2338..5f7577feb229658126fc67c97c41fdf918babaf5 100644 Binary files a/python/ur_simple_control/basics/__pycache__/basics.cpython-310.pyc and b/python/ur_simple_control/basics/__pycache__/basics.cpython-310.pyc differ diff --git a/python/ur_simple_control/clik/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/clik/__pycache__/__init__.cpython-310.pyc index c14ed132923a1fd4fe37a2eea6179541d994dc02..f748900fdc31bc412b0a999b4fb3db642fcc1623 100644 Binary files a/python/ur_simple_control/clik/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/clik/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/dmp/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/dmp/__pycache__/__init__.cpython-310.pyc index 8f623ffcc78243df2a5ee3e73e7c0e561efecc48..4d1c492319ff89555b519330a66a376c7ea6107e 100644 Binary files a/python/ur_simple_control/dmp/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/dmp/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/dmp/__pycache__/dmp.cpython-310.pyc b/python/ur_simple_control/dmp/__pycache__/dmp.cpython-310.pyc index e81144824ae642b3e14a08a19d1224855ba643bb..0e29756c453906783f2ec862504e575fe0d94cd1 100644 Binary files a/python/ur_simple_control/dmp/__pycache__/dmp.cpython-310.pyc and b/python/ur_simple_control/dmp/__pycache__/dmp.cpython-310.pyc differ diff --git a/python/ur_simple_control/optimal_control/__init__.py b/python/ur_simple_control/optimal_control/__init__.py index adbd050942478d9957c0384029c66b8e7ac3dd66..1feaec8e968dc9d22865791a63b24db8077af2d7 100644 --- a/python/ur_simple_control/optimal_control/__init__.py +++ b/python/ur_simple_control/optimal_control/__init__.py @@ -1,10 +1,10 @@ import importlib.util -if importlib.util.find_spec('casadi'): - import pinocchio as pin - if int(pin.__version__[0]) < 3: - print("you need to have pinocchio version 3.0.0 or greater to use pinocchio.casadi!") - exit() - from .create_pinocchio_casadi_ocp import * +#if importlib.util.find_spec('casadi'): +# import pinocchio as pin +# if int(pin.__version__[0]) < 3: +# print("you need to have pinocchio version 3.0.0 or greater to use pinocchio.casadi!") +# exit() +# from .create_pinocchio_casadi_ocp import * from .crocoddyl_mpc import * from .crocoddyl_optimal_control import * from .get_ocp_args import * diff --git a/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-310.pyc index 654427aae8dcbedf493f3a356f4a6e5732f76014..e15880dc900e8f8d54ed9375536c1ff25861b877 100644 Binary files a/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/robot_descriptions/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/util/__pycache__/__init__.cpython-310.pyc index 49efa1685621d359f4209efe2cdfd6fac8a86bfa..68f9f19de45ab20cab0014a1af94d8390b3013f7 100644 Binary files a/python/ur_simple_control/util/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/util/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/get_model.cpython-310.pyc b/python/ur_simple_control/util/__pycache__/get_model.cpython-310.pyc index 7d915c240c73fce908dbaf592187296265279892..66be41a9466e86d1e63cc8c6d6de71f3dc0db74c 100644 Binary files a/python/ur_simple_control/util/__pycache__/get_model.cpython-310.pyc and b/python/ur_simple_control/util/__pycache__/get_model.cpython-310.pyc differ diff --git a/python/ur_simple_control/util/__pycache__/logging_utils.cpython-310.pyc b/python/ur_simple_control/util/__pycache__/logging_utils.cpython-310.pyc index f3e4e64d35092a39fd51bda1a2b81e6f0f0f1341..2e37258da435a8748e38b6df86896ab68dbc2f6b 100644 Binary files a/python/ur_simple_control/util/__pycache__/logging_utils.cpython-310.pyc and b/python/ur_simple_control/util/__pycache__/logging_utils.cpython-310.pyc differ diff --git a/python/ur_simple_control/visualize/__pycache__/__init__.cpython-310.pyc b/python/ur_simple_control/visualize/__pycache__/__init__.cpython-310.pyc index 66a8209bfd54f39391e1003fc8c1a3e7a66d382b..51d48f74c07792fe02bb0a151b6b46bcc253c927 100644 Binary files a/python/ur_simple_control/visualize/__pycache__/__init__.cpython-310.pyc and b/python/ur_simple_control/visualize/__pycache__/__init__.cpython-310.pyc differ diff --git a/python/ur_simple_control/visualize/__pycache__/visualize.cpython-310.pyc b/python/ur_simple_control/visualize/__pycache__/visualize.cpython-310.pyc index 86c35e0c7f317e7d72788853f7280a7d2570a6c3..1ba8d819410731c72985bdc5203973f93569c258 100644 Binary files a/python/ur_simple_control/visualize/__pycache__/visualize.cpython-310.pyc and b/python/ur_simple_control/visualize/__pycache__/visualize.cpython-310.pyc differ