From 0465276e142d6703d69b2fa2aa463de986dd44d2 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 14 Jan 2019 09:56:30 +0100 Subject: [PATCH] Fix wall time dimension in sat examples WallTime is in second not millisecond... --- examples/python/assignment_sat.py | 2 +- examples/python/assignment_with_constraints_sat.py | 2 +- examples/python/gate_scheduling_sat.py | 2 +- examples/python/hidato_sat.py | 2 +- examples/python/nqueens_sat.py | 2 +- examples/python/qubo_sat.py | 2 +- examples/python/shift_scheduling_sat.py | 2 +- examples/python/wedding_optimal_chart_sat.py | 2 +- examples/python/worker_schedule_sat.py | 2 +- ortools/sat/samples/cp_is_fun_sat.py | 2 +- ortools/sat/samples/nurses_sat.py | 2 +- ortools/sat/samples/schedule_requests_sat.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/python/assignment_sat.py b/examples/python/assignment_sat.py index 78a3cbad2b..f633336f07 100644 --- a/examples/python/assignment_sat.py +++ b/examples/python/assignment_sat.py @@ -75,7 +75,7 @@ def main(): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) if __name__ == '__main__': diff --git a/examples/python/assignment_with_constraints_sat.py b/examples/python/assignment_with_constraints_sat.py index 71f9340f55..ba5b34db33 100644 --- a/examples/python/assignment_with_constraints_sat.py +++ b/examples/python/assignment_with_constraints_sat.py @@ -114,7 +114,7 @@ def solve_assignment(): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) solve_assignment() diff --git a/examples/python/gate_scheduling_sat.py b/examples/python/gate_scheduling_sat.py index 6b226519ff..d1f271b0a1 100644 --- a/examples/python/gate_scheduling_sat.py +++ b/examples/python/gate_scheduling_sat.py @@ -129,7 +129,7 @@ def main(): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) if __name__ == '__main__': diff --git a/examples/python/hidato_sat.py b/examples/python/hidato_sat.py index 1bc30a3489..d6f9768872 100644 --- a/examples/python/hidato_sat.py +++ b/examples/python/hidato_sat.py @@ -184,7 +184,7 @@ def solve_hidato(puzzle, index): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) for pb in range(1, 7): diff --git a/examples/python/nqueens_sat.py b/examples/python/nqueens_sat.py index aab8560930..cca943a84f 100644 --- a/examples/python/nqueens_sat.py +++ b/examples/python/nqueens_sat.py @@ -85,7 +85,7 @@ def main(board_size): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) print(' - solutions found : %i' % solution_printer.solution_count()) diff --git a/examples/python/qubo_sat.py b/examples/python/qubo_sat.py index bb91060a70..5e75b34eba 100644 --- a/examples/python/qubo_sat.py +++ b/examples/python/qubo_sat.py @@ -601,7 +601,7 @@ def solve_qubo(): print(' - status : %s' % solver.StatusName(status)) print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) print(' - solutions found : %i' % solution_printer.solution_count()) diff --git a/examples/python/shift_scheduling_sat.py b/examples/python/shift_scheduling_sat.py index 840a7a6c9c..a4f1321700 100644 --- a/examples/python/shift_scheduling_sat.py +++ b/examples/python/shift_scheduling_sat.py @@ -417,7 +417,7 @@ def solve_shift_scheduling(params, output_proto): print(' - status : %s' % solver.StatusName(status)) print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) def main(args): diff --git a/examples/python/wedding_optimal_chart_sat.py b/examples/python/wedding_optimal_chart_sat.py index 1d9323aaec..5061e46425 100644 --- a/examples/python/wedding_optimal_chart_sat.py +++ b/examples/python/wedding_optimal_chart_sat.py @@ -203,7 +203,7 @@ def solve_with_discrete_model(): print("Statistics") print(" - conflicts : %i" % solver.NumConflicts()) print(" - branches : %i" % solver.NumBranches()) - print(" - wall time : %f ms" % solver.WallTime()) + print(" - wall time : %f s" % solver.WallTime()) print(" - num solutions: %i" % solution_printer.num_solutions()) diff --git a/examples/python/worker_schedule_sat.py b/examples/python/worker_schedule_sat.py index 5ecfef81e9..8f2e0b1c34 100644 --- a/examples/python/worker_schedule_sat.py +++ b/examples/python/worker_schedule_sat.py @@ -152,7 +152,7 @@ def schedule(): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) if __name__ == '__main__': diff --git a/ortools/sat/samples/cp_is_fun_sat.py b/ortools/sat/samples/cp_is_fun_sat.py index 10837e57c7..38d3b46fd8 100644 --- a/ortools/sat/samples/cp_is_fun_sat.py +++ b/ortools/sat/samples/cp_is_fun_sat.py @@ -92,7 +92,7 @@ def CPIsFunSat(): print(' - status : %s' % solver.StatusName(status)) print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) print(' - solutions found : %i' % solution_printer.solution_count()) diff --git a/ortools/sat/samples/nurses_sat.py b/ortools/sat/samples/nurses_sat.py index 22a92fd908..b3eb0523e6 100644 --- a/ortools/sat/samples/nurses_sat.py +++ b/ortools/sat/samples/nurses_sat.py @@ -127,7 +127,7 @@ def main(): print('Statistics') print(' - conflicts : %i' % solver.NumConflicts()) print(' - branches : %i' % solver.NumBranches()) - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) print(' - solutions found : %i' % solution_printer.solution_count()) diff --git a/ortools/sat/samples/schedule_requests_sat.py b/ortools/sat/samples/schedule_requests_sat.py index eb0b6c109d..4d33028c2e 100644 --- a/ortools/sat/samples/schedule_requests_sat.py +++ b/ortools/sat/samples/schedule_requests_sat.py @@ -113,7 +113,7 @@ def main(): print('Statistics') print(' - Number of shift requests met = %i' % solver.ObjectiveValue(), '(out of', num_nurses * min_shifts_per_nurse, ')') - print(' - wall time : %f ms' % solver.WallTime()) + print(' - wall time : %f s' % solver.WallTime()) # [END print_solution]