Fix of eval_observables() when quantum_circuit is a StateFn. (#7863) (#…

…7881) * Fix the eval_observables() when quantum_state is StateFn. StateFn(StateFn()) actually returns an OperatorStateFn. This caused an issue that was not checked by the test cases test_aux_ops_evaluator.py. The associated test case was added. * Add the associated releasenote * Update releasenotes/notes/fix-aux-ops-evaluator-83ce1606d1ad19b3.yaml Co-authored-by: Julien Gacon <[email protected]> * Fix sphinx identifier Co-authored-by: Julien Gacon <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit a296ca0) Co-authored-by: Anthony-Gandon <[email protected]>
Qiskit · Apr 4, 2022 · 5306c95 · 5306c95
1 parent 080950b
commit 5306c95
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/qiskit/algorithms/aux_ops_evaluator.py b/qiskit/algorithms/aux_ops_evaluator.py
@@ -122,8 +122,10 @@ def _prepare_list_op(
     if isinstance(observables, dict):
         observables = list(observables.values())
 
-    state = StateFn(quantum_state)
-    return ListOp([StateFn(obs, is_measurement=True).compose(state) for obs in observables])
+    if not isinstance(quantum_state, StateFn):
+        quantum_state = StateFn(quantum_state)
+
+    return ListOp([StateFn(obs, is_measurement=True).compose(quantum_state) for obs in observables])
 
 
 def _prepare_result(

diff --git a/releasenotes/notes/fix-aux-ops-evaluator-83ce1606d1ad19b3.yaml b/releasenotes/notes/fix-aux-ops-evaluator-83ce1606d1ad19b3.yaml
@@ -0,0 +1,6 @@
+fixes:
+  - |
+    The :func:`~qiskit.algorithms.eval_observables` function raised an error when the 
+    ``quantum_state`` argument is a :class:`~qiskit.opflow.StateFn`. 
+    This error was fixed and ``eval_observables`` now correctly supports all input types
+    specifying in the type hints.
diff --git a/test/python/algorithms/test_aux_ops_evaluator.py b/test/python/algorithms/test_aux_ops_evaluator.py
@@ -24,7 +24,16 @@
 from qiskit.algorithms import eval_observables
 from qiskit import BasicAer, QuantumCircuit
 from qiskit.circuit.library import EfficientSU2
-from qiskit.opflow import PauliSumOp, X, Z, I, ExpectationFactory, OperatorBase, ExpectationBase
+from qiskit.opflow import (
+    PauliSumOp,
+    X,
+    Z,
+    I,
+    ExpectationFactory,
+    OperatorBase,
+    ExpectationBase,
+    StateFn,
+)
 from qiskit.utils import QuantumInstance, algorithm_globals
 
 
@@ -155,6 +164,17 @@ def test_eval_observables(self, observables: ListOrDict[OperatorBase]):
                         quantum_instance,
                     )
 
+                with self.subTest(msg="Test StateFn."):
+                    statefn = StateFn(bound_ansatz)
+                    self._run_test(
+                        expected_result,
+                        statefn,
+                        decimal,
+                        expectation,
+                        observables,
+                        quantum_instance,
+                    )
+
 
 if __name__ == "__main__":
     unittest.main()