From 0ca6b4fff24faedce899167b06b8413bd7bfc27c Mon Sep 17 00:00:00 2001 From: Julien Gacon Date: Tue, 11 Feb 2025 18:43:19 +0100 Subject: [PATCH] fix tests --- .../library/arithmetic/linear_amplitude_function.py | 3 ++- .../arithmetic/piecewise_polynomial_pauli_rotations.py | 1 - .../synthesis/arithmetic/comparators/compare_greedy.py | 2 ++ .../circuit/library/test_linear_amplitude_function.py | 10 ++++------ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qiskit/circuit/library/arithmetic/linear_amplitude_function.py b/qiskit/circuit/library/arithmetic/linear_amplitude_function.py index 429a33f1bad2..ef40e6b04ff0 100644 --- a/qiskit/circuit/library/arithmetic/linear_amplitude_function.py +++ b/qiskit/circuit/library/arithmetic/linear_amplitude_function.py @@ -283,7 +283,8 @@ def __init__( super().__init__("LinFunction", num_state_qubits + num_compare + 1, [], label=label) def _define(self): - num_state_qubits = self.num_qubits - 1 + num_compare = int(len(self.breakpoints) > 1) + num_state_qubits = self.num_qubits - num_compare - 1 # do rescaling a, b = self.domain diff --git a/qiskit/circuit/library/arithmetic/piecewise_polynomial_pauli_rotations.py b/qiskit/circuit/library/arithmetic/piecewise_polynomial_pauli_rotations.py index 5f7efd88de69..62104e191087 100644 --- a/qiskit/circuit/library/arithmetic/piecewise_polynomial_pauli_rotations.py +++ b/qiskit/circuit/library/arithmetic/piecewise_polynomial_pauli_rotations.py @@ -187,7 +187,6 @@ def mapped_coeffs(self) -> List[List[float]]: Returns: The mapped coefficients. """ - print("valled") return _map_coeffs(self._hom_coeffs) @property diff --git a/qiskit/synthesis/arithmetic/comparators/compare_greedy.py b/qiskit/synthesis/arithmetic/comparators/compare_greedy.py index e81f55da0a97..e18fc16e429b 100644 --- a/qiskit/synthesis/arithmetic/comparators/compare_greedy.py +++ b/qiskit/synthesis/arithmetic/comparators/compare_greedy.py @@ -12,6 +12,7 @@ """Integer comparator based on 2s complement.""" +import numpy as np from qiskit.circuit import QuantumCircuit @@ -29,6 +30,7 @@ def synth_integer_comparator_greedy( # make sure to always choose the comparison where we have to place less than # (2 ** n)/2 MCX gates + value = int(np.ceil(value)) if (value < 2 ** (num_state_qubits - 1) and geq) or ( value > 2 ** (num_state_qubits - 1) and not geq ): diff --git a/test/python/circuit/library/test_linear_amplitude_function.py b/test/python/circuit/library/test_linear_amplitude_function.py index 6ad754bd8685..c9815f0fa261 100644 --- a/test/python/circuit/library/test_linear_amplitude_function.py +++ b/test/python/circuit/library/test_linear_amplitude_function.py @@ -86,11 +86,11 @@ def evaluate_function( return np.pi / 4 + np.pi * rescaling_factor / 2 * (normalized - 0.5) @data( - # (2, 1, 0, (0, 3), (0, 3), 0.1, None), - # (3, 1, 0, (0, 1), (0, 1), 0.01, None), + (2, 1, 0, (0, 3), (0, 3), 0.1, None), + (3, 1, 0, (0, 1), (0, 1), 0.01, None), (1, [0, 0], [0, 0], (0, 2), (0, 1), 0.1, [0, 1]), - # (2, [1, -1], [0, 1], (0, 2), (0, 1), 0.1, [0, 1]), - # (3, [1, 0, -1, 0], [0, 0.5, -0.5, -0.5], (0, 2.5), (-0.5, 0.5), 0.1, [0, 0.5, 1, 2]), + (2, [1, -1], [0, 1], (0, 2), (0, 1), 0.1, [0, 1]), + (3, [1, 0, -1, 0], [0, 0.5, -0.5, -0.5], (0, 2.5), (-0.5, 0.5), 0.1, [0, 0.5, 1, 2]), ) @unpack def test_polynomial_function( @@ -116,8 +116,6 @@ def test_polynomial_function( linear_f = constructor( num_state_qubits, slope, offset, domain, image, rescaling_factor, breakpoints ) - print(linear_f) - print("anc", num_ancillas) self.assertFunctionIsCorrect(linear_f, reference, num_ancillas) def test_not_including_start_in_breakpoints(self):