From 34e442cd5d7d4731f32063ffb0a417bbff87fb9b Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 14 Apr 2022 14:44:13 +0200 Subject: [PATCH] examples: Fix main default parameter --- examples/notebook/examples/bus_driver_scheduling_sat.ipynb | 2 +- examples/notebook/examples/gate_scheduling_sat.ipynb | 2 +- examples/notebook/examples/golomb8.ipynb | 2 +- examples/notebook/examples/golomb_sat.ipynb | 2 +- examples/notebook/examples/hidato_sat.ipynb | 2 +- examples/notebook/examples/knapsack_2d_sat.ipynb | 2 +- examples/notebook/examples/linear_assignment_api.ipynb | 2 +- examples/notebook/examples/pyflow_example.ipynb | 2 +- examples/notebook/examples/rcpsp_sat.ipynb | 2 +- examples/notebook/examples/shift_scheduling_sat.ipynb | 2 +- examples/notebook/examples/steel_mill_slab_sat.ipynb | 2 +- examples/python/bus_driver_scheduling_sat.py | 2 +- examples/python/gate_scheduling_sat.py | 2 +- examples/python/golomb8.py | 2 +- examples/python/golomb_sat.py | 2 +- examples/python/hidato_sat.py | 2 +- examples/python/knapsack_2d_sat.py | 2 +- examples/python/linear_assignment_api.py | 2 +- examples/python/pyflow_example.py | 2 +- examples/python/rcpsp_sat.py | 2 +- examples/python/shift_scheduling_sat.py | 2 +- examples/python/steel_mill_slab_sat.py | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/notebook/examples/bus_driver_scheduling_sat.ipynb b/examples/notebook/examples/bus_driver_scheduling_sat.ipynb index 40c874e338..da05459665 100644 --- a/examples/notebook/examples/bus_driver_scheduling_sat.ipynb +++ b/examples/notebook/examples/bus_driver_scheduling_sat.ipynb @@ -2053,7 +2053,7 @@ " bus_driver_scheduling(False, num_drivers)\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " solve_bus_driver_scheduling()\n", "\n", "\n", diff --git a/examples/notebook/examples/gate_scheduling_sat.ipynb b/examples/notebook/examples/gate_scheduling_sat.ipynb index 3d2e599093..0132081302 100644 --- a/examples/notebook/examples/gate_scheduling_sat.ipynb +++ b/examples/notebook/examples/gate_scheduling_sat.ipynb @@ -95,7 +95,7 @@ "from ortools.sat.python import cp_model\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " \"\"\"Solves the gate scheduling problem.\"\"\"\n", " model = cp_model.CpModel()\n", "\n", diff --git a/examples/notebook/examples/golomb8.ipynb b/examples/notebook/examples/golomb8.ipynb index 1548229063..fb90a5ab41 100644 --- a/examples/notebook/examples/golomb8.ipynb +++ b/examples/notebook/examples/golomb8.ipynb @@ -160,7 +160,7 @@ " print(f'- total wall time: {solver.WallTime()}ms\\n')\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " solve_golomb_ruler(FLAGS.order)\n", "\n", "\n", diff --git a/examples/notebook/examples/golomb_sat.ipynb b/examples/notebook/examples/golomb_sat.ipynb index bf11a3bf17..e88cc7ab28 100644 --- a/examples/notebook/examples/golomb_sat.ipynb +++ b/examples/notebook/examples/golomb_sat.ipynb @@ -150,7 +150,7 @@ " print(f'- wall time: {solver.WallTime()}s\\n')\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " solve_golomb_ruler(FLAGS.order, FLAGS.params)\n", "\n", "\n", diff --git a/examples/notebook/examples/hidato_sat.ipynb b/examples/notebook/examples/hidato_sat.ipynb index d934e1fe68..e7c3236320 100644 --- a/examples/notebook/examples/hidato_sat.ipynb +++ b/examples/notebook/examples/hidato_sat.ipynb @@ -257,7 +257,7 @@ " print(' - wall time : %f s' % solver.WallTime())\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " for pb in range(1, 7):\n", " solve_hidato(build_puzzle(pb), pb)\n", "\n", diff --git a/examples/notebook/examples/knapsack_2d_sat.ipynb b/examples/notebook/examples/knapsack_2d_sat.ipynb index 27b9101e6a..0763581e00 100644 --- a/examples/notebook/examples/knapsack_2d_sat.ipynb +++ b/examples/notebook/examples/knapsack_2d_sat.ipynb @@ -432,7 +432,7 @@ " solve_with_rotations(data, max_height, max_width)\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " solve_knapsack(FLAGS.model)\n", "\n", "\n", diff --git a/examples/notebook/examples/linear_assignment_api.ipynb b/examples/notebook/examples/linear_assignment_api.ipynb index 912e47b182..83088fefe9 100644 --- a/examples/notebook/examples/linear_assignment_api.ipynb +++ b/examples/notebook/examples/linear_assignment_api.ipynb @@ -117,7 +117,7 @@ " 'Some input costs are too large and may cause an integer overflow.')\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " RunAssignmentOn4x4Matrix()\n", "\n", "\n", diff --git a/examples/notebook/examples/pyflow_example.ipynb b/examples/notebook/examples/pyflow_example.ipynb index 13d87c57df..171e449f05 100644 --- a/examples/notebook/examples/pyflow_example.ipynb +++ b/examples/notebook/examples/pyflow_example.ipynb @@ -140,7 +140,7 @@ " print('There was an issue with the min cost flow input.')\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " MaxFlow()\n", " MinCostFlow()\n", "\n", diff --git a/examples/notebook/examples/rcpsp_sat.ipynb b/examples/notebook/examples/rcpsp_sat.ipynb index 03205b7d8d..e2dfb2725a 100644 --- a/examples/notebook/examples/rcpsp_sat.ipynb +++ b/examples/notebook/examples/rcpsp_sat.ipynb @@ -367,7 +367,7 @@ " solver.Solve(model)\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " rcpsp_parser = pywraprcpsp.RcpspParser()\n", " rcpsp_parser.ParseFile(FLAGS.input)\n", " SolveRcpsp(rcpsp_parser.Problem(), FLAGS.output_proto, FLAGS.params)\n", diff --git a/examples/notebook/examples/shift_scheduling_sat.ipynb b/examples/notebook/examples/shift_scheduling_sat.ipynb index 518f7ddfcc..db0c169043 100644 --- a/examples/notebook/examples/shift_scheduling_sat.ipynb +++ b/examples/notebook/examples/shift_scheduling_sat.ipynb @@ -483,7 +483,7 @@ " print(' - wall time : %f s' % solver.WallTime())\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " solve_shift_scheduling(FLAGS.params, FLAGS.output_proto)\n", "\n", "\n", diff --git a/examples/notebook/examples/steel_mill_slab_sat.ipynb b/examples/notebook/examples/steel_mill_slab_sat.ipynb index 5bad946bca..be07168a51 100644 --- a/examples/notebook/examples/steel_mill_slab_sat.ipynb +++ b/examples/notebook/examples/steel_mill_slab_sat.ipynb @@ -797,7 +797,7 @@ " print('No solution')\n", "\n", "\n", - "def main(_):\n", + "def main(_=None):\n", " if FLAGS.solver == 'sat':\n", " steel_mill_slab(FLAGS.problem, FLAGS.break_symmetries)\n", " elif FLAGS.solver == 'sat_table':\n", diff --git a/examples/python/bus_driver_scheduling_sat.py b/examples/python/bus_driver_scheduling_sat.py index 87cec6999c..50c4fcdab5 100755 --- a/examples/python/bus_driver_scheduling_sat.py +++ b/examples/python/bus_driver_scheduling_sat.py @@ -1989,7 +1989,7 @@ def solve_bus_driver_scheduling(): bus_driver_scheduling(False, num_drivers) -def main(_): +def main(_=None): solve_bus_driver_scheduling() diff --git a/examples/python/gate_scheduling_sat.py b/examples/python/gate_scheduling_sat.py index 4860789f5e..e3d3e4a80a 100755 --- a/examples/python/gate_scheduling_sat.py +++ b/examples/python/gate_scheduling_sat.py @@ -28,7 +28,7 @@ from ortools.sat.python import visualization from ortools.sat.python import cp_model -def main(_): +def main(_=None): """Solves the gate scheduling problem.""" model = cp_model.CpModel() diff --git a/examples/python/golomb8.py b/examples/python/golomb8.py index ae52de8f62..fd56ba83d3 100755 --- a/examples/python/golomb8.py +++ b/examples/python/golomb8.py @@ -93,7 +93,7 @@ def solve_golomb_ruler(order): print(f'- total wall time: {solver.WallTime()}ms\n') -def main(_): +def main(_=None): solve_golomb_ruler(FLAGS.order) diff --git a/examples/python/golomb_sat.py b/examples/python/golomb_sat.py index f76e915ff2..3ced6b8409 100755 --- a/examples/python/golomb_sat.py +++ b/examples/python/golomb_sat.py @@ -85,7 +85,7 @@ def solve_golomb_ruler(order, params): print(f'- wall time: {solver.WallTime()}s\n') -def main(_): +def main(_=None): solve_golomb_ruler(FLAGS.order, FLAGS.params) diff --git a/examples/python/hidato_sat.py b/examples/python/hidato_sat.py index d5f8dbcc8a..0ad82cabac 100644 --- a/examples/python/hidato_sat.py +++ b/examples/python/hidato_sat.py @@ -189,7 +189,7 @@ def solve_hidato(puzzle, index): print(' - wall time : %f s' % solver.WallTime()) -def main(_): +def main(_=None): for pb in range(1, 7): solve_hidato(build_puzzle(pb), pb) diff --git a/examples/python/knapsack_2d_sat.py b/examples/python/knapsack_2d_sat.py index 90c1028edc..5fd7523424 100755 --- a/examples/python/knapsack_2d_sat.py +++ b/examples/python/knapsack_2d_sat.py @@ -369,7 +369,7 @@ def solve_knapsack(model): solve_with_rotations(data, max_height, max_width) -def main(_): +def main(_=None): solve_knapsack(FLAGS.model) diff --git a/examples/python/linear_assignment_api.py b/examples/python/linear_assignment_api.py index 96e9f75877..3dc2dd2fcd 100644 --- a/examples/python/linear_assignment_api.py +++ b/examples/python/linear_assignment_api.py @@ -49,7 +49,7 @@ def RunAssignmentOn4x4Matrix(): 'Some input costs are too large and may cause an integer overflow.') -def main(_): +def main(_=None): RunAssignmentOn4x4Matrix() diff --git a/examples/python/pyflow_example.py b/examples/python/pyflow_example.py index 2083b0b6fd..25518c1746 100644 --- a/examples/python/pyflow_example.py +++ b/examples/python/pyflow_example.py @@ -72,7 +72,7 @@ def MinCostFlow(): print('There was an issue with the min cost flow input.') -def main(_): +def main(_=None): MaxFlow() MinCostFlow() diff --git a/examples/python/rcpsp_sat.py b/examples/python/rcpsp_sat.py index 1ff493a943..9b99ce0997 100755 --- a/examples/python/rcpsp_sat.py +++ b/examples/python/rcpsp_sat.py @@ -300,7 +300,7 @@ def SolveRcpsp(problem, proto_file, params): solver.Solve(model) -def main(_): +def main(_=None): rcpsp_parser = pywraprcpsp.RcpspParser() rcpsp_parser.ParseFile(FLAGS.input) SolveRcpsp(rcpsp_parser.Problem(), FLAGS.output_proto, FLAGS.params) diff --git a/examples/python/shift_scheduling_sat.py b/examples/python/shift_scheduling_sat.py index e7d2972bcb..5d1a59189d 100755 --- a/examples/python/shift_scheduling_sat.py +++ b/examples/python/shift_scheduling_sat.py @@ -419,7 +419,7 @@ def solve_shift_scheduling(params, output_proto): print(' - wall time : %f s' % solver.WallTime()) -def main(_): +def main(_=None): solve_shift_scheduling(FLAGS.params, FLAGS.output_proto) diff --git a/examples/python/steel_mill_slab_sat.py b/examples/python/steel_mill_slab_sat.py index 282c82a293..845fea084f 100755 --- a/examples/python/steel_mill_slab_sat.py +++ b/examples/python/steel_mill_slab_sat.py @@ -736,7 +736,7 @@ def steel_mill_slab_with_mip_column_generation(problem): print('No solution') -def main(_): +def main(_=None): if FLAGS.solver == 'sat': steel_mill_slab(FLAGS.problem, FLAGS.break_symmetries) elif FLAGS.solver == 'sat_table':