From 88d25b9d2c85397bbece85ac5f049425ec4250a8 Mon Sep 17 00:00:00 2001
From: Sam Dotson <sdotson@ucsusa.org>
Date: Wed, 15 May 2024 16:39:13 -0500
Subject: [PATCH] updates model

---
 notebooks/illinois_model.ipynb | 57 ++++++++--------------------------
 1 file changed, 13 insertions(+), 44 deletions(-)

diff --git a/notebooks/illinois_model.ipynb b/notebooks/illinois_model.ipynb
index 2b9325d..92c34e3 100644
--- a/notebooks/illinois_model.ipynb
+++ b/notebooks/illinois_model.ipynb
@@ -1030,7 +1030,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 35,
    "metadata": {},
    "outputs": [
     {
@@ -1041,33 +1041,9 @@
       "\n",
       "coords for dimension(s) ['snapshot'] is not aligned with the pandas object. Previously, the indexes of the pandas were ignored and overwritten in these cases. Now, the pandas object's coordinates are taken considered for alignment.\n",
       "\n",
-      "INFO:linopy.model: Solve problem using Cplex solver\n",
-      "INFO:linopy.io: Writing time: 0.06s\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Version identifier: 22.1.1.0 | 2022-11-27 | 9160aff4d\n",
-      "CPXPARAM_Read_DataCheck                          1\n",
-      "Parallel mode: deterministic, using up to 12 threads for concurrent optimization:\n",
-      " * Starting dual Simplex on 1 thread...\n",
-      " * Starting Barrier on 10 threads...\n",
-      " * Starting primal Simplex on 1 thread...\n",
-      "Tried aggregator 1 time.\n",
-      "LP Presolve eliminated 13142 rows and 4382 columns.\n",
-      "All rows and columns eliminated.\n",
-      "Presolve time = 0.01 sec. (4.14 ticks)\n",
-      "\n",
-      "Dual simplex solved model.\n",
-      "\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
+      "INFO:linopy.model: Solve problem using Highs solver\n",
+      "INFO:linopy.io: Writing time: 0.06s\n",
+      "INFO:linopy.solvers:Log file at C:\\Users\\sdotson\\AppData\\Local\\Temp\\highs.log.\n",
       "INFO:linopy.constants: Optimization successful: \n",
       "Status: ok\n",
       "Termination condition: optimal\n",
@@ -1094,18 +1070,18 @@
        "('ok', 'optimal')"
       ]
      },
-     "execution_count": 29,
+     "execution_count": 35,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "n.optimize(solver_name='cplex')"
+    "n.optimize(solver_name='highs')"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 36,
    "metadata": {},
    "outputs": [
     {
@@ -1217,7 +1193,7 @@
        "[2190 rows x 2 columns]"
       ]
      },
-     "execution_count": 30,
+     "execution_count": 36,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1228,7 +1204,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": 37,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1237,7 +1213,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 38,
    "metadata": {},
    "outputs": [
     {
@@ -1253,7 +1229,7 @@
        "Name: color, dtype: object"
       ]
      },
-     "execution_count": 32,
+     "execution_count": 38,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1264,14 +1240,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 33,
+   "execution_count": 39,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1310,7 +1279,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 34,
+   "execution_count": 40,
    "metadata": {},
    "outputs": [
     {