Skip to content

Commit 8e0bbd2

Browse files
committed
[dartpy] Format code using black
1 parent 9c33040 commit 8e0bbd2

File tree

30 files changed

+568
-5065
lines changed

30 files changed

+568
-5065
lines changed

pixi.lock

Lines changed: 260 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ pkg-config = ">=0.29.2,<0.30"
3434
pytest = ">=8.1.1,<8.2"
3535
doxygen = ">=1.10.0,<1.11"
3636
setuptools = ">=69.1.1,<69.2"
37+
black = ">=24.2.0,<24.3"
38+
isort = ">=5.13.2,<5.14"
3739

3840
[target.linux-64.dependencies]
3941
freeglut = ">=3.2.2,<3.3"

python/examples/biped_stand/main.py

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ def __init__(self, world, skel):
4141
self.world = world
4242
self.skel = skel
4343
self.dofs = self.skel.getNumDofs()
44-
self.left_heel = self.skel.getBodyNode('h_heel_left')
44+
self.left_heel = self.skel.getBodyNode("h_heel_left")
4545
self.left_foot = [
46-
self.skel.getDof('j_heel_left_1').getIndexInSkeleton(),
47-
self.skel.getDof('j_toe_left').getIndexInSkeleton(),
46+
self.skel.getDof("j_heel_left_1").getIndexInSkeleton(),
47+
self.skel.getDof("j_toe_left").getIndexInSkeleton(),
4848
]
4949
self.right_foot = [
50-
self.skel.getDof('j_heel_right_1').getIndexInSkeleton(),
51-
self.skel.getDof('j_toe_right').getIndexInSkeleton(),
50+
self.skel.getDof("j_heel_right_1").getIndexInSkeleton(),
51+
self.skel.getDof("j_toe_right").getIndexInSkeleton(),
5252
]
5353
self.timestep = world.getTimeStep()
5454
self.Kp = np.eye(self.dofs)
@@ -83,15 +83,17 @@ def __init__(self, world, skel):
8383
self.world.addSimpleFrame(self.ext_force_simple_frame)
8484

8585
def customPreStep(self):
86-
q = self.skel.getPositions();
87-
dq = self.skel.getVelocities();
86+
q = self.skel.getPositions()
87+
dq = self.skel.getVelocities()
8888
constraint_forces = self.skel.getConstraintForces()
8989

9090
# SPD tracking
9191
invM = np.linalg.inv(self.skel.getMassMatrix() + self.Kd * self.timestep)
9292
p = np.matmul(-self.Kp, q + dq * self.timestep - self.q_d)
9393
d = np.matmul(-self.Kd, dq)
94-
ddq = np.matmul(invM, -self.skel.getCoriolisAndGravityForces() + p + d + constraint_forces)
94+
ddq = np.matmul(
95+
invM, -self.skel.getCoriolisAndGravityForces() + p + d + constraint_forces
96+
)
9597

9698
self.torques = p + d + np.matmul(-self.Kd, ddq) * self.timestep
9799

@@ -101,21 +103,37 @@ def customPreStep(self):
101103

102104
offset = com[0] - cop[0]
103105
if offset < 0.1 and offset > 0.0:
104-
k1 = 200
105-
k2 = 100
106-
kd = 10
107-
self.torques[self.left_foot[0]] += -k1 * offset + kd * (self.pre_offset - offset)
108-
self.torques[self.left_foot[1]] += -k2 * offset + kd * (self.pre_offset - offset)
109-
self.torques[self.right_foot[0]] += -k1 * offset + kd * (self.pre_offset - offset)
110-
self.torques[self.right_foot[1]] += -k2 * offset + kd * (self.pre_offset - offset)
106+
k1 = 200
107+
k2 = 100
108+
kd = 10
109+
self.torques[self.left_foot[0]] += -k1 * offset + kd * (
110+
self.pre_offset - offset
111+
)
112+
self.torques[self.left_foot[1]] += -k2 * offset + kd * (
113+
self.pre_offset - offset
114+
)
115+
self.torques[self.right_foot[0]] += -k1 * offset + kd * (
116+
self.pre_offset - offset
117+
)
118+
self.torques[self.right_foot[1]] += -k2 * offset + kd * (
119+
self.pre_offset - offset
120+
)
111121
elif offset > -0.2 and offset < -0.05:
112122
k1 = 2000
113123
k2 = 100
114124
kd = 100
115-
self.torques[self.left_foot[0]] += -k1 * offset + kd * (self.pre_offset - offset)
116-
self.torques[self.left_foot[1]] += -k2 * offset + kd * (self.pre_offset - offset)
117-
self.torques[self.right_foot[0]] += -k1 * offset + kd * (self.pre_offset - offset)
118-
self.torques[self.right_foot[1]] += -k2 * offset + kd * (self.pre_offset - offset)
125+
self.torques[self.left_foot[0]] += -k1 * offset + kd * (
126+
self.pre_offset - offset
127+
)
128+
self.torques[self.left_foot[1]] += -k2 * offset + kd * (
129+
self.pre_offset - offset
130+
)
131+
self.torques[self.right_foot[0]] += -k1 * offset + kd * (
132+
self.pre_offset - offset
133+
)
134+
self.torques[self.right_foot[1]] += -k2 * offset + kd * (
135+
self.pre_offset - offset
136+
)
119137

120138
# Just to make sure no illegal torque is used
121139
for i in range(6):
@@ -128,7 +146,7 @@ def customPreStep(self):
128146
if self.ext_force_duration <= 0:
129147
self.ext_force_duration = 0
130148
self.ext_force = np.zeros(3)
131-
spine = self.skel.getBodyNode('h_spine')
149+
spine = self.skel.getBodyNode("h_spine")
132150
spine.addExtForce(self.ext_force)
133151
if self.ext_force_duration > 0:
134152
arrow_head = spine.getTransform().translation()
@@ -149,18 +167,18 @@ def external_force(self):
149167

150168

151169
def main():
152-
world = dart.utils.SkelParser.readWorld('dart://sample/skel/fullbody1.skel')
170+
world = dart.utils.SkelParser.readWorld("dart://sample/skel/fullbody1.skel")
153171
world.setGravity([0, -9.81, 0])
154172

155-
biped = world.getSkeleton('fullbody1')
156-
biped.getDof('j_pelvis_rot_y').setPosition(-0.20)
157-
biped.getDof('j_thigh_left_z').setPosition(0.15)
158-
biped.getDof('j_shin_left').setPosition(-0.40)
159-
biped.getDof('j_heel_left_1').setPosition(0.25)
160-
biped.getDof('j_thigh_right_z').setPosition(0.15)
161-
biped.getDof('j_shin_right').setPosition(-0.40)
162-
biped.getDof('j_heel_right_1').setPosition(0.25)
163-
biped.getDof('j_abdomen_2').setPosition(0.00)
173+
biped = world.getSkeleton("fullbody1")
174+
biped.getDof("j_pelvis_rot_y").setPosition(-0.20)
175+
biped.getDof("j_thigh_left_z").setPosition(0.15)
176+
biped.getDof("j_shin_left").setPosition(-0.40)
177+
biped.getDof("j_heel_left_1").setPosition(0.25)
178+
biped.getDof("j_thigh_right_z").setPosition(0.15)
179+
biped.getDof("j_shin_right").setPosition(-0.40)
180+
biped.getDof("j_heel_right_1").setPosition(0.25)
181+
biped.getDof("j_abdomen_2").setPosition(0.00)
164182

165183
node = MyWorldNode(world, biped)
166184

python/examples/contacts_pointcloud/main.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212

1313
class ContactVisualizingNode(dart.gui.osg.RealTimeWorldNode):
14-
""" WorldNode subclass, which extracts the contacts of the last simulation
14+
"""WorldNode subclass, which extracts the contacts of the last simulation
1515
step and adds them to a pointloud for visualization.
1616
1717
Note: Simulation must run for the contacts to be displayed.
@@ -36,14 +36,11 @@ def customPreRefresh(self):
3636
self._pointCloudShape.setPoint(contactPoints)
3737

3838
def _getListOfContactPoints(self):
39-
return [
40-
c.point
41-
for c in self.getWorld().getLastCollisionResult().getContacts()
42-
]
39+
return [c.point for c in self.getWorld().getLastCollisionResult().getContacts()]
4340

4441

4542
def setAlpha(skeleton, alphaValue):
46-
""" setAlpha(skeleton : dartpy.dynamics.Skeleton, alphaValue : float) -> None
43+
"""setAlpha(skeleton : dartpy.dynamics.Skeleton, alphaValue : float) -> None
4744
4845
sets the transparency (alpha) value for each body node of the skeleton,
4946
assuming that the VisualAspect is contained within the first ShapeNode

python/examples/drag_and_drop/main.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,32 @@ def main():
99

1010
tf.set_translation([4, -4, 0])
1111
frame = dart.gui.osg.InteractiveFrame(
12-
dart.dynamics.Frame.World(), 'interactive frame', tf, 2)
12+
dart.dynamics.Frame.World(), "interactive frame", tf, 2
13+
)
1314
world.addSimpleFrame(frame)
1415

1516
tf.set_translation([-4, 4, 0])
16-
draggable = dart.dynamics.SimpleFrame(frame, 'draggable', tf)
17+
draggable = dart.dynamics.SimpleFrame(frame, "draggable", tf)
1718
draggable.setShape(dart.dynamics.BoxShape([1, 1, 1]))
1819
draggable.getVisualAspect(True).setColor([0.9, 0, 0])
1920
world.addSimpleFrame(draggable)
2021

2122
tf.set_translation([8, 0, 0])
22-
x_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), 'X', tf)
23+
x_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), "X", tf)
2324
x_shape = dart.dynamics.BoxShape([0.2, 0.2, 0.2])
2425
x_marker.setShape(x_shape)
2526
x_marker.getVisualAspect(True).setColor([0.9, 0, 0])
2627
world.addSimpleFrame(x_marker)
2728

2829
tf.set_translation([0, 8, 0])
29-
y_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), 'Y', tf)
30+
y_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), "Y", tf)
3031
y_shape = dart.dynamics.BoxShape([0.2, 0.2, 0.2])
3132
y_marker.setShape(y_shape)
3233
y_marker.getVisualAspect(True).setColor([0, 0.9, 0])
3334
world.addSimpleFrame(y_marker)
3435

3536
tf.set_translation([0, 0, 8])
36-
z_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), 'Z', tf)
37+
z_marker = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), "Z", tf)
3738
z_shape = dart.dynamics.BoxShape([0.2, 0.2, 0.2])
3839
z_marker.setShape(z_shape)
3940
z_marker.getVisualAspect(True).setColor([0, 0, 0.9])

python/examples/hello_world/main.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ def main():
99
ground = urdfParser.parseSkeleton("dart://sample/urdf/KR5/ground.urdf")
1010
world.addSkeleton(kr5)
1111
world.addSkeleton(ground)
12-
print('Robot {} is loaded'.format(kr5.getName()))
12+
print("Robot {} is loaded".format(kr5.getName()))
1313

1414
for i in range(100):
1515
if i % 10 == 0:
16-
print('[{}] joint position: {}'.format(world.getSimFrames(), kr5.getPositions()))
16+
print(
17+
"[{}] joint position: {}".format(
18+
world.getSimFrames(), kr5.getPositions()
19+
)
20+
)
1721
world.step()
1822

1923

python/examples/hello_world_gui/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ def main():
5151
viewer.addAttachment(grid)
5252

5353
viewer.setUpViewInWindow(0, 0, 640, 480)
54-
viewer.setCameraHomePosition([2.0, 1.0, 2.0],
55-
[0.00, 0.00, 0.00],
56-
[-0.24, 0.94, -0.25])
54+
viewer.setCameraHomePosition(
55+
[2.0, 1.0, 2.0], [0.00, 0.00, 0.00], [-0.24, 0.94, -0.25]
56+
)
5757
viewer.run()
5858

5959

python/examples/operational_space_control/main.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@ def __init__(self, world, kr5):
77
super(HelloWorldNode, self).__init__(world)
88
self.kr5 = kr5
99
self.dofs = self.kr5.getNumDofs()
10-
self.ee = kr5.getBodyNode('palm')
10+
self.ee = kr5.getBodyNode("palm")
1111
self.Kp = np.eye(3) * 50.0
1212
self.Kd = np.eye(self.dofs) * 5.0
1313
self.ee_offset = [0.05, 0, 0]
1414

1515
tf = self.ee.getTransform()
1616
tf.pretranslate(self.ee_offset)
17-
self.target = dart.dynamics.SimpleFrame(dart.dynamics.Frame.World(), "target", tf)
17+
self.target = dart.dynamics.SimpleFrame(
18+
dart.dynamics.Frame.World(), "target", tf
19+
)
1820

1921
def customPreStep(self):
2022
M = self.kr5.getMassMatrix()
2123

2224
J = self.ee.getLinearJacobian()
23-
Jt = J.transpose();
25+
Jt = J.transpose()
2426
JJt = np.matmul(J, Jt)
2527
kI = 0.0025 * np.eye(3)
2628
invJ = np.matmul(Jt, np.linalg.inv(JJt + kI))
@@ -30,7 +32,10 @@ def customPreStep(self):
3032
dJdJt = np.matmul(dJ, dJt)
3133
invdJ = np.matmul(dJt, np.linalg.inv(dJdJt + kI))
3234

33-
e = self.target.getTransform().translation() - self.ee.getTransform().translation()
35+
e = (
36+
self.target.getTransform().translation()
37+
- self.ee.getTransform().translation()
38+
)
3439
de = -self.ee.getLinearVelocity()
3540

3641
cg = self.kr5.getCoriolisAndGravityForces()
@@ -70,9 +75,9 @@ def main():
7075
viewer.addAttachment(grid)
7176

7277
viewer.setUpViewInWindow(0, 0, 640, 480)
73-
viewer.setCameraHomePosition([2.0, 1.0, 2.0],
74-
[0.00, 0.00, 0.00],
75-
[-0.24, 0.94, -0.25])
78+
viewer.setCameraHomePosition(
79+
[2.0, 1.0, 2.0], [0.00, 0.00, 0.00], [-0.24, 0.94, -0.25]
80+
)
7681
viewer.run()
7782

7883

python/examples/rigid_chain/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ def main():
4545
viewer.run()
4646

4747

48-
if __name__== "__main__":
48+
if __name__ == "__main__":
4949
main()

python/examples/rigid_cubes/main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ def main():
1414
world = dart.utils.SkelParser.readWorld("dart://sample/skel/cubes.skel")
1515
world.setGravity([0, -9.81, 0])
1616

17-
1817
viewer = dart.gui.osg.Viewer()
1918
shadow = dart.gui.osg.WorldNode.createDefaultShadowTechnique(viewer)
2019

@@ -26,5 +25,5 @@ def main():
2625
viewer.run()
2726

2827

29-
if __name__== "__main__":
28+
if __name__ == "__main__":
3029
main()

0 commit comments

Comments
 (0)