fixup3

Author: Mizux

examples/contrib/permutation_flow_shop.py

@@ -27,7 +27,6 @@
 
 from absl import app
 from absl import flags
-from google.protobuf import text_format
 from ortools.sat.python import cp_model
 
 _PARAMS = flags.DEFINE_string(
@@ -149,7 +148,7 @@ def permutation_flow_shop(
 
     solver = cp_model.CpSolver()
     if params:
-        text_format.Parse(params, solver.parameters)
+        solver.parameters.parse_text_format(params)
     solver.parameters.log_search_progress = log
     solver.parameters.max_time_in_seconds = time_limit
 

examples/contrib/scheduling_with_transitions_sat.py

@@ -9,7 +9,6 @@
 import collections
 
 from ortools.sat.python import cp_model
-from google.protobuf import text_format
 
 #----------------------------------------------------------------------------
 # Command line arguments.
@@ -295,7 +294,7 @@ def main(args):
   solver = cp_model.CpSolver()
   solver.parameters.max_time_in_seconds = 60 * 60 * 2
   if parameters:
-    text_format.Merge(parameters, solver.parameters)
+    solver.parameters.merge_text_format(parameters)
   solution_printer = SolutionPrinter(makespan)
   status = solver.Solve(model, solution_printer)