ommx-python-mip-adapter 1.5.0__tar.gz → 1.6.0__tar.gz

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/PKG-INFO

@@ -1,18 +1,17 @@
 Metadata-Version: 2.1
 Name: ommx_python_mip_adapter
-Version: 1.5.0
+Version: 1.6.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-python-mip-adapter
-Project-URL: Issues, https://github.com/Jij-Inc/ommx-python-mip-adapter/issues
+Project-URL: Repository, https://github.com/Jij-Inc/ommx
+Project-URL: Issues, https://github.com/Jij-Inc/ommx/issues
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: ommx<2.0.0,>=1.4.0
 Requires-Dist: mip<2.0.0,>=1.15.0

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/ommx_python_mip_adapter/ommx_to_python_mip.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 import mip
 
 from ommx.v1.function_pb2 import Function
-from ommx.v1.solution_pb2 import Optimality, Result, Infeasible, Unbounded, Relaxation
+from ommx.v1.solution_pb2 import Result, Infeasible, Unbounded, Relaxation
 from ommx.v1 import Instance, DecisionVariable, Constraint
 
 from .exception import OMMXPythonMIPAdapterError
@@ -305,9 +305,6 @@ def solve(
 
     solution = model_to_solution(model, instance)
 
-    if model.status == mip.OptimizationStatus.OPTIMAL:
-        solution.raw.optimality = Optimality.OPTIMALITY_OPTIMAL
-
     if relax:
         solution.raw.relaxation = Relaxation.RELAXATION_LP_RELAXED
 

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/ommx_python_mip_adapter/python_mip_to_ommx.py

@@ -7,7 +7,7 @@ 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.solution_pb2 import State
+from ommx.v1.solution_pb2 import State, Optimality
 from ommx.v1 import Instance, DecisionVariable, Solution
 
 from .exception import OMMXPythonMIPAdapterError
@@ -248,4 +248,7 @@ def model_to_solution(
         if id in dual_variables:
             constraint.dual_variable = dual_variables[id]
 
+    if model.status == mip.OptimizationStatus.OPTIMAL:
+        solution.raw.optimality = Optimality.OPTIMALITY_OPTIMAL
+
     return solution

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/ommx_python_mip_adapter.egg-info/PKG-INFO

@@ -1,18 +1,17 @@
 Metadata-Version: 2.1
 Name: ommx_python_mip_adapter
-Version: 1.5.0
+Version: 1.6.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-python-mip-adapter
-Project-URL: Issues, https://github.com/Jij-Inc/ommx-python-mip-adapter/issues
+Project-URL: Repository, https://github.com/Jij-Inc/ommx
+Project-URL: Issues, https://github.com/Jij-Inc/ommx/issues
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: ommx<2.0.0,>=1.4.0
 Requires-Dist: mip<2.0.0,>=1.15.0

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/pyproject.toml

@@ -4,18 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "1.5.0"
+version = "1.6.0"
 
 description = "An adapter for the Python-MIP from/to OMMX."
-authors = [
-    { name="Jij Inc.", email="info@j-ij.com" },
-]
+authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
 readme = "README.md"
 
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -31,8 +28,8 @@ dependencies = [
 ]
 
 [project.urls]
-Repository = "https://github.com/Jij-Inc/ommx-python-mip-adapter"
-Issues = "https://github.com/Jij-Inc/ommx-python-mip-adapter/issues"
+Repository = "https://github.com/Jij-Inc/ommx"
+Issues = "https://github.com/Jij-Inc/ommx/issues"
 
 [project.optional-dependencies]
 dev = [

{ommx_python_mip_adapter-1.5.0 → ommx_python_mip_adapter-1.6.0}/tests/test_model_to_instance.py

@@ -1,6 +1,7 @@
 import mip
 
 from ommx.v1 import Instance, DecisionVariable, Constraint
+from ommx.v1.solution_pb2 import Optimality
 
 import ommx_python_mip_adapter as adapter
 
@@ -200,3 +201,19 @@ def test_no_objective_model():
     constraint2_term_x3 = constraint2.function.linear.terms[1]
     assert constraint2_term_x3.id == 1
     assert constraint2_term_x3.coefficient == 3
+
+
+def test_solution_optimality():
+    x = DecisionVariable.integer(1, lower=0, upper=5)
+    y = DecisionVariable.integer(1, lower=0, upper=5)
+    ommx_instance = Instance.from_components(
+        decision_variables=[x, y],
+        objective=x + y,
+        constraints=[],
+        sense=Instance.MAXIMIZE,
+    )
+
+    model = adapter.instance_to_model(ommx_instance)
+    model.optimize()
+    solution = adapter.model_to_solution(model, ommx_instance)
+    assert solution.optimality == Optimality.OPTIMALITY_OPTIMAL