ommx-python-mip-adapter 2.0.0b2__tar.gz → 2.0.0rc1__tar.gz

{ommx_python_mip_adapter-2.0.0b2 → ommx_python_mip_adapter-2.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 2.0.0b2
+Version: 2.0.0rc1
 Summary: An adapter for the Python-MIP from/to OMMX.
 Author-email: "Jij Inc." <info@j-ij.com>
 Project-URL: Repository, https://github.com/Jij-Inc/ommx
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<3.0.0,>=2.0.0b2
+Requires-Dist: ommx<3.0.0,>=2.0.0b3
 Requires-Dist: mip<2.0.0,>=1.15.0
 
 OMMX adapter for Python-MIP

{ommx_python_mip_adapter-2.0.0b2 → ommx_python_mip_adapter-2.0.0rc1}/ommx_python_mip_adapter/adapter.py

@@ -27,14 +27,12 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         :param solver: Passes a specific solver to the Python-MIP model.
         :param verbose: If True, enable Python-MIP's verbose mode
         """
-        if ommx_instance.raw.sense == Instance.MAXIMIZE:
+        if ommx_instance.sense == Instance.MAXIMIZE:
             sense = mip.MAXIMIZE
-        elif ommx_instance.raw.sense == Instance.MINIMIZE:
+        elif ommx_instance.sense == Instance.MINIMIZE:
             sense = mip.MINIMIZE
         else:
-            raise OMMXPythonMIPAdapterError(
-                f"Unsupported sense: {ommx_instance.raw.sense}"
-            )
+            raise OMMXPythonMIPAdapterError(f"Unsupported sense: {ommx_instance.sense}")
         self.instance = ommx_instance
         self.model = mip.Model(
             sense=sense,
@@ -86,7 +84,7 @@ class OMMXPythonMIPAdapter(SolverAdapter):
             >>> instance = Instance.from_components(
             ...     decision_variables=x,
             ...     objective=sum(p[i] * x[i] for i in range(6)),
-            ...     constraints=[sum(w[i] * x[i] for i in range(6)) <= 47],
+            ...     constraints=[(sum(w[i] * x[i] for i in range(6)) <= 47).set_id(0)],
             ...     sense=Instance.MAXIMIZE,
             ... )
 
@@ -107,7 +105,7 @@ class OMMXPythonMIPAdapter(SolverAdapter):
 
             >>> solution.objective
             42.0
-            >>> solution.raw.evaluated_constraints[0].evaluated_value
+            >>> solution.get_constraint_value(0)
             -1.0
 
         Infeasible Problem
@@ -162,12 +160,12 @@ class OMMXPythonMIPAdapter(SolverAdapter):
                 >>> instance = Instance.from_components(
                 ...     decision_variables=[x, y],
                 ...     objective=x + y,
-                ...     constraints=[x + y <= 1],
+                ...     constraints=[(x + y <= 1).set_id(0)],
                 ...     sense=Instance.MAXIMIZE,
                 ... )
 
                 >>> solution = OMMXPythonMIPAdapter.solve(instance)
-                >>> solution.raw.evaluated_constraints[0].dual_variable
+                >>> solution.get_dual_variable(0)
                 1.0
 
         """
@@ -247,16 +245,14 @@ class OMMXPythonMIPAdapter(SolverAdapter):
             if pi is not None:
                 id = int(constraint.name)
                 dual_variables[id] = pi
-        for constraint in solution.raw.evaluated_constraints:
-            id = constraint.id
-            if id in dual_variables:
-                constraint.dual_variable = dual_variables[id]
+        for constraint_id, dual_value in dual_variables.items():
+            solution.set_dual_variable(constraint_id, dual_value)
 
         if data.status == mip.OptimizationStatus.OPTIMAL:
-            solution.raw.optimality = Solution.OPTIMAL
+            solution.optimality = Solution.OPTIMAL
 
         if self._relax:
-            solution.raw.relaxation = Solution.LP_RELAXED
+            solution.relaxation = Solution.LP_RELAXED
         return solution
 
     def decode_to_state(self, data: mip.Model) -> State:
@@ -299,13 +295,13 @@ class OMMXPythonMIPAdapter(SolverAdapter):
 
         return State(
             entries={
-                var_id: data.var_by_name(str(var_id)).x  # type: ignore
-                for var_id, var in self.instance.raw.decision_variables.items()
+                var.id: data.var_by_name(str(var.id)).x  # type: ignore
+                for var in self.instance.decision_variables
             }
         )
 
     def _set_decision_variables(self):
-        for var_id, var in self.instance.raw.decision_variables.items():
+        for var in self.instance.decision_variables:
             if var.kind == DecisionVariable.BINARY:
                 self.model.add_var(
                     name=str(var.id),
@@ -360,7 +356,7 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         self.model.objective = self._as_lin_expr(self.instance.objective)
 
     def _set_constraints(self):
-        for constraint in self.instance.get_constraints():
+        for constraint in self.instance.constraints:
             lin_expr = self._as_lin_expr(constraint.function)
             if constraint.equality == Constraint.EQUAL_TO_ZERO:
                 constr_expr = lin_expr == 0

{ommx_python_mip_adapter-2.0.0b2 → ommx_python_mip_adapter-2.0.0rc1}/ommx_python_mip_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 2.0.0b2
+Version: 2.0.0rc1
 Summary: An adapter for the Python-MIP from/to OMMX.
 Author-email: "Jij Inc." <info@j-ij.com>
 Project-URL: Repository, https://github.com/Jij-Inc/ommx
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<3.0.0,>=2.0.0b2
+Requires-Dist: ommx<3.0.0,>=2.0.0b3
 Requires-Dist: mip<2.0.0,>=1.15.0
 
 OMMX adapter for Python-MIP

ommx_python_mip_adapter-2.0.0rc1/ommx_python_mip_adapter.egg-info/requires.txt

@@ -0,0 +1,2 @@
+ommx<3.0.0,>=2.0.0b3
+mip<2.0.0,>=1.15.0

{ommx_python_mip_adapter-2.0.0b2 → ommx_python_mip_adapter-2.0.0rc1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "2.0.0b2"
+version = "2.0.0rc1"
 
 description = "An adapter for the Python-MIP from/to OMMX."
 authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
@@ -27,7 +27,7 @@ classifiers = [
 # To support Python 3.12 and Apple silicon systems, this requires latest version of Python-MIP (will be 1.16.0?),
 # which does not release yet. https://github.com/coin-or/python-mip/issues/384
 # This project uses dev-dependency to use the latest version of Python-MIP not to include pre-release version in the release.
-dependencies = ["ommx >= 2.0.0b2, < 3.0.0", "mip >= 1.15.0, < 2.0.0"]
+dependencies = ["ommx >= 2.0.0b3, < 3.0.0", "mip >= 1.15.0, < 2.0.0"]
 
 [project.urls]
 Repository = "https://github.com/Jij-Inc/ommx"

{ommx_python_mip_adapter-2.0.0b2 → ommx_python_mip_adapter-2.0.0rc1}/tests/test_model_to_instance.py

@@ -48,20 +48,20 @@ def test_milp():
     assert ommx_instance.sense == Instance.MINIMIZE
 
     # Check the decision variables
-    assert len(ommx_instance.get_decision_variables()) == 3
-    decision_variables_x1 = ommx_instance.get_decision_variable(0)
+    assert len(ommx_instance.decision_variables) == 3
+    decision_variables_x1 = ommx_instance.get_decision_variable_by_id(0)
     assert decision_variables_x1.id == 0
     assert decision_variables_x1.kind == DecisionVariable.CONTINUOUS
     assert decision_variables_x1.bound.lower == CONTINUOUS_LOWER_BOUND
     assert decision_variables_x1.bound.upper == CONTINUOUS_UPPER_BOUND
     assert decision_variables_x1.name == "1"
-    decision_variables_x2 = ommx_instance.get_decision_variable(1)
+    decision_variables_x2 = ommx_instance.get_decision_variable_by_id(1)
     assert decision_variables_x2.id == 1
     assert decision_variables_x2.kind == DecisionVariable.INTEGER
     assert decision_variables_x2.bound.lower == INTEGER_LOWER_BOUND
     assert decision_variables_x2.bound.upper == INTEGER_UPPER_BOUND
     assert decision_variables_x2.name == "2"
-    decision_variables_x3 = ommx_instance.get_decision_variable(2)
+    decision_variables_x3 = ommx_instance.get_decision_variable_by_id(2)
     assert decision_variables_x3.id == 2
     assert decision_variables_x3.kind == DecisionVariable.BINARY
     assert decision_variables_x3.bound.lower == 0
@@ -78,9 +78,9 @@ def test_milp():
     assert linear_terms[2] == -3
 
     # Check the constraints
-    assert len(ommx_instance.get_constraints()) == 3
+    assert len(ommx_instance.constraints) == 3
 
-    constraint1 = ommx_instance.get_constraint(0)
+    constraint1 = ommx_instance.get_constraint_by_id(0)
     assert constraint1.equality == Constraint.EQUAL_TO_ZERO
     assert constraint1.function.degree() == 1
     assert constraint1.function.constant_term == 6
@@ -89,7 +89,7 @@ def test_milp():
     assert constraint1_terms[0] == 4
     assert constraint1_terms[1] == -5
 
-    constraint2 = ommx_instance.get_constraint(1)
+    constraint2 = ommx_instance.get_constraint_by_id(1)
     assert constraint2.equality == Constraint.LESS_THAN_OR_EQUAL_TO_ZERO
     assert constraint2.function.degree() == 1
     assert constraint2.function.constant_term == -9
@@ -98,7 +98,7 @@ def test_milp():
     assert constraint2_terms[0] == -7
     assert constraint2_terms[2] == 8
 
-    constraint3 = ommx_instance.get_constraint(2)
+    constraint3 = ommx_instance.get_constraint_by_id(2)
     assert constraint3.equality == Constraint.LESS_THAN_OR_EQUAL_TO_ZERO
     assert constraint3.function.degree() == 1
     assert constraint3.function.constant_term == -12
@@ -141,14 +141,14 @@ def test_no_objective_model():
     assert ommx_instance.sense == Instance.MAXIMIZE
 
     # Check the decision variables
-    assert len(ommx_instance.get_decision_variables()) == 2
-    decision_variables_x1 = ommx_instance.get_decision_variable(0)
+    assert len(ommx_instance.decision_variables) == 2
+    decision_variables_x1 = ommx_instance.get_decision_variable_by_id(0)
     assert decision_variables_x1.id == 0
     assert decision_variables_x1.kind == DecisionVariable.CONTINUOUS
     assert decision_variables_x1.bound.lower == LOWER_BOUND
     assert decision_variables_x1.bound.upper == UPPER_BOUND
     assert decision_variables_x1.name == "1"
-    decision_variables_x2 = ommx_instance.get_decision_variable(1)
+    decision_variables_x2 = ommx_instance.get_decision_variable_by_id(1)
     assert decision_variables_x2.id == 1
     assert decision_variables_x2.kind == DecisionVariable.CONTINUOUS
     assert decision_variables_x2.bound.lower == LOWER_BOUND
@@ -160,9 +160,9 @@ def test_no_objective_model():
     assert ommx_instance.objective.num_terms() == 0  # Zero function has 0 terms
 
     # Check the constraints
-    assert len(ommx_instance.get_constraints()) == 2
+    assert len(ommx_instance.constraints) == 2
 
-    constraint1 = ommx_instance.get_constraint(0)
+    constraint1 = ommx_instance.get_constraint_by_id(0)
     assert constraint1.equality == Constraint.EQUAL_TO_ZERO
     assert constraint1.function.degree() == 1
     assert constraint1.function.constant_term == -5
@@ -171,7 +171,7 @@ def test_no_objective_model():
     assert constraint1_terms[0] == 1
     assert constraint1_terms[1] == 2
 
-    constraint2 = ommx_instance.get_constraint(1)
+    constraint2 = ommx_instance.get_constraint_by_id(1)
     assert constraint2.equality == Constraint.EQUAL_TO_ZERO
     assert constraint2.function.degree() == 1
     assert constraint2.function.constant_term == -10

ommx_python_mip_adapter-2.0.0b2/ommx_python_mip_adapter.egg-info/requires.txt

@@ -1,2 +0,0 @@
-ommx<3.0.0,>=2.0.0b2
-mip<2.0.0,>=1.15.0