diff --git a/ortools/linear_solver/python/model_builder_helper.cc b/ortools/linear_solver/python/model_builder_helper.cc index 6de3bbaad3..c597ac80c3 100644 --- a/ortools/linear_solver/python/model_builder_helper.cc +++ b/ortools/linear_solver/python/model_builder_helper.cc @@ -169,7 +169,8 @@ PYBIND11_MODULE(model_builder_helper, m) { py::class_(m, "ModelBuilderHelper") .def(py::init<>()) - .def("overwrite_model", &ModelBuilderHelper::OverwriteModel, arg("other_helper")) + .def("overwrite_model", &ModelBuilderHelper::OverwriteModel, + arg("other_helper")) .def("export_to_mps_string", &ModelBuilderHelper::ExportToMpsString, arg("options") = MPModelExportOptions()) .def("export_to_lp_string", &ModelBuilderHelper::ExportToLpString, diff --git a/ortools/linear_solver/samples/BUILD.bazel b/ortools/linear_solver/samples/BUILD.bazel index 2a0c4f37c2..a5a2574982 100644 --- a/ortools/linear_solver/samples/BUILD.bazel +++ b/ortools/linear_solver/samples/BUILD.bazel @@ -44,7 +44,7 @@ code_sample_py(name = "assignment_mb") code_sample_py(name = "bin_packing_mb") -code_sample_py(name = "copy_model_mb") +code_sample_py(name = "clone_model_mb") code_sample_py(name = "simple_lp_program_mb") diff --git a/ortools/linear_solver/samples/copy_model_mb.py b/ortools/linear_solver/samples/clone_model_mb.py similarity index 79% rename from ortools/linear_solver/samples/copy_model_mb.py rename to ortools/linear_solver/samples/clone_model_mb.py index 3b20fec4a9..e8c02c8ea9 100644 --- a/ortools/linear_solver/samples/copy_model_mb.py +++ b/ortools/linear_solver/samples/clone_model_mb.py @@ -13,7 +13,7 @@ # limitations under the License. # [START program] -"""Integer programming examples that show how to use the APIs.""" +"""Integer programming examples that show how to clone a model.""" # [START import] import math @@ -35,7 +35,7 @@ def main(): # [START constraints] # x + 7 * y <= 17.5. - c1 = model.add(x + 7 * y <= 17.5) + unused_c1 = model.add(x + 7 * y <= 17.5) # x <= 3.5. c2 = model.add(x <= 3.5) @@ -56,14 +56,12 @@ def main(): # Add new constraint. model_copy.add(x_copy >= 1) - print("Number of constraints in original model =", model.num_constraints) - print("Number of constraints in cloned model =", model_copy.num_constraints) + print(f"Number of constraints in original model ={model.num_constraints}") + print(f"Number of constraints in cloned model = {model_copy.num_constraints}") # Modify a constraint. c2_copy.add_term(z_copy, 2.0) - print(model_copy.export_to_lp_string()) - # [START solve] # Create the solver with the SCIP backend, and solve the model. solver = model_builder.ModelSolver("scip") @@ -73,17 +71,17 @@ def main(): # [START print_solution] if status == model_builder.SolveStatus.OPTIMAL: print("Solution:") - print("Objective value =", solver.objective_value) - print("x =", solver.value(x_copy)) - print("y =", solver.value(y_copy)) - print("z =", solver.value(z_copy)) + print(f"Objective value = {solver.objective_value}") + print(f"x = {solver.value(x_copy)}") + print(f"y = {solver.value(y_copy)}") + print(f"z = {solver.value(z_copy)}") else: print("The problem does not have an optimal solution.") # [END print_solution] # [START advanced] print("\nAdvanced usage:") - print("Problem solved in %f seconds" % solver.wall_time) + print(f"Problem solved in {solver.wall_time} seconds") # [END advanced] diff --git a/ortools/linear_solver/wrappers/model_builder_helper.cc b/ortools/linear_solver/wrappers/model_builder_helper.cc index d44069995d..56dc07b830 100644 --- a/ortools/linear_solver/wrappers/model_builder_helper.cc +++ b/ortools/linear_solver/wrappers/model_builder_helper.cc @@ -40,7 +40,8 @@ namespace operations_research { -void ModelBuilderHelper::OverwriteModel(const ModelBuilderHelper& other_helper) { +void ModelBuilderHelper::OverwriteModel( + const ModelBuilderHelper& other_helper) { model_ = other_helper.model(); }