Update various notebooks

mobook · Oct 20, 2023 · 83a5a8d · 83a5a8d
1 parent 8a55ce7
commit 83a5a8d
Show file tree

Hide file tree

Showing 8 changed files with 1,329 additions and 2,420 deletions.
diff --git a/notebooks/03/bim-production-revisited.ipynb b/notebooks/03/bim-production-revisited.ipynb
diff --git a/notebooks/03/shift-scheduling.ipynb b/notebooks/03/shift-scheduling.ipynb
diff --git a/notebooks/03/simple-production-model-gdp.ipynb b/notebooks/03/simple-production-model-gdp.ipynb
@@ -39,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.\""
+    " \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.\""
    ]
   },
   {
@@ -101,15 +99,15 @@
     "\n",
     "A small production facility produces two products, $X$ and $Y$. With current technology $\\alpha$, the facility is subject to the following conditions and constraints:\n",
     "\n",
-    "* Product $X$ requires 1 hour of labor A, 2 hours of labor B, and 100$ of raw material. Product $X$ sells for 270$ per unit. The daily demand is limited to 40 units.\n",
+    "* Product $X$ requires 1 hour of labor A, 2 hours of labor B, and 100\\$ of raw material. Product $X$ sells for 270\\$ per unit. The daily demand is limited to 40 units.\n",
     "\n",
-    "* Product $Y$ requires 1 hour of labor A, 1 hour of labor B, and 90$ of raw material. Product $Y$ sells for 210$ per unit with unlimited demand. \n",
+    "* Product $Y$ requires 1 hour of labor A, 1 hour of labor B, and 90\\$ of raw material. Product $Y$ sells for 210\\$ per unit with unlimited demand. \n",
     "\n",
-    "* There are 80 hours per day of labor A available at a cost of 50$/hour.\n",
+    "* There are 80 hours per day of labor A available at a cost of 50\\$/hour.\n",
     "\n",
-    "* There are 100 hours per day of labor B available at a cost of 40$/hour.\n",
+    "* There are 100 hours per day of labor B available at a cost of 40\\$/hour.\n",
     "\n",
-    "Using the given data we see that the net profit for each unit of $X$ and $Y$ is 40$ and 30$, respectively. The optimal product strategy is the solution to a linear optimization\n",
+    "Using the given data we see that the net profit for each unit of $X$ and $Y$ is 40\\$ and 30\\$, respectively. The optimal product strategy is the solution to a linear optimization\n",
     "\n",
     "$$\n",
     "\\begin{align*}\n",
@@ -133,6 +131,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Running HiGHS 1.5.3 [date: 2023-05-16, git hash: 594fa5a9d]\n",
+      "Copyright (c) 2023 HiGHS under MIT licence terms\n",
       "Profit = $2600.00\n",
       "Production X = 20.0\n",
       "Production Y = 60.0\n"
@@ -232,6 +232,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Running HiGHS 1.5.3 [date: 2023-05-16, git hash: 594fa5a9d]\n",
+      "Copyright (c) 2023 HiGHS under MIT licence terms\n",
       "Profit = $3600.00\n",
       "Production X = 40.0\n",
       "Production Y = 40.0\n"
@@ -332,6 +334,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Running HiGHS 1.5.3 [date: 2023-05-16, git hash: 594fa5a9d]\n",
+      "Copyright (c) 2023 HiGHS under MIT licence terms\n",
       "Profit = $3600.00\n",
       "Production X = 40.0\n",
       "Production Y = 40.0\n"

diff --git a/notebooks/04/cache/958cbe4ebd7fedf3786c2bffce35357441116635.json b/notebooks/04/cache/958cbe4ebd7fedf3786c2bffce35357441116635.json
diff --git a/notebooks/04/dinner-seat-allocation.ipynb b/notebooks/04/dinner-seat-allocation.ipynb
@@ -53,19 +53,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.\""
+    " \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/...c7735f2adc0b7c44046035693e7423a8331a.json → ...e43fb9b55a6c09282a18fb55c2f2ef4434d1.json b/...c7735f2adc0b7c44046035693e7423a8331a.json → ...e43fb9b55a6c09282a18fb55c2f2ef4434d1.json
diff --git a/notebooks/04/in_development/cache/958cbe4ebd7fedf3786c2bffce35357441116635.json b/notebooks/04/in_development/cache/958cbe4ebd7fedf3786c2bffce35357441116635.json