always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove SolutionObserver is sat/swig_helper.h; rename WithObserver into WithCallback

Browse Source
This commit is contained in:
Laurent Perron
2018-09-04 18:47:10 +02:00
parent 1c0f2f0fbd
commit 9a116eba39
13 changed files with 46 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/python/balance_group_sat.py
View File

@@ -151,7 +151,7 @@ class SolutionPrinter(cp_model.CpSolverSolutionCallback):
solver = cp_model.CpSolver()
solution_printer = SolutionPrinter()
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
if status == cp_model.OPTIMAL:
print('Optimal epsilon: %i' % solver.ObjectiveValue())

2
examples/python/code_samples_sat.py
View File

@@ -252,7 +252,7 @@ def MinimalCpSatPrintIntermediateSolutions():
# Creates a solver and solves.
solver = cp_model.CpSolver()
solution_printer = VarArrayAndObjectiveSolutionPrinter([x, y, z])
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
print('Status = %s' % solver.StatusName(status))
print('Number of solutions found: %i' % solution_printer.SolutionCount())

2
examples/python/flexible_job_shop_sat.py
View File

@@ -145,7 +145,7 @@ model.Minimize(makespan)
# Solve model.
solver = cp_model.CpSolver()
solution_printer = SolutionPrinter()
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
# Print final solution.
for job_id in all_jobs:

2
examples/python/rcpsp_sat.py
View File

@@ -255,7 +255,7 @@ def SolveRcpsp(problem, proto_file):
# Solve model.
solver = cp_model.CpSolver()
solution_printer = SolutionPrinter()
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
print('Solve status: %s' % solver.StatusName(status))
print('Optimal objective value: %i' % solver.ObjectiveValue())
print('Statistics')

4
examples/python/steel_mill_slab_sat.py
View File

@@ -617,7 +617,7 @@ def SteelMillSlabWithValidSlabs(problem, break_symmetries, output_proto):
### Solve model.
solver = cp_model.CpSolver()
solution_printer = SteelMillSlabSolutionPrinter(orders, assign, loads, losses)
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
### Output the solution.
if status == cp_model.OPTIMAL:
@@ -689,7 +689,7 @@ def SteelMillSlabWithColumnGeneration(problem, output_proto):
### Solve model.
solver = cp_model.CpSolver()
solution_printer = SolutionPrinterWithObjective()
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
### Output the solution.
if status == cp_model.OPTIMAL:

2
examples/python/wedding_optimal_chart_sat.py
View File

@@ -196,7 +196,7 @@ def SolveWithDiscreteModel():
### Solve model.
solver = cp_model.CpSolver()
solution_printer = WeddingChartPrinter(seats, names, num_tables, num_guests)
status = solver.SolveWithSolutionObserver(model, solution_printer)
status = solver.SolveWithSolutionCallback(model, solution_printer)
print("Statistics")
print(" - conflicts : %i" % solver.NumConflicts())