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

Commit 2a6de4d

Browse files
authored
Merge branch 'master' into fix_transpiler_notebook
2 parents ce82ae4 + 815f1eb commit 2a6de4d

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ installation procedure:
4242
accompanying `environment.yml` file)
4343

4444
```
45-
cd qiskit-iqx-tutorials
45+
cd qiskit-tutorials
4646
conda env create -f environment.yml
4747
```
4848

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Welcome to the [Qiskit](https://www.qiskit.org/) Tutorials!
88

9-
In this repository, we've put together a collection of Jupyter notebooks aimed at teaching people who want to use Qiskit for writing quantum computing programs, and executing them on one of several backends (online quantum processors, online simulators, and local simulators). The online quantum processors are the [IBM Quantum](https://quantum-computing.ibm.com) devices.
9+
In this repository, we've put together a collection of Jupyter notebooks aimed at teaching people who want to use Qiskit for writing quantum computing programs, and executing them on one of several backends (online quantum processors, online simulators, and local simulators). The online quantum processors are the [IBM Quantum](https://quantum-computing.ibm.com) systems.
1010

1111
For our community-contributed tutorials, please check out the [qiskit-community-tutorials](https://github.com/Qiskit/qiskit-community-tutorials) repository.
1212

tutorials/optimization/1_quadratic_program.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
"metadata": {},
219219
"source": [
220220
"The `QuadraticProgram` supports three types of variables:\n",
221-
"- Binary varible\n",
221+
"- Binary variable\n",
222222
"- Integer variable\n",
223223
"- Continuous variable\n",
224224
"\n",
@@ -607,10 +607,10 @@
607607
"cell_type": "markdown",
608608
"metadata": {},
609609
"source": [
610-
"You can substitue some of variables with constants or other variables.\n",
610+
"You can substitute some of variables with constants or other variables.\n",
611611
"More precicely, `QuadraticProgram` has a method `substitute_variables(constants=..., variables=...)` to deal with the following two cases.\n",
612612
"- $x \\leftarrow c$: when `constants` have a dictionary `{x: c}`. \n",
613-
"- $x \\leftarrow c y$: when `variables` have a dictuinary `{x: (y, c)}`."
613+
"- $x \\leftarrow c y$: when `variables` have a dictionary `{x: (y, c)}`."
614614
]
615615
},
616616
{
@@ -691,7 +691,7 @@
691691
"metadata": {},
692692
"source": [
693693
"You cannot substitute variables multiple times. \n",
694-
"The metdod raises an error in such a case."
694+
"The method raises an error in such a case."
695695
]
696696
},
697697
{
@@ -776,7 +776,7 @@
776776
"name": "python",
777777
"nbconvert_exporter": "python",
778778
"pygments_lexer": "ipython3",
779-
"version": "3.7.4"
779+
"version": "3.7.7"
780780
}
781781
},
782782
"nbformat": 4,

tutorials/optimization/3_minimum_eigen_optimizer.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@
298298
"metadata": {},
299299
"source": [
300300
"The `RecursiveMinimumEigenOptimizer` takes a `MinimumEigenOptimizer` as input and applies the recursive optimization scheme to reduce the size of the problem one variable at a time.\n",
301-
"Once the size of the generated intermediate problem is below a given threshold (`min...`), the `RecurisveMinimumEigenOptimizer` uses another solver (`...`), e.g., an exact classical solver such as CPLEX or the `MinimumEigenOptimizer` based on the `NumPyMinimumEigensolver`.\n",
301+
"Once the size of the generated intermediate problem is below a given threshold (`min...`), the `RecursiveMinimumEigenOptimizer` uses another solver (`...`), e.g., an exact classical solver such as CPLEX or the `MinimumEigenOptimizer` based on the `NumPyMinimumEigensolver`.\n",
302302
"\n",
303303
"In the following, we show how to use the `RecursiveMinimumEigenOptimizer` using the two `MinimumEigenOptimizer` introduced before."
304304
]
@@ -398,7 +398,7 @@
398398
"name": "python",
399399
"nbconvert_exporter": "python",
400400
"pygments_lexer": "ipython3",
401-
"version": "3.7.4"
401+
"version": "3.7.7"
402402
},
403403
"toc": {
404404
"base_numbering": 1,

0 commit comments

Comments
 (0)