ommx-python-mip-adapter 1.9.4__tar.gz → 2.0.0__tar.gz

{ommx_python_mip_adapter-1.9.4 → ommx_python_mip_adapter-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 1.9.4
+Version: 2.0.0
 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<2.0.0,>=1.9.0rc1
+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-1.9.4 → ommx_python_mip_adapter-2.0.0}/ommx_python_mip_adapter/adapter.py

@@ -5,9 +5,7 @@ from typing import Optional
 import mip
 
 from ommx.adapter import SolverAdapter, InfeasibleDetected, UnboundedDetected
-from ommx.v1 import Instance, Constraint, DecisionVariable, Solution, State, Optimality
-from ommx.v1.function_pb2 import Function
-from ommx.v1.solution_pb2 import Relaxation
+from ommx.v1 import Instance, Constraint, DecisionVariable, Solution, State, Function
 
 from .exception import OMMXPythonMIPAdapterError
 
@@ -29,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,
@@ -80,7 +76,6 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         .. doctest::
 
             >>> from ommx.v1 import Instance, DecisionVariable
-            >>> from ommx.v1.solution_pb2 import Optimality
             >>> from ommx_python_mip_adapter import OMMXPythonMIPAdapter
 
             >>> p = [10, 13, 18, 32, 7, 15]
@@ -89,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,
             ... )
 
@@ -103,14 +98,14 @@ class OMMXPythonMIPAdapter(SolverAdapter):
             [(0, 1.0), (1, 0.0), (2, 0.0), (3, 1.0), (4, 0.0), (5, 0.0)]
             >>> solution.feasible
             True
-            >>> assert solution.optimality == Optimality.OPTIMALITY_OPTIMAL
+            >>> assert solution.optimality == Solution.OPTIMAL
 
             p[0] + p[3] = 42
             w[0] + w[3] = 46 <= 47
 
             >>> solution.objective
             42.0
-            >>> solution.raw.evaluated_constraints[0].evaluated_value
+            >>> solution.get_constraint_value(0)
             -1.0
 
         Infeasible Problem
@@ -165,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
 
         """
@@ -250,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 = Optimality.OPTIMALITY_OPTIMAL
+            solution.optimality = Solution.OPTIMAL
 
         if self._relax:
-            solution.raw.relaxation = Relaxation.RELAXATION_LP_RELAXED
+            solution.relaxation = Solution.LP_RELAXED
         return solution
 
     def decode_to_state(self, data: mip.Model) -> State:
@@ -303,12 +296,12 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         return State(
             entries={
                 var.id: data.var_by_name(str(var.id)).x  # type: ignore
-                for var in self.instance.raw.decision_variables
+                for var in self.instance.decision_variables
             }
         )
 
     def _set_decision_variables(self):
-        for var in self.instance.raw.decision_variables:
+        for var in self.instance.decision_variables:
             if var.kind == DecisionVariable.BINARY:
                 self.model.add_var(
                     name=str(var.id),
@@ -341,26 +334,29 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         """
         Translate ommx.v1.Function to `mip.LinExpr` or `float`.
         """
-        if f.HasField("constant"):
-            return mip.LinExpr(const=f.constant)  # type: ignore
-        elif f.HasField("linear"):
-            ommx_linear = f.linear
-            return (
-                mip.xsum(
-                    term.coefficient * self.model.vars[str(term.id)]  # type: ignore
-                    for term in ommx_linear.terms
-                )
-                + ommx_linear.constant
-            )  # type: ignore
-        raise OMMXPythonMIPAdapterError(
-            "The function must be either `constant` or `linear`."
+        degree = f.degree()
+        constant = f.constant_term
+        if degree > 1:
+            raise OMMXPythonMIPAdapterError(
+                f"Function with degree {degree} is not supported. "
+                "Only linear (degree 1) and constant (degree 0) functions are supported."
+            )
+        if degree == 0:
+            return mip.LinExpr(const=constant)  # type: ignore
+        assert degree == 1
+        return (
+            mip.xsum(
+                coeff * self.model.vars[str(var_id)]  # type: ignore
+                for var_id, coeff in f.linear_terms.items()
+            )
+            + constant
         )
 
     def _set_objective(self):
-        self.model.objective = self._as_lin_expr(self.instance.raw.objective)  # type: ignore
+        self.model.objective = self._as_lin_expr(self.instance.objective)
 
     def _set_constraints(self):
-        for constraint in self.instance.raw.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-1.9.4 → ommx_python_mip_adapter-2.0.0}/ommx_python_mip_adapter/python_mip_to_ommx.py

@@ -4,10 +4,7 @@ from typing import final
 import mip
 
 from mip.exceptions import ParameterNotAvailable
-from ommx.v1.constraint_pb2 import Constraint, Equality
-from ommx.v1.function_pb2 import Function
-from ommx.v1.linear_pb2 import Linear
-from ommx.v1 import Instance, DecisionVariable
+from ommx.v1 import Instance, DecisionVariable, Constraint, Function, Linear
 
 from .exception import OMMXPythonMIPAdapterError
 
@@ -27,35 +24,41 @@ class OMMXInstanceBuilder:
         decision_variables = []
         for var in self.model.vars:
             if var.var_type == mip.BINARY:
-                kind = DecisionVariable.BINARY
+                decision_variables.append(
+                    DecisionVariable.binary(var.idx, name=var.name)
+                )
             elif var.var_type == mip.INTEGER:
-                kind = DecisionVariable.INTEGER
+                decision_variables.append(
+                    DecisionVariable.integer(
+                        var.idx, lower=var.lb, upper=var.ub, name=var.name
+                    )
+                )
             elif var.var_type == mip.CONTINUOUS:
-                kind = DecisionVariable.CONTINUOUS
+                decision_variables.append(
+                    DecisionVariable.continuous(
+                        var.idx, lower=var.lb, upper=var.ub, name=var.name
+                    )
+                )
             else:
                 raise OMMXPythonMIPAdapterError(
                     f"Not supported variable type. "
                     f"idx: {var.idx} name: {var.name}, type: {var.var_type}"
                 )
-            decision_variables.append(
-                DecisionVariable.of_type(
-                    kind, var.idx, lower=var.lb, upper=var.ub, name=var.name
-                )
-            )
         return decision_variables
 
     def as_ommx_function(self, lin_expr: mip.LinExpr) -> Function:
-        terms = [
-            Linear.Term(id=var.idx, coefficient=coefficient)  # type: ignore
+        terms = {
+            var.idx: coefficient  # type: ignore
             for var, coefficient in lin_expr.expr.items()
-        ]
+        }
         constant: float = lin_expr.const  # type: ignore
 
         # If the terms are empty, the function is a constant.
         if len(terms) == 0:
-            return Function(constant=constant)
+            return Function(constant)
         else:
-            return Function(linear=Linear(terms=terms, constant=constant))
+            linear = Linear(terms=terms, constant=constant)  # type: ignore
+            return Function(linear)
 
     def objective(self) -> Function:
         # In Python-MIP, it is allowed not to set the objective function.
@@ -65,7 +68,7 @@ class OMMXInstanceBuilder:
         try:
             objective = self.model.objective
         except ParameterNotAvailable:
-            return Function(constant=0)
+            return Function(0.0)
 
         return self.as_ommx_function(objective)
 
@@ -80,15 +83,15 @@ class OMMXInstanceBuilder:
             if lin_expr.sense == "=":
                 constraint = Constraint(
                     id=id,
-                    equality=Equality.EQUALITY_EQUAL_TO_ZERO,
                     function=self.as_ommx_function(lin_expr),
+                    equality=Constraint.EQUAL_TO_ZERO,
                     name=name,
                 )
             elif lin_expr.sense == "<":
                 constraint = Constraint(
                     id=id,
-                    equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self.as_ommx_function(lin_expr),
+                    equality=Constraint.LESS_THAN_OR_EQUAL_TO_ZERO,
                     name=name,
                 )
             elif lin_expr.sense == ">":
@@ -96,8 +99,8 @@ class OMMXInstanceBuilder:
                 # So multiply the linear expression by -1.
                 constraint = Constraint(
                     id=id,
-                    equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self.as_ommx_function(-lin_expr),
+                    equality=Constraint.LESS_THAN_OR_EQUAL_TO_ZERO,
                     name=name,
                 )
             else:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 1.9.4
+Version: 2.0.0
 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<2.0.0,>=1.9.0rc1
+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.0/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-1.9.4 → ommx_python_mip_adapter-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "1.9.4"
+version = "2.0.0"
 
 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 >= 1.9.0rc1, < 2.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.0/tests/test_adapter.py

@@ -0,0 +1,41 @@
+import pytest
+from ommx.v1 import Instance, DecisionVariable
+from ommx_python_mip_adapter import OMMXPythonMIPAdapter
+from ommx_python_mip_adapter.exception import OMMXPythonMIPAdapterError
+
+
+def test_error_nonlinear_objective():
+    # Objective function: 2.3 * x * x (variable ID should match)
+    x = DecisionVariable.continuous(0)
+    ommx_instance = Instance.from_components(
+        decision_variables=[x],
+        objective=2.3 * x * x,
+        constraints=[],
+        sense=Instance.MINIMIZE,
+    )
+
+    with pytest.raises(OMMXPythonMIPAdapterError) as e:
+        OMMXPythonMIPAdapter(ommx_instance)
+    assert (
+        "Function with degree 2 is not supported. Only linear (degree 1) and constant (degree 0) functions are supported."
+        in str(e.value)
+    )
+
+
+def test_error_nonlinear_constraint():
+    # Objective function: 0
+    # Constraint: 2.3 * x * x = 0
+    x = DecisionVariable.continuous(1)
+    ommx_instance = Instance.from_components(
+        decision_variables=[x],
+        objective=0.0,
+        constraints=[(2.3 * x * x == 0).set_id(0)],
+        sense=Instance.MINIMIZE,
+    )
+
+    with pytest.raises(OMMXPythonMIPAdapterError) as e:
+        OMMXPythonMIPAdapter(ommx_instance)
+    assert (
+        "Function with degree 2 is not supported. Only linear (degree 1) and constant (degree 0) functions are supported."
+        in str(e.value)
+    )

{ommx_python_mip_adapter-1.9.4 → ommx_python_mip_adapter-2.0.0}/tests/test_constant_constraint.py

@@ -24,7 +24,7 @@ def test_constant_constraint_feasible():
     assert solution.state.entries == {0: 1.0}
     assert solution.objective == 1.0
 
-    assert len(solution.raw.evaluated_constraints) == 2
+    assert len(solution.constraints) == 2
 
 
 @pytest.mark.skip(

{ommx_python_mip_adapter-1.9.4 → ommx_python_mip_adapter-2.0.0}/tests/test_integration.py

@@ -1,7 +1,6 @@
 import pytest
 
-from ommx.v1 import Instance, DecisionVariable
-from ommx.v1.solution_pb2 import Optimality
+from ommx.v1 import Instance, DecisionVariable, Solution
 from ommx.testing import SingleFeasibleLPGenerator, DataType
 
 from ommx_python_mip_adapter import OMMXPythonMIPAdapter
@@ -74,4 +73,4 @@ def test_solution_optimality():
     )
 
     solution = OMMXPythonMIPAdapter.solve(ommx_instance)
-    assert solution.optimality == Optimality.OPTIMALITY_OPTIMAL
+    assert solution.optimality == Solution.OPTIMAL

{ommx_python_mip_adapter-1.9.4 → ommx_python_mip_adapter-2.0.0}/tests/test_model_to_instance.py

@@ -1,6 +1,6 @@
 import mip
 
-from ommx.v1 import Instance, DecisionVariable, Constraint
+from ommx.v1 import DecisionVariable, Instance, Constraint
 
 from ommx_python_mip_adapter import model_to_instance
 
@@ -43,25 +43,25 @@ def test_milp():
     model.add_constr(-7 * x1 + 8 * x3 - 9 <= 0)  # type: ignore
     model.add_constr(10 * x2 - 11 * x3 + 12 >= 0)  # type: ignore
 
-    ommx_instance = model_to_instance(model).raw
+    ommx_instance = model_to_instance(model)
 
     assert ommx_instance.sense == Instance.MINIMIZE
 
     # Check the decision variables
     assert len(ommx_instance.decision_variables) == 3
-    decision_variables_x1 = ommx_instance.decision_variables[0]
+    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.decision_variables[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.decision_variables[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
@@ -69,58 +69,43 @@ def test_milp():
     assert decision_variables_x3.name == "3"
 
     # Check the objective function
-    assert ommx_instance.objective.HasField("linear")
-    objective = ommx_instance.objective.linear
-    assert objective.constant == 0
-    assert len(objective.terms) == 3
-    objective_term_x1 = objective.terms[0]
-    assert objective_term_x1.id == 0
-    assert objective_term_x1.coefficient == -1
-    objective_term_x2 = objective.terms[1]
-    assert objective_term_x2.id == 1
-    assert objective_term_x2.coefficient == -2
-    objective_term_x3 = objective.terms[2]
-    assert objective_term_x3.id == 2
-    assert objective_term_x3.coefficient == -3
+    assert ommx_instance.objective.degree() == 1
+    assert ommx_instance.objective.constant_term == 0
+    linear_terms = ommx_instance.objective.linear_terms
+    assert len(linear_terms) == 3
+    assert linear_terms[0] == -1
+    assert linear_terms[1] == -2
+    assert linear_terms[2] == -3
 
     # Check the constraints
     assert len(ommx_instance.constraints) == 3
 
-    constraint1 = ommx_instance.constraints[0]
+    constraint1 = ommx_instance.get_constraint_by_id(0)
     assert constraint1.equality == Constraint.EQUAL_TO_ZERO
-    assert constraint1.function.HasField("linear")
-    assert constraint1.function.linear.constant == 6
-    assert len(constraint1.function.linear.terms) == 2
-    constraint1_term_x1 = constraint1.function.linear.terms[0]
-    assert constraint1_term_x1.id == 0
-    assert constraint1_term_x1.coefficient == 4
-    constraint1_term_x2 = constraint1.function.linear.terms[1]
-    assert constraint1_term_x2.id == 1
-    assert constraint1_term_x2.coefficient == -5
-
-    constraint2 = ommx_instance.constraints[1]
+    assert constraint1.function.degree() == 1
+    assert constraint1.function.constant_term == 6
+    constraint1_terms = constraint1.function.linear_terms
+    assert len(constraint1_terms) == 2
+    assert constraint1_terms[0] == 4
+    assert constraint1_terms[1] == -5
+
+    constraint2 = ommx_instance.get_constraint_by_id(1)
     assert constraint2.equality == Constraint.LESS_THAN_OR_EQUAL_TO_ZERO
-    assert constraint2.function.HasField("linear")
-    assert constraint2.function.linear.constant == -9
-    assert len(constraint2.function.linear.terms) == 2
-    constraint2_term_x1 = constraint2.function.linear.terms[0]
-    assert constraint2_term_x1.id == 0
-    assert constraint2_term_x1.coefficient == -7
-    constraint2_term_x3 = constraint2.function.linear.terms[1]
-    assert constraint2_term_x3.id == 2
-    assert constraint2_term_x3.coefficient == 8
-
-    constraint3 = ommx_instance.constraints[2]
+    assert constraint2.function.degree() == 1
+    assert constraint2.function.constant_term == -9
+    constraint2_terms = constraint2.function.linear_terms
+    assert len(constraint2_terms) == 2
+    assert constraint2_terms[0] == -7
+    assert constraint2_terms[2] == 8
+
+    constraint3 = ommx_instance.get_constraint_by_id(2)
     assert constraint3.equality == Constraint.LESS_THAN_OR_EQUAL_TO_ZERO
-    assert constraint3.function.HasField("linear")
-    assert constraint3.function.linear.constant == -12
-    assert len(constraint3.function.linear.terms) == 2
-    constraint3_term_x2 = constraint3.function.linear.terms[0]
-    assert constraint3_term_x2.id == 1
-    assert constraint3_term_x2.coefficient == -10
-    constraint3_term_x3 = constraint3.function.linear.terms[1]
-    assert constraint3_term_x3.id == 2
-    assert constraint3_term_x3.coefficient == 11
+    assert constraint3.function.degree() == 1
+    assert constraint3.function.constant_term == -12
+    constraint3_terms = constraint3.function.linear_terms
+    assert len(constraint3_terms) == 2
+    assert constraint3_terms[1] == -10
+    assert constraint3_terms[2] == 11
 
 
 def test_no_objective_model():
@@ -151,52 +136,46 @@ def test_no_objective_model():
     model.add_constr(1 * x1 + 2 * x2 - 5 == 0)  # type: ignore
     model.add_constr(4 * x1 + 3 * x2 - 10 == 0)  # type: ignore
 
-    ommx_instance = model_to_instance(model).raw
+    ommx_instance = model_to_instance(model)
 
     assert ommx_instance.sense == Instance.MAXIMIZE
 
     # Check the decision variables
     assert len(ommx_instance.decision_variables) == 2
-    decision_variables_x1 = ommx_instance.decision_variables[0]
+    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.decision_variables[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
     assert decision_variables_x2.bound.upper == UPPER_BOUND
     assert decision_variables_x2.name == "2"
 
-    # check the objective function
-    assert ommx_instance.objective.HasField("constant")
-    assert ommx_instance.objective.constant == 0
+    # check the objective function - should be a zero constant
+    assert ommx_instance.objective.degree() == 0
+    assert ommx_instance.objective.num_terms() == 0  # Zero function has 0 terms
 
     # Check the constraints
     assert len(ommx_instance.constraints) == 2
 
-    constraint1 = ommx_instance.constraints[0]
+    constraint1 = ommx_instance.get_constraint_by_id(0)
     assert constraint1.equality == Constraint.EQUAL_TO_ZERO
-    assert constraint1.function.HasField("linear")
-    assert constraint1.function.linear.constant == -5
-    assert len(constraint1.function.linear.terms) == 2
-    constraint1_term_x1 = constraint1.function.linear.terms[0]
-    assert constraint1_term_x1.id == 0
-    assert constraint1_term_x1.coefficient == 1
-    constraint1_term_x2 = constraint1.function.linear.terms[1]
-    assert constraint1_term_x2.id == 1
-    assert constraint1_term_x2.coefficient == 2
-
-    constraint2 = ommx_instance.constraints[1]
+    assert constraint1.function.degree() == 1
+    assert constraint1.function.constant_term == -5
+    constraint1_terms = constraint1.function.linear_terms
+    assert len(constraint1_terms) == 2
+    assert constraint1_terms[0] == 1
+    assert constraint1_terms[1] == 2
+
+    constraint2 = ommx_instance.get_constraint_by_id(1)
     assert constraint2.equality == Constraint.EQUAL_TO_ZERO
-    assert constraint2.function.HasField("linear")
-    assert constraint2.function.linear.constant == -10
-    assert len(constraint2.function.linear.terms) == 2
-    constraint2_term_x1 = constraint2.function.linear.terms[0]
-    assert constraint2_term_x1.id == 0
-    assert constraint2_term_x1.coefficient == 4
-    constraint2_term_x3 = constraint2.function.linear.terms[1]
-    assert constraint2_term_x3.id == 1
-    assert constraint2_term_x3.coefficient == 3
+    assert constraint2.function.degree() == 1
+    assert constraint2.function.constant_term == -10
+    constraint2_terms = constraint2.function.linear_terms
+    assert len(constraint2_terms) == 2
+    assert constraint2_terms[0] == 4
+    assert constraint2_terms[1] == 3

ommx_python_mip_adapter-1.9.4/ommx_python_mip_adapter.egg-info/requires.txt

@@ -1,2 +0,0 @@
-ommx<2.0.0,>=1.9.0rc1
-mip<2.0.0,>=1.15.0

ommx_python_mip_adapter-1.9.4/tests/test_adapter.py

@@ -1,90 +0,0 @@
-import pytest
-
-from ommx.v1.constraint_pb2 import Constraint, Equality
-from ommx.v1.decision_variables_pb2 import DecisionVariable as _DecisionVariable
-from ommx.v1.function_pb2 import Function
-from ommx.v1.linear_pb2 import Linear
-from ommx.v1.quadratic_pb2 import Quadratic
-from ommx.v1 import Instance, DecisionVariable
-
-from ommx_python_mip_adapter import OMMXPythonMIPAdapter
-
-from ommx_python_mip_adapter.exception import OMMXPythonMIPAdapterError
-
-
-def test_error_not_suppoerted_decision_variable():
-    ommx_instance = Instance.from_components(
-        decision_variables=[
-            DecisionVariable(
-                _DecisionVariable(id=1, kind=_DecisionVariable.KIND_UNSPECIFIED)
-            )
-        ],
-        objective=Function(constant=0),
-        constraints=[],
-        sense=Instance.MINIMIZE,
-    )
-    with pytest.raises(OMMXPythonMIPAdapterError) as e:
-        OMMXPythonMIPAdapter(ommx_instance)
-    assert "Not supported decision variable" in str(e.value)
-
-
-def test_error_nonlinear_objective():
-    # Objective function: 2.3 * x * x
-    ommx_instance = Instance.from_components(
-        decision_variables=[DecisionVariable.continuous(0)],
-        objective=Function(
-            quadratic=Quadratic(rows=[1], columns=[1], values=[2.3]),
-        ),
-        constraints=[],
-        sense=Instance.MINIMIZE,
-    )
-
-    with pytest.raises(OMMXPythonMIPAdapterError) as e:
-        OMMXPythonMIPAdapter(ommx_instance)
-    assert "The function must be either `constant` or `linear`." in str(e.value)
-
-
-def test_error_nonlinear_constraint():
-    # Objective function: 0
-    # Constraint: 2.3 * x * x = 0
-    ommx_instance = Instance.from_components(
-        decision_variables=[DecisionVariable.continuous(1)],
-        objective=Function(
-            constant=0,
-        ),
-        constraints=[
-            Constraint(
-                function=Function(
-                    quadratic=Quadratic(rows=[1], columns=[1], values=[2.3]),
-                ),
-                equality=Equality.EQUALITY_EQUAL_TO_ZERO,
-            ),
-        ],
-        sense=Instance.MINIMIZE,
-    )
-
-    with pytest.raises(OMMXPythonMIPAdapterError) as e:
-        OMMXPythonMIPAdapter(ommx_instance)
-    assert "The function must be either `constant` or `linear`." in str(e.value)
-
-
-def test_error_not_supported_constraint_equality():
-    # Objective function: 0
-    # Constraint: 2x ?? 0 (equality: unspecified)
-    ommx_instance = Instance.from_components(
-        decision_variables=[DecisionVariable.continuous(1)],
-        objective=Function(constant=0),
-        constraints=[
-            Constraint(
-                function=Function(
-                    linear=Linear(terms=[Linear.Term(id=1, coefficient=2)])
-                ),
-                equality=Equality.EQUALITY_UNSPECIFIED,
-            ),
-        ],
-        sense=Instance.MINIMIZE,
-    )
-
-    with pytest.raises(OMMXPythonMIPAdapterError) as e:
-        OMMXPythonMIPAdapter(ommx_instance)
-    assert "Not supported constraint equality" in str(e.value)