Skip to content

Commit 859dbe7

Browse files
committed
Address review: use @Property wrappers instead of direct assignment
1 parent d961af4 commit 859dbe7

File tree

7 files changed

+55
-16
lines changed

7 files changed

+55
-16
lines changed

skrobot/model/robot_model.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1866,9 +1866,10 @@ def init_pose(self):
18661866
self.joint_max_angles)
18671867
return self.angle_vector(target_angles)
18681868

1869-
# New naming convention properties (forward compatibility)
1869+
# New naming convention properties with more intuitive full names.
18701870
# These provide access using full names (right_arm, left_arm, etc.)
1871-
# while maintaining backward compatibility with abbreviated names.
1871+
# while keeping the abbreviated names (rarm, larm, etc.) available for
1872+
# backward compatibility.
18721873

18731874
def _get_limb(self, attr_name):
18741875
"""Get limb by attribute name, returning None if not available."""
@@ -1877,6 +1878,7 @@ def _get_limb(self, attr_name):
18771878
if isinstance(limb, RobotModel):
18781879
return limb
18791880
except NotImplementedError:
1881+
# Some robot models raise NotImplementedError for unsupported limbs
18801882
pass
18811883
return None
18821884

@@ -1887,6 +1889,7 @@ def _get_end_coords(self, attr_name):
18871889
if isinstance(coords, CascadedCoords):
18881890
return coords
18891891
except NotImplementedError:
1892+
# Some robot models raise NotImplementedError for unsupported coords
18901893
pass
18911894
return None
18921895

skrobot/models/fetch.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,13 @@ def rarm_with_torso(self):
8787
return r
8888

8989
# New naming convention aliases (backward compatible)
90-
arm = rarm
91-
arm_with_torso = rarm_with_torso
90+
@property
91+
def arm(self):
92+
return self.rarm
93+
94+
@property
95+
def arm_with_torso(self):
96+
return self.rarm_with_torso
9297

9398
@property
9499
def arm_end_coords(self):

skrobot/models/kuka.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ def open_hand(self, default_angle=np.deg2rad(10), av=None):
6363
return self.angle_vector(av)
6464

6565
# New naming convention aliases (backward compatible)
66-
arm = rarm
66+
@property
67+
def arm(self):
68+
return self.rarm
6769

6870
@property
6971
def arm_end_coords(self):

skrobot/models/nextage.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ def torso(self):
107107
return model
108108

109109
# New naming convention aliases (backward compatible)
110-
right_arm = rarm
111-
left_arm = larm
110+
@property
111+
def right_arm(self):
112+
return self.rarm
113+
114+
@property
115+
def left_arm(self):
116+
return self.larm
112117

113118
@property
114119
def right_arm_end_coords(self):

skrobot/models/panda.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ def rarm(self):
5959
return model
6060

6161
# New naming convention aliases (backward compatible)
62-
arm = rarm
62+
@property
63+
def arm(self):
64+
return self.rarm
6365

6466
@property
6567
def arm_end_coords(self):

skrobot/models/pr2.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,21 @@ def head(self):
157157
return r
158158

159159
# New naming convention aliases (backward compatible)
160-
right_arm = rarm
161-
left_arm = larm
162-
right_arm_with_torso = rarm_with_torso
163-
left_arm_with_torso = larm_with_torso
160+
@property
161+
def right_arm(self):
162+
return self.rarm
163+
164+
@property
165+
def left_arm(self):
166+
return self.larm
167+
168+
@property
169+
def right_arm_with_torso(self):
170+
return self.rarm_with_torso
171+
172+
@property
173+
def left_arm_with_torso(self):
174+
return self.larm_with_torso
164175

165176
@property
166177
def right_arm_end_coords(self):

skrobot/models/r8_6.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,21 @@ def elv(self):
265265
return elv_model
266266

267267
# New naming convention aliases (backward compatible)
268-
right_arm = rarm
269-
left_arm = larm
270-
right_arm_with_torso = rarm_with_torso
271-
left_arm_with_torso = larm_with_torso
268+
@property
269+
def right_arm(self):
270+
return self.rarm
271+
272+
@property
273+
def left_arm(self):
274+
return self.larm
275+
276+
@property
277+
def right_arm_with_torso(self):
278+
return self.rarm_with_torso
279+
280+
@property
281+
def left_arm_with_torso(self):
282+
return self.larm_with_torso
272283

273284
@property
274285
def right_arm_end_coords(self):

0 commit comments

Comments
 (0)