From 447410f2e78316cb4eb3e7fe7d7b2ac731f228f8 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Wed, 9 Dec 2020 17:28:01 +0100 Subject: [PATCH] Fixup notebook --- .../linear_programming_example.ipynb | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/examples/notebook/linear_solver/linear_programming_example.ipynb b/examples/notebook/linear_solver/linear_programming_example.ipynb index 7967f819a4..9cec601038 100644 --- a/examples/notebook/linear_solver/linear_programming_example.ipynb +++ b/examples/notebook/linear_solver/linear_programming_example.ipynb @@ -103,29 +103,20 @@ "\n", " # [START constraints]\n", " # Constraint 0: x + 2y <= 14.\n", - " constraint0 = solver.Constraint(-solver.infinity(), 14)\n", - " constraint0.SetCoefficient(x, 1)\n", - " constraint0.SetCoefficient(y, 2)\n", + " solver.Add(x + 2 * y <= 14.0)\n", "\n", " # Constraint 1: 3x - y >= 0.\n", - " constraint1 = solver.Constraint(0, solver.infinity())\n", - " constraint1.SetCoefficient(x, 3)\n", - " constraint1.SetCoefficient(y, -1)\n", + " solver.Add(3 * x - y >= 0.0)\n", "\n", " # Constraint 2: x - y <= 2.\n", - " constraint2 = solver.Constraint(-solver.infinity(), 2)\n", - " constraint2.SetCoefficient(x, 1)\n", - " constraint2.SetCoefficient(y, -1)\n", + " solver.Add(x - y <= 2.0)\n", "\n", " print('Number of constraints =', solver.NumConstraints())\n", " # [END constraints]\n", "\n", " # [START objective]\n", " # Objective function: 3x + 4y.\n", - " objective = solver.Objective()\n", - " objective.SetCoefficient(x, 3)\n", - " objective.SetCoefficient(y, 4)\n", - " objective.SetMaximization()\n", + " solver.Maximize(3 * x + 4 * y)\n", " # [END objective]\n", "\n", " # Solve the system.\n",