Update notebooks' preamble

mobook · Nov 20, 2023 · 9d1896f · 9d1896f
1 parent a9be9c6
commit 9d1896f
Show file tree

Hide file tree

Showing 37 changed files with 555 additions and 525 deletions.
diff --git a/notebooks/02/L1-regression-wine-quality.ipynb b/notebooks/02/L1-regression-wine-quality.ipynb
@@ -24,12 +24,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -45,19 +40,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/bim-dual.ipynb b/notebooks/02/bim-dual.ipynb
@@ -24,12 +24,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -46,19 +41,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/bim-fractional.ipynb b/notebooks/02/bim-fractional.ipynb
@@ -18,12 +18,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -39,19 +34,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/bim-maxmin.ipynb b/notebooks/02/bim-maxmin.ipynb
@@ -18,12 +18,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -39,19 +34,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/bim-rawmaterialplanning.ipynb b/notebooks/02/bim-rawmaterialplanning.ipynb
@@ -31,12 +31,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -52,19 +47,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/bim.ipynb b/notebooks/02/bim.ipynb
@@ -26,12 +26,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -48,19 +43,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:   \n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/lad-regression.ipynb b/notebooks/02/lad-regression.ipynb
@@ -23,12 +23,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -44,19 +39,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/mad-portfolio-optimization.ipynb b/notebooks/02/mad-portfolio-optimization.ipynb
@@ -33,12 +33,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -54,19 +49,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {

diff --git a/notebooks/02/multiproductionfaciliity_worstcase.ipynb b/notebooks/02/multiproductionfaciliity_worstcase.ipynb
@@ -26,12 +26,7 @@
    "source": [
     "## Preamble: Install Pyomo and a solver\n",
     "\n",
-    "This cell selects and verifies a global SOLVER for the notebook.\n",
-    "\n",
-    "If run on Google Colab, the cell installs Pyomo and HiGHS, then sets SOLVER to \n",
-    "use the Highs solver via the appsi module. If run elsewhere, it assumes Pyomo and CBC\n",
-    "have been previously installed and sets SOLVER to use the CBC solver via the Pyomo \n",
-    "SolverFactory. It then verifies that SOLVER is available."
+    "The following cell sets and verifies a global SOLVER for the notebook. If run on Google Colab, the cell installs Pyomo and the HiGHS solver, while, if run elsewhere, it assumes Pyomo and HiGHS have been previously installed. It then sets to use HiGHS as solver via the appsi module and a test is performed to verify that it is available. The solver interface is stored in a global object `SOLVER` for later use."
    ]
   },
   {
@@ -47,19 +42,17 @@
    "outputs": [],
    "source": [
     "import sys\n",
-    "\n",
+    " \n",
     "if 'google.colab' in sys.modules:\n",
-    "    !pip install pyomo >/dev/null 2>/dev/null\n",
-    "    !pip install highspy >/dev/null 2>/dev/null\n",
-    "\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('appsi_highs')\n",
-    "    \n",
-    "else:\n",
-    "    from pyomo.environ import SolverFactory\n",
-    "    SOLVER = SolverFactory('cbc')\n",
-    "\n",
-    "assert SOLVER.available(), f\"Solver {SOLVER} is not available.\""
+    "    %pip install pyomo >/dev/null 2>/dev/null\n",
+    "    %pip install highspy >/dev/null 2>/dev/null\n",
+    " \n",
+    "solver = 'appsi_highs'\n",
+    " \n",
+    "import pyomo.environ as pyo\n",
+    "SOLVER = pyo.SolverFactory(solver)\n",
+    " \n",
+    "assert SOLVER.available(), f\"Solver {solver} is not available.\""
    ]
   },
   {