From b462ea01cbe9b33d3dd5ba6c55906bdfdf361337 Mon Sep 17 00:00:00 2001 From: beyerju Date: Mon, 22 Jul 2019 09:29:02 +0200 Subject: [PATCH 1/7] jdsf --- Uebungen/Test 2.0.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Uebungen/Test 2.0.py diff --git a/Uebungen/Test 2.0.py b/Uebungen/Test 2.0.py new file mode 100644 index 0000000..9432906 --- /dev/null +++ b/Uebungen/Test 2.0.py @@ -0,0 +1,21 @@ +# print("Wie alt bist du?") +# # name = (input("Wie ist dein Name")) +# # alter = int(input("Wie alt bist du?")) +# # print(name) +# # print(alter) +# # +# # if alter >= 18: +# # print("Sie sind älter als 17") +# # elif alter <= 10: +# # print("Du bist jünger als 11") +# # +# # else: +# Produkte = ["Apfel","Birne","Banane","Ananas"] +# woerterbuch = {"Apfel":1, "Birne":2, "Banane":34} +# for produkt in Produkte: +# print (produkt) + +zaehler = 0 +while True: + print (zaehler) + zaehler = zaehler + 1 \ No newline at end of file From 06174c483a46e28293048499156a94f837a97ff9 Mon Sep 17 00:00:00 2001 From: beyerju Date: Mon, 22 Jul 2019 09:29:58 +0200 Subject: [PATCH 2/7] jdsf --- .github/ISSUE_TEMPLATE/aufgaben.md | 1 + .idea/Projekttage1.iml | 6 ++++-- .idea/misc.xml | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/aufgaben.md b/.github/ISSUE_TEMPLATE/aufgaben.md index a7ea7e8..ab8b97b 100644 --- a/.github/ISSUE_TEMPLATE/aufgaben.md +++ b/.github/ISSUE_TEMPLATE/aufgaben.md @@ -10,3 +10,4 @@ assignees: '' **Kurzbeschreibung** **weitere Infos** + diff --git a/.idea/Projekttage1.iml b/.idea/Projekttage1.iml index 6711606..d1483a3 100644 --- a/.idea/Projekttage1.iml +++ b/.idea/Projekttage1.iml @@ -1,8 +1,10 @@ - - + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index a2e120d..cddc448 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file From be8112d3f5f4ba141917b14df60cbb9babea7d1f Mon Sep 17 00:00:00 2001 From: beyerju Date: Mon, 22 Jul 2019 09:46:44 +0200 Subject: [PATCH 3/7] jdsf --- Uebungen/Test 2.0.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Uebungen/Test 2.0.py b/Uebungen/Test 2.0.py index 9432906..0413bdf 100644 --- a/Uebungen/Test 2.0.py +++ b/Uebungen/Test 2.0.py @@ -15,7 +15,10 @@ # for produkt in Produkte: # print (produkt) -zaehler = 0 -while True: - print (zaehler) - zaehler = zaehler + 1 \ No newline at end of file +# zaehler = 0 +# while True: +# print (zaehler) +# zaehler = zaehler + 1 + +def Addiere(Zahl1,Zahl2): + return Zahl1+Zahl2) \ No newline at end of file From 855621323e444438296b387625dabedcb81558cd Mon Sep 17 00:00:00 2001 From: beyerju Date: Wed, 24 Jul 2019 07:27:25 +0200 Subject: [PATCH 4/7] jdsf --- Klassen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Klassen.py b/Klassen.py index 4bce1ca..b185d7d 100644 --- a/Klassen.py +++ b/Klassen.py @@ -51,7 +51,7 @@ class Formel: pass def _solve_to_x(self): - pass + return math.log(i-d*e*f-g)/(a**z)*(b**y, c) def __init__(self, name, i, a=Groesse(None, None, True, 0), b=Groesse(None, None, True, 0), c=Groesse(None, None, True, 0), d=Groesse(None, None, True, 0), e=Groesse(None, None, True, 0), From c926b62b8a151e1f476ccf9b0f9696e3f843d30e Mon Sep 17 00:00:00 2001 From: stockth Date: Wed, 24 Jul 2019 08:22:47 +0200 Subject: [PATCH 5/7] t --- Main.py | 5 +++++ user-IO.py | 0 2 files changed, 5 insertions(+) delete mode 100644 user-IO.py diff --git a/Main.py b/Main.py index e69de29..a171303 100644 --- a/Main.py +++ b/Main.py @@ -0,0 +1,5 @@ +#import Formeln +import user_IO +#import Klassen +while True: + _ = user_IO.user_Input() \ No newline at end of file diff --git a/user-IO.py b/user-IO.py deleted file mode 100644 index e69de29..0000000 From 3305222e93a80b281a95f4d94d63db0f2c402a47 Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Wed, 24 Jul 2019 08:14:36 +0200 Subject: [PATCH 6/7] Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/misc.xml --- .idea/Projekttage.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idea/Projekttage.iml b/.idea/Projekttage.iml index 6711606..f3d7bc9 100644 --- a/.idea/Projekttage.iml +++ b/.idea/Projekttage.iml @@ -2,7 +2,7 @@ - + From 574b8037a6dcef408b85622dc6540c2425845b89 Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Wed, 24 Jul 2019 08:26:18 +0200 Subject: [PATCH 7/7] Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/misc.xml --- Klassen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Klassen.py b/Klassen.py index dd227b0..7d93f81 100644 --- a/Klassen.py +++ b/Klassen.py @@ -33,7 +33,7 @@ class Formel: pass def _solve_to_d(self): - pass + return i - g - (a**z) * (b**y)* (c**x) / e * f def _solve_to_e(self): pass