From d82ee3b08678531885527097efb4acdf792b1d16 Mon Sep 17 00:00:00 2001 From: Sebastian Uerlich Date: Wed, 22 Jan 2020 14:32:39 +0100 Subject: [PATCH 1/2] use new gurobi 9.0.0 version --- utils/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/Dockerfile b/utils/Dockerfile index e56ae29..55d0edf 100644 --- a/utils/Dockerfile +++ b/utils/Dockerfile @@ -1,12 +1,12 @@ FROM python:3.6 AS base -ENV GUROBI_HOME="/opt/gurobi752/linux64" +ENV GUROBI_HOME="/opt/gurobi900/linux64" ENV PATH="${PATH}:$GUROBI_HOME/bin" \ LD_LIBRARY_PATH="/usr/local/lib:/usr/local/lib64:$GUROBI_HOME/lib" -## add gurobi 7.5.2 -RUN curl https://packages.gurobi.com/7.5/gurobi7.5.2_linux64.tar.gz > /gurobi.tar.gz &&\ +## add gurobi 9.0.0 +RUN curl https://packages.gurobi.com/9.0/gurobi9.0.0_linux64.tar.gz > /gurobi.tar.gz &&\ tar xfz gurobi.tar.gz -C /opt/ &&\ chmod 777 -R $GUROBI_HOME &&\ rm gurobi.tar.gz &&\ -- GitLab From fae8398bc19815c8595f01eb4101cc2173e3038d Mon Sep 17 00:00:00 2001 From: Sebastian Uerlich Date: Wed, 22 Jan 2020 16:04:42 +0100 Subject: [PATCH 2/2] change tests for new gurobi version --- testing/unit_tests/test_classes.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testing/unit_tests/test_classes.py b/testing/unit_tests/test_classes.py index b5f5abb..0c063f8 100644 --- a/testing/unit_tests/test_classes.py +++ b/testing/unit_tests/test_classes.py @@ -223,7 +223,7 @@ class TestDeferrableLoad(unittest.TestCase): self.dl.update_model(model) model.optimize() - self.assertAlmostEqual(10, gp.quicksum(self.dl.P_El_vars), places=5) + self.assertAlmostEqual(13.333333*4, gp.quicksum(self.dl.P_El_vars).getValue(), places=5) self.dl.timer.mpc_update() self.dl.update_model(model) @@ -327,8 +327,7 @@ class TestElectricVehicle(unittest.TestCase): else: self.assertEqual(0, self.ev.P_El_Demand_vars[t].ub) self.assertEqual(0, self.ev.P_El_Supply_vars[t].ub) - self.assertEqual(gp.GRB.INFINITY, - self.ev.P_El_Drive_vars[t].ub) + self.assertTrue(np.isinf(self.ev.P_El_Drive_vars[t].ub)) self.assertAlmostEqual(10, self.ev.E_El_vars[1].x, places=5) self.assertAlmostEqual(2, self.ev.E_El_vars[2].x, places=5) self.assertLessEqual(1.6, self.ev.E_El_vars[-1].x) -- GitLab