pyqrackising 9.3.10__py3-none-macosx_14_0_arm64.whl → 9.3.11__py3-none-macosx_14_0_arm64.whl

pyqrackising/otoc.py

@@ -73,21 +73,11 @@ def fix_cdf(hamming_prob):
     return cum_prob
 
 
-def take_all(b, basis, sample):
-    for i in range(len(basis)):
-        if basis[i] == b:
-            sample |= (1 << i)
-
-    return sample
-
-
-def take_sample(b, basis, sample, m, inv_dist):
-    indices = []
+def take_sample(n_qubits, sample, m, inv_dist):
+    indices = [i for i in range(n_qubits)]
     tot_inv_dist = 0.0
-    for i in range(len(basis)):
-        if basis[i] == b:
-            indices.append(i)
-            tot_inv_dist += inv_dist[i]
+    for i in range(n_qubits):
+        tot_inv_dist += inv_dist[i]
     selected = []
     for i in range(m):
         r = tot_inv_dist * np.random.random()
@@ -139,8 +129,7 @@ def get_inv_dist(butterfly_idx, n_qubits, row_len):
             q_row = q // row_len
             q_col = q % row_len
             dist = (q_row - b_row) ** 2 + (q_col - b_col) ** 2
-            if dist > 0:
-                inv_dist[q] += 1.0 / dist
+            inv_dist[q] += 1.0 / (1.0 + dist)
 
     return inv_dist
 
@@ -154,26 +143,6 @@ def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.174532925199432957, t=5, n
     if len(measurement_basis) != n_qubits:
         raise ValueError("OTOC measurement_basis must be same length as n_qubits! (Use 'I' for excluded qubits.)")
 
-    basis_x, basis_y, basis_z = [], [], []
-    for b in pauli_string:
-        if b == 'Z':
-            basis_z.append('X')
-            basis_y.append('I')
-            basis_x.append('Z')
-        elif b == 'X':
-            basis_z.append('Z')
-            basis_y.append('I')
-            basis_x.append('X')
-        elif b == 'Y':
-            basis_z.append('I')
-            basis_y.append('Z')
-            basis_x.append('I')
-        else:
-            basis_z.append('I')
-            basis_y.append('I')
-            basis_x.append('I')
-
-    bases = { 'X': basis_x, 'Y': basis_y, 'Z': basis_z }
     thresholds = { key: fix_cdf(value) for key, value in get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, cycles, pauli_string).items() }
 
     row_len, col_len = factor_width(n_qubits)
@@ -192,8 +161,6 @@ def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.174532925199432957, t=5, n
     for _ in range(shots):
         sample_3_axis = { 'X': 0, 'Y': 0, 'Z': 0 }
         for key, value in thresholds.items():
-            basis = bases[key]
-
             # First dimension: Hamming weight
             m = sample_mag(value)
             if m == 0:
@@ -203,25 +170,7 @@ def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.174532925199432957, t=5, n
                 continue
 
             # Second dimension: permutation within Hamming weight
-            z_count = basis.count('Z')
-            if z_count > m:
-                sample_3_axis[key] = take_sample('Z', basis, sample_3_axis[key], m, inv_dist[key])
-                continue
-            m -= z_count
-            sample_3_axis[key] = take_all('Z', basis, sample_3_axis[key])
-            if m == 0:
-                continue
-
-            i_count = basis.count('I')
-            if i_count > m:
-                sample_3_axis[key] = take_sample('I', basis, sample_3_axis[key], m, inv_dist[key])
-                continue
-            m -= i_count
-            sample_3_axis[key] = take_all('I', basis, sample_3_axis[key])
-            if m == 0:
-                continue
-
-            sample_3_axis[key] = take_sample('X', basis, sample_3_axis[key], m, inv_dist[key])
+            sample_3_axis[key] = take_sample(n_qubits, sample_3_axis[key], m, inv_dist[key])
 
         sample = 0
         j = 0

{pyqrackising-9.3.10.dist-info → pyqrackising-9.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqrackising
-Version: 9.3.10
+Version: 9.3.11
 Summary: Fast MAXCUT, TSP, and sampling heuristics from near-ideal transverse field Ising model (TFIM)
 Home-page: https://github.com/vm6502q/PyQrackIsing
 Author: Dan Strano

{pyqrackising-9.3.10.dist-info → pyqrackising-9.3.11.dist-info}/RECORD

@@ -6,7 +6,7 @@ pyqrackising/maxcut_tfim.py,sha256=U1nNjyfMS48TtTQk7TRf5_VF3pVPfAcZEa2awc2nR8k,1
 pyqrackising/maxcut_tfim_sparse.py,sha256=eenJNSEwRvgwACfKoH0tj6rpn7uqH6nNTBuxUPh_lDg,11941
 pyqrackising/maxcut_tfim_streaming.py,sha256=FkBsRoXSRhv4gUeN9O7Ivx54oxq_SqiCDKnYsyxU4bs,6664
 pyqrackising/maxcut_tfim_util.py,sha256=nMLrbvDMsCtVgbS4vbRNSZYpdne5YzdifjlQbbWmKjU,16935
-pyqrackising/otoc.py,sha256=-SGs5Y2slNsqEURGPQv-uI5bIz2JOejY4iEckMRf0Sw,7674
+pyqrackising/otoc.py,sha256=CciS348HDws8spCgkWxeKaaHNIqGMsml52T337e-db8,6119
 pyqrackising/spin_glass_solver.py,sha256=YtsIfYfpwhEMQPVd_sbjqpz6nQcrv8p2mUBYZ-wRpnM,13792
 pyqrackising/spin_glass_solver_sparse.py,sha256=E4Ft7H-uKXZyq1cS7Z77AgdkL5fMlKMK6DwnXgrgOhk,14740
 pyqrackising/spin_glass_solver_streaming.py,sha256=xpWq63yODMzBPQQtpDuB1Tro6ta8pPbVwc0ZkDWVASk,10018
@@ -14,8 +14,8 @@ pyqrackising/tfim_magnetization.py,sha256=On1MhCNGGHRxJFRmCOpMcdqQJiy25gWkjz0Ka8
 pyqrackising/tfim_square_magnetization.py,sha256=9uJCT8ytyufcGFrZiignjCkWJr9UcP44sAAy0BIBw34,531
 pyqrackising/tsp.py,sha256=kqDxU2RCjad-T4tW_C9WO1I-COSwX7fHB6VhIuQsjfQ,62464
 pyqrackising/tsp_maxcut.py,sha256=ngxfSJgePXVwJXfNXYdk4jv1ISznx8zHOqR-Vbf33B0,9772
-pyqrackising-9.3.10.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-pyqrackising-9.3.10.dist-info/METADATA,sha256=HNlA3a55jS5AyRvq8A0XDB2OFrNpQIzkmWvYevLYkGc,1144
-pyqrackising-9.3.10.dist-info/WHEEL,sha256=97pmOSfusofyzGlW1jJA8mX_ciF6NJq3BQs-Zshjrk4,105
-pyqrackising-9.3.10.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
-pyqrackising-9.3.10.dist-info/RECORD,,
+pyqrackising-9.3.11.dist-info/licenses/LICENSE.md,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+pyqrackising-9.3.11.dist-info/METADATA,sha256=kXHONRvf5Sxh3LqfylPxpJIf_GsTKw0pd6Xjpgop5ng,1144
+pyqrackising-9.3.11.dist-info/WHEEL,sha256=97pmOSfusofyzGlW1jJA8mX_ciF6NJq3BQs-Zshjrk4,105
+pyqrackising-9.3.11.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
+pyqrackising-9.3.11.dist-info/RECORD,,