ommx-python-mip-adapter 1.8.4__tar.gz → 1.8.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/PKG-INFO +4 -2
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/adapter.py +3 -2
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter.egg-info/PKG-INFO +4 -2
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter.egg-info/requires.txt +1 -1
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/pyproject.toml +10 -8
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_integration.py +3 -1
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/README.md +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/__init__.py +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/exception.py +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/python_mip_to_ommx.py +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter.egg-info/SOURCES.txt +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter.egg-info/dependency_links.txt +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter.egg-info/top_level.txt +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/setup.cfg +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_adapter.py +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_constant_constraint.py +0 -0
- {ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_model_to_instance.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: ommx_python_mip_adapter
|
|
3
|
-
Version: 1.8.
|
|
3
|
+
Version: 1.8.6
|
|
4
4
|
Summary: An adapter for the Python-MIP from/to OMMX.
|
|
5
5
|
Author-email: "Jij Inc." <info@j-ij.com>
|
|
6
6
|
Project-URL: Repository, https://github.com/Jij-Inc/ommx
|
|
@@ -9,11 +9,13 @@ Classifier: Programming Language :: Python :: 3 :: Only
|
|
|
9
9
|
Classifier: Programming Language :: Python :: 3.9
|
|
10
10
|
Classifier: Programming Language :: Python :: 3.10
|
|
11
11
|
Classifier: Programming Language :: Python :: 3.11
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
13
|
+
Classifier: Programming Language :: Python :: 3.13
|
|
12
14
|
Classifier: License :: OSI Approved :: Apache Software License
|
|
13
15
|
Classifier: License :: OSI Approved :: MIT License
|
|
14
16
|
Requires-Python: >=3.9
|
|
15
17
|
Description-Content-Type: text/markdown
|
|
16
|
-
Requires-Dist: ommx<2.0.0,>=1.8.
|
|
18
|
+
Requires-Dist: ommx<2.0.0,>=1.8.6
|
|
17
19
|
Requires-Dist: mip<2.0.0,>=1.15.0
|
|
18
20
|
|
|
19
21
|
OMMX adapter for Python-MIP
|
{ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/adapter.py
RENAMED
|
@@ -58,8 +58,9 @@ class OMMXPythonMIPAdapter(SolverAdapter):
|
|
|
58
58
|
else:
|
|
59
59
|
self._relax = False
|
|
60
60
|
|
|
61
|
-
@
|
|
61
|
+
@classmethod
|
|
62
62
|
def solve(
|
|
63
|
+
cls,
|
|
63
64
|
ommx_instance: Instance,
|
|
64
65
|
relax: bool = False,
|
|
65
66
|
verbose: bool = False,
|
|
@@ -173,7 +174,7 @@ class OMMXPythonMIPAdapter(SolverAdapter):
|
|
|
173
174
|
1.0
|
|
174
175
|
|
|
175
176
|
"""
|
|
176
|
-
adapter =
|
|
177
|
+
adapter = cls(ommx_instance, relax=relax, verbose=verbose)
|
|
177
178
|
model = adapter.solver_input
|
|
178
179
|
model.optimize(relax=relax)
|
|
179
180
|
return adapter.decode(model)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.2
|
|
2
2
|
Name: ommx_python_mip_adapter
|
|
3
|
-
Version: 1.8.
|
|
3
|
+
Version: 1.8.6
|
|
4
4
|
Summary: An adapter for the Python-MIP from/to OMMX.
|
|
5
5
|
Author-email: "Jij Inc." <info@j-ij.com>
|
|
6
6
|
Project-URL: Repository, https://github.com/Jij-Inc/ommx
|
|
@@ -9,11 +9,13 @@ Classifier: Programming Language :: Python :: 3 :: Only
|
|
|
9
9
|
Classifier: Programming Language :: Python :: 3.9
|
|
10
10
|
Classifier: Programming Language :: Python :: 3.10
|
|
11
11
|
Classifier: Programming Language :: Python :: 3.11
|
|
12
|
+
Classifier: Programming Language :: Python :: 3.12
|
|
13
|
+
Classifier: Programming Language :: Python :: 3.13
|
|
12
14
|
Classifier: License :: OSI Approved :: Apache Software License
|
|
13
15
|
Classifier: License :: OSI Approved :: MIT License
|
|
14
16
|
Requires-Python: >=3.9
|
|
15
17
|
Description-Content-Type: text/markdown
|
|
16
|
-
Requires-Dist: ommx<2.0.0,>=1.8.
|
|
18
|
+
Requires-Dist: ommx<2.0.0,>=1.8.6
|
|
17
19
|
Requires-Dist: mip<2.0.0,>=1.15.0
|
|
18
20
|
|
|
19
21
|
OMMX adapter for Python-MIP
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
ommx<2.0.0,>=1.8.
|
|
1
|
+
ommx<2.0.0,>=1.8.6
|
|
2
2
|
mip<2.0.0,>=1.15.0
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "ommx_python_mip_adapter"
|
|
7
|
-
version = "1.8.
|
|
7
|
+
version = "1.8.6"
|
|
8
8
|
|
|
9
9
|
description = "An adapter for the Python-MIP from/to OMMX."
|
|
10
10
|
authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
|
|
@@ -12,12 +12,14 @@ readme = "README.md"
|
|
|
12
12
|
|
|
13
13
|
requires-python = ">=3.9"
|
|
14
14
|
classifiers = [
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
15
|
+
"Programming Language :: Python :: 3 :: Only",
|
|
16
|
+
"Programming Language :: Python :: 3.9",
|
|
17
|
+
"Programming Language :: Python :: 3.10",
|
|
18
|
+
"Programming Language :: Python :: 3.11",
|
|
19
|
+
"Programming Language :: Python :: 3.12",
|
|
20
|
+
"Programming Language :: Python :: 3.13",
|
|
21
|
+
"License :: OSI Approved :: Apache Software License",
|
|
22
|
+
"License :: OSI Approved :: MIT License",
|
|
21
23
|
]
|
|
22
24
|
|
|
23
25
|
# FIXME
|
|
@@ -25,7 +27,7 @@ classifiers = [
|
|
|
25
27
|
# To support Python 3.12 and Apple silicon systems, this requires latest version of Python-MIP (will be 1.16.0?),
|
|
26
28
|
# which does not release yet. https://github.com/coin-or/python-mip/issues/384
|
|
27
29
|
# This project uses dev-dependency to use the latest version of Python-MIP not to include pre-release version in the release.
|
|
28
|
-
dependencies = ["ommx >= 1.8.
|
|
30
|
+
dependencies = ["ommx >= 1.8.6, < 2.0.0", "mip >= 1.15.0, < 2.0.0"]
|
|
29
31
|
|
|
30
32
|
[project.urls]
|
|
31
33
|
Repository = "https://github.com/Jij-Inc/ommx"
|
|
@@ -27,7 +27,9 @@ def test_integration_lp(generater):
|
|
|
27
27
|
expected_solution = generater.get_v1_state()
|
|
28
28
|
assert ommx_state.entries.keys() == expected_solution.entries.keys()
|
|
29
29
|
for key in ommx_state.entries.keys():
|
|
30
|
-
assert ommx_state.entries[key] == pytest.approx(
|
|
30
|
+
assert ommx_state.entries[key] == pytest.approx(
|
|
31
|
+
expected_solution.entries[key], abs=1e-6
|
|
32
|
+
)
|
|
31
33
|
|
|
32
34
|
|
|
33
35
|
def test_integration_milp():
|
|
File without changes
|
{ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/__init__.py
RENAMED
|
File without changes
|
{ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/ommx_python_mip_adapter/exception.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_constant_constraint.py
RENAMED
|
File without changes
|
{ommx_python_mip_adapter-1.8.4 → ommx_python_mip_adapter-1.8.6}/tests/test_model_to_instance.py
RENAMED
|
File without changes
|