Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2804271

Browse filesBrowse files
committed
complete test_rotate_around [skip ci]
1 parent 4ea7cce commit 2804271
Copy full SHA for 2804271

File tree

1 file changed

+27
-25
lines changed
Filter options

1 file changed

+27
-25
lines changed

‎lib/matplotlib/tests/test_transforms.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_transforms.py
+27-25Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -377,9 +377,6 @@ def test_rotate(self):
377377
r_pi_2 = [Affine3D().rotate(np.pi / 2, dim) for dim in range(3)]
378378
r90 = [Affine3D().rotate_deg(90, dim) for dim in range(3)]
379379

380-
for dim in range(3):
381-
assert_array_equal(r_pi_2[dim].get_matrix(), r90[dim].get_matrix())
382-
383380
assert_array_almost_equal(r90[0].transform(self.single_point), [1, -1, 1])
384381
assert_array_almost_equal(r90[1].transform(self.single_point), [1, 1, -1])
385382
assert_array_almost_equal(r90[2].transform(self.single_point), [-1, 1, 1])
@@ -394,9 +391,6 @@ def test_rotate(self):
394391
r_pi = [Affine3D().rotate(np.pi, dim) for dim in range(3)]
395392
r180 = [Affine3D().rotate_deg(180, dim) for dim in range(3)]
396393

397-
for dim in range(3):
398-
assert_array_equal(r_pi[dim].get_matrix(), r180[dim].get_matrix())
399-
400394
assert_array_almost_equal(r180[0].transform(self.single_point), [1, -1, -1])
401395
assert_array_almost_equal(r180[1].transform(self.single_point), [-1, 1, -1])
402396
assert_array_almost_equal(r180[2].transform(self.single_point), [-1, -1, 1])
@@ -411,9 +405,6 @@ def test_rotate(self):
411405
r_pi_3_2 = [Affine3D().rotate(3 * np.pi / 2, dim) for dim in range(3)]
412406
r270 = [Affine3D().rotate_deg(270, dim) for dim in range(3)]
413407

414-
for dim in range(3):
415-
assert_array_equal(r_pi_3_2[dim].get_matrix(), r270[dim].get_matrix())
416-
417408
assert_array_almost_equal(r270[0].transform(self.single_point), [1, 1, -1])
418409
assert_array_almost_equal(r270[1].transform(self.single_point), [-1, 1, 1])
419410
assert_array_almost_equal(r270[2].transform(self.single_point), [1, -1, 1])
@@ -426,6 +417,9 @@ def test_rotate(self):
426417
[0, -2, 0], [3, 0, 0], [0, 0, 4], [5, -5, 0], [6, -6, 6]])
427418

428419
for dim in range(3):
420+
assert_array_equal(r_pi_2[dim].get_matrix(), r90[dim].get_matrix())
421+
assert_array_equal(r_pi[dim].get_matrix(), r180[dim].get_matrix())
422+
assert_array_equal(r_pi_3_2[dim].get_matrix(), r270[dim].get_matrix())
429423
assert_array_almost_equal(
430424
(r90[dim] + r90[dim]).get_matrix(), r180[dim].get_matrix())
431425
assert_array_almost_equal(
@@ -436,35 +430,43 @@ def test_rotate_around(self):
436430
for dim in range(3)]
437431
r90 = [Affine3D().rotate_deg_around(*self.pivot, 90, dim) for dim in range(3)]
438432

439-
for dim in range(3):
440-
assert_array_equal(r_pi_2[dim].get_matrix(), r90[dim].get_matrix())
433+
assert_array_almost_equal(r90[0].transform(self.multiple_points), [
434+
[2, 2, 0], [0, 2, 3], [0, -2, 0], [5, 2, 5], [6, -4, 6]])
435+
assert_array_almost_equal(r90[1].transform(self.multiple_points), [
436+
[0, 0, 0], [0, 3, 2], [4, 0, 2], [0, 5, -3], [6, 6, -4]])
437+
assert_array_almost_equal(r90[2].transform(self.multiple_points), [
438+
[2, 2, 0], [-1, 0, 0], [2, 0, 4], [-3, 5, 0], [-4, 6, 6]])
441439

442-
# assert_array_almost_equal(r90.transform(self.single_point), [1, 1])
443-
# assert_array_almost_equal(r90.transform(self.multiple_points),
444-
# [[0, 0], [-1, 3], [2, 4]])
445440

446441
r_pi = [Affine3D().rotate_around(*self.pivot, np.pi, dim) for dim in range(3)]
447442
r180 = [Affine3D().rotate_deg_around(*self.pivot, 180, dim) for dim in range(3)]
448443

449-
for dim in range(3):
450-
assert_array_equal(r_pi[dim].get_matrix(), r180[dim].get_matrix())
444+
assert_array_almost_equal(r180[0].transform(self.multiple_points), [
445+
[2, 2, 2], [0, -1, 2], [0, 2, -2], [5, -3, 2], [6, -4, -4]])
446+
assert_array_almost_equal(r180[1].transform(self.multiple_points), [
447+
[0, 0, 2], [2, 3, 2], [2, 0, -2], [-3, 5, 2], [-4, 6, -4]])
448+
assert_array_almost_equal(r180[2].transform(self.multiple_points), [
449+
[0, 2, 0], [2, -1, 0], [2, 2, 4], [-3, -3, 0], [-4, -4, 6]])
451450

452-
# assert_array_almost_equal(r180.transform(self.single_point), [1, 1])
453-
# assert_array_almost_equal(r180.transform(self.multiple_points),
454-
# [[2, 0], [-1, -1], [-2, 2]])
455451

456452
r_pi_3_2 = [Affine3D().rotate_around(*self.pivot, 3 * np.pi / 2, dim)
457453
for dim in range(3)]
458454
r270 = [Affine3D().rotate_deg_around(*self.pivot, 270, dim) for dim in range(3)]
459455

460-
for dim in range(3):
461-
assert_array_equal(r_pi_3_2[dim].get_matrix(), r270[dim].get_matrix())
462-
463-
# assert_array_almost_equal(r270.transform(self.single_point), [1, 1])
464-
# assert_array_almost_equal(r270.transform(self.multiple_points),
465-
# [[2, 2], [3, -1], [0, -2]])
456+
assert_array_almost_equal(r270[0].transform(self.multiple_points), [
457+
[2, 0, 2], [0, 0, -1], [0, 4, 2], [5, 0, -3], [6, 6, -4]])
458+
assert_array_almost_equal(r270[1].transform(self.multiple_points), [
459+
[2, 0, 2], [2, 3, 0], [-2, 0, 0], [2, 5, 5], [-4, 6, 6]])
460+
assert_array_almost_equal(r270[2].transform(self.multiple_points), [
461+
[0, 0, 0], [3, 2, 0], [0, 2, 4], [5, -3, 0], [6, -4, 6]])
466462

467463
for dim in range(3):
464+
assert_array_almost_equal(r90[dim].transform(self.single_point), [1, 1, 1])
465+
assert_array_almost_equal(r180[dim].transform(self.single_point), [1, 1, 1])
466+
assert_array_almost_equal(r270[dim].transform(self.single_point), [1, 1, 1])
467+
assert_array_equal(r_pi_2[dim].get_matrix(), r90[dim].get_matrix())
468+
assert_array_equal(r_pi[dim].get_matrix(), r180[dim].get_matrix())
469+
assert_array_equal(r_pi_3_2[dim].get_matrix(), r270[dim].get_matrix())
468470
assert_array_almost_equal(
469471
(r90[dim] + r90[dim]).get_matrix(), r180[dim].get_matrix())
470472
assert_array_almost_equal(

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.