From a12aa6fd8b6f4b7fc17db0688c68d5321107ea5e Mon Sep 17 00:00:00 2001 From: Cryoris Date: Thu, 18 Jun 2020 19:15:15 +0200 Subject: [PATCH 1/3] rm pprint_as_string --- tutorials/optimization/1_quadratic_program.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tutorials/optimization/1_quadratic_program.ipynb b/tutorials/optimization/1_quadratic_program.ipynb index 298da01fc..784df2486 100644 --- a/tutorials/optimization/1_quadratic_program.ipynb +++ b/tutorials/optimization/1_quadratic_program.ipynb @@ -63,7 +63,7 @@ "metadata": {}, "source": [ "You start with an empty model.\n", - "You can display your optimization problem with a method `pprint_as_string` and `print_as_lp_string`." + "You can display your optimization problem e.g. with the `print_as_lp_string` method." ] }, { @@ -762,9 +762,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3.7.5 64-bit ('latest': virtualenv)", "language": "python", - "name": "python3" + "name": "python37564bitlatestvirtualenv76cfe9d7d3f749489cf2ff69593234af" }, "language_info": { "codemirror_mode": { @@ -776,7 +776,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.7" + "version": "3.7.5" } }, "nbformat": 4, From 1fed51d90250fa1231d008ab10251a7a4c659d78 Mon Sep 17 00:00:00 2001 From: Cryoris Date: Fri, 19 Jun 2020 08:51:15 +0200 Subject: [PATCH 2/3] rm print_as_lp_string --- tutorials/optimization/1_quadratic_program.ipynb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tutorials/optimization/1_quadratic_program.ipynb b/tutorials/optimization/1_quadratic_program.ipynb index 784df2486..cdd1df979 100644 --- a/tutorials/optimization/1_quadratic_program.ipynb +++ b/tutorials/optimization/1_quadratic_program.ipynb @@ -62,8 +62,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "You start with an empty model.\n", - "You can display your optimization problem e.g. with the `print_as_lp_string` method." + "You start with an empty model. How to add variables and constraints to a model is explained in the section \"Directly constructing a `QuadraticProgram`\"." ] }, { From 008f78f2f03c0980ca15f0a5def11accf5bb32dc Mon Sep 17 00:00:00 2001 From: Cryoris Date: Fri, 19 Jun 2020 16:00:02 +0200 Subject: [PATCH 3/3] set correct kernelspec --- .../optimization/1_quadratic_program.ipynb | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tutorials/optimization/1_quadratic_program.ipynb b/tutorials/optimization/1_quadratic_program.ipynb index cdd1df979..da12ee413 100644 --- a/tutorials/optimization/1_quadratic_program.ipynb +++ b/tutorials/optimization/1_quadratic_program.ipynb @@ -51,7 +51,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -84,7 +84,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 5, "metadata": {}, "outputs": [ { @@ -130,7 +130,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 6, "metadata": {}, "outputs": [ { @@ -185,7 +185,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 7, "metadata": {}, "outputs": [ { @@ -231,7 +231,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 8, "metadata": {}, "outputs": [ { @@ -282,7 +282,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 9, "metadata": {}, "outputs": [ { @@ -320,7 +320,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "metadata": {}, "outputs": [ { @@ -370,7 +370,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 11, "metadata": {}, "outputs": [ { @@ -430,7 +430,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 12, "metadata": {}, "outputs": [ { @@ -480,7 +480,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -533,7 +533,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 14, "metadata": {}, "outputs": [ { @@ -561,7 +561,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 15, "metadata": {}, "outputs": [ { @@ -621,7 +621,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 16, "metadata": {}, "outputs": [ { @@ -662,7 +662,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 17, "metadata": {}, "outputs": [ { @@ -695,7 +695,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 18, "metadata": {}, "outputs": [ { @@ -716,14 +716,14 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 19, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "

Version Information

Qiskit SoftwareVersion
Qiskit0.19.1
Terra0.14.1
Aer0.5.1
Ignis0.3.0
Aqua0.7.0
IBM Q Provider0.7.0
System information
Python3.7.4 (default, Aug 13 2019, 15:17:50) \n", - "[Clang 4.0.1 (tags/RELEASE_401/final)]
OSDarwin
CPUs6
Memory (Gb)16.0
Mon May 11 08:44:58 2020 CEST
" + "

Version Information

Qiskit SoftwareVersion
QiskitNone
Terra0.15.0.dev0+2e8582d
Aer0.6.0
Ignis0.4.0.dev0+be205e2
Aqua0.8.0.dev0+8d17693
IBM Q Provider0.7.0
System information
Python3.7.5 (default, Nov 1 2019, 02:16:32) \n", + "[Clang 11.0.0 (clang-1100.0.33.8)]
OSDarwin
CPUs2
Memory (Gb)16.0
Fri Jun 19 09:02:44 2020 CEST
" ], "text/plain": [ "" @@ -761,9 +761,9 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3.7.5 64-bit ('latest': virtualenv)", + "display_name": "Python 3", "language": "python", - "name": "python37564bitlatestvirtualenv76cfe9d7d3f749489cf2ff69593234af" + "name": "python3" }, "language_info": { "codemirror_mode": { @@ -775,7 +775,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.5" + "version": "3.7.7" } }, "nbformat": 4,