Merge branch 'master' into remove-pprint

Qiskit · Jun 19, 2020 · fd7f819 · fd7f819
2 parents 438ec9e + 7a538d0
commit fd7f819
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/start_here.ipynb b/start_here.ipynb
@@ -70,7 +70,7 @@
     "6. [Extended stabilizer tutorial](tutorials/simulators/6_extended_stabilizer_tutorial.ipynb) - Gives an overview of the *extended stabilizer* Qasm Simulator method\n",
     "\n",
     "\n",
-    "7. [Matrix Product State simulator](tutorials/simulations/7_matrix_product_state_method.ipynb) - Gives an overview of the *matrix product state* Simulator method\n",
+    "7. [Matrix Product State simulator](tutorials/simulators/7_matrix_product_state_method.ipynb) - Gives an overview of the *matrix product state* Simulator method\n",
     "\n",
     "\n",
     "##  Quantum Device Noise Analysis\n",
@@ -106,7 +106,7 @@
     "2. [Quadratic Program Converters](tutorials/optimization/2_converters_for_quadratic_programs.ipynb) - Qiskit Optimization provides with `QuadraticProgram` a very generic and powerful representation for optimization problems\n",
     "\n",
     "\n",
-    "3. [Minimum Eigen Optimizer](tutorials/optimization/3_minimum_eigen_optimizer) - Solutions to quadratic programs using minimum eigenvalue solvers.\n",
+    "3. [Minimum Eigen Optimizer](tutorials/optimization/3_minimum_eigen_optimizer.ipynb) - Solutions to quadratic programs using minimum eigenvalue solvers.\n",
     "\n",
     "\n",
     "4. [Grover Optimizer](tutorials/optimization/4_grover_optimizer.ipynb) - Explore each component of the `GroverOptimizer`, which utilizes the techniques described in GAS, by minimizing a Quadratic Unconstrained Binary Optimization (QUBO) problem\n",

diff --git a/tutorials/optimization/3_minimum_eigen_optimizer.ipynb b/tutorials/optimization/3_minimum_eigen_optimizer.ipynb
@@ -29,7 +29,7 @@
     "Qiskit wraps the translation to an Ising Hamiltonian (in Qiskit Aqua also called `Operator`), the call to an `MinimumEigensolver` as well as the translation of the results back to `OptimizationResult` in the `MinimumEigenOptimizer`.\n",
     "\n",
     "In the following we first illustrate the conversion from a `QuadraticProgram` to an `Operator` and then show how to use the `MinimumEigenOptimizer` with different `MinimumEigensolver` to solve a given `QuadraticProgram`.\n",
-    "The algorithms in Qiskit automatically try to convert a given problem to the supported problem class if possible, for instance, the `MinimumEigenOptimizer` will automatically translate integer variables to binary variables or add a linear equality constraints as a quadratic penalty term to the objective.\n",
+    "The algorithms in Qiskit automatically try to convert a given problem to the supported problem class if possible, for instance, the `MinimumEigenOptimizer` will automatically translate integer variables to binary variables or add a linear equality constraints as a quadratic penalty term to the objective. It should be mentioned that Aqua will through a `QiskitOptimizationError` if conversion of a quadratic program with integer variable is attempted.\n",
     "\n",
     "The circuit depth of `QAOA` potentially has to be increased with the problem size, which might be prohibitive for near-term quantum devices.\n",
     "A possible workaround is Recursive QAOA, as introduced in [2].\n",