adjusted test files

QUARK-framework · Feb 26, 2025 · 3d3ef36 · 3d3ef36
1 parent c7905f3
commit 3d3ef36
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/tests/modules/applications/optimization/bp/mappings/test_ising.py b/tests/modules/applications/optimization/bp/mappings/test_ising.py
@@ -34,8 +34,8 @@ def test_map(self):
         """
         config = {"penalty_factor": 2}
         problem = ([2, 4, 6], 10, [])
-        with patch("modules.applications.optimization.bp.bp.create_MIP", return_value=MagicMock()):
-            with patch("modules.applications.optimization.bp.bp.transform_docplex_mip_to_ising", return_value=(np.array([[1, -1], [-1, 1]]), np.array([1, -1]), 0, MagicMock())):
+        with patch("modules.applications.optimization.bp.mappings.mip.MIP.create_MIP", return_value=MagicMock()):
+            with patch("modules.applications.optimization.bp.mappings.ising.Ising.transform_docplex_mip_to_ising", return_value=(np.array([[1, -1], [-1, 1]]), np.array([1, -1]), 0, MagicMock())):
                 result, _ = self.ising_instance.map(problem, config)
 
         self.assertIn("J", result)

diff --git a/tests/modules/applications/optimization/bp/mappings/test_qubo.py b/tests/modules/applications/optimization/bp/mappings/test_qubo.py
@@ -28,8 +28,8 @@ def test_map(self):
         config = {"penalty_factor": 2}
         problem = ([2, 4, 6], 10, [])
 
-        with patch("modules.applications.optimization.bp.bp.create_MIP", return_value=MagicMock()):
-            with patch("modules.applications.optimization.bp.bp.transform_docplex_mip_to_qubo",
+        with patch("modules.applications.optimization.bp.mappings.mip.mip.create_MIP", return_value=MagicMock()):
+            with patch("modules.applications.optimization.bp.mappings.qubo.QUBO.transform_docplex_mip_to_qubo",
                        return_value=(MagicMock(), MagicMock())):
                 result, _ = self.qubo_instance.map(problem, config)
 

diff --git a/tests/modules/applications/optimization/bp/test_bp.py b/tests/modules/applications/optimization/bp/test_bp.py
@@ -4,7 +4,10 @@
 from qiskit_optimization import QuadraticProgram
 
 from docplex.mp.model import Model
-from modules.applications.optimization.bp.bp import BP, create_MIP, transform_docplex_mip_to_qubo, transform_docplex_mip_to_ising
+from modules.applications.optimization.bp.bp import BP
+from modules.applications.optimization.bp.mappings.mip import MIP
+from modules.applications.optimization.bp.mappings.ising import Ising
+from modules.applications.optimization.bp.mappings.qubo import QUBO
 
 
 class TestBP(unittest.TestCase):
@@ -92,7 +95,7 @@ def test_evaluate_solution(self):
 
     def test_create_MIP(self):
         problem = ([2, 4, 6], 10, [])
-        model = create_MIP(problem)
+        model = MIP.create_MIP(problem)
 
         self.assertIsInstance(model, Model)
         self.assertTrue(model.get_objective_expr() is not None)
@@ -103,7 +106,7 @@ def test_transform_docplex_mip_to_qubo(self):
         model.binary_var(name="x2")
 
         with patch("modules.applications.optimization.bp.bp.from_docplex_mp", return_value=QuadraticProgram()):
-            qubo_operator, qubo = transform_docplex_mip_to_qubo(model, penalty_factor=1.0)
+            qubo_operator, qubo = QUBO.transform_docplex_mip_to_qubo(model, penalty_factor=1.0)
 
         self.assertIsInstance(qubo_operator, dict)
         self.assertIsInstance(qubo, QuadraticProgram)
@@ -114,7 +117,7 @@ def test_transform_docplex_mip_to_ising(self):
         model.binary_var(name="x2")
 
         with patch("modules.applications.optimization.bp.bp.from_docplex_mp", return_value=QuadraticProgram()):
-            ising_matrix, ising_vector, ising_offset, qubo = transform_docplex_mip_to_ising(model, penalty_factor=1.0)
+            ising_matrix, ising_vector, ising_offset, qubo = Ising.transform_docplex_mip_to_ising(model, penalty_factor=1.0)
         ising_offset = float(ising_offset)
 
         self.assertIsInstance(ising_matrix, np.ndarray)

diff --git a/tests/modules/applications/optimization/salbp/test_salbp.py b/tests/modules/applications/optimization/salbp/test_salbp.py
@@ -96,7 +96,7 @@ def test_get_requirements(self):
         requirements = salbp.get_requirements()
         expected_requirements = [
             {"name": "docplex", "version": "2.25.236"},
-            {"name": "networkx", "version": "2.8.8"},
+            {"name": "networkx", "version": "3.4.2"},
         ]
         self.assertEqual(requirements, expected_requirements, "Expected correct module dependencies")