ommx-openjij-adapter 2.0.2__tar.gz → 2.0.4__tar.gz

{ommx_openjij_adapter-2.0.2 → ommx_openjij_adapter-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_openjij_adapter
-Version: 2.0.2
+Version: 2.0.4
 Summary: OMMX Adapter for OpenJij.
 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 :: MIT License
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: ommx<3.0.0,>=2.0.0rc1
-Requires-Dist: openjij<0.10.0,>=0.9.2
+Requires-Dist: openjij<1.0.0,>=0.9.2
 
 OMMX Adapter for OpenJij
 =========================

{ommx_openjij_adapter-2.0.2 → ommx_openjij_adapter-2.0.4}/ommx_openjij_adapter/__init__.py

@@ -252,7 +252,7 @@ class OMMXOpenJijSAAdapter(SamplerAdapter):
 
         continuous_variables = [
             var.id
-            for var in self.ommx_instance.decision_variables
+            for var in self.ommx_instance.used_decision_variables
             if var.kind == DecisionVariable.CONTINUOUS
         ]
         if len(continuous_variables) > 0:

{ommx_openjij_adapter-2.0.2 → ommx_openjij_adapter-2.0.4}/ommx_openjij_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_openjij_adapter
-Version: 2.0.2
+Version: 2.0.4
 Summary: OMMX Adapter for OpenJij.
 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 :: MIT License
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: ommx<3.0.0,>=2.0.0rc1
-Requires-Dist: openjij<0.10.0,>=0.9.2
+Requires-Dist: openjij<1.0.0,>=0.9.2
 
 OMMX Adapter for OpenJij
 =========================

ommx_openjij_adapter-2.0.4/ommx_openjij_adapter.egg-info/requires.txt

@@ -0,0 +1,2 @@
+ommx<3.0.0,>=2.0.0rc1
+openjij<1.0.0,>=0.9.2

{ommx_openjij_adapter-2.0.2 → ommx_openjij_adapter-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_openjij_adapter"
-version = "2.0.2"
+version = "2.0.4"
 
 description = "OMMX Adapter for OpenJij."
 authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]
@@ -22,7 +22,7 @@ classifiers = [
   "License :: OSI Approved :: Apache Software License",
   "License :: OSI Approved :: MIT License",
 ]
-dependencies = ["ommx >= 2.0.0rc1, < 3.0.0", "openjij >= 0.9.2, < 0.10.0"]
+dependencies = ["ommx >= 2.0.0rc1, < 3.0.0", "openjij >= 0.9.2, < 1.0.0"]
 
 [project.urls]
 Repository = "https://github.com/Jij-Inc/ommx"

{ommx_openjij_adapter-2.0.2 → ommx_openjij_adapter-2.0.4}/tests/test_sample.py

@@ -101,7 +101,7 @@ def hubo_binary_no_constraint_minimize():
     x2 = DecisionVariable.binary(2, name="x", subscripts=[2])
     instance = Instance.from_components(
         decision_variables=[x0, x1, x2],
-        objective=x0 + x0 * x1 * x2,
+        objective=x0 + x1 + x2 + x0 * x1 * x2,
         constraints=[],
         sense=Instance.MINIMIZE,
     )
@@ -173,8 +173,11 @@ def hubo_binary_inequality():
     ],
 )
 def test_sample(instance, ans):
+    # The uniform_penalty_weight of 3.1 was chosen to resolve multiple optimal solutions
+    # effectively. This value was determined based on prior experimentation and ensures
+    # that constraints are sufficiently penalized without overwhelming the objective.
     sample_set = OMMXOpenJijSAAdapter.sample(
-        instance, num_reads=1, uniform_penalty_weight=3.0, seed=999
+        instance, num_reads=1, uniform_penalty_weight=3.1, seed=999
     )
     assert sample_set.extract_decision_variables("x", 0) == ans
 
@@ -196,7 +199,7 @@ def test_sample(instance, ans):
 )
 def test_solve(instance, ans):
     solution = OMMXOpenJijSAAdapter.solve(
-        instance, num_reads=1, uniform_penalty_weight=3.0, seed=999
+        instance, num_reads=1, uniform_penalty_weight=3.1, seed=999
     )
     assert solution.extract_decision_variables("x") == ans
 

ommx_openjij_adapter-2.0.2/ommx_openjij_adapter.egg-info/requires.txt

@@ -1,2 +0,0 @@
-ommx<3.0.0,>=2.0.0rc1
-openjij<0.10.0,>=0.9.2