Merge pull request #97 from sblauth/hotfix/1.8.8

Hotfix/1.8.8
sblauth · Sep 15, 2022 · 99af184 · 99af184
2 parents 883364f + 14511da
commit 99af184
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,8 +1,8 @@
 {
     "description": "<p>cashocs is a computational, adjoint-based shape optimization and optimal control software.</p>", 
     "license": "GPL-3.0+", 
-    "title": "cashocs v1.8.7",
-    "version": "v1.8.7",
+    "title": "cashocs v1.8.8",
+    "version": "v1.8.8",
     "upload_type": "software", 
     "creators": [
         {

diff --git a/cashocs/__init__.py b/cashocs/__init__.py
@@ -59,7 +59,7 @@
 from cashocs.nonlinear_solvers import newton_solve
 from cashocs.nonlinear_solvers import picard_iteration
 
-__version__ = "1.8.7"
+__version__ = "1.8.8"
 
 __citation__ = """
 @Article{Blauth2021cashocs,

diff --git a/cashocs/_optimization/optimization_algorithms/l_bfgs.py b/cashocs/_optimization/optimization_algorithms/l_bfgs.py
@@ -241,15 +241,12 @@ def update_hessian_approximation(self) -> None:
             self.history_y.appendleft([x.copy(True) for x in self.y_k])
             self.history_s.appendleft([x.copy(True) for x in self.s_k])
             curvature_condition = self.form_handler.scalar_product(self.y_k, self.s_k)
+            denominator = np.sqrt(
+                self.form_handler.scalar_product(self.s_k, self.s_k)
+                * self.form_handler.scalar_product(self.y_k, self.y_k)
+            )
 
-            if (
-                curvature_condition
-                / np.sqrt(
-                    self.form_handler.scalar_product(self.s_k, self.s_k)
-                    * self.form_handler.scalar_product(self.y_k, self.y_k)
-                )
-                <= 1e-14
-            ):
+            if denominator <= 1e-15 or curvature_condition / denominator <= 1e-14:
                 self.has_curvature_info = False
 
                 self.history_s.clear()

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -23,7 +23,7 @@
 author = "Sebastian Blauth"
 
 # The full version, including alpha/beta/rc tags
-release = "1.8.7"
+release = "1.8.8"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = cashocs
-version = 1.8.7
+version = 1.8.8
 author = Sebastian Blauth
 author_email = sebastian.blauth@itwm.fraunhofer.de
 description = Computational Adjoint-Based Shape Optimization and Optimal Control Software