Optimize for MAXCUT case without TFIM repulsion/attraction

Author: WrathfulSpatula

pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyqrackising"
-version = "9.5.12"
+version = "9.5.13"
 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/maxcut_tfim.py

@@ -22,6 +22,9 @@ def update_repulsion_choice(G_m, weights, n, used, node, repulsion_base):
     # Select node
     used[node] = True
 
+    if abs(1.0 - repulsion_base) <= epsilon:
+        return
+
     # Repulsion: penalize neighbors
     for nbr in range(n):
         if used[nbr]:

pyqrackising/maxcut_tfim_sparse.py

@@ -22,6 +22,9 @@ def update_repulsion_choice(G_data, G_rows, G_cols, weights, n, used, node, repu
     # Select node
     used[node] = True
 
+    if abs(1.0 - repulsion_base) <= epsilon:
+        return
+
     # Repulsion: penalize neighbors
     for j in range(G_rows[node], G_rows[node + 1]):
         nbr = G_cols[j]

pyqrackising/maxcut_tfim_streaming.py

@@ -15,6 +15,9 @@ def update_repulsion_choice(G_func, nodes, weights, n, used, node, repulsion_bas
     # Select node
     used[node] = True
 
+    if abs(1.0 - repulsion_base) <= epsilon:
+        return
+
     # Repulsion: penalize neighbors
     for nbr in range(n):
         if used[nbr]:

scripts/labs.py

@@ -81,7 +81,7 @@ def generate_labs_qubo(N, lam=10.0):
     n_nodes = int(sys.argv[2]) if len(sys.argv) > 2 else 32
     quality = int(sys.argv[3]) if len(sys.argv) > 3 else None
     G_m, labels = generate_labs_qubo(n_nodes)
-    best_bitstring, best_cut_value, best_cut = spin_glass_solver(G_m, quality=quality, is_spin_glass=False, anneal_t=64.0, anneal_h=64.0, repulsion_base=1.0)
+    best_bitstring, best_cut_value, best_cut, best_energy = spin_glass_solver(G_m, quality=quality, is_spin_glass=False, anneal_t=64.0, anneal_h=64.0, repulsion_base=1.0)
 
     print(f"Best cut: {best_cut_value}")
     print(f"Length {n_nodes} solution: {best_bitstring}")

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='pyqrackising',
-    version='9.5.12',
+    version='9.5.13',
     author='Dan Strano',
     author_email='stranoj@gmail.com',
     description='Fast MAXCUT, TSP, and sampling heuristics from near-ideal transverse field Ising model (TFIM)',