pyqrackising 9.5.0__tar.gz → 9.5.1__tar.gz

{pyqrackising-9.5.0/pyqrackising.egg-info → pyqrackising-9.5.1}/PKG-INFO

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

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqrackising"
-version = "9.5.0"
+version = "9.5.1"
 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.0 → pyqrackising-9.5.1}/pyqrackising/maxcut_tfim_util.py

@@ -389,22 +389,57 @@ def init_theta(h_mult, n_qubits, J_eff, degrees):
     return theta
 
 
+# From Google Search AI
+@njit
+def factorial(num):
+    """Calculates the factorial of a non-negative integer."""
+    if num == 0:
+        return 1
+
+    result = 1
+    for i in range(1, num + 1):
+        result *= i
+
+    return result
+
+
+# From Google Search AI
+@njit
+def comb(n, k):
+    """
+    Calculates the number of combinations (n choose k) from scratch.
+    n: The total number of items.
+    k: The number of items to choose.
+    """
+    # Optimize by choosing the smaller of k and (n-k)
+    # This reduces the number of multiplications in the factorial calculation
+    k = min(k, n - k)
+
+    # Calculate the numerator: n * (n-1) * ... * (n-k+1)
+    numerator = 1
+    for i in range(k):
+        numerator *= (n - i)
+
+    # Calculate the denominator: k!
+    denominator = factorial(k)
+
+    return numerator // denominator
+
+
 @njit
 def init_thresholds(n_qubits):
     n_bias = n_qubits - 1
     thresholds = np.empty(n_bias, dtype=np.float64)
     tot_prob = 0
-    p = 1.0
-    if n_qubits & 1:
-        q = n_qubits // 2
-        thresholds[q - 1] = p
-        tot_prob = p
-        p /= 2
+    p = n_qubits
     for q in range(1, n_qubits // 2):
         thresholds[q - 1] = p
         thresholds[n_bias - q] = p
         tot_prob += 2 * p
-        p /= 2
+        p = comb(n_qubits, q + 1)
+    if n_qubits & 1:
+        thresholds[q - 1] = p
+        tot_prob += p
     thresholds /= tot_prob
 
     return thresholds

{pyqrackising-9.5.0 → pyqrackising-9.5.1}/pyqrackising/otoc.py

@@ -1,4 +1,5 @@
 from .maxcut_tfim_util import probability_by_hamming_weight, sample_mag, opencl_context
+import math
 from numba import njit
 import numpy as np
 import sys
@@ -14,6 +15,19 @@ 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
 
+    max_entropy = np.empty(n_bias, dtype=np.float64)
+    tot_prob = 0
+    p = 1.0
+    for q in range(n_qubits // 2):
+        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[q - 1] = p
+        tot_prob += p
+    max_entropy /= tot_prob
+
     diff_z = np.zeros(n_bias, dtype=np.float64)
     for pauli_string in pauli_strings:
         pauli_string = list(pauli_string)
@@ -33,17 +47,24 @@ def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=6
         # so there is no difference in this dimension.
 
         diff_z[0] += n_qubits
+        entropy_frac = 0
         for b in pauli_string:
             match b:
                 case 'X':
                     diff_z += diff_theta
+                    entropy_frac += 1
                 case 'Z':
                     diff_z += diff_phi
+                    entropy_frac += 1
                 case 'Y':
                     diff_z += diff_theta + diff_phi
+                    entropy_frac += 1
                 case _:
                     pass
 
+        entropy_frac /= n_qubits
+        diff_z = ((1 - entropy_frac) / n_qubits) * diff_z + entropy_frac * max_entropy
+
     # Normalize:
     diff_z /= diff_z.sum()
 

{pyqrackising-9.5.0 → pyqrackising-9.5.1/pyqrackising.egg-info}/PKG-INFO

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

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