From 3eaddf72c51a597046d64293a024fdf37c9ac31c Mon Sep 17 00:00:00 2001
From: stockth <thorstenstock334@gmail.com>
Date: Wed, 24 Jul 2019 11:13:01 +0200
Subject: [PATCH 1/3] ich hasse python

---
 Klassen.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Klassen.py b/Klassen.py
index 89e0d90..2ba9546 100644
--- a/Klassen.py
+++ b/Klassen.py
@@ -23,6 +23,11 @@ class Formel:
             self.formel = formel
             self.dicts = []
 
+        def set_geg(self):
+            for element in self.dicts[0]:
+                for element1 in self.formel.liste:
+                    element1.set(self.dicts[0][element])
+
         def set_dicts(self, dicts):
             self.dicts = dicts
 
@@ -30,7 +35,7 @@ class Formel:
             return self.dicts
 
         def solve_to_i(self):
-            return [(self.formel.a**self.formel.z) * (self.formel.b**self.formel.y) * (self.formel.c**self.formel.x) + self.formel.d * self.formel.e * self.formel.f + self.formel.g, self.get_dicts()]
+            return [(self.formel.a.wert**self.formel.z.wert) * (self.formel.b.wert**self.formel.y.wert) * (self.formel.c.wert**self.formel.x.wert) + self.formel.d.wert * self.formel.e.wert * self.formel.f.wert + self.formel.g.wert, self.get_dicts()]
 
         def solve_to_a(self):
             return [((self.formel.b**self.formel.y) * (self.formel.c**self.formel.x) + self.formel.d * self.formel.e *self.formel.f + self.formel.g * self.formel.i)**1/self.formel.z, self.get_dicts()]

From 46580e6c56e934a48d483de62239ae2d62552a1f Mon Sep 17 00:00:00 2001
From: TimMcCool <timkrome2006@hotmail.com>
Date: Wed, 24 Jul 2019 12:20:09 +0200
Subject: [PATCH 2/3] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Klassen.py
---
 Klassen.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Klassen.py b/Klassen.py
index 89e0d90..da87ad4 100644
--- a/Klassen.py
+++ b/Klassen.py
@@ -42,7 +42,7 @@ class Formel:
             return [((self.formel.a**self.formel.z) * (self.formel.b**self.formel.y) + self.formel.d *self.formel.e *self.formel.f +self.formel.g * self.formel.i)**1/self.formel.x, self.get_dicts()]
 
         def solve_to_d(self):
-            return [self.formel.i - self.formel.g - (self.formel.a**self.formel.z) * (self.formel.b**self.formel.y)* (self.formel.c**self.formel.x) / self.formel.e * self.formel.f, self.get_dicts()]
+            return [self.formel.i.wert - self.formel.g.wert - (self.formel.a**self.formel.z.wert) * (self.formel.b**self.formel.y.wert)* (self.formel.c**self.formel.x.wert) / self.formel.e.wert * self.formel.f.wert, self.get_dicts()]
 
         def solve_to_e(self):
             return [self.formel.i - self.formel.g - (self.formel.a**2) * (self.formel.b**self.formel.y) * (self.formel.c**self.formel.x) / self.formel.d * self.formel.f, self.get_dicts()]

From 65e6eea62ca5f2d0f10d12d1b9284909a8ad6300 Mon Sep 17 00:00:00 2001
From: Kommindiewhatsappgruppe <Yannick.Scheiwe@web.de>
Date: Wed, 24 Jul 2019 10:24:04 +0200
Subject: [PATCH 3/3] ggg

---
 .idea/modules.xml | 2 +-
 Klassen.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9ac0270..9fb6e7a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/projekttage.iml" filepath="$PROJECT_DIR$/.idea/projekttage.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/Klassen.py b/Klassen.py
index c2ad221..47aac4b 100644
--- a/Klassen.py
+++ b/Klassen.py
@@ -59,7 +59,7 @@ class Formel:
             return [- ((self.formel.a**self.formel.z) * (self.formel.b**self.formel.y) * (self.formel.c**self.formel.x) + self.formel.d * self.formel.e * self.formel.f - self.formel.i), self.get_dicts()]
 
         def solve_to_z(self):
-            return [math.log((self.formel.i-self.formel.d*self.formel.e*self.formel.f-self.formel.g) / ((self.formel.b**self.formel.y) * (self.formel.c**self.formel.x)), self.formel.a), self.get_dicts()]
+            return [math.log((self.formel.i.wert-self.formel.d.wert*self.formel.e.wert*self.formel.f.wert-self.formel.g.wert) / ((self.formel.b.wert**self.formel.y.wert) * (self.formel.c.wert**self.formel.x.wert)), self.formel.a), self.get_dicts()]
 
         def solve_to_y(self):
             return [math.log((self.formel.i-self.formel.d*self.formel.e*self.formel.f-self.formel.g)/((self.formel.a**self.formel.z) * (self.formel.c**self.formel.x)), self.formel.b), self.get_dicts()]