Skip to content
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

Jump to bottom

Rename "warmstart" boolean for cpsat coloring solver into "do_warmstart" #316

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Rename "warmstart" boolean for cpsat coloring solver into "do_warmstart" #316

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
4 changes: 2 additions & 2 deletions discrete_optimization/coloring/solvers/coloring_cpsat_solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ColoringCPSatSolver(
name="modeling", enum=ModelingCPSat, default=ModelingCPSat.INTEGER
),
CategoricalHyperparameter(
name="warmstart", choices=[True, False], default=True
name="do_warmstart", choices=[True, False], default=True
),
CategoricalHyperparameter(
name="value_sequence_chain",
Expand Down Expand Up @@ -220,7 +220,7 @@ def set_warm_start_binary(self, solution: ColoringSolution):
def init_model(self, **args: Any) -> None:
args = self.complete_with_default_hyperparameters(args)
modeling = args["modeling"]
do_warmstart = args["warmstart"]
do_warmstart = args["do_warmstart"]
assert isinstance(modeling, ModelingCPSat)
if "nb_colors" not in args or do_warmstart:
solution = self.get_starting_solution(**args)
Expand Down
2 changes: 1 addition & 1 deletion examples/coloring/coloring_cpspat_solver_example.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def run_cpsat_coloring():
solver = ColoringCPSatSolver(color_problem, params_objective_function=None)
solver.init_model(
modeling=ModelingCPSat.INTEGER,
warmstart=False,
do_warmstart=False,
value_sequence_chain=False,
used_variable=True,
symmetry_on_used=True,
Expand Down
6 changes: 3 additions & 3 deletions tests/coloring/test_coloring_lns_cpsat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_lns_cpsat_coloring():
solver = ColoringCPSatSolver(color_problem, params_objective_function=None)
solver.init_model(
modeling=ModelingCPSat.INTEGER,
warmstart=False,
do_warmstart=False,
value_sequence_chain=False,
used_variable=True,
symmetry_on_used=True,
Expand Down Expand Up @@ -98,7 +98,7 @@ def test_lns_cpsat_coloring_with_constraints():
solver = ColoringCPSatSolver(color_problem, params_objective_function=None)
solver.init_model(
modeling=ModelingCPSat.INTEGER,
warmstart=False,
do_warmstart=False,
value_sequence_chain=False,
used_variable=True,
symmetry_on_used=True,
Expand Down Expand Up @@ -147,7 +147,7 @@ def solver_lns_factory():
solver = ColoringCPSatSolver(color_problem, params_objective_function=None)
solver.init_model(
modeling=ModelingCPSat.INTEGER,
warmstart=False,
do_warmstart=False,
value_sequence_chain=False,
used_variable=True,
symmetry_on_used=True,
Expand Down
Loading