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

Fix .add dep warning. #940

Merged
manoelmarques merged 3 commits into from
Apr 30, 2020
Merged

Fix .add dep warning. #940

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d002386
Fix .add dep warning.
dongreenberg Apr 30, 2020
2d963a2
Merge branch 'master' into add_dep_warning
manoelmarques Apr 30, 2020
f90d752
Merge branch 'master' into add_dep_warning
manoelmarques Apr 30, 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
2 changes: 1 addition & 1 deletion qiskit/aqua/operators/state_fns/vector_state_fn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def add(self, other: OperatorBase) -> OperatorBase:
# Right now doesn't make sense to add a StateFn to a Measurement
if isinstance(other, VectorStateFn) and self.is_measurement == other.is_measurement:
# Covers MatrixOperator, Statevector and custom.
return VectorStateFn((self.coeff * self.primitive).add(other.primitive * other.coeff),
return VectorStateFn((self.coeff * self.primitive) + (other.primitive * other.coeff),
is_measurement=self._is_measurement)
# pylint: disable=cyclic-import,import-outside-toplevel
from .. import SummedOp
Expand Down