Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

Change conversion from array of strings to array of booleans for numpy 1.18.3 #907

Merged
merged 2 commits into from
Apr 20, 2020
Merged

Change conversion from array of strings to array of booleans for numpy 1.18.3 #907

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3caf09e
Change conversion from array of strings to array of booleans for nump…
manoelmarques Apr 20, 2020
3c14596
removing unnecessary conversions
manoelmarques Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qiskit/aqua/operators/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def measure_pauli_z(data, pauli):
num_shots = sum(data.values())
p_z_or_x = np.logical_or(pauli.z, pauli.x)
for key, value in data.items():
bitstr = np.asarray(list(key))[::-1].astype(np.bool)
bitstr = np.asarray(list(key))[::-1].astype(np.int).astype(np.bool)
# pylint: disable=no-member
sign = -1.0 if np.logical_xor.reduce(np.logical_and(bitstr, p_z_or_x)) else 1.0
observable += sign * value
Expand Down Expand Up @@ -107,7 +107,7 @@ def covariance(data, pauli_1, pauli_2, avg_1, avg_2):
p1_z_or_x = np.logical_or(pauli_1.z, pauli_1.x)
p2_z_or_x = np.logical_or(pauli_2.z, pauli_2.x)
for key, value in data.items():
bitstr = np.asarray(list(key))[::-1].astype(np.bool)
bitstr = np.asarray(list(key))[::-1].astype(np.int).astype(np.bool)
# pylint: disable=no-member
sign_1 = -1.0 if np.logical_xor.reduce(np.logical_and(bitstr, p1_z_or_x)) else 1.0
sign_2 = -1.0 if np.logical_xor.reduce(np.logical_and(bitstr, p2_z_or_x)) else 1.0
Expand Down