pyqrackising 9.5.5__tar.gz → 9.5.7__tar.gz

{pyqrackising-9.5.5/pyqrackising.egg-info → pyqrackising-9.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqrackising
-Version: 9.5.5
+Version: 9.5.7
 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.5.5 → pyqrackising-9.5.7}/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqrackising"
-version = "9.5.5"
+version = "9.5.7"
 requires-python = ">=3.8"
 description = "Fast MAXCUT, TSP, and sampling heuristics from near-ideal transverse field Ising model (TFIM)"
 readme = {file = "README.txt", content-type = "text/markdown"}

{pyqrackising-9.5.5 → pyqrackising-9.5.7}/pyqrackising/otoc.py

@@ -15,29 +15,39 @@ def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=6
         bias[0] = 1.0
         return bias
 
-    entropy_frac = 0.0
+    max_entropy = np.empty(n_bias, dtype=np.float64)
+    tot_prob = 0
+    p = 1.0
+    for q in range(n_qubits >> 1):
+        max_entropy[q] = p
+        max_entropy[n_bias - (q + 1)] = p
+        tot_prob += 2 * p
+        p = math.comb(n_qubits, q + 1)
+    if n_qubits & 1:
+        max_entropy[n_qubits >> 1] = p
+        tot_prob += p
+    max_entropy /= tot_prob
+
+    signal_frac = 0.0
     diff_z = np.zeros(n_bias, dtype=np.float64)
     for pauli_string in pauli_strings:
         pauli_string = list(pauli_string)
         if len(pauli_string) != n_qubits:
             raise ValueError("OTOCS pauli_string must be same length as n_qubits! (Use 'I' for qubits that aren't changed.)")
 
-        entropy_frac += pauli_string.count('X') + pauli_string.count('Y') + pauli_string.count('Z')
+        signal_frac -= pauli_string.count('Y') + pauli_string.count('Z')
 
         fwd = probability_by_hamming_weight(J, h, z, theta, t, n_qubits + 1)
         rev = probability_by_hamming_weight(-J, -h, z, theta + np.pi, t, n_qubits + 1)
         diff_theta = rev - fwd
+        diff_theta[0] += 1.0
 
         phi = theta + np.pi / 2
         fwd = probability_by_hamming_weight(-h, -J, z, phi, t, n_qubits + 1)
-        rev = probability_by_hamming_weight(h, J, z, phi + np.pi, t, n_qubits + 1)
-        diff_phi = rev - fwd
-
-        diff_lam = diff_theta + diff_phi
+        rev = probability_by_hamming_weight(h, J, z, phi - np.pi, t, n_qubits + 1)
+        diff_phi = (rev - fwd) + max_entropy
 
-        diff_theta[0] += 1.0
-        diff_phi[0] += 1.0
-        diff_lam[0] += 1.0
+        diff_lam = (diff_theta + diff_phi) / 2
 
         for b in pauli_string:
             match b:
@@ -53,20 +63,8 @@ def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=6
     # Normalize:
     diff_z /= diff_z.sum()
 
-    entropy_frac = np.atan2(entropy_frac, math.sqrt(n_qubits))
-    max_entropy = np.empty(n_bias, dtype=np.float64)
-    tot_prob = 0
-    p = 1.0
-    for q in range(n_qubits >> 1):
-        max_entropy[q] = p
-        max_entropy[n_bias - (q + 1)] = p
-        tot_prob += 2 * p
-        p = math.comb(n_qubits, q + 1)
-    if n_qubits & 1:
-        max_entropy[n_qubits >> 1] = p
-        tot_prob += p
-    max_entropy *= entropy_frac / tot_prob
-    diff_z = max_entropy + (1 - entropy_frac) * diff_z
+    signal_frac = 2 ** signal_frac
+    diff_z = signal_frac * diff_z + (1 - signal_frac) * max_entropy
 
     # Normalize:
     diff_z /= diff_z.sum()
@@ -188,11 +186,11 @@ def get_inv_dist(butterfly_idx_x, butterfly_idx_z, n_qubits, row_len, col_len):
 def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=65, pauli_strings = ['X' + 'I' * 64], shots=100, is_orbifold=True):
     thresholds = fix_cdf(get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, pauli_strings))
 
-    entropy_frac = 0.0
+    signal_frac = 0.0
     for pauli_string in pauli_strings:
         pauli_string = list(pauli_string)
-        entropy_frac += pauli_string.count('X') + pauli_string.count('Y') + pauli_string.count('Z')
-    entropy_frac = np.atan2(entropy_frac, math.sqrt(n_qubits))
+        signal_frac -= pauli_string.count('Y') + pauli_string.count('Z')
+    signal_frac = 2 ** signal_frac
 
     row_len, col_len = factor_width(n_qubits)
     inv_dist = np.zeros(n_qubits, dtype=np.float64)
@@ -218,13 +216,13 @@ def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=65, pauli
             continue
 
         # Second dimension: permutation within Hamming weight
-        if np.random.random() < entropy_frac:
+        if np.random.random() < signal_frac:
+            samples.append(take_sample(n_qubits, 0, m, inv_dist))
+        else:
             bit_pows = np.random.choice(qubit_pows, size=m, replace=False)
             sample = 0
             for bit_pow in bit_pows:
                 sample |= bit_pow
             samples.append(sample)
-        else:
-            samples.append(take_sample(n_qubits, 0, m, inv_dist))
 
     return samples

{pyqrackising-9.5.5 → pyqrackising-9.5.7/pyqrackising.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqrackising
-Version: 9.5.5
+Version: 9.5.7
 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.5.5 → pyqrackising-9.5.7}/setup.py

@@ -7,7 +7,7 @@ with open(README_PATH) as readme_file:
 
 setup(
     name='pyqrackising',
-    version='9.5.5',
+    version='9.5.7',
     author='Dan Strano',
     author_email='stranoj@gmail.com',
     description='Fast MAXCUT, TSP, and sampling heuristics from near-ideal transverse field Ising model (TFIM)',