Skip to content

Commit f238702

Browse files
committed
even more allclose
1 parent b3db0eb commit f238702

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

src/compas/geometry/primitives/frame.py

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
from __future__ import print_function
22

3-
import math
4-
5-
from compas.geometry import cross_vectors
6-
from compas.geometry import subtract_vectors
7-
from compas.geometry import matrix_from_basis_vectors
8-
from compas.geometry import basis_vectors_from_matrix
9-
from compas.geometry import quaternion_from_matrix
10-
from compas.geometry import matrix_from_quaternion
3+
from compas.geometry import allclose
4+
from compas.geometry import argmax
115
from compas.geometry import axis_angle_vector_from_matrix
12-
from compas.geometry import matrix_from_axis_angle_vector
6+
from compas.geometry import basis_vectors_from_matrix
7+
from compas.geometry import cross_vectors
8+
from compas.geometry import decompose_matrix
139
from compas.geometry import euler_angles_from_matrix
10+
from compas.geometry import matrix_from_axis_angle_vector
11+
from compas.geometry import matrix_from_basis_vectors
1412
from compas.geometry import matrix_from_euler_angles
15-
from compas.geometry import decompose_matrix
13+
from compas.geometry import matrix_from_quaternion
14+
from compas.geometry import quaternion_from_matrix
15+
from compas.geometry import subtract_vectors
1616
from compas.geometry import Transformation
17-
from compas.geometry import argmax
1817

19-
from compas.geometry.primitives import Primitive
2018
from compas.geometry.primitives import Point
21-
from compas.geometry.primitives import Vector
19+
from compas.geometry.primitives import Primitive
2220
from compas.geometry.primitives import Quaternion
21+
from compas.geometry.primitives import Vector
2322

2423
__all__ = ['Frame']
2524

@@ -182,11 +181,7 @@ def __iter__(self):
182181
def __eq__(self, other, tol=1e-05):
183182
if not hasattr(other, '__iter__') or not hasattr(other, '__len__') or len(self) != len(other):
184183
return False
185-
for v1, v2 in zip(self, other):
186-
for a, b in zip(v1, v2):
187-
if math.fabs(a - b) > tol:
188-
return False
189-
return True
184+
return allclose(self, other)
190185

191186
# ==========================================================================
192187
# constructors
@@ -744,5 +739,4 @@ def transform(self, T):
744739
if __name__ == '__main__':
745740

746741
import doctest
747-
from compas.geometry import allclose # noqa: F401
748742
doctest.testmod(globs=globals())

0 commit comments

Comments
 (0)