Skip to content

Commit 37757c4

Browse files
committed
Merge remote-tracking branch 'origin/development' into development
2 parents 83e33af + 92f945a commit 37757c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+55534
-18
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,9 @@
77

88
# checkpoint directory
99
.ipynb_checkpoints/
10+
11+
# Jupyter Lab LSP temporary files
12+
.virtual_documents/
13+
14+
# Powerpoint backup file
1015
/~$python_for_programmers.pptx

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ Repository for participants of the "Python for programmers" training
55

66
## What is it?
77

8-
* `python_for_programmers.pptx`: Microsoft Powerpoint presentation
9-
that can be used for the training.
10-
* `source_code`: source code used in the slides as well as additional
11-
material not covered in the slides. There are also a number of
12-
Jupyter notebooks on specific topics.
13-
* `environment.yml`/`python_for_programmers_linux64_conda_specs.txt`: conda environment specifications with all
14-
Python packages used in this material.
8+
* `python_for_programmers.pptx`: Microsoft Powerpoint presentation that can be
9+
used for the training.
10+
* `source_code`: source code used in the slides as well as additional material
11+
not covered in the slides. There are also a number of Jupyter notebooks on
12+
specific topics.
13+
* `hands-on`: hands-on exercises for participants to follow along with the
14+
presentation.
15+
* `environment.yml`/`python_for_programmers_linux64_conda_specs.txt`: conda
16+
environment specifications with all Python packages used in this material.
1517
* `docs`: website for this training.
1618
* `CONTRIBUTING.md`: how to contribute to this material.
1719
* `LICENSE`: license under which this material is released.

hands-on/.virtual_documents/Untitled.ipynb

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
case dim temperature
2+
1 1 0.0000
3+
2 1 0.0000
4+
3 1 0.5000
5+
4 2 0.0000
6+
5 2 0.0000
7+
6 2 0.5000
8+
7 3 0.0000
9+
8 3 0.0000
10+
9 3 0.5000

hands-on/data/measurement.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
case condition temperature
1+
case dim temperature
22
1 1 -0.5
33
2 1 0.0
44
3 1 0.5

0 commit comments

Comments
 (0)