223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

consistently define allclose for own type only

This commit is contained in:
Martin Diehl 2022-02-15 22:08:12 +01:00
parent b1922c9fc0
commit 35caed305f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/damask/_orientation.py
View File

@ -168,8 +168,8 @@ class Orientation(Rotation,Crystal):
return np.logical_not(self==other) if isinstance(other, Orientation) else NotImplemented return np.logical_not(self==other) if isinstance(other, Orientation) else NotImplemented
def isclose(self, def isclose(self: MyType,
other: object, other: MyType,
rtol: float = 1e-5, rtol: float = 1e-5,
atol: float = 1e-8, atol: float = 1e-8,
equal_nan: bool = True) -> bool: equal_nan: bool = True) -> bool:
@ -193,8 +193,6 @@ class Orientation(Rotation,Crystal):
Mask indicating where corresponding orientations are close. Mask indicating where corresponding orientations are close.
""" """
if not isinstance(other, Orientation):
raise TypeError
matching_type = self.family == other.family and \ matching_type = self.family == other.family and \
self.lattice == other.lattice and \ self.lattice == other.lattice and \
self.parameters == other.parameters self.parameters == other.parameters
@ -202,8 +200,8 @@ class Orientation(Rotation,Crystal):
def allclose(self, def allclose(self: MyType,
other: object, other: MyType,
rtol: float = 1e-5, rtol: float = 1e-5,
atol: float = 1e-8, atol: float = 1e-8,
equal_nan: bool = True) -> bool: equal_nan: bool = True) -> bool:

8
python/damask/_rotation.py
View File

@ -140,8 +140,8 @@ class Rotation:
""" """
return np.logical_not(self==other) if isinstance(other, Rotation) else NotImplemented return np.logical_not(self==other) if isinstance(other, Rotation) else NotImplemented
def isclose(self, def isclose(self: MyType,
other: 'Rotation', other: MyType,
rtol: float = 1e-5, rtol: float = 1e-5,
atol: float = 1e-8, atol: float = 1e-8,
equal_nan: bool = True) -> bool: equal_nan: bool = True) -> bool:
@ -171,8 +171,8 @@ class Rotation:
np.all(np.isclose(s,-1.0*o,rtol,atol,equal_nan),axis=-1)) np.all(np.isclose(s,-1.0*o,rtol,atol,equal_nan),axis=-1))
def allclose(self, def allclose(self: MyType,
other: 'Rotation', other: MyType,
rtol: float = 1e-5, rtol: float = 1e-5,
atol: float = 1e-8, atol: float = 1e-8,
equal_nan: bool = True) -> Union[np.bool_, bool]: equal_nan: bool = True) -> Union[np.bool_, bool]: