Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

Commit 7f70354

Browse files
nonhermitiannonhermitian
authored
Merge pull request #905 from stefan-woerner/rename-tutorials
rename tutorials
2 parents e9129c9 + ffcca53 commit 7f70354

5 files changed

Lines changed: 69 additions & 87 deletions

File tree

tutorials/aqua/optimization/1_optimization_problems.ipynb renamed to tutorials/aqua/optimization/1_quadratic_program.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# Quadratically Constrained Quadratic Programs"
7+
"# Quadratic Programs"
88
]
99
},
1010
{
@@ -723,8 +723,8 @@
723723
{
724724
"data": {
725725
"text/html": [
726-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.7 (default, Mar 26 2020, 10:32:53) \n",
727-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Fri May 08 08:55:19 2020 EDT</td></tr></table>"
726+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
727+
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Mon May 11 08:44:58 2020 CEST</td></tr></table>"
728728
],
729729
"text/plain": [
730730
"<IPython.core.display.HTML object>"
@@ -776,7 +776,7 @@
776776
"name": "python",
777777
"nbconvert_exporter": "python",
778778
"pygments_lexer": "ipython3",
779-
"version": "3.7.7"
779+
"version": "3.7.4"
780780
}
781781
},
782782
"nbformat": 4,

‎tutorials/aqua/optimization/2_converters_for_quadratic_programs.ipynb‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,7 @@
5454
"cell_type": "code",
5555
"execution_count": 1,
5656
"metadata": {},
57-
"outputs": [
58-
{
59-
"name": "stderr",
60-
"output_type": "stream",
61-
"text": [
62-
"/opt/miniconda3/lib/python3.7/site-packages/qiskit_aqua-0.7.0-py3.7.egg/qiskit/aqua/operators/primitive_ops/pauli_op.py:25: DeprecationWarning: The module qiskit.extensions.standard is deprecated as of 0.14.0 and will be removed no earlier than 3 months after the release. You should import the standard gates from qiskit.circuit.library.standard_gates instead.\n",
63-
" from qiskit.extensions.standard import RZGate, RYGate, RXGate, XGate, YGate, ZGate, IGate\n"
64-
]
65-
}
66-
],
57+
"outputs": [],
6758
"source": [
6859
"from qiskit.optimization import QuadraticProgram"
6960
]
@@ -486,14 +477,14 @@
486477
},
487478
{
488479
"cell_type": "code",
489-
"execution_count": 23,
480+
"execution_count": 11,
490481
"metadata": {},
491482
"outputs": [
492483
{
493484
"data": {
494485
"text/html": [
495-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>None</td></tr><tr><td>Terra</td><td>0.14.0</td></tr><tr><td>Aer</td><td>0.6.0</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.6.1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.7 (default, Mar 26 2020, 10:32:53) \n",
496-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Wed Apr 29 12:14:58 2020 EDT</td></tr></table>"
486+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
487+
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Mon May 11 08:45:29 2020 CEST</td></tr></table>"
497488
],
498489
"text/plain": [
499490
"<IPython.core.display.HTML object>"
@@ -545,7 +536,7 @@
545536
"name": "python",
546537
"nbconvert_exporter": "python",
547538
"pygments_lexer": "ipython3",
548-
"version": "3.8.2"
539+
"version": "3.7.4"
549540
},
550541
"toc": {
551542
"base_numbering": 1,

‎tutorials/aqua/optimization/3_minimum_eigen_optimizer.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@
345345
{
346346
"data": {
347347
"text/html": [
348-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.7 (default, Mar 26 2020, 10:32:53) \n",
349-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Fri May 08 08:54:33 2020 EDT</td></tr></table>"
348+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
349+
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Mon May 11 08:45:37 2020 CEST</td></tr></table>"
350350
],
351351
"text/plain": [
352352
"<IPython.core.display.HTML object>"
@@ -398,7 +398,7 @@
398398
"name": "python",
399399
"nbconvert_exporter": "python",
400400
"pygments_lexer": "ipython3",
401-
"version": "3.7.7"
401+
"version": "3.7.4"
402402
},
403403
"toc": {
404404
"base_numbering": 1,

‎tutorials/aqua/optimization/4_grover_optimizer.ipynb‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# Grover Optimizer for Quadratic Unconstrained Binary Optimization"
7+
"# Grover Optimizer"
88
]
99
},
1010
{
@@ -76,16 +76,7 @@
7676
"cell_type": "code",
7777
"execution_count": 1,
7878
"metadata": {},
79-
"outputs": [
80-
{
81-
"name": "stderr",
82-
"output_type": "stream",
83-
"text": [
84-
"/opt/miniconda3/lib/python3.7/site-packages/qiskit_aqua-0.7.0-py3.7.egg/qiskit/aqua/operators/primitive_ops/pauli_op.py:25: DeprecationWarning: The module qiskit.extensions.standard is deprecated as of 0.14.0 and will be removed no earlier than 3 months after the release. You should import the standard gates from qiskit.circuit.library.standard_gates instead.\n",
85-
" from qiskit.extensions.standard import RZGate, RYGate, RXGate, XGate, YGate, ZGate, IGate\n"
86-
]
87-
}
88-
],
79+
"outputs": [],
8980
"source": [
9081
"from qiskit.aqua.algorithms import NumPyMinimumEigensolver\n",
9182
"from qiskit.optimization.algorithms import GroverOptimizer, MinimumEigenOptimizer\n",
@@ -228,8 +219,8 @@
228219
{
229220
"data": {
230221
"text/html": [
231-
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>None</td></tr><tr><td>Terra</td><td>0.14.0</td></tr><tr><td>Aer</td><td>0.6.0</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.6.1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.7 (default, Mar 26 2020, 10:32:53) \n",
232-
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Wed Apr 29 12:17:49 2020 EDT</td></tr></table>"
222+
"<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.19.1</td></tr><tr><td>Terra</td><td>0.14.1</td></tr><tr><td>Aer</td><td>0.5.1</td></tr><tr><td>Ignis</td><td>0.3.0</td></tr><tr><td>Aqua</td><td>0.7.0</td></tr><tr><td>IBM Q Provider</td><td>0.7.0</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
223+
"[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>6</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Mon May 11 08:46:51 2020 CEST</td></tr></table>"
233224
],
234225
"text/plain": [
235226
"<IPython.core.display.HTML object>"
@@ -281,7 +272,7 @@
281272
"name": "python",
282273
"nbconvert_exporter": "python",
283274
"pygments_lexer": "ipython3",
284-
"version": "3.7.7"
275+
"version": "3.7.4"
285276
},
286277
"varInspector": {
287278
"cols": {

0 commit comments

Comments
 (0)