ommx-python-mip-adapter 0.3.4__tar.gz → 0.4.0__tar.gz

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ommx_python_mip_adapter
-Version: 0.3.4
+Version: 0.4.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
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<0.4.0,>=0.3.4
+Requires-Dist: ommx<0.5.0,>=0.4.0
 Requires-Dist: mip
 Provides-Extra: dev
 Requires-Dist: markdown-code-runner; extra == "dev"

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/ommx_python_mip_adapter/adapter.py

@@ -3,7 +3,7 @@ import typing as tp
 import mip
 
 from mip.exceptions import ParameterNotAvailable
-from ommx.v1.constraint_pb2 import Constraint, Equality, ConstraintDescription
+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
@@ -139,11 +139,7 @@ class OMMXInstanceBuilder:
 
             decision_variables.append(
                 DecisionVariable.of_type(
-                    kind,
-                    var.idx,
-                    lower=var.lb,
-                    upper=var.ub,
-                    description=DecisionVariable.Description(name=var.name),
+                    kind, var.idx, lower=var.lb, upper=var.ub, name=var.name
                 )
             )
 
@@ -190,14 +186,14 @@ class OMMXInstanceBuilder:
                     id=id,
                     equality=Equality.EQUALITY_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(lin_expr),
-                    description=ConstraintDescription(name=name),
+                    name=name,
                 )
             elif lin_expr.sense == "<":
                 constraint = Constraint(
                     id=id,
                     equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(lin_expr),
-                    description=ConstraintDescription(name=name),
+                    name=name,
                 )
             elif lin_expr.sense == ">":
                 # `ommx.v1.Constraint` does not support `GREATER_THAN_OR_EQUAL_TO_ZERO`.
@@ -206,7 +202,7 @@ class OMMXInstanceBuilder:
                     id=id,
                     equality=Equality.EQUALITY_LESS_THAN_OR_EQUAL_TO_ZERO,
                     function=self._make_function_from_lin_expr(-lin_expr),
-                    description=ConstraintDescription(name=name),
+                    name=name,
                 )
             else:
                 raise OMMXPythonMIPAdapterError(

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/ommx_python_mip_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ommx_python_mip_adapter
-Version: 0.3.4
+Version: 0.4.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
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: ommx<0.4.0,>=0.3.4
+Requires-Dist: ommx<0.5.0,>=0.4.0
 Requires-Dist: mip
 Provides-Extra: dev
 Requires-Dist: markdown-code-runner; extra == "dev"

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/ommx_python_mip_adapter.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ommx<0.4.0,>=0.3.4
+ommx<0.5.0,>=0.4.0
 mip
 
 [dev]

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_python_mip_adapter"
-version = "0.3.4"
+version = "0.4.0"
 
 description = "An adapter for the Python-MIP from/to OMMX."
 authors = [
@@ -24,7 +24,7 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    "ommx >= 0.3.4, < 0.4.0",
+    "ommx >= 0.4.0, < 0.5.0",
     "mip",
 ]
 

{ommx_python_mip_adapter-0.3.4 → ommx_python_mip_adapter-0.4.0}/tests/test_model_to_instance.py

@@ -54,19 +54,19 @@ def test_milp():
     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.description.name == "1"
+    assert decision_variables_x1.name == "1"
     decision_variables_x2 = ommx_instance.decision_variables[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.description.name == "2"
+    assert decision_variables_x2.name == "2"
     decision_variables_x3 = ommx_instance.decision_variables[2]
     assert decision_variables_x3.id == 2
     assert decision_variables_x3.kind == DecisionVariable.BINARY
     assert decision_variables_x3.bound.lower == 0
     assert decision_variables_x3.bound.upper == 1
-    assert decision_variables_x3.description.name == "3"
+    assert decision_variables_x3.name == "3"
 
     # Check the objective function
     assert ommx_instance.objective.HasField("linear")
@@ -162,13 +162,13 @@ def test_no_objective_model():
     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.description.name == "1"
+    assert decision_variables_x1.name == "1"
     decision_variables_x2 = ommx_instance.decision_variables[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.description.name == "2"
+    assert decision_variables_x2.name == "2"
 
     # check the objective function
     assert ommx_instance.objective.HasField("constant")