diff --git a/pyproject.toml b/pyproject.toml index a7de0679..2fdc60f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,12 +44,7 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - "ortools==9.7.2996; python_version < '3.12'", - # ortools depends on pandas, but 9.7 does not specify it as dependency - "pandas>=2.0.3; python_version < '3.12'", - # ortools 9.7 requires protobuf<=6.31.1 - "protobuf<=6.31.1; python_version < '3.12'", - "ortools==9.15.6755; python_version >= '3.12'", + "ortools==9.15.6755", "sympy==1.14.0", "unicorn==2.1.4", ] diff --git a/requirements.txt b/requirements.txt index 740cd6b8..2cbcd3ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,4 @@ -ortools==9.7.2996 ; python_version < "3.12" -ortools==9.15.6755 ; python_version >= "3.12" -# ortools 9.7 requires protobuf<=6.31.1 -protobuf<=6.31.1 ; python_version < "3.12" -# ortools depends on pandas, but 9.7 does not specify it as dependency -pandas>=2.0.3 ; python_version < "3.12" +ortools==9.15.6755 sympy==1.14.0 unicorn==2.1.4 black==26.3.1 diff --git a/slothy/core/core.py b/slothy/core/core.py index c255535d..08754bcd 100644 --- a/slothy/core/core.py +++ b/slothy/core/core.py @@ -4006,6 +4006,8 @@ def _init_external_model_and_solver(self): self._model.cp_model = cp_model.CpModel() self._model.cp_solver = cp_model.CpSolver() self._model.cp_solver.random_seed = self.config.solver_random_seed + # feasibility_jump (default-on since 9.8) hurts performance on SLOTHY models. + self._model.cp_solver.parameters.use_feasibility_jump = False def _NewIntVar(self, minval, maxval, name=""): r = self._model.cp_model.NewIntVar(minval, maxval, name)