eqc-models 0.10.2__tar.gz → 0.10.3__tar.gz

{eqc_models-0.10.2/eqc_models.egg-info → eqc_models-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.10.2
+Version: 0.10.3
 Summary: Optimization and ML modeling package targeting EQC devices
 Author: Quantum Computing Inc.
 Author-email: support@quantumcomputinginc.com
@@ -22,6 +22,7 @@ Provides-Extra: dev
 Requires-Dist: pytest<8,>=7.1.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: sphinx_rtd_theme<2,>=1.3.0; extra == "dev"
+Dynamic: license-file
 
 # EQC Models
 

{eqc_models-0.10.2 → eqc_models-0.10.3}/eqc_models/combinatorics/setcover.py

@@ -41,41 +41,57 @@ class SetCoverModel(ConstrainedQuadraticModel):
     >>> X = [set(['A', 'B']), set(['B', 'C']), set(['C'])]
     >>> weights = [2, 2, 1]
     >>> model = SetCoverModel(X, weights)
-    >>> model.penalty_multiplier = 2
+    >>> model.penalty_multiplier = 8
+    >>> lhs, rhs = model.constraints
+    >>> lhs
+    array([[ 1,  0,  0,  0,  0],
+           [ 1,  1,  0, -1,  0],
+           [ 0,  1,  1,  0, -1]])
     >>> from eqc_models.solvers import Dirac3IntegerCloudSolver
     >>> solver = Dirac3IntegerCloudSolver()
     >>> response = solver.solve(model, relaxation_schedule=1, num_samples=5) #doctest: +ELLIPSIS
     20...
     >>> solutions = response["results"]["solutions"]
     >>> solutions[0]
-    [1, 0, 1, 0, 0, 0]
-    >>> model.decode(solutions[0])
-    [{'B', 'A'}, {'C'}]
+    [1, 0, 1, 0, 0]
+    >>> selections = model.decode(solutions[0])
+    >>> assert {'B', 'A'} in selections
+    >>> assert {'C'} in selections
+    >>> assert len(selections) == 2
 
     """
 
     def __init__(self, subsets, weights):
         # ensure that X is ordered
-        self.X = X = list(subsets)
-        self.S = S = set()
+        self.S = S = list(subsets)
+        self.universal_set = U = set()
 
         for x in subsets:
-            S = S.union(x)
+            U.update(x)
         # elements is sorted to maintain consistent output
-        elements = [a for a in S]
+        elements = [a for a in U]
         elements.sort()
         # constraints 
         A = []
         b = []
-        variables = [f'x_{i}' for i in range(len(X))]
+        variables = [f'x_{i}' for i in range(len(S))]
         pos = 0
+        num_slacks = 0
+        slack_ub = []
         for a in elements:
-            variables.append(f"s_{pos}")
-            constraint = [1 if a in X[i] else 0 for i in range(len(X))]
-            slacks = [0 for i in range(len(S))]
-            slacks[pos] = -1
+            num_sets = sum([1 if a in S[i] else 0 for i in range(len(S))])
+            assert num_sets >= 1, "Invalid subsets, check the universal set"
+            if num_sets > 1:
+                num_slacks += 1
+            slack_ub.append(num_sets-1)
+        for i, a in enumerate(elements):
+            constraint = [1 if a in S[j] else 0 for j in range(len(S))]
+            slacks = [0 for i in range(num_slacks)]
+            if slack_ub[i] > 0:
+                variables.append(f"s_{pos}")
+                slacks[pos] = -1
+                pos += 1
             A.append(constraint + slacks)
-            pos += 1
             b.append(1)
         n = len(variables)
         J = np.zeros((n, n))
@@ -84,11 +100,12 @@ class SetCoverModel(ConstrainedQuadraticModel):
         # call the superclass constructor with the objective and constraints
         super(SetCoverModel, self).__init__(h, J, np.array(A), np.array(b))
         # set upper bound on the variables to be 1 for x_i and the length of X minus 1 for the slacks
-        self.upper_bound = np.array([1 for i in range(len(weights))] + [len(X)-1 for i in range(n-len(weights))])
+        slack_ub = [val for val in slack_ub if val > 0]
+        self.upper_bound = np.array([1 for i in range(len(weights))] + slack_ub)
 
     def decode(self, solution) -> List:
         xbar = []
-        for i in range(len(self.X)):
+        for i in range(len(self.S)):
             if solution[i] > 0.5:
-                xbar.append(self.X[i])
+                xbar.append(self.S[i])
         return xbar

{eqc_models-0.10.2 → eqc_models-0.10.3/eqc_models.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.10.2
+Version: 0.10.3
 Summary: Optimization and ML modeling package targeting EQC devices
 Author: Quantum Computing Inc.
 Author-email: support@quantumcomputinginc.com
@@ -22,6 +22,7 @@ Provides-Extra: dev
 Requires-Dist: pytest<8,>=7.1.0; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: sphinx_rtd_theme<2,>=1.3.0; extra == "dev"
+Dynamic: license-file
 
 # EQC Models
 

{eqc_models-0.10.2 → eqc_models-0.10.3}/test/testsetcovermodel.py

@@ -15,11 +15,11 @@ class SetCoverTestCase(TestCase):
 
     def testConstraints(self):
         lhs, rhs = self.model.constraints
-        assert lhs.shape == (3, 6)
+        assert lhs.shape == (3, 5)
         assert rhs.shape == (3,)
-        assert (lhs == [[1, 0, 0, -1, 0, 0],[1, 1, 0, 0, -1, 0],[0, 1, 1, 0, 0, -1]]).all()
+        assert (lhs == [[1, 0, 0, 0, 0],[1, 1, 0, -1, 0],[0, 1, 1, 0, -1]]).all()
         assert (rhs == [1, 1, 1]).all()
 
     def testObjective(self):
         objective = self.model.linear_objective
-        assert (objective == [2, 2, 1, 0, 0, 0]).all()
+        assert (objective == [2, 2, 1, 0, 0]).all()