Add support for creating x0 with linear equality constraints

fau-advanced-separations · Jan 9, 2024 · 658221f · 658221f
1 parent 419081a
commit 658221f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CADETProcess/optimization/optimizationProblem.py b/CADETProcess/optimization/optimizationProblem.py
@@ -2691,6 +2691,13 @@ def compute_negative_log_likelihood(self, x):
             simplify=simplify,
         )
 
+        if self.n_linear_equality_constraints > 0:
+            problem = hopsy.add_equality_constraints(
+                problem,
+                self.Aeq,
+                self.beq
+            )
+
         return problem
 
     def create_initial_values(

diff --git a/CADETProcess/optimization/optimizer.py b/CADETProcess/optimization/optimizer.py
@@ -232,13 +232,7 @@ def optimize(
         if reinit_cache:
             self.optimization_problem.setup_cache()
 
-        if x0 is None:
-            if optimization_problem.n_linear_equality_constraints > 0:
-                raise CADETProcessError(
-                    "x0 should be set by the user if linear equality "
-                    "constraints are specified."
-                )
-        else:
+        if x0 is not None:
             x0check = np.array(x0, ndmin=2)
             for x in x0check:
                 if not optimization_problem.check_bounds(x):

diff --git a/setup.cfg b/setup.cfg
@@ -26,7 +26,7 @@ install_requires =
     pathos>=0.2.8
     addict==2.3
     cadet-python>=0.14
-    hopsy>=1.3.0
+    hopsy>=1.4.0
     pymoo>=0.6
     numba>=0.55.1
     diskcache>=5.4.0