Update notebooks

2020-12-07 17:50:07 +01:00
parent a34aa62ff6
commit 7626ea5615
3 changed files with 181 additions and 26 deletions
--- a/examples/notebook/linear_solver/basic_example.ipynb
+++ b/examples/notebook/linear_solver/basic_example.ipynb
@@ -0,0 +1,136 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "##### Copyright 2020 Google LLC."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Licensed under the Apache License, Version 2.0 (the \"License\");\n",
+    "you may not use this file except in compliance with the License.\n",
+    "You may obtain a copy of the License at\n",
+    "\n",
+    "    http://www.apache.org/licenses/LICENSE-2.0\n",
+    "\n",
+    "Unless required by applicable law or agreed to in writing, software\n",
+    "distributed under the License is distributed on an \"AS IS\" BASIS,\n",
+    "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
+    "See the License for the specific language governing permissions and\n",
+    "limitations under the License.\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# basic_example"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "<table align=\"left\">\n",
+    "<td>\n",
+    "<a href=\"https://colab.research.google.com/github/google/or-tools/blob/master/examples/notebook/linear_solver/basic_example.ipynb\"><img src=\"https://raw.githubusercontent.com/google/or-tools/master/tools/colab_32px.png\"/>Run in Google Colab</a>\n",
+    "</td>\n",
+    "<td>\n",
+    "<a href=\"https://github.com/google/or-tools/blob/master/ortools/linear_solver/samples/basic_example.py\"><img src=\"https://raw.githubusercontent.com/google/or-tools/master/tools/github_32px.png\"/>View source on GitHub</a>\n",
+    "</td>\n",
+    "</table>"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "First, you must install [ortools](https://pypi.org/project/ortools/) package in this colab."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!pip install ortools"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Copyright 2010-2018 Google LLC\n",
+    "# Licensed under the Apache License, Version 2.0 (the \"License\");\n",
+    "# you may not use this file except in compliance with the License.\n",
+    "# You may obtain a copy of the License at\n",
+    "#\n",
+    "#     http://www.apache.org/licenses/LICENSE-2.0\n",
+    "#\n",
+    "# Unless required by applicable law or agreed to in writing, software\n",
+    "# distributed under the License is distributed on an \"AS IS\" BASIS,\n",
+    "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n",
+    "# See the License for the specific language governing permissions and\n",
+    "# limitations under the License.\n",
+    "\"\"\"Minimal example to call the GLOP solver.\"\"\"\n",
+    "# [START program]\n",
+    "# [START import]\n",
+    "from ortools.linear_solver import pywraplp\n",
+    "# [END import]\n",
+    "\n",
+    "\n",
+    "# [START solver]\n",
+    "# Create the linear solver with the GLOP backend.\n",
+    "solver = pywraplp.Solver.CreateSolver('GLOP')\n",
+    "# [END solver]\n",
+    "\n",
+    "# [START variables]\n",
+    "# Create the variables x and y.\n",
+    "x = solver.NumVar(0, 1, 'x')\n",
+    "y = solver.NumVar(0, 2, 'y')\n",
+    "\n",
+    "print('Number of variables =', solver.NumVariables())\n",
+    "# [END variables]\n",
+    "\n",
+    "# [START constraints]\n",
+    "# Create a linear constraint, 0 <= x + y <= 2.\n",
+    "ct = solver.Constraint(0, 2, 'ct')\n",
+    "ct.SetCoefficient(x, 1)\n",
+    "ct.SetCoefficient(y, 1)\n",
+    "\n",
+    "print('Number of constraints =', solver.NumConstraints())\n",
+    "# [END constraints]\n",
+    "\n",
+    "# [START objective]\n",
+    "# Create the objective function, 3 * x + y.\n",
+    "objective = solver.Objective()\n",
+    "objective.SetCoefficient(x, 3)\n",
+    "objective.SetCoefficient(y, 1)\n",
+    "objective.SetMaximization()\n",
+    "# [END objective]\n",
+    "\n",
+    "# [START solve]\n",
+    "solver.Solve()\n",
+    "# [END solve]\n",
+    "\n",
+    "# [START print_solution]\n",
+    "print('Solution:')\n",
+    "print('Objective value =', objective.Value())\n",
+    "print('x =', x.solution_value())\n",
+    "print('y =', y.solution_value())\n",
+    "# [END print_solution]\n",
+    "\n"
+   ]
+  }
+ ],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 4
+}
--- a/examples/notebook/linear_solver/linear_programming_example.ipynb
+++ b/examples/notebook/linear_solver/linear_programming_example.ipynb
@@ -97,6 +97,8 @@
    "    # [START variables]\n",
    "    x = solver.NumVar(0, solver.infinity(), 'x')\n",
    "    y = solver.NumVar(0, solver.infinity(), 'y')\n",
+    "\n",
+    "    print('Number of variables =', solver.NumVariables())\n",
    "    # [END variables]\n",
    "\n",
    "    # [START constraints]\n",
@@ -114,6 +116,8 @@
    "    constraint2 = solver.Constraint(-solver.infinity(), 2)\n",
    "    constraint2.SetCoefficient(x, 1)\n",
    "    constraint2.SetCoefficient(y, -1)\n",
+    "\n",
+    "    print('Number of constraints =', solver.NumConstraints())\n",
    "    # [END constraints]\n",
    "\n",
    "    # [START objective]\n",
@@ -126,20 +130,26 @@
    "\n",
    "    # Solve the system.\n",
    "    # [START solve]\n",
-    "    solver.Solve()\n",
+    "    status = solver.Solve()\n",
    "    # [END solve]\n",
+    "\n",
    "    # [START print_solution]\n",
-    "    opt_solution = 3 * x.solution_value() + 4 * y.solution_value()\n",
-    "    print('Number of variables =', solver.NumVariables())\n",
-    "    print('Number of constraints =', solver.NumConstraints())\n",
-    "    # The value of each variable in the solution.\n",
-    "    print('Solution:')\n",
-    "    print('x = ', x.solution_value())\n",
-    "    print('y = ', y.solution_value())\n",
-    "    # The objective value of the solution.\n",
-    "    print('Optimal objective value =', opt_solution)\n",
+    "    if status == pywraplp.Solver.OPTIMAL:\n",
+    "        print('Solution:')\n",
+    "        print('Objective value =', solver.Objective().Value())\n",
+    "        print('x =', x.solution_value())\n",
+    "        print('y =', y.solution_value())\n",
+    "    else:\n",
+    "        print('The problem does not have an optimal solution.')\n",
    "    # [END print_solution]\n",
    "\n",
+    "    # [START advanced]\n",
+    "    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",
    "LinearProgrammingExample()\n",
    "# [END program]\n",
--- a/examples/notebook/linear_solver/simple_lp_program.ipynb
+++ b/examples/notebook/linear_solver/simple_lp_program.ipynb
@@ -92,40 +92,49 @@
    "# [END solver]\n",
    "\n",
    "# [START variables]\n",
+    "infinity = solver.infinity()\n",
    "# Create the variables x and y.\n",
-    "x = solver.NumVar(0, 1, 'x')\n",
-    "y = solver.NumVar(0, 2, 'y')\n",
+    "x = solver.NumVar(0.0, infinity, 'x')\n",
+    "y = solver.NumVar(0.0, infinity, 'y')\n",
    "\n",
    "print('Number of variables =', solver.NumVariables())\n",
    "# [END variables]\n",
    "\n",
    "# [START constraints]\n",
-    "# Create a linear constraint, 0 <= x + y <= 2.\n",
-    "ct = solver.Constraint(0, 2, 'ct')\n",
-    "ct.SetCoefficient(x, 1)\n",
-    "ct.SetCoefficient(y, 1)\n",
+    "# x + 7 * y <= 17.5.\n",
+    "solver.Add(x + 7 * y <= 17.5)\n",
+    "\n",
+    "# x <= 3.5.\n",
+    "solver.Add(x <= 3.5)\n",
    "\n",
    "print('Number of constraints =', solver.NumConstraints())\n",
    "# [END constraints]\n",
    "\n",
    "# [START objective]\n",
-    "# Create the objective function, 3 * x + y.\n",
-    "objective = solver.Objective()\n",
-    "objective.SetCoefficient(x, 3)\n",
-    "objective.SetCoefficient(y, 1)\n",
-    "objective.SetMaximization()\n",
+    "# Maximize x + 10 * y.\n",
+    "solver.Maximize(x + 10 * y)\n",
    "# [END objective]\n",
    "\n",
    "# [START solve]\n",
-    "solver.Solve()\n",
+    "status = solver.Solve()\n",
    "# [END solve]\n",
    "\n",
    "# [START print_solution]\n",
-    "print('Solution:')\n",
-    "print('Objective value =', objective.Value())\n",
-    "print('x =', x.solution_value())\n",
-    "print('y =', y.solution_value())\n",
+    "if status == pywraplp.Solver.OPTIMAL:\n",
+    "    print('Solution:')\n",
+    "    print('Objective value =', solver.Objective().Value())\n",
+    "    print('x =', x.solution_value())\n",
+    "    print('y =', y.solution_value())\n",
+    "else:\n",
+    "    print('The problem does not have an optimal solution.')\n",
    "# [END print_solution]\n",
+    "\n",
+    "# [START advanced]\n",
+    "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"
   ]
  }