revert changes

Author: rileyjmurray

pygsti/data/dataset.py

@@ -1177,7 +1177,6 @@ def _get_row(self, circuit):
         # needed because name-only Labels don't hash the same as strings
         # so key lookups need to be done at least with tuples of Labels.
         circuit = _cir.Circuit.cast(circuit)
-        circuit._static = False
         #Note: cirIndex value is either an int (non-static) or a slice (static)
         cirIndex = self.cirIndex[circuit]
         repData = self.repData[cirIndex] if (self.repData is not None) else None

pygsti/models/gaugegroup.py

@@ -675,8 +675,6 @@ def __init__(self, state_space, evotype='default'):
         rtrans = _np.identity(dim, 'd')
         baseMx = _np.identity(dim, 'd')
         parameterArray = _np.zeros(dim, 'd')
-        # ^ ... shouldn't that be ones?
-        #   parameterArray = _np.ones(dim, 'd')
         parameterToBaseIndicesMap = {i: [(i, i)] for i in range(dim)}
         operation = _op.LinearlyParamArbitraryOp(baseMx, parameterArray, parameterToBaseIndicesMap, ltrans, rtrans,
                                                  real=True, evotype=evotype, state_space=state_space)
@@ -733,7 +731,6 @@ def __init__(self, state_space, evotype='default'):
         rtrans = _np.identity(dim, 'd')
         baseMx = _np.identity(dim, 'd')
         parameterArray = _np.zeros(dim - 1, 'd')
-        # parameterArray = _np.ones(dim - 1, 'd')
         parameterToBaseIndicesMap = {i: [(i + 1, i + 1)] for i in range(dim - 1)}
         operation = _op.LinearlyParamArbitraryOp(baseMx, parameterArray, parameterToBaseIndicesMap, ltrans, rtrans,
                                                  real=True, evotype=evotype, state_space=state_space)

pygsti/report/factory.py

@@ -1248,9 +1248,8 @@ def construct_standard_report(results, title="auto",
 
     advanced_options = advanced_options or {}
     n_leak = advanced_options.get('n_leak', 0)
-    # ^ Not sure if this is a good place to pass this parameter.
-    #   A better implementation would be to store this info in model.basis
-    #   (for the various models).
+    # ^ It would be preferable to store n_leak in a Basis object, or something similar.
+    #   We're using this for now since it's simple and gets the job done.
     linlogPercentile = advanced_options.get('linlog percentile', 5)
     nmthreshold = advanced_options.get('nmthreshold', DEFAULT_NONMARK_ERRBAR_THRESHOLD)
     embed_figures = advanced_options.get('embed_figures', True)
@@ -1396,9 +1395,6 @@ def construct_standard_report(results, title="auto",
         'show_unmodeled_error': bool('ShowUnmodeledError' in flags),
         'n_leak' : n_leak
     }
-    # ^ Not sure if this is a good place to pass n_leak.
-    #   A better implementation would be to store this info in model.basis
-    #   (for the various models).
 
     templates = dict(
         html='~standard_html_report',

pygsti/tools/basistools.py

@@ -15,7 +15,6 @@
 import numpy as _np
 
 from pygsti.baseobjs.basisconstructors import _basis_constructor_dict
-# from ..baseobjs.basis import Basis, BuiltinBasis, DirectSumBasis
 from pygsti.baseobjs import basis as _basis
 
 
@@ -60,10 +59,9 @@ def leakage_friendly_basis_2plus1(return_subspace_basis=False):
             labels=["I", "X", "Y", "Z"]
     )
     return leakage_basis, subspace_basis
-    
-
 
 
+@lru_cache(maxsize=1)
 def basis_matrices(name_or_basis, dim, sparse=False):
     """
     Get the elements of the specifed basis-type which spans the density-matrix space given by `dim`.

pygsti/tools/optools.py

@@ -620,11 +620,6 @@ def leading_dxd_submatrix_basis_vectors(d: int, n: int, current_basis, return_la
     if, instead of starting with the objective function || (M1 - M2) v ||, we started with
     f((M1 - M2) v) and f satisfied the property that f(c v) >= f(v) whenever c is a scalar
     greater than or equal to one.
-
-    Interesting idea:
-        Set M2 = 0.
-        Use || (I - P) M1 P || as a metric for leakage.
-        Use || P M1 (I - P) || as a metric for seepage
     """
     assert d <= n
     current_basis = _pgb.Basis.cast(current_basis, dim=n**2)

scripts/api_names.yaml

@@ -3690,6 +3690,8 @@ tools:
     expm_multiply_prep: null
     expop_multiply_prep: null
     find_zero_communtant_connection: null
+    frobeniusnorm: null
+    frobeniusnorm2: frobeniusnorm_squared
     get_csr_sum_flat_indices: csr_sum_flat_indices
     get_csr_sum_indices: csr_sum_indices
     get_kite: compute_kite  # XXX parameter `evals` -> `eigenvalues`