eqc-models 0.9.8__tar.gz → 0.9.9__tar.gz

{eqc_models-0.9.8/eqc_models.egg-info → eqc_models-0.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: eqc-models
-Version: 0.9.8
+Version: 0.9.9
 Summary: Optimization and ML modeling package targeting EQC devices
 Author: Quantum Computing Inc.
 Author-email: support@quantumcomputinginc.com

{eqc_models-0.9.8 → eqc_models-0.9.9}/eqc_models/assignment/setpartition.py

@@ -1,8 +1,9 @@
 from typing import List, Tuple, Dict, Union
 import numpy as np
 from eqc_models.base import ConstraintsMixIn, PolynomialModel
+from eqc_models.base.polynomial import ConstrainedPolynomialModel
 
-class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
+class SetPartitionModel(ConstrainedPolynomialModel):
     """
     This class represents a set partitioning model for optimization problems that require selecting subsets
     to partition a universal set while minimizing an objective function defined by weights. Given a collection
@@ -83,24 +84,15 @@ class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
             A.append(row)
         A = np.array(A)
         b = np.ones((A.shape[0],))
-
-        # Define penalty terms
-        J = A.T @ A
-        h = -2 * b.T @ A
-        n = h.shape[0]
-        h = h.reshape((n, 1))
-        offset = b.T @ b
-
-        # Assign the constraints to the mixin's properties
-        self.constraints = (A, b)
-
-        # Initialize PolynomialModel with J and h, properly formatted as indices and coefficients
-        indices, coefficients = self._construct_polynomial_terms(h, J)
-        super().__init__(coefficients, indices)
+        n = A.shape[1]
 
         # Define the linear objective function based on subset weights
         self.linear_objective = np.array(weights).reshape((n, 1))
-        self.quad_objective = np.zeros_like(J)
+        self.quad_objective = np.zeros((n, n)) #np.zeros_like(J)
+
+        # Initialize PolynomialModel with J and h, properly formatted as indices and coefficients
+        indices, coefficients = self._construct_polynomial_terms(self.linear_objective, self.quad_objective)
+        super().__init__(coefficients, indices, A, b)
 
     def _construct_polynomial_terms(self, h: np.ndarray, J: np.ndarray) -> Tuple[List[List[int]], List[np.ndarray]]:
         """
@@ -140,19 +132,6 @@ class SetPartitionModel(ConstraintsMixIn, PolynomialModel):
 
         return indices, coefficients
 
-    @property
-    def H(self) -> Tuple[np.ndarray, np.ndarray]:
-        """
-        Hamiltonian representation as a polynomial, returning the coefficients and indices.
-
-        Returns
-        -------
-        Tuple[np.ndarray, np.ndarray]
-            Tuple where the first element is an array of coefficients, and the second element
-            is an array of indices, each representing polynomial terms for the Hamiltonian.
-        """
-        return self.coefficients, self.indices
-
     def evaluateObjective(self, solution: np.ndarray) -> float:
         """
         Evaluate the objective function by calculating the weighted sum of selected subsets.