From 838c939d78f307650e942f7480ccba835c9e1444 Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:31:58 +0200 Subject: [PATCH 1/8] Klassen.py --- Klassen.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Klassen.py diff --git a/Klassen.py b/Klassen.py new file mode 100644 index 0000000..a3790dd --- /dev/null +++ b/Klassen.py @@ -0,0 +1,28 @@ +class Formel: + def __init__(self, name, 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), + f=Groesse(None, None, True, 0), g=Groesse(None, None, True, 0), z=Groesse(None, None, True, 0), + y=Groesse(None, None, True, 0), x=Groesse(None, None, True, 0)): + self.a = a + self.b = b + self.c = c + self.d = d + self.e = e + self.f = f + self.g = g + self.z = z + self.y = y + self.x = x + self.name = name + self.liste = [] + for var in [self.a, self.b, self.c]: + if var.konst is False: + self.liste.append(var) + + +class Groesse: + def __init__(self, formelsymbol, einheit, konst, wert=None): + self.formelsymbol = formelsymbol + self.einheit = einheit + self.wert = wert + self.konst = konst \ No newline at end of file From 0d65b9ee4449d6cacb3a356eeffd7bd4164fcd27 Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:33:42 +0200 Subject: [PATCH 2/8] Klassen.py --- Klassen.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Klassen.py b/Klassen.py index a3790dd..92ca796 100644 --- a/Klassen.py +++ b/Klassen.py @@ -1,5 +1,5 @@ class Formel: - def __init__(self, name, a=Groesse(None, None, True, 0), b=Groesse(None, None, True, 0), + 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), f=Groesse(None, None, True, 0), g=Groesse(None, None, True, 0), z=Groesse(None, None, True, 0), y=Groesse(None, None, True, 0), x=Groesse(None, None, True, 0)): @@ -14,6 +14,7 @@ class Formel: self.y = y self.x = x self.name = name + self.i = i self.liste = [] for var in [self.a, self.b, self.c]: if var.konst is False: From 969eae2a97000186ef734959a1afbcdf424ecf04 Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:34:49 +0200 Subject: [PATCH 3/8] Klassen.py --- Klassen.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Klassen.py b/Klassen.py index 92ca796..0db64be 100644 --- a/Klassen.py +++ b/Klassen.py @@ -1,3 +1,11 @@ +class Groesse: + def __init__(self, formelsymbol, einheit, konst, wert=None): + self.formelsymbol = formelsymbol + self.einheit = einheit + self.wert = wert + self.konst = konst + + class Formel: 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), @@ -21,9 +29,3 @@ class Formel: self.liste.append(var) -class Groesse: - def __init__(self, formelsymbol, einheit, konst, wert=None): - self.formelsymbol = formelsymbol - self.einheit = einheit - self.wert = wert - self.konst = konst \ No newline at end of file From 2d46c3463fa5049bd825987eb0c89cea0700709e Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:36:40 +0200 Subject: [PATCH 4/8] Klassen.py --- Klassen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Klassen.py b/Klassen.py index 0db64be..522f79a 100644 --- a/Klassen.py +++ b/Klassen.py @@ -28,4 +28,4 @@ class Formel: if var.konst is False: self.liste.append(var) - +Formeln = [] From 4929b19636581d6e8b884efaa73c5e958a16186b Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:43:29 +0200 Subject: [PATCH 5/8] Formeln#1 --- Formeln.py | 5 +++++ Klassen.py | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Formeln.py diff --git a/Formeln.py b/Formeln.py new file mode 100644 index 0000000..41f49b8 --- /dev/null +++ b/Formeln.py @@ -0,0 +1,5 @@ +import Klassen as k + +Formeln = [k.Formel('Kraftformel', k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), + b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True), y=k.Groesse(None, None, True), + x=k.Groesse(None, None, True))] \ No newline at end of file diff --git a/Klassen.py b/Klassen.py index 522f79a..61c39e8 100644 --- a/Klassen.py +++ b/Klassen.py @@ -28,4 +28,3 @@ class Formel: if var.konst is False: self.liste.append(var) -Formeln = [] From bf8aae95452b9dc7d0c9cbbb2f7e69f00068d5c0 Mon Sep 17 00:00:00 2001 From: stockth Date: Tue, 23 Jul 2019 09:40:55 +0200 Subject: [PATCH 6/8] t --- Formeln.py | 6 +++--- Uebungen/Test/Test.thorsten.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Formeln.py b/Formeln.py index 41f49b8..68f2f31 100644 --- a/Formeln.py +++ b/Formeln.py @@ -1,5 +1,5 @@ import Klassen as k -Formeln = [k.Formel('Kraftformel', k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), - b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True), y=k.Groesse(None, None, True), - x=k.Groesse(None, None, True))] \ No newline at end of file +Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), + b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True, 1), y=k.Groesse(None, None, True, 1), + x=k.Groesse(None, None, True, ))] \ No newline at end of file diff --git a/Uebungen/Test/Test.thorsten.py b/Uebungen/Test/Test.thorsten.py index 3ea4816..6c4c151 100644 --- a/Uebungen/Test/Test.thorsten.py +++ b/Uebungen/Test/Test.thorsten.py @@ -4,12 +4,12 @@ geheimzahl = random.randrange(32) ratezahl = 0 while ratezahl != geheimzahl: - ratezahl = int(input("Raten Sie die geheime Zahl: ")) + ratezahl = int(input("Raten Sie die geheime Zahl: ")) - if ratezahl > geheimzahl: - print("Zu hoch") + if ratezahl > geheimzahl: + print("Zu hoch") - elif ratezahl < geheimzahl: - print("Zu niedrig") + elif ratezahl < geheimzahl: + print("Zu niedrig") print("Herzlichen Glückwunsch! Die geheime Zahl war " + str(geheimzahl)) From 779ea729a7aeafdbf27386584cbda2b9756c19cf Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Tue, 23 Jul 2019 10:48:36 +0200 Subject: [PATCH 7/8] merged --- Formeln.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Formeln.py b/Formeln.py index 68f2f31..d98d6b6 100644 --- a/Formeln.py +++ b/Formeln.py @@ -1,5 +1,7 @@ import Klassen as k -Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), +konstante_eins = k.Groesse(None, None, True, 1) + +Formeln = [k.Formel('Kraftformel', k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True, 1), y=k.Groesse(None, None, True, 1), - x=k.Groesse(None, None, True, ))] \ No newline at end of file + x=k.Groesse(None, None, True, 1))] From 0a2a1e533dcde2d595330a02c793402cdcec90f1 Mon Sep 17 00:00:00 2001 From: stockth Date: Tue, 23 Jul 2019 09:56:58 +0200 Subject: [PATCH 8/8] t --- Formeln.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Formeln.py b/Formeln.py index d98d6b6..0be8810 100644 --- a/Formeln.py +++ b/Formeln.py @@ -2,6 +2,10 @@ import Klassen as k konstante_eins = k.Groesse(None, None, True, 1) -Formeln = [k.Formel('Kraftformel', k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), +Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False), b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True, 1), y=k.Groesse(None, None, True, 1), - x=k.Groesse(None, None, True, 1))] + x=k.Groesse(None, None, True, 1)), + k.Formel('Gleichm. beschl. Bew.', i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5), + b=('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins, + y=k.Groesse(None, None, True, 2)), + ]