From dd41459b49b42cb79ddc3951f6b501f85f3cc52f Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Fri, 12 Apr 2019 17:55:54 +0200 Subject: [PATCH 1/6] update ExactLSsolver naming --- .../aqua/general/linear_systems_of_equations.ipynb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index 58e2a5e06..92383b7d1 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -51,7 +51,7 @@ "from qiskit.aqua import run_algorithm\n", "from qiskit.aqua.input import LinearSystemInput\n", "from qiskit.quantum_info import state_fidelity\n", - "from qiskit.aqua.algorithms.classical import ExactLPsolver\n", + "from qiskit.aqua.algorithms.classical import ExactLSsolver\n", "import numpy as np" ] }, @@ -147,7 +147,7 @@ "result = run_algorithm(params)\n", "print(\"solution \", np.round(result['solution'], 5))\n", "\n", - "result_ref = ExactLPsolver(matrix, vector).run()\n", + "result_ref = ExactLSsolver(matrix, vector).run()\n", "print(\"classical solution \", np.round(result_ref['solution'], 5))\n", "\n", "print(\"probability %f\" % result['probability_result'])\n", @@ -186,7 +186,7 @@ "result = run_algorithm(params2)\n", "print(\"solution \", np.round(result['solution'], 5))\n", "\n", - "result_ref = ExactLPsolver(matrix, vector).run()\n", + "result_ref = ExactLSsolver(matrix, vector).run()\n", "print(\"classical solution \", np.round(result_ref['solution'], 5))\n", "\n", "print(\"probability %f\" % result['probability_result'])\n", @@ -275,7 +275,7 @@ "result = run_algorithm(params3)\n", "print(\"solution \", np.round(result['solution'], 5))\n", "\n", - "result_ref = ExactLPsolver(matrix, vector).run()\n", + "result_ref = ExactLSsolver(matrix, vector).run()\n", "print(\"classical solution \", np.round(result_ref['solution'], 5))\n", "\n", "print(\"probability %f\" % result['probability_result'])\n", @@ -378,7 +378,7 @@ "result = run_algorithm(params4)\n", "print(\"solution \", np.round(result['solution'], 5))\n", "\n", - "result_ref = ExactLPsolver(matrix, vector).run()\n", + "result_ref = ExactLSsolver(matrix, vector).run()\n", "print(\"classical solution \", np.round(result_ref['solution'], 5))\n", "\n", "print(\"probability %f\" % result['probability_result'])\n", @@ -521,7 +521,7 @@ "result = hhl.run(quantum_instance)\n", "print(\"solution \", np.round(result['solution'], 5))\n", "\n", - "result_ref = ExactLPsolver(matrix, vector).run()\n", + "result_ref = ExactLSsolver(matrix, vector).run()\n", "print(\"classical solution \", np.round(result_ref['solution'], 5))\n", "\n", "print(\"probability %f\" % result['probability_result'])\n", From 0c3915aea0f93dbb4ce4088564aa678b5a5a3e0f Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Thu, 18 Apr 2019 23:00:44 +0200 Subject: [PATCH 2/6] add HHL truncate parameters --- qiskit/aqua/general/linear_systems_of_equations.ipynb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index 92383b7d1..c899ff742 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -1,4 +1,4 @@ -{ +{ "cells": [ { "cell_type": "markdown", @@ -451,6 +451,10 @@ "outputs": [], "source": [ "params5 = params\n", + "params5[\"algorithm\"] = {\n", + " \"truncate_powerdim\": False,\n", + " \"truncate_hermitian\": False\n", + "}\n", "params5[\"reciprocal\"] = {\n", " \"name\": \"Lookup\",\n", " \"negative_evals\": True\n", From 560f6a854499c81cca0c04ce4b9b237c2c198c83 Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Fri, 19 Apr 2019 00:39:06 +0200 Subject: [PATCH 3/6] improve HHL example and clean up --- .../general/linear_systems_of_equations.ipynb | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index 92383b7d1..50bde1686 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -252,8 +252,14 @@ " 'name': 'LinearSystemInput',\n", " 'matrix': matrix,\n", " 'vector': vector\n", - "}" - ] + "}\n", + "params3['reciprocal'] = {\n", + " 'negative_evals': True\n", + "}\n", + "params3['eigs'] = {\n", + " 'negative_evals': True\n", + "}\n" + ] }, { "cell_type": "code", @@ -264,10 +270,10 @@ "name": "stdout", "output_type": "stream", "text": [ - "solution [0.22147+0.j 0.22034-0.j]\n", + "solution [0.13449+0.j 0.29238-0.j]\n", "classical solution [0.14286 0.28571]\n", - "probability 0.424639\n", - "fidelity 0.898454\n" + "probability 0.022362\n", + "fidelity 0.998942\n" ] } ], @@ -451,26 +457,30 @@ "outputs": [], "source": [ "params5 = params\n", - "params5[\"reciprocal\"] = {\n", - " \"name\": \"Lookup\",\n", - " \"negative_evals\": True\n", + "params5['algorithm'] = {\n", + " 'truncate_powerdim': False,\n", + " 'truncate_hermitian': False\n", + "}\n", + "params5['reciprocal'] = {\n", + " 'name': 'Lookup',\n", + " 'negative_evals': True\n", "}\n", - "params5[\"eigs\"] = {\n", - " \"expansion_mode\": \"suzuki\",\n", - " \"expansion_order\": 2,\n", - " \"name\": \"EigsQPE\",\n", - " \"negative_evals\": True,\n", - " \"num_ancillae\": 6,\n", - " \"num_time_slices\": 70\n", + "params5['eigs'] = {\n", + " 'expansion_mode': 'suzuki',\n", + " 'expansion_order': 2,\n", + " 'name': 'EigsQPE',\n", + " 'negative_evals': True,\n", + " 'num_ancillae': 6,\n", + " 'num_time_slices': 70\n", "}\n", - "params5[\"initial_state\"] = {\n", - " \"name\": \"CUSTOM\"\n", + "params5['initial_state'] = {\n", + " 'name': 'CUSTOM'\n", "}\n", - "params5[\"iqft\"] = {\n", - " \"name\": \"STANDARD\"\n", + "params5['iqft'] = {\n", + " 'name': 'STANDARD'\n", "}\n", - "params5[\"qft\"] = {\n", - " \"name\": \"STANDARD\"\n", + "params5['qft'] = {\n", + " 'name': 'STANDARD'\n", "}" ] }, From 0dcce6b8c2fbccf4e0c2b00524a38904c058b417 Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Fri, 19 Apr 2019 01:00:09 +0200 Subject: [PATCH 4/6] update results --- .../aqua/general/linear_systems_of_equations.ipynb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index 50bde1686..094ffd501 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -259,7 +259,7 @@ "params3['eigs'] = {\n", " 'negative_evals': True\n", "}\n" - ] + ] }, { "cell_type": "code", @@ -270,10 +270,10 @@ "name": "stdout", "output_type": "stream", "text": [ - "solution [0.13449+0.j 0.29238-0.j]\n", + "solution [0.14223-5.e-05j 0.28622+7.e-05j]\n", "classical solution [0.14286 0.28571]\n", - "probability 0.022362\n", - "fidelity 0.998942\n" + "probability 0.000316\n", + "fidelity 0.999994\n" ] } ], @@ -304,8 +304,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "circuit_width 7\n", - "circuit_depth 30254\n" + "circuit_width 11\n", + "circuit_depth 73313\n" ] } ], From 5df3b325c6995bf281cd37a03fe22ec9e82ce246 Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Fri, 19 Apr 2019 01:08:16 +0200 Subject: [PATCH 5/6] fix --- qiskit/aqua/general/linear_systems_of_equations.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index b103cb602..094ffd501 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -1,4 +1,4 @@ -{ +{ "cells": [ { "cell_type": "markdown", From 33f09709567e6f7168c45d32504e112159021a5a Mon Sep 17 00:00:00 2001 From: Albert Frisch Date: Fri, 19 Apr 2019 01:12:56 +0200 Subject: [PATCH 6/6] text update --- qiskit/aqua/general/linear_systems_of_equations.ipynb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qiskit/aqua/general/linear_systems_of_equations.ipynb b/qiskit/aqua/general/linear_systems_of_equations.ipynb index 094ffd501..3d857aa4d 100644 --- a/qiskit/aqua/general/linear_systems_of_equations.ipynb +++ b/qiskit/aqua/general/linear_systems_of_equations.ipynb @@ -292,7 +292,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Compared to the the first example, the circuit depth is increased approximately by a factor 2,5" + "Compared to the the first example, the circuit depth is increased approximately by a factor of 6" ] }, { @@ -395,7 +395,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Considering the circuit depth, it is increased approximately by a factor 10 compared to the two dimensional matrices. The circuit width is increased by two additional qubits" + "Considering the circuit depth and circuit width" ] }, {