Merge branch 'bugfix-rotation-repr' into 'development'

Fixing some issues with Rotation/Orientation

See merge request damask/DAMASK!310

python/damask/_orientation.py

@@ -226,9 +226,9 @@ class Orientation(Rotation):
 
         """
         return  super().__eq__(other) \
-            and self.family     == other.family \
-            and self.lattice    == other.lattice \
-            and self.parameters == other.parameters
+            and hasattr(other, 'family')     and self.family     == other.family \
+            and hasattr(other, 'lattice')    and self.lattice    == other.lattice \
+            and hasattr(other, 'parameters') and self.parameters == other.parameters
 
 
     def __matmul__(self,other):

python/damask/_rotation.py

@@ -204,8 +204,16 @@ class Rotation:
 
 
     def append(self,other):
-        """Extend rotation array along first dimension with other array."""
-        return self.copy(rotation=np.vstack((self.quaternion,other.quaternion)))
+        """
+        Extend rotation array along first dimension with other array(s).
+
+        Parameters
+        ----------
+            other : Rotation or list of Rotations.
+
+        """
+        return self.copy(rotation=np.vstack(tuple(map(lambda x:x.quaternion,
+                                                      [self]+other if isinstance(other,list) else [self,other]))))
 
 
     def flatten(self,order = 'C'):
@@ -263,7 +271,7 @@ class Rotation:
             """Intermediate representation supporting quaternion averaging."""
             return np.einsum('...i,...j',quat,quat)
 
-        if not weights:
+        if weights is None:
             weights = np.ones(self.shape,dtype=float)
 
         eig, vec = np.linalg.eig(np.sum(_M(self.quaternion) * weights[...,np.newaxis,np.newaxis],axis=-3) \

python/tests/test_Rotation.py

@@ -800,6 +800,14 @@ class TestRotation:
         print(f'append 2x {shape} --> {s.shape}')
         assert s[0,...] == r[0,...] and s[-1,...] == p[-1,...]
 
+    @pytest.mark.parametrize('shape',[None,1,(1,),(4,2),(3,3,2)])
+    def test_append_list(self,shape):
+        r = Rotation.from_random(shape=shape)
+        p = Rotation.from_random(shape=shape)
+        s = r.append([r,p])
+        print(f'append 3x {shape} --> {s.shape}')
+        assert s[0,...] == r[0,...] and s[-1,...] == p[-1,...]
+
     @pytest.mark.parametrize('quat,standardized',[
                                                   ([-1,0,0,0],[1,0,0,0]),
                                                   ([-0.5,-0.5,-0.5,-0.5],[0.5,0.5,0.5,0.5]),