eqc-models 0.14.0__tar.gz → 0.14.2__tar.gz

{eqc_models-0.14.0 → eqc_models-0.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.14.0
+Version: 0.14.2
 Summary: Optimization and ML modeling package targeting EQC devices
 Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com
@@ -16,7 +16,7 @@ Requires-Dist: networkx<3,>=2.6.3
 Requires-Dist: pandas<3,>=2.1.0
 Requires-Dist: scikit-learn<2,>=1.2.1
 Requires-Dist: lightgbm<5,>=4.6.0
-Requires-Dist: xgboost<2,>=1.7.4
+Requires-Dist: xgboost<4,>=1.7.4
 Requires-Dist: qci-client<6,>=5
 Provides-Extra: dev
 Requires-Dist: pytest<8,>=7.1.0; extra == "dev"

eqc_models-0.14.2/docs/source/dependencies.rst

@@ -0,0 +1,17 @@
+Dependencies
+=============
+
+Requires Python: >=3.9, <3.14
+
+Packages
+--------
+
+- ``emucore-direct ==1.0.7; python_version <'3.11'``
+- ``eqc-direct ==2.0.2; python_version <'3.11'``
+- ``numpy >=1.22.1, <2``
+- ``networkx >=2.6.3, <3``
+- ``pandas >=2.1.0, <3``
+- ``scikit-learn >=1.2.1, <2``
+- ``lightgbm >= 4.6.0, <5``
+- ``xgboost >= 1.7.4, <2``
+- ``qci-client>=5, <6``

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/algorithms/penaltymultiplier.py

@@ -25,7 +25,6 @@ class PenaltyMultiplierAlgorithm(Algorithm):
     upper_bound : float
         Upper bound value for the objective function, this need not be a least upper bound, 
         but the tighter the value, the more efficient the search
-
     solutions : List
         The solutions found during the algorithm run
     alphas : List

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/assignment/resource.py

@@ -9,9 +9,9 @@ class ResourceAssignmentModel(InequalitiesMixin, ConstrainedQuadraticModel):
 
     Parameters
     ------------
-
     resources : List
     tasks : List
+    
 
     >>> # name is not a required attribute of the resources or tasks
     >>> crews = [{"name": "Maintenance Crew 1", "skills": ["A", "F"], "capacity": 5, "cost": 4},

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/base/results.py

@@ -153,14 +153,19 @@ class SolutionResults:
             solutions = np.array(new_solutions)
         if hasattr(model, "evaluateObjective"):
             objectives = np.zeros((solutions.shape[0],), dtype=np.float32)
-            for i in range(solutions.shape[0]):
-                try:
-                    objective = model.evaluateObjective(solutions[i])
-                except NotImplementedError:
-                    warnings.warn(f"Cannot set objective value in results for {model.__class__}")
-                    objectives = None
-                    break
-                objectives[i] = objective
+            try:
+                objectives[:] = model.evaluateObjective(solutions)
+            except NotImplementedError:
+                warnings.warn(f"Cannot evaluate objective value in results for {model.__class__}. Method not implemented.")
+                objectives = None
+            # for i in range(solutions.shape[0]):
+            #     try:
+            #         objective = model.evaluateObjective(solutions[i])
+            #     except NotImplementedError:
+            #         warnings.warn(f"Cannot set objective value in results for {model.__class__}")
+            #         objectives = None
+            #         break
+            #     objectives[i] = objective
         else:
             objectives = None
         if hasattr(model, "evaluatePenalties"):
@@ -217,14 +222,11 @@ class SolutionResults:
         device_type = info_dict["device_type"]
         if hasattr(model, "evaluateObjective"):
             objectives = np.zeros((solutions.shape[0],), dtype=np.float32)
-            for i in range(solutions.shape[0]):
-                try:
-                    objective = model.evaluateObjective(solutions[i])
-                except NotImplementedError:
-                    warnings.warn(f"Cannot set objective value in results for {model.__class__}")
-                    objectives = None
-                    break
-                objectives[i] = objective
+            try:
+                objectives[:] = model.evaluateObjective(solutions)
+            except NotImplementedError:
+                warnings.warn(f"Cannot evaluate objective value in results for {model.__class__}. Method not implemented.")
+                objectives = None
         else:
             objectives = None
         if hasattr(model, "evaluatePenalties"):

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/ml/classifierqboost.py

@@ -235,7 +235,9 @@ class QBoostClassifier(ClassifierBase):
         self.classes_ = None
 
     def topNPairs(self, X, n):
-        assert n < X.shape[1]*(X.shape[1]-1)
+        
+        assert n <= int(X.shape[1] * (X.shape[1] - 3) /2)
+        
         cov = np.corrcoef(X, rowvar=False)
         abscov = np.abs(cov)
         flatcov = []
@@ -275,7 +277,7 @@ class QBoostClassifier(ClassifierBase):
 
             """
             if self.weak_cls_pair_count is None:
-                weak_cls_pair_count = n_dims * (n_dims - 1)
+                weak_cls_pair_count = int(n_dims * (n_dims - 3) / 2)
             else:
                 weak_cls_pair_count = self.weak_cls_pair_count
             pairs = self.topNPairs(X, weak_cls_pair_count)
@@ -284,8 +286,7 @@ class QBoostClassifier(ClassifierBase):
                     X[:, [i, j]],
                     y,
                     self.weak_cls_type,
-                    self.weak_max_depth,
-                    self.weak_min_samples_split,
+                    self.weak_cls_params,                    
                 )
                 weak_classifier.train()
                 self.ind_list.append([i, j])

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/solvers/__init__.py

@@ -12,5 +12,5 @@ class Dirac3MIPDirectSolver(MIPMixin, Dirac3DirectSolver):
 
 __all__ = ["Dirac3DirectSolver", "Dirac1CloudSolver", "Dirac3CloudSolver", 
            "EqcDirectSolver", "QciClientSolver", "Dirac3IntegerCloudSolver",
-           "Dirac3ContinuousCloudSolver", "MILPMixin",
+           "Dirac3ContinuousCloudSolver", "MIPMixin",
            "Dirac3MIPCloudSolver", "Dirac3MIPDirectSolver"]

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models/solvers/mip.py

@@ -77,11 +77,11 @@ class MIPMixin:
         for i in range(len(solutions)):
             log.debug("SolutionResults solution: %s", solutions[i])
         if hasattr(model, "evaluateObjective"):
-            new_objectives = []
+            new_objectives = np.zeros((len(solutions),), dtype=np.float32)
         else:
             new_objectives = None
         if hasattr(model, "evaluatePenalties"):
-            new_penalties = []
+            new_penalties = np.zeros((len(solutions),), dtype=np.float32)
         else:
             new_penalties = None
         new_solutions = []
@@ -98,12 +98,12 @@ class MIPMixin:
             log.debug("%d - New solution %s", i, new_sol)
             if new_objectives is not None:
                 try:
-                    new_objectives.append(model.evaluateObjective(new_sol))
+                    new_objectives[i:i+1] = model.evaluateObjective(new_sol)
                 except NotImplementedError as err:
                     pass
             if new_penalties is not None:
                 try:
-                    new_penalties.append(model.evaluatePenalties(new_sol))
+                    new_penalties[i:i+1] = model.evaluatePenalties(new_sol)
                 except NotImplementedError as err:
                     pass
             new_solutions.append(new_sol)

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.14.0
+Version: 0.14.2
 Summary: Optimization and ML modeling package targeting EQC devices
 Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com
@@ -16,7 +16,7 @@ Requires-Dist: networkx<3,>=2.6.3
 Requires-Dist: pandas<3,>=2.1.0
 Requires-Dist: scikit-learn<2,>=1.2.1
 Requires-Dist: lightgbm<5,>=4.6.0
-Requires-Dist: xgboost<2,>=1.7.4
+Requires-Dist: xgboost<4,>=1.7.4
 Requires-Dist: qci-client<6,>=5
 Provides-Extra: dev
 Requires-Dist: pytest<8,>=7.1.0; extra == "dev"

{eqc_models-0.14.0 → eqc_models-0.14.2}/eqc_models.egg-info/requires.txt

@@ -3,7 +3,7 @@ networkx<3,>=2.6.3
 pandas<3,>=2.1.0
 scikit-learn<2,>=1.2.1
 lightgbm<5,>=4.6.0
-xgboost<2,>=1.7.4
+xgboost<4,>=1.7.4
 qci-client<6,>=5
 
 [:python_version < "3.11"]

{eqc_models-0.14.0 → eqc_models-0.14.2}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "pandas >=2.1.0, <3",
     "scikit-learn >=1.2.1, <2",
     "lightgbm >= 4.6.0, <5",
-    "xgboost >= 1.7.4, <2",
+    "xgboost >= 1.7.4, <4",
     "qci-client>=5, <6",
 ]
 

eqc_models-0.14.0/docs/source/dependencies.rst

@@ -1,14 +0,0 @@
-Dependencies
-=============
-
-Requires Python: >=3.9, <3.11
-
-Packages
---------
-
-- ``numpy>=1.22.1, <2``
-- ``networkx>=2.6.3, <3``
-- ``pandas>=2.1.0``
-- ``scikit-learn>=1.2.1``
-- ``qci-client>=4.3.0, <5``
-- ``emucore-direct==1.0.6``