ommx-openjij-adapter 2.0.0rc3__tar.gz → 2.0.1__tar.gz

{ommx_openjij_adapter-2.0.0rc3 → ommx_openjij_adapter-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_openjij_adapter
-Version: 2.0.0rc3
+Version: 2.0.1
 Summary: OMMX Adapter for OpenJij.
 Author-email: "Jij Inc." <info@j-ij.com>
 Project-URL: Repository, https://github.com/Jij-Inc/ommx

{ommx_openjij_adapter-2.0.0rc3 → ommx_openjij_adapter-2.0.1}/ommx_openjij_adapter/__init__.py

@@ -1,6 +1,14 @@
 from __future__ import annotations
 
-from ommx.v1 import Instance, State, Samples, SampleSet, DecisionVariable, Constraint
+from ommx.v1 import (
+    Instance,
+    State,
+    Samples,
+    SampleSet,
+    Solution,
+    DecisionVariable,
+    Constraint,
+)
 from ommx.adapter import SamplerAdapter
 import openjij as oj
 from typing_extensions import deprecated
@@ -57,6 +65,39 @@ class OMMXOpenJijSAAdapter(SamplerAdapter):
 
     _instance_prepared: bool = False
 
+    def __init__(
+        self,
+        ommx_instance: Instance,
+        *,
+        beta_min: float | None = None,
+        beta_max: float | None = None,
+        num_sweeps: int | None = None,
+        num_reads: int | None = None,
+        schedule: list | None = None,
+        initial_state: list | dict | None = None,
+        updater: str | None = None,
+        sparse: bool | None = None,
+        reinitialize_state: bool | None = None,
+        seed: int | None = None,
+        uniform_penalty_weight: Optional[float] = None,
+        penalty_weights: dict[int, float] = {},
+        inequality_integer_slack_max_range: int = 32,
+    ):
+        self.ommx_instance = copy.deepcopy(ommx_instance)
+        self.beta_min = beta_min
+        self.beta_max = beta_max
+        self.num_sweeps = num_sweeps
+        self.num_reads = num_reads
+        self.schedule = schedule
+        self.initial_state = initial_state
+        self.updater = updater
+        self.sparse = sparse
+        self.reinitialize_state = reinitialize_state
+        self.seed = seed
+        self.uniform_penalty_weight = uniform_penalty_weight
+        self.penalty_weights = penalty_weights
+        self.inequality_integer_slack_max_range = inequality_integer_slack_max_range
+
     @classmethod
     def sample(
         cls,
@@ -95,8 +136,9 @@ class OMMXOpenJijSAAdapter(SamplerAdapter):
         response = sampler._sample()
         return sampler.decode_to_sampleset(response)
 
-    def __init__(
-        self,
+    @classmethod
+    def solve(
+        cls,
         ommx_instance: Instance,
         *,
         beta_min: float | None = None,
@@ -112,21 +154,24 @@ class OMMXOpenJijSAAdapter(SamplerAdapter):
         uniform_penalty_weight: Optional[float] = None,
         penalty_weights: dict[int, float] = {},
         inequality_integer_slack_max_range: int = 32,
-    ):
-        self.ommx_instance = copy.deepcopy(ommx_instance)
-        self.beta_min = beta_min
-        self.beta_max = beta_max
-        self.num_sweeps = num_sweeps
-        self.num_reads = num_reads
-        self.schedule = schedule
-        self.initial_state = initial_state
-        self.updater = updater
-        self.sparse = sparse
-        self.reinitialize_state = reinitialize_state
-        self.seed = seed
-        self.uniform_penalty_weight = uniform_penalty_weight
-        self.penalty_weights = penalty_weights
-        self.inequality_integer_slack_max_range = inequality_integer_slack_max_range
+    ) -> Solution:
+        sample_set = cls.sample(
+            ommx_instance,
+            beta_min=beta_min,
+            beta_max=beta_max,
+            num_sweeps=num_sweeps,
+            num_reads=num_reads,
+            schedule=schedule,
+            initial_state=initial_state,
+            updater=updater,
+            sparse=sparse,
+            reinitialize_state=reinitialize_state,
+            seed=seed,
+            uniform_penalty_weight=uniform_penalty_weight,
+            penalty_weights=penalty_weights,
+            inequality_integer_slack_max_range=inequality_integer_slack_max_range,
+        )
+        return sample_set.best_feasible
 
     def decode_to_sampleset(self, data: oj.Response) -> SampleSet:
         samples = decode_to_samples(data)
@@ -148,6 +193,14 @@ class OMMXOpenJijSAAdapter(SamplerAdapter):
         else:
             return self._qubo
 
+    @property
+    def solver_input(self) -> dict[tuple[int, ...], float]:
+        return self.sampler_input
+
+    def decode(self, data: oj.Response) -> Solution:
+        sample_set = self.decode_to_sampleset(data)
+        return sample_set.best_feasible
+
     def _sample(self) -> oj.Response:
         sampler = oj.SASampler()
         input = self.sampler_input

{ommx_openjij_adapter-2.0.0rc3 → ommx_openjij_adapter-2.0.1}/ommx_openjij_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommx_openjij_adapter
-Version: 2.0.0rc3
+Version: 2.0.1
 Summary: OMMX Adapter for OpenJij.
 Author-email: "Jij Inc." <info@j-ij.com>
 Project-URL: Repository, https://github.com/Jij-Inc/ommx

{ommx_openjij_adapter-2.0.0rc3 → ommx_openjij_adapter-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ommx_openjij_adapter"
-version = "2.0.0rc3"
+version = "2.0.1"
 
 description = "OMMX Adapter for OpenJij."
 authors = [{ name = "Jij Inc.", email = "info@j-ij.com" }]