no 'dangling' functions
@staticmethod is what we need here
This commit is contained in:
Martin Diehl
parent
1e1cb3f151
commit
c84a6e90c9
|
|
@ -4,6 +4,13 @@ from . import Lambert
|
|||
|
||||
P = -1
|
||||
|
||||
def isone(a):
|
||||
return np.isclose(a,1.0,atol=1.0e-7,rtol=0.0)
|
||||
|
||||
def iszero(a):
|
||||
return np.isclose(a,0.0,atol=1.0e-12,rtol=0.0)
|
||||
|
||||
|
||||
####################################################################################################
|
||||
class Rotation:
|
||||
u"""
|
||||
|
|
@ -183,7 +190,7 @@ class Rotation:
|
|||
return angles in degrees.
|
||||
|
||||
"""
|
||||
eu = qu2eu(self.quaternion)
|
||||
eu = Rotation.qu2eu(self.quaternion)
|
||||
if degrees: eu = np.degrees(eu)
|
||||
return eu
|
||||
|
||||
|
|
@ -201,13 +208,13 @@ class Rotation:
|
|||
return tuple of axis and angle.
|
||||
|
||||
"""
|
||||
ax = qu2ax(self.quaternion)
|
||||
ax = Rotation.qu2ax(self.quaternion)
|
||||
if degrees: ax[3] = np.degrees(ax[3])
|
||||
return (ax[:3],np.degrees(ax[3])) if pair else ax
|
||||
|
||||
def asMatrix(self):
|
||||
"""Rotation matrix."""
|
||||
return qu2om(self.quaternion)
|
||||
return Rotation.qu2om(self.quaternion)
|
||||
|
||||
def asRodrigues(self,
|
||||
vector = False):
|
||||
|
|
@ -221,16 +228,16 @@ class Rotation:
|
|||
return as actual Rodrigues--Frank vector, i.e. rotation axis scaled by tan(ω/2).
|
||||
|
||||
"""
|
||||
ro = qu2ro(self.quaternion)
|
||||
ro = Rotation.qu2ro(self.quaternion)
|
||||
return ro[:3]*ro[3] if vector else ro
|
||||
|
||||
def asHomochoric(self):
|
||||
"""Homochoric vector: (h_1, h_2, h_3)."""
|
||||
return qu2ho(self.quaternion)
|
||||
return Rotation.qu2ho(self.quaternion)
|
||||
|
||||
def asCubochoric(self):
|
||||
"""Cubochoric vector: (c_1, c_2, c_3)."""
|
||||
return qu2cu(self.quaternion)
|
||||
return Rotation.qu2cu(self.quaternion)
|
||||
|
||||
def asM(self):
|
||||
"""
|
||||
|
|
@ -276,7 +283,7 @@ class Rotation:
|
|||
if np.any(eu < 0.0) or np.any(eu > 2.0*np.pi) or eu[1] > np.pi:
|
||||
raise ValueError('Euler angles outside of [0..2π],[0..π],[0..2π].\n{} {} {}.'.format(*eu))
|
||||
|
||||
return Rotation(eu2qu(eu))
|
||||
return Rotation(Rotation.eu2qu(eu))
|
||||
|
||||
@staticmethod
|
||||
def fromAxisAngle(angleAxis,
|
||||
|
|
@ -294,7 +301,7 @@ class Rotation:
|
|||
if not np.isclose(np.linalg.norm(ax[0:3]), 1.0):
|
||||
raise ValueError('Axis angle rotation axis is not of unit length.\n{} {} {}'.format(*ax[0:3]))
|
||||
|
||||
return Rotation(ax2qu(ax))
|
||||
return Rotation(Rotation.ax2qu(ax))
|
||||
|
||||
@staticmethod
|
||||
def fromBasis(basis,
|
||||
|
|
@ -316,7 +323,7 @@ class Rotation:
|
|||
or not np.isclose(np.dot(om[2],om[0]), 0.0):
|
||||
raise ValueError('matrix is not orthogonal.\n{}'.format(om))
|
||||
|
||||
return Rotation(om2qu(om))
|
||||
return Rotation(Rotation.om2qu(om))
|
||||
|
||||
@staticmethod
|
||||
def fromMatrix(om,
|
||||
|
|
@ -338,7 +345,7 @@ class Rotation:
|
|||
if ro[3] < 0.0:
|
||||
raise ValueError('Rodriques rotation angle not positive.\n'.format(ro[3]))
|
||||
|
||||
return Rotation(ro2qu(ro))
|
||||
return Rotation(Rotation.ro2qu(ro))
|
||||
|
||||
@staticmethod
|
||||
def fromHomochoric(homochoric,
|
||||
|
|
@ -348,7 +355,7 @@ class Rotation:
|
|||
else np.array(homochoric,dtype=float)
|
||||
if P > 0: ho *= -1 # convert from P=1 to P=-1
|
||||
|
||||
return Rotation(ho2qu(ho))
|
||||
return Rotation(Rotation.ho2qu(ho))
|
||||
|
||||
@staticmethod
|
||||
def fromCubochoric(cubochoric,
|
||||
|
|
@ -356,10 +363,10 @@ class Rotation:
|
|||
|
||||
cu = cubochoric if isinstance(cubochoric, np.ndarray) and cubochoric.dtype == np.dtype(float) \
|
||||
else np.array(cubochoric,dtype=float)
|
||||
ho = cu2ho(cu)
|
||||
ho = Rotation.cu2ho(cu)
|
||||
if P > 0: ho *= -1 # convert from P=1 to P=-1
|
||||
|
||||
return Rotation(ho2qu(ho))
|
||||
return Rotation(Rotation.ho2qu(ho))
|
||||
|
||||
|
||||
@staticmethod
|
||||
|
|
@ -437,16 +444,9 @@ class Rotation:
|
|||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
####################################################################################################
|
||||
|
||||
def isone(a):
|
||||
return np.isclose(a,1.0,atol=1.0e-7,rtol=0.0)
|
||||
|
||||
def iszero(a):
|
||||
return np.isclose(a,0.0,atol=1.0e-12,rtol=0.0)
|
||||
|
||||
#---------- Quaternion ----------
|
||||
|
||||
def qu2om(qu):
|
||||
#---------- Quaternion ----------
|
||||
@staticmethod
|
||||
def qu2om(qu):
|
||||
"""Quaternion to rotation matrix."""
|
||||
qq = qu[0]**2-(qu[1]**2 + qu[2]**2 + qu[3]**2)
|
||||
om = np.diag(qq + 2.0*np.array([qu[1],qu[2],qu[3]])**2)
|
||||
|
|
@ -459,8 +459,8 @@ def qu2om(qu):
|
|||
om[2,0] = 2.0*(qu[3]*qu[1]-qu[0]*qu[2])
|
||||
return om if P > 0.0 else om.T
|
||||
|
||||
|
||||
def qu2eu(qu):
|
||||
@staticmethod
|
||||
def qu2eu(qu):
|
||||
"""Quaternion to Bunge-Euler angles."""
|
||||
q03 = qu[0]**2+qu[3]**2
|
||||
q12 = qu[1]**2+qu[2]**2
|
||||
|
|
@ -478,8 +478,8 @@ def qu2eu(qu):
|
|||
eu = np.where(eu<0, (eu+2.0*np.pi)%np.array([2.0*np.pi,np.pi,2.0*np.pi]),eu)
|
||||
return eu
|
||||
|
||||
|
||||
def qu2ax(qu):
|
||||
@staticmethod
|
||||
def qu2ax(qu):
|
||||
"""
|
||||
Quaternion to axis angle pair.
|
||||
|
||||
|
|
@ -496,8 +496,8 @@ def qu2ax(qu):
|
|||
|
||||
return np.array(ax)
|
||||
|
||||
|
||||
def qu2ro(qu):
|
||||
@staticmethod
|
||||
def qu2ro(qu):
|
||||
"""Quaternion to Rodriques-Frank vector."""
|
||||
if iszero(qu[0]):
|
||||
ro = [qu[1], qu[2], qu[3], np.inf]
|
||||
|
|
@ -508,8 +508,8 @@ def qu2ro(qu):
|
|||
|
||||
return np.array(ro)
|
||||
|
||||
|
||||
def qu2ho(qu):
|
||||
@staticmethod
|
||||
def qu2ho(qu):
|
||||
"""Quaternion to homochoric vector."""
|
||||
omega = 2.0 * np.arccos(np.clip(qu[0],-1.0,1.0)) # avoid numerical difficulties
|
||||
|
||||
|
|
@ -522,24 +522,24 @@ def qu2ho(qu):
|
|||
|
||||
return ho
|
||||
|
||||
|
||||
def qu2cu(qu):
|
||||
@staticmethod
|
||||
def qu2cu(qu):
|
||||
"""Quaternion to cubochoric vector."""
|
||||
return ho2cu(qu2ho(qu))
|
||||
return Rotation.ho2cu(Rotation.qu2ho(qu))
|
||||
|
||||
|
||||
#---------- Rotation matrix ----------
|
||||
|
||||
def om2qu(om):
|
||||
#---------- Rotation matrix ----------
|
||||
@staticmethod
|
||||
def om2qu(om):
|
||||
"""
|
||||
Rotation matrix to quaternion.
|
||||
|
||||
The original formulation (direct conversion) had (numerical?) issues
|
||||
"""
|
||||
return eu2qu(om2eu(om))
|
||||
return Rotation.eu2qu(Rotation.om2eu(om))
|
||||
|
||||
|
||||
def om2eu(om):
|
||||
@staticmethod
|
||||
def om2eu(om):
|
||||
"""Rotation matrix to Bunge-Euler angles."""
|
||||
if abs(om[2,2]) < 1.0:
|
||||
zeta = 1.0/np.sqrt(1.0-om[2,2]**2)
|
||||
|
|
@ -553,8 +553,8 @@ def om2eu(om):
|
|||
eu = np.where(eu<0, (eu+2.0*np.pi)%np.array([2.0*np.pi,np.pi,2.0*np.pi]),eu)
|
||||
return eu
|
||||
|
||||
|
||||
def om2ax(om):
|
||||
@staticmethod
|
||||
def om2ax(om):
|
||||
"""Rotation matrix to axis angle pair."""
|
||||
ax=np.empty(4)
|
||||
|
||||
|
|
@ -574,25 +574,25 @@ def om2ax(om):
|
|||
|
||||
return np.array(ax)
|
||||
|
||||
|
||||
def om2ro(om):
|
||||
@staticmethod
|
||||
def om2ro(om):
|
||||
"""Rotation matrix to Rodriques-Frank vector."""
|
||||
return eu2ro(om2eu(om))
|
||||
return Rotation.eu2ro(Rotation.om2eu(om))
|
||||
|
||||
|
||||
def om2ho(om):
|
||||
@staticmethod
|
||||
def om2ho(om):
|
||||
"""Rotation matrix to homochoric vector."""
|
||||
return ax2ho(om2ax(om))
|
||||
return Rotation.ax2ho(Rotation.om2ax(om))
|
||||
|
||||
|
||||
def om2cu(om):
|
||||
@staticmethod
|
||||
def om2cu(om):
|
||||
"""Rotation matrix to cubochoric vector."""
|
||||
return ho2cu(om2ho(om))
|
||||
return Rotation.ho2cu(Rotation.om2ho(om))
|
||||
|
||||
|
||||
#---------- Bunge-Euler angles ----------
|
||||
|
||||
def eu2qu(eu):
|
||||
#---------- Bunge-Euler angles ----------
|
||||
@staticmethod
|
||||
def eu2qu(eu):
|
||||
"""Bunge-Euler angles to quaternion."""
|
||||
ee = 0.5*eu
|
||||
cPhi = np.cos(ee[1])
|
||||
|
|
@ -604,8 +604,8 @@ def eu2qu(eu):
|
|||
if qu[0] < 0.0: qu*=-1
|
||||
return qu
|
||||
|
||||
|
||||
def eu2om(eu):
|
||||
@staticmethod
|
||||
def eu2om(eu):
|
||||
"""Bunge-Euler angles to rotation matrix."""
|
||||
c = np.cos(eu)
|
||||
s = np.sin(eu)
|
||||
|
|
@ -617,8 +617,8 @@ def eu2om(eu):
|
|||
om[np.where(iszero(om))] = 0.0
|
||||
return om
|
||||
|
||||
|
||||
def eu2ax(eu):
|
||||
@staticmethod
|
||||
def eu2ax(eu):
|
||||
"""Bunge-Euler angles to axis angle pair."""
|
||||
t = np.tan(eu[1]*0.5)
|
||||
sigma = 0.5*(eu[0]+eu[2])
|
||||
|
|
@ -636,8 +636,8 @@ def eu2ax(eu):
|
|||
|
||||
return ax
|
||||
|
||||
|
||||
def eu2ro(eu):
|
||||
@staticmethod
|
||||
def eu2ro(eu):
|
||||
"""Bunge-Euler angles to Rodriques-Frank vector."""
|
||||
ro = eu2ax(eu) # convert to axis angle pair representation
|
||||
if ro[3] >= np.pi: # Differs from original implementation. check convention 5
|
||||
|
|
@ -649,20 +649,20 @@ def eu2ro(eu):
|
|||
|
||||
return ro
|
||||
|
||||
|
||||
def eu2ho(eu):
|
||||
@staticmethod
|
||||
def eu2ho(eu):
|
||||
"""Bunge-Euler angles to homochoric vector."""
|
||||
return ax2ho(eu2ax(eu))
|
||||
return Rotation.ax2ho(Rotation.eu2ax(eu))
|
||||
|
||||
|
||||
def eu2cu(eu):
|
||||
@staticmethod
|
||||
def eu2cu(eu):
|
||||
"""Bunge-Euler angles to cubochoric vector."""
|
||||
return ho2cu(eu2ho(eu))
|
||||
return Rotation.ho2cu(Rotation.eu2ho(eu))
|
||||
|
||||
|
||||
#---------- Axis angle pair ----------
|
||||
|
||||
def ax2qu(ax):
|
||||
#---------- Axis angle pair ----------
|
||||
@staticmethod
|
||||
def ax2qu(ax):
|
||||
"""Axis angle pair to quaternion."""
|
||||
if iszero(ax[3]):
|
||||
qu = np.array([ 1.0, 0.0, 0.0, 0.0 ])
|
||||
|
|
@ -673,8 +673,8 @@ def ax2qu(ax):
|
|||
|
||||
return qu
|
||||
|
||||
|
||||
def ax2om(ax):
|
||||
@staticmethod
|
||||
def ax2om(ax):
|
||||
"""Axis angle pair to rotation matrix."""
|
||||
c = np.cos(ax[3])
|
||||
s = np.sin(ax[3])
|
||||
|
|
@ -688,13 +688,13 @@ def ax2om(ax):
|
|||
|
||||
return om if P < 0.0 else om.T
|
||||
|
||||
|
||||
def ax2eu(ax):
|
||||
@staticmethod
|
||||
def ax2eu(ax):
|
||||
"""Rotation matrix to Bunge Euler angles."""
|
||||
return om2eu(ax2om(ax))
|
||||
return Rotation.om2eu(Rotation.ax2om(ax))
|
||||
|
||||
|
||||
def ax2ro(ax):
|
||||
@staticmethod
|
||||
def ax2ro(ax):
|
||||
"""Axis angle pair to Rodriques-Frank vector."""
|
||||
if iszero(ax[3]):
|
||||
ro = [ 0.0, 0.0, P, 0.0 ]
|
||||
|
|
@ -706,37 +706,37 @@ def ax2ro(ax):
|
|||
|
||||
return np.array(ro)
|
||||
|
||||
|
||||
def ax2ho(ax):
|
||||
@staticmethod
|
||||
def ax2ho(ax):
|
||||
"""Axis angle pair to homochoric vector."""
|
||||
f = (0.75 * ( ax[3] - np.sin(ax[3]) ))**(1.0/3.0)
|
||||
ho = ax[0:3] * f
|
||||
return ho
|
||||
|
||||
|
||||
def ax2cu(ax):
|
||||
@staticmethod
|
||||
def ax2cu(ax):
|
||||
"""Axis angle pair to cubochoric vector."""
|
||||
return ho2cu(ax2ho(ax))
|
||||
return Rotation.ho2cu(Rotation.ax2ho(ax))
|
||||
|
||||
|
||||
#---------- Rodrigues-Frank vector ----------
|
||||
|
||||
def ro2qu(ro):
|
||||
#---------- Rodrigues-Frank vector ----------
|
||||
@staticmethod
|
||||
def ro2qu(ro):
|
||||
"""Rodriques-Frank vector to quaternion."""
|
||||
return ax2qu(ro2ax(ro))
|
||||
return Rotation.ax2qu(Rotation.ro2ax(ro))
|
||||
|
||||
|
||||
def ro2om(ro):
|
||||
@staticmethod
|
||||
def ro2om(ro):
|
||||
"""Rodgrigues-Frank vector to rotation matrix."""
|
||||
return ax2om(ro2ax(ro))
|
||||
return Rotation.ax2om(Rotation.ro2ax(ro))
|
||||
|
||||
|
||||
def ro2eu(ro):
|
||||
@staticmethod
|
||||
def ro2eu(ro):
|
||||
"""Rodriques-Frank vector to Bunge-Euler angles."""
|
||||
return om2eu(ro2om(ro))
|
||||
return Rotation.om2eu(Rotation.ro2om(ro))
|
||||
|
||||
|
||||
def ro2ax(ro):
|
||||
@staticmethod
|
||||
def ro2ax(ro):
|
||||
"""Rodriques-Frank vector to axis angle pair."""
|
||||
ta = ro[3]
|
||||
|
||||
|
|
@ -751,8 +751,8 @@ def ro2ax(ro):
|
|||
|
||||
return np.array(ax)
|
||||
|
||||
|
||||
def ro2ho(ro):
|
||||
@staticmethod
|
||||
def ro2ho(ro):
|
||||
"""Rodriques-Frank vector to homochoric vector."""
|
||||
if iszero(np.sum(ro[0:3]**2.0)):
|
||||
ho = [ 0.0, 0.0, 0.0 ]
|
||||
|
|
@ -762,30 +762,30 @@ def ro2ho(ro):
|
|||
|
||||
return np.array(ho)
|
||||
|
||||
|
||||
def ro2cu(ro):
|
||||
@staticmethod
|
||||
def ro2cu(ro):
|
||||
"""Rodriques-Frank vector to cubochoric vector."""
|
||||
return ho2cu(ro2ho(ro))
|
||||
|
||||
|
||||
#---------- Homochoric vector----------
|
||||
|
||||
def ho2qu(ho):
|
||||
#---------- Homochoric vector----------
|
||||
@staticmethod
|
||||
def ho2qu(ho):
|
||||
"""Homochoric vector to quaternion."""
|
||||
return ax2qu(ho2ax(ho))
|
||||
return Rotation.ax2qu(Rotation.ho2ax(ho))
|
||||
|
||||
|
||||
def ho2om(ho):
|
||||
@staticmethod
|
||||
def ho2om(ho):
|
||||
"""Homochoric vector to rotation matrix."""
|
||||
return ax2om(ho2ax(ho))
|
||||
return Rotation.ax2om(Rotation.ho2ax(ho))
|
||||
|
||||
|
||||
def ho2eu(ho):
|
||||
@staticmethod
|
||||
def ho2eu(ho):
|
||||
"""Homochoric vector to Bunge-Euler angles."""
|
||||
return ax2eu(ho2ax(ho))
|
||||
return Rotation.ax2eu(Rotation.ho2ax(ho))
|
||||
|
||||
|
||||
def ho2ax(ho):
|
||||
@staticmethod
|
||||
def ho2ax(ho):
|
||||
"""Homochoric vector to axis angle pair."""
|
||||
tfit = np.array([+1.0000000000018852, -0.5000000002194847,
|
||||
-0.024999992127593126, -0.003928701544781374,
|
||||
|
|
@ -810,44 +810,44 @@ def ho2ax(ho):
|
|||
ax = np.append(ho/np.sqrt(hmag_squared),2.0*np.arccos(np.clip(s,-1.0,1.0)))
|
||||
return ax
|
||||
|
||||
|
||||
def ho2ro(ho):
|
||||
@staticmethod
|
||||
def ho2ro(ho):
|
||||
"""Axis angle pair to Rodriques-Frank vector."""
|
||||
return ax2ro(ho2ax(ho))
|
||||
return Rotation.ax2ro(Rotation.ho2ax(ho))
|
||||
|
||||
|
||||
def ho2cu(ho):
|
||||
@staticmethod
|
||||
def ho2cu(ho):
|
||||
"""Homochoric vector to cubochoric vector."""
|
||||
return Lambert.BallToCube(ho)
|
||||
|
||||
|
||||
#---------- Cubochoric ----------
|
||||
|
||||
def cu2qu(cu):
|
||||
#---------- Cubochoric ----------
|
||||
@staticmethod
|
||||
def cu2qu(cu):
|
||||
"""Cubochoric vector to quaternion."""
|
||||
return ho2qu(cu2ho(cu))
|
||||
return Rotation.ho2qu(Rotation.cu2ho(cu))
|
||||
|
||||
|
||||
def cu2om(cu):
|
||||
@staticmethod
|
||||
def cu2om(cu):
|
||||
"""Cubochoric vector to rotation matrix."""
|
||||
return ho2om(cu2ho(cu))
|
||||
return Rotation.ho2om(Rotation.cu2ho(cu))
|
||||
|
||||
|
||||
def cu2eu(cu):
|
||||
@staticmethod
|
||||
def cu2eu(cu):
|
||||
"""Cubochoric vector to Bunge-Euler angles."""
|
||||
return ho2eu(cu2ho(cu))
|
||||
return Rotation.ho2eu(Rotation.cu2ho(cu))
|
||||
|
||||
|
||||
def cu2ax(cu):
|
||||
@staticmethod
|
||||
def cu2ax(cu):
|
||||
"""Cubochoric vector to axis angle pair."""
|
||||
return ho2ax(cu2ho(cu))
|
||||
return Rotation.ho2ax(Rotation.cu2ho(cu))
|
||||
|
||||
|
||||
def cu2ro(cu):
|
||||
@staticmethod
|
||||
def cu2ro(cu):
|
||||
"""Cubochoric vector to Rodriques-Frank vector."""
|
||||
return ho2ro(cu2ho(cu))
|
||||
return Rotation.ho2ro(Rotation.cu2ho(cu))
|
||||
|
||||
|
||||
def cu2ho(cu):
|
||||
@staticmethod
|
||||
def cu2ho(cu):
|
||||
"""Cubochoric vector to homochoric vector."""
|
||||
return Lambert.CubeToBall(cu)
|
||||
|
|
|
|||
Loading…
Reference in New Issue