Fix VQD's optimal_values (Qiskit#10279)

* Fix optimal values * Add unittest * Add reno * Update unittest * Revert "Update unittest" This reverts commit 225cd09e1ae08cd48f5196fd1d3a87a549f0164a. * Update test * Make test subtest
ElePT · Jun 20, 2023 · 3089560 · 3089560
1 parent 5485e85
commit 3089560
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/qiskit/algorithms/eigensolvers/vqd.py b/qiskit/algorithms/eigensolvers/vqd.py
@@ -448,7 +448,7 @@ def _update_vqd_result(
             else np.array([opt_result.x])
         )
         result.optimal_parameters.append(dict(zip(ansatz.parameters, opt_result.x)))
-        result.optimal_values = np.concatenate([result.optimal_points, [opt_result.x]])
+        result.optimal_values = np.concatenate([result.optimal_values, [opt_result.fun]])
         result.cost_function_evals = np.concatenate([result.cost_function_evals, [opt_result.nfev]])
         result.optimizer_times = np.concatenate([result.optimizer_times, [eval_time]])
         result.eigenvalues.append(opt_result.fun + 0j)

diff --git a/test/python/algorithms/eigensolvers/test_vqd.py b/test/python/algorithms/eigensolvers/test_vqd.py
@@ -103,6 +103,11 @@ def test_basic_operator(self, op):
             )
             np.testing.assert_array_almost_equal(job.result().values, result.eigenvalues, 6)
 
+        with self.subTest(msg="assert returned values are eigenvalues"):
+            np.testing.assert_array_almost_equal(
+                result.optimal_values, self.h2_energy_excited[:2], decimal=3
+            )
+
     def test_full_spectrum(self):
         """Test obtaining all eigenvalues."""
         vqd = VQD(self.estimator, self.fidelity, self.ryrz_wavefunction, optimizer=L_BFGS_B(), k=4)