From 6b32f884c11f219347050133b05a4d8a910ab86b Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Tue, 26 Jan 2021 11:12:05 +0100 Subject: [PATCH] Sync notebook --- .../notebook/examples/balance_group_sat.ipynb | 2 ++ .../notebook/examples/flexible_job_shop_sat.ipynb | 6 +++--- .../linear_programming_example.ipynb | 1 - .../linear_solver/simple_lp_program.ipynb | 1 - examples/notebook/sat/minimal_jobshop_sat.ipynb | 15 ++++++++------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/notebook/examples/balance_group_sat.ipynb b/examples/notebook/examples/balance_group_sat.ipynb index 007f7da53c..a2115b3f29 100644 --- a/examples/notebook/examples/balance_group_sat.ipynb +++ b/examples/notebook/examples/balance_group_sat.ipynb @@ -226,6 +226,8 @@ "# Minimize epsilon\n", "model.Minimize(e)\n", "\n", + "model.ExportToFile('balance_group_sat.pbtxt')\n", + "\n", "solver = cp_model.CpSolver()\n", "solution_printer = SolutionPrinter(values, colors, all_groups, all_items,\n", " item_in_group)\n", diff --git a/examples/notebook/examples/flexible_job_shop_sat.ipynb b/examples/notebook/examples/flexible_job_shop_sat.ipynb index 8484b8e648..4b60018921 100644 --- a/examples/notebook/examples/flexible_job_shop_sat.ipynb +++ b/examples/notebook/examples/flexible_job_shop_sat.ipynb @@ -104,9 +104,9 @@ " # Data part.\n", " jobs = [ # task = (processing_time, machine_id)\n", " [ # Job 0\n", - " [(3, 0), (1, 1), (5, 2)], # alternative 0\n", - " [(2, 0), (4, 1), (6, 2)], # alternative 1\n", - " [(2, 0), (3, 1), (1, 2)], # alternative 2\n", + " [(3, 0), (1, 1), (5, 2)], # task 0 with 3 alternatives\n", + " [(2, 0), (4, 1), (6, 2)], # task 1 with 3 alternatives\n", + " [(2, 0), (3, 1), (1, 2)], # task 2 with 3 alternatives\n", " ],\n", " [ # Job 1\n", " [(2, 0), (3, 1), (4, 2)],\n", diff --git a/examples/notebook/linear_solver/linear_programming_example.ipynb b/examples/notebook/linear_solver/linear_programming_example.ipynb index 9cec601038..349f7f1fb7 100644 --- a/examples/notebook/linear_solver/linear_programming_example.ipynb +++ b/examples/notebook/linear_solver/linear_programming_example.ipynb @@ -138,7 +138,6 @@ " print('\\nAdvanced usage:')\n", " print('Problem solved in %f milliseconds' % solver.wall_time())\n", " print('Problem solved in %d iterations' % solver.iterations())\n", - " print('Problem solved in %d branch-and-bound nodes' % solver.nodes())\n", " # [END advanced]\n", "\n", "\n", diff --git a/examples/notebook/linear_solver/simple_lp_program.ipynb b/examples/notebook/linear_solver/simple_lp_program.ipynb index 0a8682a1f5..0d884e4a2f 100644 --- a/examples/notebook/linear_solver/simple_lp_program.ipynb +++ b/examples/notebook/linear_solver/simple_lp_program.ipynb @@ -133,7 +133,6 @@ "print('\\nAdvanced usage:')\n", "print('Problem solved in %f milliseconds' % solver.wall_time())\n", "print('Problem solved in %d iterations' % solver.iterations())\n", - "print('Problem solved in %d branch-and-bound nodes' % solver.nodes())\n", "# [END advanced]\n", "\n" ] diff --git a/examples/notebook/sat/minimal_jobshop_sat.ipynb b/examples/notebook/sat/minimal_jobshop_sat.ipynb index d627a86109..8ed37dfa98 100644 --- a/examples/notebook/sat/minimal_jobshop_sat.ipynb +++ b/examples/notebook/sat/minimal_jobshop_sat.ipynb @@ -129,8 +129,9 @@ " end_var = model.NewIntVar(0, horizon, 'end' + suffix)\n", " interval_var = model.NewIntervalVar(start_var, duration, end_var,\n", " 'interval' + suffix)\n", - " all_tasks[job_id, task_id] = task_type(\n", - " start=start_var, end=end_var, interval=interval_var)\n", + " all_tasks[job_id, task_id] = task_type(start=start_var,\n", + " end=end_var,\n", + " interval=interval_var)\n", " machine_to_intervals[machine].append(interval_var)\n", " # [END variables]\n", "\n", @@ -170,11 +171,11 @@ " for task_id, task in enumerate(job):\n", " machine = task[0]\n", " assigned_jobs[machine].append(\n", - " assigned_task_type(\n", - " start=solver.Value(all_tasks[job_id, task_id].start),\n", - " job=job_id,\n", - " index=task_id,\n", - " duration=task[1]))\n", + " assigned_task_type(start=solver.Value(\n", + " all_tasks[job_id, task_id].start),\n", + " job=job_id,\n", + " index=task_id,\n", + " duration=task[1]))\n", "\n", " # Create per machine output lines.\n", " output = ''\n",