rename tests, update to cbc, add callable solver name in tests

jylambert · Jul 19, 2024 · 2289deb · 2289deb
1 parent d3031c4
commit 2289deb
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -25,11 +25,11 @@ jobs:
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python-version }}
-          channels: conda-forge
+          channels: conda-forge, defaults
           channel-priority: strict
       - name: Install dependencies
         run: |
-          conda install -c conda-forge pyscipopt
+          conda install coin-or-cbc
           python -m pip install --upgrade pip
           python -m pip install flake8 pytest
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
@@ -44,4 +44,4 @@ jobs:
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
       - name: Test with pytest
         run: |
-          pytest
+          pytest tests/run_sts_test.py --solver cbc
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,3 @@
+def pytest_addoption(parser):
+    parser.addoption("--solver", action="store", default="scip",
+                     help="Define the solver to use for the optimization. Default is cbc.")
diff --git a/test/data/A_c.parquet → tests/data/A_c.parquet b/test/data/A_c.parquet → tests/data/A_c.parquet
diff --git a/test/data/A_i.parquet → tests/data/A_i.parquet b/test/data/A_i.parquet → tests/data/A_i.parquet
diff --git a/test/data/A_p.parquet → tests/data/A_p.parquet b/test/data/A_p.parquet → tests/data/A_p.parquet
diff --git a/test/data/L_i.parquet → tests/data/L_i.parquet b/test/data/L_i.parquet → tests/data/L_i.parquet
diff --git a/test/data/Q_c.parquet → tests/data/Q_c.parquet b/test/data/Q_c.parquet → tests/data/Q_c.parquet
diff --git a/test/data/regression.csv → tests/data/regression.csv b/test/data/regression.csv → tests/data/regression.csv
diff --git a/test/data/rel_positions.parquet → tests/data/rel_positions.parquet b/test/data/rel_positions.parquet → tests/data/rel_positions.parquet
diff --git a/test/data/timeseries.csv → tests/data/timeseries.csv b/test/data/timeseries.csv → tests/data/timeseries.csv
diff --git a/test/run_hydraulics_test.py → tests/run_hydraulics_test.py b/test/run_hydraulics_test.py → tests/run_hydraulics_test.py
diff --git a/test/run_mts_easy_test.py → tests/run_mts_easy_test.py b/test/run_mts_easy_test.py → tests/run_mts_easy_test.py
diff --git a/test/run_mts_test.py → tests/run_mts_test.py b/test/run_mts_test.py → tests/run_mts_test.py
diff --git a/test/run_sts_test.py → tests/run_sts_test.py b/test/run_sts_test.py → tests/run_sts_test.py
@@ -25,8 +25,9 @@ def read_regression(path, i):
     return r_thermal_cap, r_heat_loss
 
 
-def test_sts_forced():
+def test_sts_forced(request):
     """Main function to run the optimization"""
+    solver_name = request.config.getoption("--solver")
     # Load the district
     current_path = os.path.dirname(os.path.abspath(__file__))
     mat = tt.fileio.load(os.path.join(current_path, 'data'))
@@ -40,7 +41,7 @@ def test_sts_forced():
                          Optimization().economics, "forced")
 
     # Optimization initialization
-    opt = pyo.SolverFactory('scip')
+    opt = pyo.SolverFactory(solver_name)
     opt.options['mipgap'] = 0.01
     opt.options['timelimit'] = 600
 
@@ -51,8 +52,9 @@ def test_sts_forced():
     assert (abs(pyo.value(model.obj)) - 4.6259e+06) < 0.02 * 4.6259e+06
 
 
-def test_sts_eco():
+def test_sts_eco(request):
     """Main function to run the optimization"""
+    solver_name = request.config.getoption("--solver")
     # Load the district
     current_path = os.path.dirname(os.path.abspath(__file__))
     mat = tt.fileio.load(os.path.join(current_path, 'data'))
@@ -66,7 +68,7 @@ def test_sts_eco():
                          Optimization().economics, "eco")
 
     # Optimization initialization
-    opt = pyo.SolverFactory('scip')
+    opt = pyo.SolverFactory(solver_name)
     opt.options['mipgap'] = 0.01
     opt.options['timelimit'] = 600