From 3b7801166ddeced88472916942c0574ab5d20fcb Mon Sep 17 00:00:00 2001
From: taviera <alois.tavier@student.uclouvain.be>
Date: Sun, 21 May 2023 18:35:30 +0200
Subject: [PATCH] scipy

---
 Notebook_final.ipynb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Notebook_final.ipynb b/Notebook_final.ipynb
index 64be62e..c0d95d6 100644
--- a/Notebook_final.ipynb
+++ b/Notebook_final.ipynb
@@ -678,7 +678,7 @@
     "    contraintes.append((p_n_i[i]+p_r_i[i])>=0.25*p_max*x_i[i//(int(4*Duree))])\n",
     "\n",
     "probleme = cp.Problem(objectif, contraintes)\n",
-    "probleme.solve(solver=cp.CBC, warm_start = True, verbose=False)"
+    "probleme.solve(solver=cp.SCIPY, scipy_options={\"method\":\"highs\"}, verbose=False)"
    ]
   },
   {
@@ -712,7 +712,7 @@
     "    contraintes.append((p_n_i[i]+p_r_i[i])>=0.25*p_max*x_i[i//(int(4*Duree))])\n",
     "\n",
     "probleme = cp.Problem(objectif, contraintes)\n",
-    "probleme.solve(solver=cp.CBC, warm_start = True, verbose=False)"
+    "probleme.solve(solver=cp.SCIPY, scipy_options={\"method\":\"highs\"}, verbose=False)"
    ]
   },
   {
@@ -2001,7 +2001,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.13"
+   "version": "3.11.2"
   }
  },
  "nbformat": 4,
-- 
GitLab