adding cpsatsolver to the available solvers. minor change in cpsat so…

…lvers, passing kwargs to init_model
g-poveda · Feb 27, 2024 · 0f503ff · 0f503ff
1 parent 7755671
commit 0f503ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/discrete_optimization/rcpsp/rcpsp_solvers.py b/discrete_optimization/rcpsp/rcpsp_solvers.py
@@ -38,6 +38,7 @@
     CPSolverName,
 )
 from discrete_optimization.rcpsp.solver.cpm import CPM
+from discrete_optimization.rcpsp.solver.cpsat_solver import CPSatRCPSPSolver
 from discrete_optimization.rcpsp.solver.rcpsp_cp_lns_solver import LNS_CP_RCPSP_SOLVER
 from discrete_optimization.rcpsp.solver.rcpsp_ga_solver import (
     GA_MRCPSP_Solver,
@@ -107,6 +108,7 @@
                 "parameters_cp": ParametersCP.default(),
             },
         ),
+        (CPSatRCPSPSolver, {"parameters_cp": ParametersCP.default()}),
     ],
     "critical-path": [(CPM, {})],
     "lns": [

diff --git a/discrete_optimization/rcpsp/solver/cpsat_solver.py b/discrete_optimization/rcpsp/solver/cpsat_solver.py
@@ -290,7 +290,7 @@ def solve(
         self, parameters_cp: Optional[ParametersCP] = None, **kwargs: Any
     ) -> ResultStorage:
         if self.cp_model is None:
-            self.init_model()
+            self.init_model(**kwargs)
         if parameters_cp is None:
             parameters_cp = ParametersCP.default()
         solver = CpSolver()
@@ -460,7 +460,7 @@ def solve(
         self, parameters_cp: Optional[ParametersCP] = None, **kwargs: Any
     ) -> ResultStorage:
         if self.cp_model is None:
-            self.init_model()
+            self.init_model(**kwargs)
         if parameters_cp is None:
             parameters_cp = ParametersCP.default()
         solver = CpSolver()
@@ -636,7 +636,7 @@ def solve(
         self, parameters_cp: Optional[ParametersCP] = None, **kwargs: Any
     ) -> ResultStorage:
         if self.cp_model is None:
-            self.init_model()
+            self.init_model(**kwargs)
         if parameters_cp is None:
             parameters_cp = ParametersCP.default()
         solver = CpSolver()