Skip to content

Commit 0266770

Browse files
author
Andrew McCluskey
authored
Merge pull request #31 from arm61/master
remove reference to is
2 parents ad2fcc1 + 86a4187 commit 0266770

5 files changed

Lines changed: 83 additions & 51 deletions

File tree

_data/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
- url: /data_work/simple_plots
5656
- url: /data_work/surface_plots
5757
- url: /data_work/stats
58+
- url: /data_work/optimisation
59+
- url: /data_work/ir_spectra
5860
- url: /data_work/linear_algebra
5961

6062
- url: /advanced/advanced

content/basics/types.ipynb

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,56 +1143,6 @@
11431143
"cell_type": "markdown",
11441144
"metadata": {},
11451145
"source": [
1146-
"Despite the fact that it is possible to apply the `==` and `!=` operators to strings, it is stylistically frowned upon. \n",
1147-
"Instead, the use of the `is` and `is not` notation is preferred. "
1148-
]
1149-
},
1150-
{
1151-
"cell_type": "code",
1152-
"execution_count": 42,
1153-
"metadata": {},
1154-
"outputs": [
1155-
{
1156-
"data": {
1157-
"text/plain": [
1158-
"True"
1159-
]
1160-
},
1161-
"execution_count": 42,
1162-
"metadata": {},
1163-
"output_type": "execute_result"
1164-
}
1165-
],
1166-
"source": [
1167-
"'Hello World' is not 'HELLO WORLD'"
1168-
]
1169-
},
1170-
{
1171-
"cell_type": "code",
1172-
"execution_count": 43,
1173-
"metadata": {},
1174-
"outputs": [
1175-
{
1176-
"data": {
1177-
"text/plain": [
1178-
"False"
1179-
]
1180-
},
1181-
"execution_count": 43,
1182-
"metadata": {},
1183-
"output_type": "execute_result"
1184-
}
1185-
],
1186-
"source": [
1187-
"'Hello World'.upper() is 'HELLO WORLD'"
1188-
]
1189-
},
1190-
{
1191-
"cell_type": "markdown",
1192-
"metadata": {},
1193-
"source": [
1194-
"The `is` and `is not` operations act in a similar fashion to `==` and `!=`.\n",
1195-
"\n",
11961146
"#### Exercise \n",
11971147
"\n",
11981148
"Using the cells below, find the result of the following logical operations:\n",

content/data_work/ir_spectra.ipynb

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "markdown",
5+
"metadata": {},
6+
"source": [
7+
"# Exercise: Fitting IR spectra"
8+
]
9+
},
10+
{
11+
"cell_type": "code",
12+
"execution_count": null,
13+
"metadata": {},
14+
"outputs": [],
15+
"source": []
16+
}
17+
],
18+
"metadata": {
19+
"kernelspec": {
20+
"display_name": "Python 3",
21+
"language": "python",
22+
"name": "python3"
23+
},
24+
"language_info": {
25+
"codemirror_mode": {
26+
"name": "ipython",
27+
"version": 3
28+
},
29+
"file_extension": ".py",
30+
"mimetype": "text/x-python",
31+
"name": "python",
32+
"nbconvert_exporter": "python",
33+
"pygments_lexer": "ipython3",
34+
"version": "3.7.3"
35+
}
36+
},
37+
"nbformat": 4,
38+
"nbformat_minor": 4
39+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "markdown",
5+
"metadata": {},
6+
"source": [
7+
"# Fitting functions to data"
8+
]
9+
},
10+
{
11+
"cell_type": "code",
12+
"execution_count": null,
13+
"metadata": {},
14+
"outputs": [],
15+
"source": []
16+
}
17+
],
18+
"metadata": {
19+
"kernelspec": {
20+
"display_name": "Python 3",
21+
"language": "python",
22+
"name": "python3"
23+
},
24+
"language_info": {
25+
"codemirror_mode": {
26+
"name": "ipython",
27+
"version": 3
28+
},
29+
"file_extension": ".py",
30+
"mimetype": "text/x-python",
31+
"name": "python",
32+
"nbconvert_exporter": "python",
33+
"pygments_lexer": "ipython3",
34+
"version": "3.7.3"
35+
}
36+
},
37+
"nbformat": 4,
38+
"nbformat_minor": 4
39+
}

content/intro.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ If you would like to be involved, please look at the [contributing guidelines](h
2525
2. [Simple plots](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/simple_plots.html)
2626
3. [Surface plots](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/surface_plots.html)
2727
4. [Statistical analysis](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/stats.html)
28-
5. [Linear algebra](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/linear_algebra.html)
28+
5. [Fitting functions to data](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/optimisation.html)
29+
6. [Exercise: Fitting IR spectra](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/ir_spectra.html)
30+
7. [Linear algebra](https://pythoninchemistry.org/intro_python_chemists/good_practice/data_work/linear_algebra.html)
2931
4. [Advanced](https://pythoninchemistry.org/intro_python_chemists/advanced/advanced.html)
3032
1. [Object-oriented programming](https://pythoninchemistry.org/intro_python_chemists/advanced/oop.html)
3133
2. [Classes](https://pythoninchemistry.org/intro_python_chemists/advanced/classes.html)

0 commit comments

Comments
 (0)