From 8c3f56e9489107860ab4a0824fe68ccd6eba989b Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 14 Jul 2017 11:34:17 +0100
Subject: [PATCH] transform tests - scaleOffsetXform should accept tuples, and
compose should accept rotation matrix
---
tests/test_transform.py | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/tests/test_transform.py b/tests/test_transform.py
index e8b2d3422..2913b5cb7 100644
--- a/tests/test_transform.py
+++ b/tests/test_transform.py
@@ -108,9 +108,11 @@ def test_scaleOffsetXform():
expected = [[float(v) for v in l.split()] for l in expected]
expected = np.array(expected)
- result = transform.scaleOffsetXform(scales, offsets)
+ result1 = transform.scaleOffsetXform( scales, offsets)
+ result2 = transform.scaleOffsetXform(tuple(scales), tuple(offsets))
- assert np.all(np.isclose(result, expected))
+ assert np.all(np.isclose(result1, expected))
+ assert np.all(np.isclose(result2, expected))
def test_compose_and_decompose():
@@ -138,6 +140,19 @@ def test_compose_and_decompose():
assert np.all(np.isclose(xform, result, atol=1e-5))
+ # compose should also accept a rotation matrix
+ rots = [np.pi / 5, np.pi / 4, np.pi / 3]
+ rmat = transform.axisAnglesToRotMat(*rots)
+ xform = transform.compose([1, 1, 1], [0, 0, 0], rmat)
+ sc, of, rot = transform.decompose(xform)
+ sc = np.array(sc)
+ of = np.array(of)
+ rot = np.array(rot)
+
+ assert np.all(sc == [1, 1, 1])
+ assert np.all(of == [0, 0, 0])
+ assert np.all(np.isclose(rot, rots))
+
def test_axisBounds():
testfile = op.join(datadir, 'test_transform_test_axisBounds.txt')
--
GitLab