ommx-python-mip-adapter 3.0.0b4__tar.gz → 3.0.0b5__tar.gz

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0b4
+Version: 3.0.0b5
 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.10
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<4.0.0,>=3.0.0b4
+Requires-Dist: ommx<4.0.0,>=3.0.0b5
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/ommx_python_mip_adapter/adapter.py

@@ -16,13 +16,13 @@ from ommx.adapter import (
 from ommx import (
     Constraint,
     DecisionVariable,
-    DegreeBound,
     Equality,
     Function,
     Instance,
     InstanceClass,
     InstanceClassClause,
     Kind,
+    PolynomialRequirement,
     PreparationPolicy,
     Sense,
     Solution,
@@ -35,9 +35,9 @@ from .exception import OMMXPythonMIPAdapterError
 
 _tracer = trace.get_tracer("ommx.adapter.python_mip")
 
-_LINEAR_CONSTRAINT_DEGREE_BOUNDS = {
-    Equality.EqualToZero: DegreeBound.at_most(1),
-    Equality.LessThanOrEqualToZero: DegreeBound.at_most(1),
+_LINEAR_CONSTRAINT_POLYNOMIAL_REQUIREMENTS = {
+    Equality.EqualToZero: PolynomialRequirement.at_most(1),
+    Equality.LessThanOrEqualToZero: PolynomialRequirement.at_most(1),
 }
 
 
@@ -47,8 +47,10 @@ class OMMXPythonMIPAdapter(SolverAdapter):
             InstanceClassClause(
                 label="python-mip-linear-mip",
                 allowed_variable_kinds={Kind.Binary, Kind.Integer, Kind.Continuous},
-                objective_degree_bound=DegreeBound.at_most(1),
-                regular_constraint_degree_bounds=_LINEAR_CONSTRAINT_DEGREE_BOUNDS,
+                objective_polynomial_requirement=PolynomialRequirement.at_most(1),
+                regular_constraint_polynomial_requirements=(
+                    _LINEAR_CONSTRAINT_POLYNOMIAL_REQUIREMENTS
+                ),
                 allowed_senses={Sense.Minimize, Sense.Maximize},
             )
         ]
@@ -447,6 +449,11 @@ class OMMXPythonMIPAdapter(SolverAdapter):
         Translate ommx.Function to `mip.LinExpr` or `float`.
         """
         degree = f.degree()
+        if degree is None:
+            raise OMMXPythonMIPAdapterError(
+                "Non-polynomial functions are not supported. "
+                "Only linear (degree 1) and constant (degree 0) functions are supported."
+            )
         constant = f.constant_term
         if degree > 1:
             raise OMMXPythonMIPAdapterError(

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/ommx_python_mip_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_python_mip_adapter
-Version: 3.0.0b4
+Version: 3.0.0b5
 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.10
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<4.0.0,>=3.0.0b4
+Requires-Dist: ommx<4.0.0,>=3.0.0b5
 Requires-Dist: mip<2.0.0,>=1.17.0
 Requires-Dist: cffi<2.0.0,>=1.15.0
 

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/ommx_python_mip_adapter.egg-info/requires.txt

@@ -1,3 +1,3 @@
-ommx<4.0.0,>=3.0.0b4
+ommx<4.0.0,>=3.0.0b5
 mip<2.0.0,>=1.17.0
 cffi<2.0.0,>=1.15.0

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "3.0.0b4"
+version = "3.0.0b5"
 
 description = "An adapter for the Python-MIP from/to OMMX."
 authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
@@ -23,7 +23,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "ommx >= 3.0.0b4, < 4.0.0",
+  "ommx >= 3.0.0b5, < 4.0.0",
   "mip >= 1.17.0, < 2.0.0",
   "cffi >= 1.15.0, < 2.0.0",
 ]

{ommx_python_mip_adapter-3.0.0b4 → ommx_python_mip_adapter-3.0.0b5}/tests/test_adapter.py

@@ -2,13 +2,14 @@ import pytest
 
 from ommx import (
     DecisionVariable,
-    DegreeBound,
     Equality,
+    Function,
     IndicatorConstraint,
     Instance,
     InstanceClassMismatch,
     Kind,
     OneHotConstraint,
+    PolynomialRequirement,
     Sense,
     Sos1Constraint,
 )
@@ -26,12 +27,12 @@ def test_declares_linear_mip_input_class() -> None:
         Kind.Integer,
         Kind.Continuous,
     }
-    assert clause.objective_degree_bound == DegreeBound.at_most(1)
-    assert clause.regular_constraint_degree_bounds == {
-        Equality.EqualToZero: DegreeBound.at_most(1),
-        Equality.LessThanOrEqualToZero: DegreeBound.at_most(1),
+    assert clause.objective_polynomial_requirement == PolynomialRequirement.at_most(1)
+    assert clause.regular_constraint_polynomial_requirements == {
+        Equality.EqualToZero: PolynomialRequirement.at_most(1),
+        Equality.LessThanOrEqualToZero: PolynomialRequirement.at_most(1),
     }
-    assert clause.indicator_constraint_degree_bounds == {}
+    assert clause.indicator_body_polynomial_requirements == {}
     assert not clause.allows_one_hot
     assert not clause.allows_sos1
     assert clause.allowed_senses == {Sense.Minimize, Sense.Maximize}
@@ -73,6 +74,22 @@ def test_error_nonlinear_objective():
     )
 
 
+def test_error_non_polynomial_objective() -> None:
+    x = DecisionVariable.continuous(0)
+    instance = Instance.from_components(
+        decision_variables=[x],
+        objective=abs(Function(x)),
+        constraints={},
+        sense=Sense.Minimize,
+    )
+
+    with pytest.raises(AdapterNotApplicableError) as error:
+        OMMXPythonMIPAdapter(instance)
+
+    [mismatch] = error.value.report.clause_reports[0].mismatches
+    assert isinstance(mismatch, InstanceClassMismatch.ObjectiveFunctionNotPolynomial)
+
+
 def test_error_nonlinear_constraint():
     # Objective function: 0
     # Constraint: 2.3 * x * x = 0