Merge branch 'binpacking_and_mipsolver' of https://github.com/QUARK-f…

…ramework/QUARK into binpacking_and_mipsolver
QUARK-framework · Feb 27, 2025 · dacd6d6 · dacd6d6
2 parents 22cbcdc + eada168
commit dacd6d6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/modules/applications/optimization/bp/bp.py b/src/modules/applications/optimization/bp/bp.py
@@ -221,7 +221,7 @@ def detect_mapping_from_solution(solution: dict) -> str:
         """
         if solution is None:
             return "Invalid"
-        
+
         if any('@int_slack@' in key for key in solution.keys()):
             return ['QUBO', 'Ising']
         else:

diff --git a/src/modules/applications/optimization/bp/mappings/qubo.py b/src/modules/applications/optimization/bp/mappings/qubo.py
@@ -154,7 +154,6 @@ def transform_docplex_mip_to_qubo(self, mip_docplex: Model, penalty_factor) -> t
 
         return qubo_operator, qubo
 
-
     def get_default_submodule(self, option: str) -> Core:
         """
         Returns the default submodule based on the provided option.

diff --git a/tests/modules/applications/optimization/bp/test_bp.py b/tests/modules/applications/optimization/bp/test_bp.py
@@ -95,7 +95,7 @@ def test_evaluate_solution(self):
 
     def test_create_MIP(self):
         problem = ([2, 4, 6], 10, [])
-        model = MIP.create_MIP(self,problem)
+        model = MIP.create_MIP(self, problem)
 
         self.assertIsInstance(model, Model)
         self.assertTrue(model.get_objective_expr() is not None)
-Original file line number
+Diff line change
@@ Expand Up @@
             return qubo_operator, qubo
         def get_default_submodule(self, option: str) -> Core:
             """
             Returns the default submodule based on the provided option.
@@ Expand Down @@