Merge pull request #22 from pymor/update_assemble_lincomb

Update DealIIMatrixOperator.assemble_lincomb

Author: renefritze

.ci/common_setup.bash

@@ -17,6 +17,6 @@ git submodule update --init
 
 python -m venv ~/venv
 source ~/venv/bin/activate
-python -m pip install -U pip pytest wheel build
+python -m pip install -r ./.ci/requirements-ci.txt
 
 python -m pip install git+https://github.com/pymor/pymor.git#egg=pymor

.ci/pytest.bash

@@ -10,5 +10,4 @@ source ${BASE_DIR}/.ci/common_setup.bash
 # if we're in a versioned branch pip will downgrade pymor here from pypi
 python -m pip install .
 
-cd ${BASE_DIR}/src/
-xvfb-run -a pytest -s -r sxX  test/demo.py
+xvfb-run -a pytest -s -r sxX  test/*py

.ci/requirements-ci.txt

@@ -0,0 +1,6 @@
+pytest
+wheel
+build
+pytest
+pytest-regressions
+pandas

.gitignore

@@ -2,3 +2,7 @@
 build
 CMakeLists.txt.user
 .idea
+.vscode
+cache
+__pycache__
+

README.md

@@ -21,3 +21,9 @@ Development notes
 We have a `pre-commit` config that is also run/checked in CI.
 Python source is formatted with `black`.
 C++ source is formatted with `clang-format`.
+
+Dependencies for running the test suite can be installed with
+
+```
+python -m pip install -r ./.ci/requirements-ci.txt
+```

src/pymor_dealii/pymor/operator.py

@@ -3,7 +3,6 @@
 # License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
 from pymor.operators.interface import Operator
-from pymor.operators.constructions import ZeroOperator
 
 from pymor_dealii.pymor.vectorarray import DealIIVectorSpace
 import pymor_dealii_bindings as pd2
@@ -33,7 +32,7 @@ def apply_transpose(self, V, mu=None):
             self.matrix.Tvmult(r.impl, u.impl)
         return U
 
-    def apply_inverse(self, V, mu=None, least_squares=False):
+    def apply_inverse(self, V, mu=None, initial_guess=None, least_squares=False):
         assert V in self.range
         if least_squares:
             raise NotImplementedError
@@ -42,18 +41,23 @@ def apply_inverse(self, V, mu=None, least_squares=False):
             self.matrix.cg_solve(r.impl, v.impl)
         return R
 
-    def assemble_lincomb(self, operators, coefficients, solver_options=None, name=None):
-        if not all(
-            isinstance(op, (DealIIMatrixOperator, ZeroOperator)) for op in operators
-        ):
+    def _assemble_lincomb(
+        self,
+        operators,
+        coefficients,
+        identity_shift=0.0,
+        solver_options=None,
+        name=None,
+    ):
+        if not all(isinstance(op, (DealIIMatrixOperator)) for op in operators):
+            return None
+        if identity_shift != 0.0:
             return None
         assert not solver_options  # linear solver is not yet configurable
 
         matrix = pd2.SparseMatrix(operators[0].matrix.get_sparsity_pattern())
         matrix.copy_from(operators[0].matrix)
         matrix *= coefficients[0]
         for op, c in zip(operators[1:], coefficients[1:]):
-            if isinstance(op, ZeroOperator):
-                continue
             matrix.add(c, op.matrix)
         return DealIIMatrixOperator(matrix, name=name)

src/test/demo.py

@@ -3,7 +3,7 @@
 # License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
 import numpy as np
-import pydealii_bindings as dealii
+import pymor_dealii_bindings as dealii
 
 
 def test_vector():

src/test/demo_result.pickle

@@ -0,0 +1,7 @@
+def test_demo_results(ndarrays_regression):
+    from pymor_dealii.pymor.demo import run
+
+    result, _, _, _ = run(plot_error=False)
+
+    compare = ["errors", "basis_sizes", "rel_errors"]
+    ndarrays_regression.check({k: v for k, v in result.items() if k in compare})