@@ -377,9 +377,6 @@ def test_rotate(self):
377
377
r_pi_2 = [Affine3D ().rotate (np .pi / 2 , dim ) for dim in range (3 )]
378
378
r90 = [Affine3D ().rotate_deg (90 , dim ) for dim in range (3 )]
379
379
380
- for dim in range (3 ):
381
- assert_array_equal (r_pi_2 [dim ].get_matrix (), r90 [dim ].get_matrix ())
382
-
383
380
assert_array_almost_equal (r90 [0 ].transform (self .single_point ), [1 , - 1 , 1 ])
384
381
assert_array_almost_equal (r90 [1 ].transform (self .single_point ), [1 , 1 , - 1 ])
385
382
assert_array_almost_equal (r90 [2 ].transform (self .single_point ), [- 1 , 1 , 1 ])
@@ -394,9 +391,6 @@ def test_rotate(self):
394
391
r_pi = [Affine3D ().rotate (np .pi , dim ) for dim in range (3 )]
395
392
r180 = [Affine3D ().rotate_deg (180 , dim ) for dim in range (3 )]
396
393
397
- for dim in range (3 ):
398
- assert_array_equal (r_pi [dim ].get_matrix (), r180 [dim ].get_matrix ())
399
-
400
394
assert_array_almost_equal (r180 [0 ].transform (self .single_point ), [1 , - 1 , - 1 ])
401
395
assert_array_almost_equal (r180 [1 ].transform (self .single_point ), [- 1 , 1 , - 1 ])
402
396
assert_array_almost_equal (r180 [2 ].transform (self .single_point ), [- 1 , - 1 , 1 ])
@@ -411,9 +405,6 @@ def test_rotate(self):
411
405
r_pi_3_2 = [Affine3D ().rotate (3 * np .pi / 2 , dim ) for dim in range (3 )]
412
406
r270 = [Affine3D ().rotate_deg (270 , dim ) for dim in range (3 )]
413
407
414
- for dim in range (3 ):
415
- assert_array_equal (r_pi_3_2 [dim ].get_matrix (), r270 [dim ].get_matrix ())
416
-
417
408
assert_array_almost_equal (r270 [0 ].transform (self .single_point ), [1 , 1 , - 1 ])
418
409
assert_array_almost_equal (r270 [1 ].transform (self .single_point ), [- 1 , 1 , 1 ])
419
410
assert_array_almost_equal (r270 [2 ].transform (self .single_point ), [1 , - 1 , 1 ])
@@ -426,6 +417,9 @@ def test_rotate(self):
426
417
[0 , - 2 , 0 ], [3 , 0 , 0 ], [0 , 0 , 4 ], [5 , - 5 , 0 ], [6 , - 6 , 6 ]])
427
418
428
419
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 ())
429
423
assert_array_almost_equal (
430
424
(r90 [dim ] + r90 [dim ]).get_matrix (), r180 [dim ].get_matrix ())
431
425
assert_array_almost_equal (
@@ -436,35 +430,43 @@ def test_rotate_around(self):
436
430
for dim in range (3 )]
437
431
r90 = [Affine3D ().rotate_deg_around (* self .pivot , 90 , dim ) for dim in range (3 )]
438
432
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 ]])
441
439
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]])
445
440
446
441
r_pi = [Affine3D ().rotate_around (* self .pivot , np .pi , dim ) for dim in range (3 )]
447
442
r180 = [Affine3D ().rotate_deg_around (* self .pivot , 180 , dim ) for dim in range (3 )]
448
443
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 ]])
451
450
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]])
455
451
456
452
r_pi_3_2 = [Affine3D ().rotate_around (* self .pivot , 3 * np .pi / 2 , dim )
457
453
for dim in range (3 )]
458
454
r270 = [Affine3D ().rotate_deg_around (* self .pivot , 270 , dim ) for dim in range (3 )]
459
455
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 ]])
466
462
467
463
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 ())
468
470
assert_array_almost_equal (
469
471
(r90 [dim ] + r90 [dim ]).get_matrix (), r180 [dim ].get_matrix ())
470
472
assert_array_almost_equal (
0 commit comments