Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024 revision before 2024 #412

Merged
merged 3 commits into from
Sep 22, 2024
Merged

2024 revision before 2024 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f29c8f5
append gitignore with scipy data file
chrbeckm Sep 21, 2024
510fa43
change order according to plan
chrbeckm Sep 21, 2024
5a9e15e
python notebook: change version, fix f-string unit, closes #200
chrbeckm Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions exercises-toolbox/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.dummy
vorlage.py
FB53-Coronafallzahlen.csv
4-scipy/3-polyfit/daten.txt
0 exercises-toolbox/7-git/aufgabe.txt → exercises-toolbox/6-git/aufgabe.txt
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/7-git/repo/HEAD → exercises-toolbox/6-git/repo/HEAD
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/7-git/repo/config → exercises-toolbox/6-git/repo/config
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/7-git/repo/description → exercises-toolbox/6-git/repo/description
View file
Open in desktop
File renamed without changes.
0 ...ox/7-git/repo/hooks/applypatch-msg.sample → ...ox/6-git/repo/hooks/applypatch-msg.sample
View file
Open in desktop
File renamed without changes.
0 ...oolbox/7-git/repo/hooks/commit-msg.sample → ...oolbox/6-git/repo/hooks/commit-msg.sample
View file
Open in desktop
File renamed without changes.
0 ...olbox/7-git/repo/hooks/post-update.sample → ...olbox/6-git/repo/hooks/post-update.sample
View file
Open in desktop
File renamed without changes.
0 ...ox/7-git/repo/hooks/pre-applypatch.sample → ...ox/6-git/repo/hooks/pre-applypatch.sample
View file
Open in desktop
File renamed without changes.
0 ...oolbox/7-git/repo/hooks/pre-commit.sample → ...oolbox/6-git/repo/hooks/pre-commit.sample
View file
Open in desktop
File renamed without changes.
0 ...-toolbox/7-git/repo/hooks/pre-push.sample → ...-toolbox/6-git/repo/hooks/pre-push.sample
View file
Open in desktop
File renamed without changes.
0 ...oolbox/7-git/repo/hooks/pre-rebase.sample → ...oolbox/6-git/repo/hooks/pre-rebase.sample
View file
Open in desktop
File renamed without changes.
0 ...-git/repo/hooks/prepare-commit-msg.sample → ...-git/repo/hooks/prepare-commit-msg.sample
View file
Open in desktop
File renamed without changes.
0 ...es-toolbox/7-git/repo/hooks/update.sample → ...es-toolbox/6-git/repo/hooks/update.sample
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/7-git/repo/info/exclude → exercises-toolbox/6-git/repo/info/exclude
View file
Open in desktop
File renamed without changes.
0 ...08/12ad76f0973724e371b34d1d4ce0f94a1f8116 → ...08/12ad76f0973724e371b34d1d4ce0f94a1f8116
View file
Open in desktop
File renamed without changes.
0 ...31/0ad6d3e3742ee979b82278b5cc1f876603ce31 → ...31/0ad6d3e3742ee979b82278b5cc1f876603ce31
View file
Open in desktop
File renamed without changes.
0 ...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea → ...3e/e8a5721ac10476e0c823f67fc56e62ac4f5cea
View file
Open in desktop
File renamed without changes.
0 ...49/c601bc19da81a83a205449e4897f19ba7a3206 → ...49/c601bc19da81a83a205449e4897f19ba7a3206
View file
Open in desktop
File renamed without changes.
0 ...66/c41ab8a887f27f8bebcd305411df5326c8c9ed → ...66/c41ab8a887f27f8bebcd305411df5326c8c9ed
View file
Open in desktop
File renamed without changes.
0 ...74/4809e58151727928bd7c2b817ae0b013b60abd → ...74/4809e58151727928bd7c2b817ae0b013b60abd
View file
Open in desktop
File renamed without changes.
0 ...93/98763c2fc0165a7739e58b5612234e0a9a0b2f → ...93/98763c2fc0165a7739e58b5612234e0a9a0b2f
View file
Open in desktop
File renamed without changes.
0 ...9d/67a8c6b9ac9c9749720797ad3c51031906bf22 → ...9d/67a8c6b9ac9c9749720797ad3c51031906bf22
View file
Open in desktop
File renamed without changes.
0 ...9e/4a210068506c9c80685f2972657beb1e7e9baf → ...9e/4a210068506c9c80685f2972657beb1e7e9baf
View file
Open in desktop
File renamed without changes.
0 ...ab/a966bc5470ff40518141076d239d80752c7c45 → ...ab/a966bc5470ff40518141076d239d80752c7c45
View file
Open in desktop
File renamed without changes.
0 ...b0/566c0142bc9889bd683c21a0819f264628f0f2 → ...b0/566c0142bc9889bd683c21a0819f264628f0f2
View file
Open in desktop
File renamed without changes.
0 ...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9 → ...bd/e6fe651d9c6da730f477c1d6e7f1a836030af9
View file
Open in desktop
File renamed without changes.
0 ...d5/f152a8469657041b4d51e932210ecd2d65b6d6 → ...d5/f152a8469657041b4d51e932210ecd2d65b6d6
View file
Open in desktop
File renamed without changes.
0 ...e0/2d436b047c6a0bacd25bfa9239590001b5f58e → ...e0/2d436b047c6a0bacd25bfa9239590001b5f58e
View file
Open in desktop
File renamed without changes.
0 ...e0/809ac6648cae33e48e1eb04a116645b32faf67 → ...e0/809ac6648cae33e48e1eb04a116645b32faf67
View file
Open in desktop
File renamed without changes.
0 ...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 → ...e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
View file
Open in desktop
File renamed without changes.
0 ...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc → ...f9/3e3a1a1525fb5b91020da86e44810c87a2d7bc
View file
Open in desktop
File renamed without changes.
0 ...fd/77fce646b2a931a52c96c7bcac626085a81184 → ...fd/77fce646b2a931a52c96c7bcac626085a81184
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/7-git/repo/refs/heads/main → exercises-toolbox/6-git/repo/refs/heads/main
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/.gitignore → exercises-toolbox/7-make/.gitignore
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/I.txt → exercises-toolbox/7-make/I.txt
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/L.txt → exercises-toolbox/7-make/L.txt
View file
Open in desktop
File renamed without changes.
0 ...ses-toolbox/6-make/Makefile-bonus-loesung → ...ses-toolbox/7-make/Makefile-bonus-loesung
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/Makefile-loesung → exercises-toolbox/7-make/Makefile-loesung
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/aufgabe.txt → exercises-toolbox/7-make/aufgabe.txt
View file
Open in desktop
File renamed without changes.
0 ...oolbox/6-make/auswertung-bonus-loesung.py → ...oolbox/7-make/auswertung-bonus-loesung.py
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/auswertung.py → exercises-toolbox/7-make/auswertung.py
View file
Open in desktop
File renamed without changes.
0 exercises-toolbox/6-make/lambda.txt → exercises-toolbox/7-make/lambda.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions exercises-toolbox/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ all: $(BUILDS)
@cp -r 1-python build/exercises-toolbox-1
@cp -r 2-numpy 3-matplotlib build/exercises-toolbox-2
@cp -r 4-scipy 5-uncertainties build/exercises-toolbox-3
@cp -r 6-make build/exercises-toolbox-4
@cp -r 7-git 8-all build/exercises-toolbox-5
@cp -r 6-git build/exercises-toolbox-4
@cp -r 7-make 8-all build/exercises-toolbox-5
@rm -rf build/exercises-toolbox-{1,2,3,4,5}/*/{,*/}{Makefile,.gitignore,__pycache__,*.dummy}
@cd build ; \
for day in 1 2 3 4 5 ; do \
Expand Down
8 changes: 4 additions & 4 deletions python/python.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"source": [
"![Python](https://www.python.org/static/community_logos/python-logo-generic.svg)\n",
"\n",
"- Aktuelle Version: Python 3.11\n",
"- Aktuelle Version: Python 3.12\n",
"- *Interpretierte* Programmiersprache\n",
" - Kein Kompilieren\n",
" - Programme werden mit dem `python`-Programm ausgeführt\n",
Expand Down Expand Up @@ -1415,7 +1415,7 @@
"U = 42\n",
"R = 7\n",
"\n",
"print(f\"Spannung U = {U}, R = {R}, I = {U / R}\")"
"print(f\"Spannung U = {U} V, R = {R} Ω, I = {U / R} A\")"
]
},
{
Expand Down Expand Up @@ -1653,7 +1653,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"## Allgemeiner Syntax-Fehler: ` SyntaxError`\n",
"## Allgemeiner Syntax-Fehler: `SyntaxError`\n",
"Zeile in der der Fehler auftritt: `line 6` \n",
"Grund für den Fehler: `SyntaxError: invalid syntax` \n",
"Hier sogar mit Hinweis auf das fehlerhafte/fehlende Zeichen.\n"
Expand Down Expand Up @@ -2005,7 +2005,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.6"
"version": "3.10.8"
}
},
"nbformat": 4,
Expand Down
Loading