From a3ed87c5bc9cd16d1b27f59e0157c3a4de6670e3 Mon Sep 17 00:00:00 2001 From: LockeDerBoss Date: Mon, 22 Jul 2019 10:29:26 +0200 Subject: [PATCH 1/7] hey --- .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/projekttage.iml | 11 +++++++++++ .idea/vcs.xml | 6 ++++++ Uebungen/jajaja.py | 13 +++++++++++++ Uebungen/test.txt | 1 - gzgzgzgzgzgzgz/test.txt | 2 ++ 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/projekttage.iml create mode 100644 .idea/vcs.xml create mode 100644 Uebungen/jajaja.py delete mode 100644 Uebungen/test.txt create mode 100644 gzgzgzgzgzgzgz/test.txt diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9ac0270 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/projekttage.iml b/.idea/projekttage.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/.idea/projekttage.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Uebungen/jajaja.py b/Uebungen/jajaja.py new file mode 100644 index 0000000..7069316 --- /dev/null +++ b/Uebungen/jajaja.py @@ -0,0 +1,13 @@ +print("Wie alt bist du?") +name = input ("Wie heißt du?") +alter = int (input("Wie alt bist du?")) +print(name) +print(alter) + +if alter >=10; +print ("Sie sind älter als 10") +elif alter <= 10; + +Produkte = ("apfel", "Banane", "Birne", "Ananas") +#print (Produkte(-31)) +woerterbuch = ("Apfel":1, "Birne":2, "Banane":34) diff --git a/Uebungen/test.txt b/Uebungen/test.txt deleted file mode 100644 index 18c28f0..0000000 --- a/Uebungen/test.txt +++ /dev/null @@ -1 +0,0 @@ -Mir fällt nix ein \ No newline at end of file diff --git a/gzgzgzgzgzgzgz/test.txt b/gzgzgzgzgzgzgz/test.txt new file mode 100644 index 0000000..85c94c2 --- /dev/null +++ b/gzgzgzgzgzgzgz/test.txt @@ -0,0 +1,2 @@ +print("Wie heißt du?") +name = input ("Wie alt bist du?")) \ No newline at end of file From 73923ec9b22de63220efef666582386773dd87a8 Mon Sep 17 00:00:00 2001 From: LockeDerBoss Date: Mon, 22 Jul 2019 10:46:26 +0200 Subject: [PATCH 2/7] hey --- Uebungen/jajaja.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Uebungen/jajaja.py b/Uebungen/jajaja.py index 7069316..f68c1a3 100644 --- a/Uebungen/jajaja.py +++ b/Uebungen/jajaja.py @@ -4,10 +4,17 @@ alter = int (input("Wie alt bist du?")) print(name) print(alter) -if alter >=10; -print ("Sie sind älter als 10") -elif alter <= 10; +#if alter >=10; +#print ("Sie sind älter als 10") +#elif alter <= 10; -Produkte = ("apfel", "Banane", "Birne", "Ananas") +Produkte = {"Apfel", "Banane", "Birne", "Ananas"} #print (Produkte(-31)) -woerterbuch = ("Apfel":1, "Birne":2, "Banane":34) +woerterbuch = {"Apfel":1, "Birne":2, "Banane":34} +#print(woerterbuch("Banane)) +#for produkt in produkte + print(produkte) +zaehler = 0 + +def addiere(Zahl1, Zahl2) + print(Zahl1 + Zahl2) \ No newline at end of file From 0671380367087283765e1b372613b8188a9280be Mon Sep 17 00:00:00 2001 From: LockeDerBoss Date: Wed, 24 Jul 2019 09:37:33 +0300 Subject: [PATCH 3/7] hey --- Klassen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Klassen.py b/Klassen.py index 4bce1ca..ad0d54b 100644 --- a/Klassen.py +++ b/Klassen.py @@ -24,7 +24,7 @@ class Formel: return (a**z) * (b**y) * (c**x) + d * e * f + g def _solve_to_a(self): - pass + return ((b**y) * (c**x) + d * e *f + g * i)**1/z def _solve_to_b(self): pass From ddceea5634d5de1293fc9bb211fa1696a42ed0bd Mon Sep 17 00:00:00 2001 From: korintanra Date: Wed, 24 Jul 2019 09:38:58 +0200 Subject: [PATCH 4/7] rhgdrh --- Klassen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Klassen.py b/Klassen.py index 4bce1ca..d78ff08 100644 --- a/Klassen.py +++ b/Klassen.py @@ -27,10 +27,10 @@ class Formel: pass def _solve_to_b(self): - pass + pass ((a**z) * (c**x) +d * e * f + g)**1/y def _solve_to_c(self): - pass + pass ((a**z) * (b**y) + d * e * f + g * i)**1/x def _solve_to_d(self): pass From d7f7dd131a0fee9fe4fc5cacb705b06760293d83 Mon Sep 17 00:00:00 2001 From: korintanra Date: Wed, 24 Jul 2019 09:44:20 +0200 Subject: [PATCH 5/7] rhgdrh --- Klassen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Klassen.py b/Klassen.py index cc26647..0283ce8 100644 --- a/Klassen.py +++ b/Klassen.py @@ -41,8 +41,8 @@ class Formel: def _solve_to_f(self): pass - def _solve_to_g(self):# fehlt - pass + def _solve_to_g(self): + pass - ((a**z) * (b**y) * (c**x) + d * e * f - i) def _solve_to_z(self): # fehlt pass From 46d954009a3d83f909e64e45df875e2ff34b23cd Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Wed, 24 Jul 2019 09:50:33 +0200 Subject: [PATCH 6/7] klassen change --- Klassen.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Klassen.py b/Klassen.py index cc26647..12e1c84 100644 --- a/Klassen.py +++ b/Klassen.py @@ -19,18 +19,20 @@ class Groesse: class Formel: class Solver: + def __init__(self, formel): + self.formel = formel + def _solve_to_i(self): - self. return (a**z) * (b**y) * (c**x) + d * e * f + g def _solve_to_a(self): return ((b**y) * (c**x) + d * e *f + g * i)**1/z def _solve_to_b(self): - pass ((a**z) * (c**x) +d * e * f + g)**1/y + return ((a**z) * (c**x) +d * e * f + g)**1/y def _solve_to_c(self): - pass ((a**z) * (b**y) + d * e * f + g * i)**1/x + return ((a**z) * (b**y) + d * e * f + g * i)**1/x def _solve_to_d(self): return i - g - (a**z) * (b**y)* (c**x) / e * f @@ -39,7 +41,7 @@ class Formel: return i - g - (a**2) * (b**y) * (c**x) / d * f def _solve_to_f(self): - pass + return (i-g-(a**z)*(b**y)*(c**x)) / (d * e) def _solve_to_g(self):# fehlt pass @@ -48,7 +50,7 @@ class Formel: pass def _solve_to_y(self): - pass + return math.log((i-d*e*f-g)/((a**z) * (c**x)), b) def _solve_to_x(self): return math.log(i-d*e*f-g)/(a**z)*(b**y, c) @@ -81,6 +83,7 @@ class Formel: self.i = i self.i.set_equals_var('i') self.liste = [] + self.solver = self.Solver(self) for var in [self.a, self.b, self.c, self.d, self.e, self.f, self.g, self.z, self.y, self.x, self.i]: if var.konst is False: self.liste.append(var) From 2a9c583d3dbb500dcb83598eef7bfc9d618a3c32 Mon Sep 17 00:00:00 2001 From: Lars Bogner Date: Wed, 24 Jul 2019 10:05:39 +0200 Subject: [PATCH 7/7] klassen change --- Klassen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Klassen.py b/Klassen.py index 3e37fbc..0b0ec21 100644 --- a/Klassen.py +++ b/Klassen.py @@ -44,10 +44,10 @@ class Formel: return (i-g-(a**z)*(b**y)*(c**x)) / (d * e) def _solve_to_g(self): - pass - ((a**z) * (b**y) * (c**x) + d * e * f - i) + return - ((a**z) * (b**y) * (c**x) + d * e * f - i) - def _solve_to_z(self): # fehlt - pass + def _solve_to_z(self): + return math.log((i-d*e*f-g) / ((b**y) * (c**x)), a) def _solve_to_y(self): return math.log((i-d*e*f-g)/((a**z) * (c**x)), b)