diff --git a/Notebook_final.ipynb b/Notebook_final.ipynb index 64be62e8f91e59c31fbd4d838e51a3cda10a58e4..c0d95d65818476579cf574ed6faf36148bdc47c5 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,