Removed unused variable and print statements from test files.

Author: bgupt

qokit/qaoa_circuit.py

@@ -50,14 +50,14 @@ def append_x_term(qc: QuantumCircuit, q1: int, beta: float) -> None:
 
 def append_cost_operator_circuit(qc: QuantumCircuit, terms: Sequence, gamma: float) -> None:
     for term in terms:
-        if len(term) == 2 and isinstance(term[1], tuple):
+        if len(term) == 2 and (isinstance(term[1], tuple) or isinstance(term[1], list)):
+            print("Here!")
             coeff, term_tuple = term
             append_z_prod_term(qc, term_tuple, gamma * coeff / 2)
         elif any([isinstance(i, tuple) for i in term]):
             raise ValueError(f"Invalid term received: {term}")
         else:
-            term_weight = len(term)
-            append_z_prod_term(qc, term, gamma * term_weight / 2)
+            append_z_prod_term(qc, term, gamma / 2)
 
 
 def append_mixer_operator_circuit(qc: QuantumCircuit, beta: float) -> None:

qokit/qaoa_objective_labs.py

@@ -183,7 +183,7 @@ def get_qaoa_labs_objective(
     # TODO: needs to generate parameterized circuit and check that the precomputed stuff is loaded correctly
     # Otherwise pass directly to get_qaoa_objective
 
-    terms_ix, offset = get_terms_offset(N)
+    _, offset = get_terms_offset(N)
 
     if precomputed_negative_merit_factors is None:
         precomputed_negative_merit_factors = get_precomputed_labs_merit_factors(N)

tests/test_fast_simulators_labs.py

@@ -84,13 +84,12 @@ def test_phase_operator(N, p, simclass):
     gammas = np.random.uniform(0, np.pi, p)
     betas = [0] * p
     terms = [(3, [0, 1, 2]), (1, [0])]
-    terms_without_weights = [t[1] for t in terms]
     offset = 2
     f = partial(energy_vals_from_bitstring_general, terms=terms, offset=offset)
     precomputed_energies = precompute_energies(f, N) - offset
 
     sim = simclass(N, costs=precomputed_energies)
-    _check_simulator_against_qiskit(sim, N, terms_without_weights, gammas, betas)
+    _check_simulator_against_qiskit(sim, N, terms, gammas, betas)
 
 
 @pytest.mark.parametrize("simclass", SIMULATORS)

tests/test_qaoa_objective_sk.py

@@ -48,7 +48,6 @@ def test_variance_normalization(N=1000):
     terms = get_sk_terms(J)
     terms_0 = [x[0] for x in terms]
     var = np.var(terms_0)
-    print("var: ", var)
 
     assert np.isclose(N * var, 1, atol=1e-2)
 
@@ -100,7 +99,6 @@ def test_sk_qaoa_convergence_with_p(simulator, N=12, threshold=0.00):
         )(2 * gamma / np.sqrt(N), beta)
         current_objective = qaoa_objective / max_energy
         current_overlap = 1 - qaoa_overlap
-        print("p = ", p)
         assert current_objective < last_objective + threshold
         assert current_overlap > last_overlap - threshold
         last_objective = current_objective