Skip to content

Update ortools to 9.15.6755 #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mkannwischer wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update ortools to 9.15.6755 #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]
Expand Down
7 changes: 1 addition & 6 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions slothy/core/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading