eqc-models 0.14.4__tar.gz → 0.14.5__tar.gz

{eqc_models-0.14.4 → eqc_models-0.14.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.14.4
+Version: 0.14.5
 Summary: Optimization and ML modeling package targeting EQC devices
 Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com

{eqc_models-0.14.4 → eqc_models-0.14.5}/eqc_models/graph/rcshortestpath.py

@@ -24,7 +24,7 @@ class RCShortestPathModel(ShortestPathModel):
         # determine shortest path by weight
         nx_path = nx.shortest_path(G, s, t)
         path_length = len(nx_path)
-        self.resource_mult = resource_mult = 2 * path_length / self.T
+        self.resource_mult = resource_mult = 1 / T
         super(RCShortestPathModel, self).__init__(G, s, t)
         upper_bound = np.ones(len(self.variables))
         upper_bound[-1] = np.ceil(resource_mult * T)

{eqc_models-0.14.4 → eqc_models-0.14.5}/eqc_models/graph/shortestpath.py

@@ -91,7 +91,7 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
             (i, j) = self.variables[l]
             if i == j:
                 # self loops are not allowed
-                raise ValueError("Self loops are not allowed in ShortestPathModel")
+                raise ValueError(f"Self loops are not allowed in {self.__class__.__name__}")
             # # ignore these edges because we can't go back to s or leave t
             elif j == self.s:
                 continue
@@ -125,10 +125,12 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
         J = np.zeros((n, n))
         return np.array(_obj), J
 
-    def decode(self, solution : np.ndarray) -> Dict:
+    def decode(self, solution : np.ndarray, weight="weight") -> Dict:
         """ 
         Convert a solution to this model into a path, which is
-        a dictionary with each edge described by key, value pairs.
+        a list as returned from nx.shortest_path with the pair option.
+        Specify the :code:`weight` kwarg to choose a metric for the final
+        evaluation.
 
         """
         variables = self.variables[:len(self.G.edges)]
@@ -152,7 +154,7 @@ class ShortestPathModel(EdgeMixin, ConstrainedQuadraticModel):
             self.alt_g = G
             path = {}
             try:
-                nx_path = nx.shortest_path(G, self.s, self.t)
+                nx_path = nx.shortest_path(G, self.s, self.t, weight=weight)
                 lower_thresh = thresh
                 got_path = nx_path
                 log.debug("Got path size %d", len(got_path))

{eqc_models-0.14.4 → eqc_models-0.14.5}/eqc_models.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eqc-models
-Version: 0.14.4
+Version: 0.14.5
 Summary: Optimization and ML modeling package targeting EQC devices
 Author-email: "Quantum Computing Inc." <support@quantumcomputinginc.com>
 Project-URL: Homepage, https://quantumcomputinginc.com

{eqc_models-0.14.4 → eqc_models-0.14.5}/scripts/test_shortestpath.py

@@ -4,10 +4,11 @@ import numpy as np
 import networkx as nx
 from eqc_models.graph.shortestpath import ShortestPathModel
 from eqc_models.graph.rcshortestpath import RCShortestPathModel
-from eqc_models.solvers import Dirac3MILPDirectSolver, Dirac3MILPCloudSolver
-from eqc_models.solvers.milp import MILPMixin
+from eqc_models.solvers import Dirac3MIPDirectSolver, Dirac3MIPCloudSolver
+from eqc_models.solvers.mip import MIPMixin
 from eqc_models.base.results import SolutionResults
-logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.INFO)
+np.set_printoptions(linewidth=180)
 G = nx.DiGraph()
 G.add_node("s")
 G.add_node("t")
@@ -25,12 +26,15 @@ model.penalty_multiplier = 95
 # model.is_discrete = [True for x in model.variables]
 # model.is_discrete[-1] = False
 print("Is Discrete:", model.is_discrete)
-# lhs, rhs = model.constraints
-# print(lhs)
-# print(rhs)
+lhs, rhs = model.constraints
+print("SP CONSTRAINTS")
+print(np.hstack([lhs, rhs.reshape((lhs.shape[0], 1))]))
 # put a time limit of 20 on the path
 rcmodel = RCShortestPathModel(G, "s", "t", 20)
-rcmodel.penalty_multiplier = 95
+rcmodel.penalty_multiplier = 200
+lhs, rhs = rcmodel.constraints
+print("RCSP CONSTRAINTS")
+print(np.hstack([lhs, rhs.reshape((lhs.shape[0], 1))]))
 # rcmodel.upper_bound = np.array([1 for x in model.variables])
 # rcmodel.upper_bound[-1] = 10
 # rcmodel.machine_slacks = 1
@@ -40,26 +44,37 @@ rcsum = len(rcmodel.G.edges) + int(rcmodel.upper_bound[-1])
 if os.environ.get("EQC_DIRECT", "NO")=="YES":
     ip_addr = os.environ.get("DEVICE_IP_ADDR", "172.18.41.171")
     port = os.environ.get("DEVICE_PORT", "50051")
-    solver = Dirac3MILPDirectSolver()
+    solver = Dirac3MIPDirectSolver()
     solver.connect(ip_addr=ip_addr, port=port)
-    results = solver.solve(model, sum_constraint=spsum, num_samples=5, relaxation_schedule=1)
-    rcresults = solver.solve(rcmodel, sum_constraint=rcsum, num_samples=5, relaxation_schedule=1)
+    results = solver.solve(model, sum_constraint=spsum, num_samples=5, relaxation_schedule=2, mean_photon_number=0.006)
+    rcresults = solver.solve(rcmodel, sum_constraint=rcsum, num_samples=5, relaxation_schedule=2, mean_photon_number=0.006)
 else:
-    solver = Dirac3MILPCloudSolver()
-    results = solver.solve(model, sum_constraint=spsum, num_samples=5, relaxation_schedule=1)
+    solver = Dirac3MIPCloudSolver()
+    results = solver.solve(model, sum_constraint=spsum, num_samples=5, relaxation_schedule=2, mean_photon_number=0.006)
     solutions = results.solutions
-    rcresults = solver.solve(rcmodel, sum_constraint=rcsum, num_samples=5, relaxation_schedule=1)
+    rcresults = solver.solve(rcmodel, sum_constraint=rcsum, num_samples=5, relaxation_schedule=2, mean_photon_number=0.006)
     rcsolutions = rcresults.solutions
 
 print("***** CHECKING ShortestPath ****")
 print(model.variables)
 for solution in solutions:
     print(solution)
-path = model.decode(solutions[0])
+for solution in solutions:
+    try:
+        path = model.decode(solution)
+        break
+    except RuntimeError as err:
+        path = None
 print(path)
 print("***** CHECKING RCShortestPath ****")
 print(rcmodel.variables)
 for solution in rcsolutions:
     print(solution)
+for solution in rcsolutions:
+    try:
+        path = rcmodel.decode(solution, weight="resource")
+        break
+    except RuntimeError as err:
+        path = None
 rcpath = rcmodel.decode(rcsolutions[0])
 print(rcpath)