8000 removed supressor · A905275/robotics-toolbox-python@c5457df · GitHub
[go: up one dir, main page]

Skip to content

Commit c5457df

Browse files
committed
removed supressor
1 parent b38d81f commit c5457df

File tree

4 files changed

+18
-320
lines changed

4 files changed

+18
-320
lines changed

roboticstoolbox/backends/VPython/stl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from io import StringIO
1010

1111
try:
12-
from roboticstoolbox.tools.stdout_supress import pipes
12+
from spatialgeometry.tools.stdout_supress import pipes
1313
except Exception: # pragma nocover
1414
from contextlib import contextmanager
1515

roboticstoolbox/tools/stdout_supress.py

Lines changed: 0 additions & 300 deletions
This file was deleted.

tests/test_ELink.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ def test_A2(self):
6262
ans = sm.SE3.Rx(np.pi) * sm.SE3.Ry(np.pi) * sm.SE3.Tz(1.2)
6363

6464
nt.assert_array_almost_equal(l0.A(1.2).A, ans.A)
65-
66-
with self.assertRaises(ValueError):
67-
l0.A()
65+
l0.A()
6866

6967
def test_qlim(self):
7068
l0 = rp.ELink(qlim=[-1, 1])
@@ -183,7 +181,6 @@ def test_collision(self):
183181
self.assertIsInstance(col, gm.Shape)
184182

185183
self.assertIsInstance(col.base, sm.SE3)
186-
self.assertIsInstance(col.scale, np.ndarray)
187184

188185
col.radius = 2
189186
self.assertEqual(col.radius, 2)
@@ -193,7 +190,7 @@ def test_collision(self):
193190

194191
def test_collision_fail(self):
195192
l0 = rp.ELink()
196-
col = rp.Box([1, 1, 1])
193+
col = gm.Box([1, 1, 1])
197194
l0.collision = col
198195

199196
with self.assertRaises(TypeError):
@@ -204,7 +201,7 @@ def test_collision_fail(self):
204201

205202
def test_geometry_fail(self):
206203
l0 = rp.ELink()
207-
col = rp.Box([1, 1, 1])
204+
col = gm.Box([1, 1, 1])
208205
l0.geometry = col
209206
l0.geometry = [col, col]
210207

@@ -215,8 +212,8 @@ def test_geometry_fail(self):
215212
l0.geometry = 1
216213

217214
def test_dist(self):
218-
s0 = rp.Box([1, 1, 1], sm.SE3(0, 0, 0))
219-
s1 = rp.Box([1, 1, 1], sm.SE3(3, 0, 0))
215+
s0 = gm.Box([1, 1, 1], base=sm.SE3(0, 0, 0))
216+
s1 = gm.Box([1, 1, 1], base=sm.SE3(3, 0, 0))
220217
p = rp.models.Panda()
221218
link = p.links[3]
222219

@@ -229,8 +226,8 @@ def test_dist(self):
229226
self.assertAlmostEqual(d2, None)
230227

231228
def test_collided(self):
232-
s0 = rp.Box([1, 1, 1], sm.SE3(0, 0, 0))
233-
s1 = rp.Box([1, 1, 1], sm.SE3(3, 0, 0))
229+
s0 = gm.Box([1, 1, 1], base=sm.SE3(0, 0, 0))
230+
s1 = gm.Box([1, 1, 1], base=sm.SE3(3, 0, 0))
234231
p = rp.models.Panda()
235232
link = p.links[3]
236233
c0 = link.collided(s0)

0 commit comments

Comments
 (0)
0