Merge branch 'nifty6_notimplemented' into 'NIFTy_6'

operator.py: Raise not-implemented in matmul call

See merge request !403

nifty6/operators/linear_operator.py

@@ -175,7 +175,7 @@ class LinearOperator(Operator):
         from ..linearization import Linearization
         if isinstance(x, Linearization):
             return x.new(self(x._val), self(x._jac))
-        return self.__matmul__(x)
+        return self@x
 
     def times(self, x):
         """Applies the Operator to a given Field.

nifty6/operators/operator.py

@@ -79,6 +79,11 @@ class Operator(metaclass=NiftyMeta):
             return NotImplemented
         return _OpChain.make((self, x))
 
+    def __rmatmul__(self, x):
+        if not isinstance(x, Operator):
+            return NotImplemented
+        return _OpChain.make((x, self))
+
     def partial_insert(self, x):
         from ..multi_domain import MultiDomain
         if not isinstance(x, Operator):