manoelmarques · manoelmarques · Aug 15, 2019 · Dec 19, 2018 · Dec 20, 2018 · Feb 12, 2019
diff --git a/qiskit/advanced/aqua/amplitude_estimation.ipynb b/qiskit/advanced/aqua/amplitude_estimation.ipynb
diff --git a/qiskit/advanced/aqua/finance/optimization/portfolio_diversification.ipynb b/qiskit/advanced/aqua/finance/optimization/portfolio_diversification.ipynb
diff --git a/qiskit/advanced/aqua/finance/optimization/portfolio_optimization.ipynb b/qiskit/advanced/aqua/finance/optimization/portfolio_optimization.ipynb
@@ -51,7 +51,11 @@
     "\n",
     "The equality constraint $1^T x = B$ is mapped to a penalty term $(1^T x - B)^2$ which is scaled by a parameter and subtracted from the objective function. \n",
     "The resulting problem can be mapped to a Hamiltonian whose groundstate corresponds to  the optimal solution.\n",
-    "This notebook shows how to use the Variational Quantum Eigensolver (VQE) or the Quantum Approximate Optimization Algorithm (QAOA) to find the optimal solution for a given set of parameters."
+    "This notebook shows how to use the Variational Quantum Eigensolver (VQE) or the Quantum Approximate Optimization Algorithm (QAOA) to find the optimal solution for a given set of parameters.\n",
+    "\n",
+    "Experiments on real quantum hardware for this problem are reported for instance in the following paper:\n",
+    "<br>\n",
+    "<a href=\"https://arxiv.org/abs/1907.04769\">Improving Variational Quantum Optimization using CVaR. Barkoutsos et al. 2019.</a>"
    ]
   },
   {
@@ -190,26 +194,26 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Optimal: selection [0 0 1 1], value -0.0026\n",
+      "Optimal: selection [1 1 0 0], value -0.0068\n",
       "\n",
       "----------------- Full result ---------------------\n",
       "selection\tvalue\t\tprobability\n",
       "---------------------------------------------------\n",
-      " [0 0 1 1]\t-0.0026\t\t1.0000\n",
-      " [1 1 1 1]\t15.9996\t\t0.0000\n",
-      " [0 1 1 1]\t3.9984\t\t0.0000\n",
-      " [1 0 1 1]\t3.9985\t\t0.0000\n",
-      " [1 1 0 1]\t4.0000\t\t0.0000\n",
-      " [0 1 0 1]\t-0.0011\t\t0.0000\n",
-      " [1 0 0 1]\t-0.0011\t\t0.0000\n",
-      " [0 0 0 1]\t3.9978\t\t0.0000\n",
-      " [1 1 1 0]\t4.0017\t\t0.0000\n",
-      " [0 1 1 0]\t0.0006\t\t0.0000\n",
-      " [1 0 1 0]\t0.0006\t\t0.0000\n",
-      " [0 0 1 0]\t3.9995\t\t0.0000\n",
-      " [1 1 0 0]\t0.0021\t\t0.0000\n",
-      " [0 1 0 0]\t4.0010\t\t0.0000\n",
-      " [1 0 0 0]\t4.0011\t\t0.0000\n",
+      " [1 1 0 0]\t-0.0068\t\t1.0000\n",
+      " [1 1 1 1]\t15.9945\t\t0.0000\n",
+      " [0 1 1 1]\t3.9954\t\t0.0000\n",
+      " [1 0 1 1]\t4.0000\t\t0.0000\n",
+      " [0 0 1 1]\t0.0010\t\t0.0000\n",
+      " [1 1 0 1]\t3.9926\t\t0.0000\n",
+      " [0 1 0 1]\t-0.0065\t\t0.0000\n",
+      " [1 0 0 1]\t-0.0017\t\t0.0000\n",
+      " [0 0 0 1]\t3.9993\t\t0.0000\n",
+      " [1 1 1 0]\t3.9951\t\t0.0000\n",
+      " [0 1 1 0]\t-0.0039\t\t0.0000\n",
+      " [1 0 1 0]\t0.0007\t\t0.0000\n",
+      " [0 0 1 0]\t4.0017\t\t0.0000\n",
+      " [0 1 0 0]\t3.9942\t\t0.0000\n",
+      " [1 0 0 0]\t3.9990\t\t0.0000\n",
       " [0 0 0 0]\t16.0000\t\t0.0000\n"
      ]
     }
@@ -252,27 +256,27 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Optimal: selection [0 1 1 0], value 0.0006\n",
+      "Optimal: selection [0 1 1 0], value -0.0039\n",
       "\n",
       "----------------- Full result ---------------------\n",
       "selection\tvalue\t\tprobability\n",
       "---------------------------------------------------\n",
-      " [0 1 1 0]\t0.0006\t\t0.7038\n",
-      " [1 0 0 1]\t-0.0011\t\t0.2120\n",
-      " [1 0 1 0]\t0.0006\t\t0.0272\n",
-      " [0 1 0 1]\t-0.0011\t\t0.0251\n",
-      " [1 1 0 0]\t0.0021\t\t0.0167\n",
-      " [0 0 1 1]\t-0.0026\t\t0.0151\n",
-      " [1 0 0 0]\t4.0011\t\t0.0000\n",
-      " [0 1 1 1]\t3.9984\t\t0.0000\n",
-      " [0 0 0 1]\t3.9978\t\t0.0000\n",
-      " [1 0 1 1]\t3.9985\t\t0.0000\n",
-      " [0 1 0 0]\t4.0010\t\t0.0000\n",
-      " [1 1 1 0]\t4.0017\t\t0.0000\n",
-      " [1 1 0 1]\t4.0000\t\t0.0000\n",
+      " [0 1 1 0]\t-0.0039\t\t0.8805\n",
+      " [0 0 1 1]\t0.0010\t\t0.1186\n",
+      " [1 1 0 0]\t-0.0068\t\t0.0008\n",
+      " [1 0 0 1]\t-0.0017\t\t0.0001\n",
+      " [1 0 1 0]\t0.0007\t\t0.0001\n",
+      " [0 1 0 1]\t-0.0065\t\t0.0000\n",
+      " [0 0 0 1]\t3.9993\t\t0.0000\n",
+      " [1 1 0 1]\t3.9926\t\t0.0000\n",
+      " [0 1 0 0]\t3.9942\t\t0.0000\n",
+      " [1 0 1 1]\t4.0000\t\t0.0000\n",
+      " [1 1 1 1]\t15.9945\t\t0.0000\n",
+      " [1 0 0 0]\t3.9990\t\t0.0000\n",
+      " [0 0 1 0]\t4.0017\t\t0.0000\n",
+      " [0 1 1 1]\t3.9954\t\t0.0000\n",
       " [0 0 0 0]\t16.0000\t\t0.0000\n",
-      " [0 0 1 0]\t3.9995\t\t0.0000\n",
-      " [1 1 1 1]\t15.9996\t\t0.0000\n"
+      " [1 1 1 0]\t3.9951\t\t0.0000\n"
      ]
     }
    ],
@@ -336,27 +340,27 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Optimal: selection [1 1 0 0], value 0.0021\n",
+      "Optimal: selection [0 0 1 1], value 0.0010\n",
       "\n",
       "----------------- Full result ---------------------\n",
       "selection\tvalue\t\tprobability\n",
       "---------------------------------------------------\n",
-      " [1 1 0 0]\t0.0021\t\t0.1667\n",
-      " [1 0 1 0]\t0.0006\t\t0.1667\n",
-      " [0 1 1 0]\t0.0006\t\t0.1667\n",
-      " [1 0 0 1]\t-0.0011\t\t0.1666\n",
-      " [0 1 0 1]\t-0.0011\t\t0.1666\n",
-      " [0 0 1 1]\t-0.0026\t\t0.1666\n",
-      " [0 0 0 0]\t16.0000\t\t0.0000\n",
-      " [1 1 1 1]\t15.9996\t\t0.0000\n",
-      " [1 1 1 0]\t4.0017\t\t0.0000\n",
-      " [1 0 0 0]\t4.0011\t\t0.0000\n",
-      " [0 1 0 0]\t4.0010\t\t0.0000\n",
-      " [1 1 0 1]\t4.0000\t\t0.0000\n",
-      " [0 0 1 0]\t3.9995\t\t0.0000\n",
-      " [1 0 1 1]\t3.9985\t\t0.0000\n",
-      " [0 1 1 1]\t3.9984\t\t0.0000\n",
-      " [0 0 0 1]\t3.9978\t\t0.0000\n"
+      " [0 0 1 1]\t0.0010\t\t0.1668\n",
+      " [1 0 1 0]\t0.0007\t\t0.1668\n",
+      " [1 0 0 1]\t-0.0017\t\t0.1667\n",
+      " [0 1 1 0]\t-0.0039\t\t0.1666\n",
+      " [0 1 0 1]\t-0.0065\t\t0.1665\n",
+      " [1 1 0 0]\t-0.0068\t\t0.1665\n",
+      " [0 0 1 0]\t4.0017\t\t0.0000\n",
+      " [1 0 1 1]\t4.0000\t\t0.0000\n",
+      " [1 1 1 1]\t15.9945\t\t0.0000\n",
+      " [0 0 0 1]\t3.9993\t\t0.0000\n",
+      " [1 0 0 0]\t3.9990\t\t0.0000\n",
+      " [0 1 0 0]\t3.9942\t\t0.0000\n",
+      " [1 1 0 1]\t3.9926\t\t0.0000\n",
+      " [0 1 1 1]\t3.9954\t\t0.0000\n",
+      " [1 1 1 0]\t3.9951\t\t0.0000\n",
+      " [0 0 0 0]\t16.0000\t\t0.0000\n"
      ]
     }
    ],

diff --git a/qiskit/advanced/aqua/finance/simulation/asian_barrier_spread_pricing.ipynb b/qiskit/advanced/aqua/finance/simulation/asian_barrier_spread_pricing.ipynb
diff --git a/qiskit/advanced/aqua/finance/simulation/basket_option_pricing.ipynb b/qiskit/advanced/aqua/finance/simulation/basket_option_pricing.ipynb
diff --git a/qiskit/advanced/aqua/finance/simulation/bull_spread_pricing.ipynb b/qiskit/advanced/aqua/finance/simulation/bull_spread_pricing.ipynb
diff --git a/qiskit/advanced/aqua/finance/simulation/credit_risk_analysis.ipynb b/qiskit/advanced/aqua/finance/simulation/credit_risk_analysis.ipynb
diff --git a/qiskit/advanced/aqua/finance/simulation/european_call_option_pricing.ipynb b/qiskit/advanced/aqua/finance/simulation/european_call_option_pricing.ipynb
diff --git a/qiskit/advanced/aqua/finance/simulation/european_put_option_pricing.ipynb b/qiskit/advanced/aqua/finance/simulation/european_put_option_pricing.ipynb