Skip to content
Snippets Groups Projects
Commit 30494a40 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

remove deprecated loaders

parent d27092f3
No related branches found
No related tags found
No related merge requests found
# flake8: noqa # flake8: noqa
from .robots_loader import (ROBOTS, getModelPath, load, load_full, loadANYmal, loadDoublePendulum, loadHector, loadHyQ, from .robots_loader import ROBOTS, getModelPath, load, load_full, readParamsFromSrdf
loadICub, loadIris, loadKinova, loadPanda, loadRomeo, loadSolo, loadTalos, loadTalosArm,
loadTalosLegs, loadTiago, loadTiagoNoHand, loadUR, readParamsFromSrdf)
...@@ -9,10 +9,6 @@ from pinocchio.robot_wrapper import RobotWrapper ...@@ -9,10 +9,6 @@ from pinocchio.robot_wrapper import RobotWrapper
pin.switchToNumpyArray() pin.switchToNumpyArray()
def _depr_msg(deprecated, key):
return "`%s` is deprecated. Please use `load('%s')`" % (deprecated, key)
def getModelPath(subpath, printmsg=False): def getModelPath(subpath, printmsg=False):
source = dirname(dirname(dirname(__file__))) # top level source directory source = dirname(dirname(dirname(__file__))) # top level source directory
paths = [ paths = [
...@@ -165,16 +161,6 @@ class BaxterLoader(RobotLoader): ...@@ -165,16 +161,6 @@ class BaxterLoader(RobotLoader):
urdf_subpath = "urdf" urdf_subpath = "urdf"
def loadANYmal(withArm=None):
if withArm:
warnings.warn(_depr_msg('loadANYmal(kinova)', 'anymal_kinova'), FutureWarning, 2)
loader = ANYmalKinovaLoader
else:
warnings.warn(_depr_msg('loadANYmal()', 'anymal'), FutureWarning, 2)
loader = ANYmalLoader
return loader().robot
class CassieLoader(RobotLoader): class CassieLoader(RobotLoader):
path = 'cassie_description' path = 'cassie_description'
if tuple(int(i) for i in pin.__version__.split('.')) > (2, 9, 1): if tuple(int(i) for i in pin.__version__.split('.')) > (2, 9, 1):
...@@ -277,40 +263,6 @@ class TalosLegsLoader(TalosLoader): ...@@ -277,40 +263,6 @@ class TalosLegsLoader(TalosLoader):
self.addFreeFlyerJointLimits() self.addFreeFlyerJointLimits()
def loadTalos(legs=False, arm=False, full=False, box=False):
if legs:
warnings.warn(_depr_msg('loadTalos(legs)', 'talos_legs'), FutureWarning, 2)
loader = TalosLegsLoader
elif arm:
warnings.warn(_depr_msg('loadTalos(arm)', 'talos_arm'), FutureWarning, 2)
loader = TalosArmLoader
elif full:
if box:
warnings.warn(_depr_msg('loadTalos(full, box)', 'talos_full_box'), FutureWarning, 2)
loader = TalosFullBoxLoader
else:
warnings.warn(_depr_msg('loadTalos(full)', 'talos_full'), FutureWarning, 2)
loader = TalosFullLoader
else:
if box:
warnings.warn(_depr_msg('loadTalos(box)', 'talos_box'), FutureWarning, 2)
loader = TalosBoxLoader
else:
warnings.warn(_depr_msg('loadTalos()', 'talos'), FutureWarning, 2)
loader = TalosLoader
return loader().robot
def loadTalosLegs():
warnings.warn(_depr_msg('loadTalosLegs()', 'talos_legs'), FutureWarning, 2)
return loadTalos(legs=True)
def loadTalosArm():
warnings.warn(_depr_msg('loadTalosArm()', 'talos_arm'), FutureWarning, 2)
return loadTalos(arm=True)
class HyQLoader(RobotLoader): class HyQLoader(RobotLoader):
path = "hyq_description" path = "hyq_description"
urdf_filename = "hyq_no_sensors.urdf" urdf_filename = "hyq_no_sensors.urdf"
...@@ -319,11 +271,6 @@ class HyQLoader(RobotLoader): ...@@ -319,11 +271,6 @@ class HyQLoader(RobotLoader):
free_flyer = True free_flyer = True
def loadHyQ():
warnings.warn(_depr_msg('loadHyQ()', 'hyq'), FutureWarning, 2)
return HyQLoader().robot
class BoltLoader(RobotLoader): class BoltLoader(RobotLoader):
path = 'bolt_description' path = 'bolt_description'
urdf_filename = "bolt.urdf" urdf_filename = "bolt.urdf"
...@@ -351,12 +298,6 @@ class Solo12Loader(Solo8Loader): ...@@ -351,12 +298,6 @@ class Solo12Loader(Solo8Loader):
urdf_filename = "solo12.urdf" urdf_filename = "solo12.urdf"
def loadSolo(solo=True):
warnings.warn(_depr_msg('loadSolo()', 'solo8'), FutureWarning, 2)
loader = Solo8Loader if solo else Solo12Loader
return loader().robot
class FingerEduLoader(RobotLoader): class FingerEduLoader(RobotLoader):
path = 'finger_edu_description' path = 'finger_edu_description'
urdf_filename = "finger_edu.urdf" urdf_filename = "finger_edu.urdf"
...@@ -372,11 +313,6 @@ class KinovaLoader(RobotLoader): ...@@ -372,11 +313,6 @@ class KinovaLoader(RobotLoader):
ref_posture = "arm_up" ref_posture = "arm_up"
def loadKinova():
warnings.warn(_depr_msg('loadKinova()', 'kinova'), FutureWarning, 2)
return KinovaLoader().robot
class TiagoLoader(RobotLoader): class TiagoLoader(RobotLoader):
path = "tiago_description" path = "tiago_description"
urdf_filename = "tiago.urdf" urdf_filename = "tiago.urdf"
...@@ -390,21 +326,6 @@ class TiagoNoHandLoader(TiagoLoader): ...@@ -390,21 +326,6 @@ class TiagoNoHandLoader(TiagoLoader):
urdf_filename = "tiago_no_hand.urdf" urdf_filename = "tiago_no_hand.urdf"
def loadTiago(hand=True):
if hand:
warnings.warn(_depr_msg('loadTiago()', 'tiago'), FutureWarning, 2)
loader = TiagoLoader
else:
warnings.warn(_depr_msg('loadTiago(hand=False)', 'tiago_no_hand'), FutureWarning, 2)
loader = TiagoNoHandLoader
return loader().robot
def loadTiagoNoHand():
warnings.warn(_depr_msg('loadTiagoNoHand()', 'tiago_no_hand'), FutureWarning, 2)
return loadTiago(hand=False)
class ICubLoader(RobotLoader): class ICubLoader(RobotLoader):
path = "icub_description" path = "icub_description"
urdf_filename = "icub.urdf" urdf_filename = "icub.urdf"
...@@ -416,27 +337,12 @@ class ICubReducedLoader(ICubLoader): ...@@ -416,27 +337,12 @@ class ICubReducedLoader(ICubLoader):
urdf_filename = "icub_reduced.urdf" urdf_filename = "icub_reduced.urdf"
def loadICub(reduced=True):
if reduced:
warnings.warn(_depr_msg('loadICub()', 'icub_reduced'), FutureWarning, 2)
loader = ICubReducedLoader
else:
warnings.warn(_depr_msg('loadICub(reduced=False)', 'icub'), FutureWarning, 2)
loader = ICubLoader
return loader().robot
class PandaLoader(RobotLoader): class PandaLoader(RobotLoader):
path = "panda_description" path = "panda_description"
urdf_filename = "panda.urdf" urdf_filename = "panda.urdf"
urdf_subpath = "urdf" urdf_subpath = "urdf"
def loadPanda():
warnings.warn(_depr_msg('loadPanda()', 'panda'), FutureWarning, 2)
return PandaLoader().robot
class UR3Loader(RobotLoader): class UR3Loader(RobotLoader):
path = "ur_description" path = "ur_description"
urdf_filename = "ur3_robot.urdf" urdf_filename = "ur3_robot.urdf"
...@@ -475,48 +381,12 @@ class UR10LimitedLoader(UR10Loader): ...@@ -475,48 +381,12 @@ class UR10LimitedLoader(UR10Loader):
urdf_filename = "ur10_joint_limited_robot.urdf" urdf_filename = "ur10_joint_limited_robot.urdf"
def loadUR(robot=5, limited=False, gripper=False):
if robot == 3:
if limited:
warnings.warn(_depr_msg('loadUr(3, limited)', 'ur3_limited'), FutureWarning, 2)
loader = UR3LimitedLoader
elif gripper:
warnings.warn(_depr_msg('loadUr(3, gripper)', 'ur3_gripper'), FutureWarning, 2)
loader = UR3GripperLoader
else:
warnings.warn(_depr_msg('loadUr(3)', 'ur3'), FutureWarning, 2)
loader = UR3Loader
elif robot == 5:
if limited:
warnings.warn(_depr_msg('loadUr(limited)', 'ur5_limited'), FutureWarning, 2)
loader = UR5LimitedLoader
elif gripper:
warnings.warn(_depr_msg('loadUr(gripper)', 'ur5_gripper'), FutureWarning, 2)
loader = UR5GripperLoader
else:
warnings.warn(_depr_msg('loadUr()', 'ur5'), FutureWarning, 2)
loader = UR5Loader
elif robot == 10:
if limited:
warnings.warn(_depr_msg('loadUr(10, limited)', 'ur10_limited'), FutureWarning, 2)
loader = UR10LimitedLoader
else:
warnings.warn(_depr_msg('loadUr(10)', 'ur10'), FutureWarning, 2)
loader = UR10Loader
return loader().robot
class HectorLoader(RobotLoader): class HectorLoader(RobotLoader):
path = "hector_description" path = "hector_description"
urdf_filename = "quadrotor_base.urdf" urdf_filename = "quadrotor_base.urdf"
free_flyer = True free_flyer = True
def loadHector():
warnings.warn(_depr_msg('loadHector()', 'hector'), FutureWarning, 2)
return HectorLoader().robot
class DoublePendulumLoader(RobotLoader): class DoublePendulumLoader(RobotLoader):
path = "double_pendulum_description" path = "double_pendulum_description"
urdf_filename = "double_pendulum.urdf" urdf_filename = "double_pendulum.urdf"
...@@ -531,11 +401,6 @@ class DoublePendulumSimpleLoader(DoublePendulumLoader): ...@@ -531,11 +401,6 @@ class DoublePendulumSimpleLoader(DoublePendulumLoader):
urdf_filename = "double_pendulum_simple.urdf" urdf_filename = "double_pendulum_simple.urdf"
def loadDoublePendulum():
warnings.warn(_depr_msg('loadDoublePendulum()', 'double_pendulum'), FutureWarning, 2)
return DoublePendulumLoader().robot
class RomeoLoader(RobotLoader): class RomeoLoader(RobotLoader):
path = "romeo_description" path = "romeo_description"
urdf_filename = "romeo.urdf" urdf_filename = "romeo.urdf"
...@@ -543,11 +408,6 @@ class RomeoLoader(RobotLoader): ...@@ -543,11 +408,6 @@ class RomeoLoader(RobotLoader):
free_flyer = True free_flyer = True
def loadRomeo():
warnings.warn(_depr_msg('loadRomeo()', 'romeo'), FutureWarning, 2)
return RomeoLoader().robot
class SimpleHumanoidLoader(RobotLoader): class SimpleHumanoidLoader(RobotLoader):
path = 'simple_humanoid_description' path = 'simple_humanoid_description'
urdf_subpath = 'urdf' urdf_subpath = 'urdf'
...@@ -567,11 +427,6 @@ class IrisLoader(RobotLoader): ...@@ -567,11 +427,6 @@ class IrisLoader(RobotLoader):
free_flyer = True free_flyer = True
def loadIris():
warnings.warn(_depr_msg('loadIris()', 'iris'), FutureWarning, 2)
return IrisLoader().robot
ROBOTS = { ROBOTS = {
'a1': A1Loader, 'a1': A1Loader,
'anymal': ANYmalLoader, 'anymal': ANYmalLoader,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment