Warning removed and tests uncommented

kalininalab · Apr 8, 2024 · 0489972 · 0489972
1 parent a5703b9
commit 0489972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/datasail/solver/utils.py b/datasail/solver/utils.py
@@ -50,7 +50,7 @@ def stratification_constraints(
     """
     c = np.sum(s_matrix, axis=0)
     slbo = np.array([[c[e] * split * (1 - delta) for e in range(s_matrix.shape[1])] for split in splits])
-    return (x * s_matrix) >= slbo
+    return (x @ s_matrix) >= slbo
 
 
 class LoggerRedirect:

diff --git a/tests/test_bqp.py b/tests/test_bqp.py
@@ -1,14 +1,15 @@
 import shutil
 from pathlib import Path
+from typing import Tuple
 
 import pytest
 
 from tests.utils import check_folder, run_sail
 
 
-# @pytest.mark.parametrize("root_dir", [Path("data") / "perf_7_3", Path("data") / "perf_70_30"])
-# @pytest.mark.parametrize("mode", [("R", "random"), ("I1e", "id_cold_single"), ("I2", "id_cold_double")])
-def test_perf_bin_2(root_dir=Path("data") / "perf_70_30", mode=("I2", "id_cold_double")):
+@pytest.mark.parametrize("root_dir", [Path("data") / "perf_7_3", Path("data") / "perf_70_30"])
+@pytest.mark.parametrize("mode", [("R", "random"), ("I1e", "id_cold_single"), ("I2", "id_cold_double")])
+def test_perf_bin_2(root_dir: Path, mode: Tuple[str, str]):
     base = root_dir / mode[1]
 
     run_sail(