Resolved all rebase issues

Author: markriegler

splinepy/helpme/integrate.py

@@ -215,11 +215,8 @@ def parametric_function(
             )
 
     else:
-        result = _np.einsum(
-            "i...,i,i->...",
-            function(positions),
-            meas(spline, positions),
-            weights,
+        result = _np.sum(
+            function(positions) * meas(spline, positions) * weights, axis=1
         )
     return result
 
@@ -707,11 +704,7 @@ def __init__(self, geometry, solution_field=None, orders=None):
         )
         self._mapper = self._solution_field.mapper(reference=self._helpee)
 
-        self._trafo = Transformation(spline, orders)
-        self.precompute_transformation()
-
-        self._rhs = None
-        self._system_matrix = None
+        self.reset(orders)
 
     def reset(self, orders=None):
         """ """