From 5c385f7f18b47cdd35137ba1d83fa15305891334 Mon Sep 17 00:00:00 2001
From: Spongebob-Schwammkopf <materntim1@gmail.com>
Date: Wed, 24 Jul 2019 08:10:31 +0200
Subject: [PATCH] Merge branch 'master' of
 C:\Users\maternti\PycharmProjects\Projekttage with conflicts.

---
 .idea/misc.xml |  2 +-
 Klassen.py     | 42 ++++++------------------------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (Projekttage)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/Klassen.py b/Klassen.py
index 4bce1ca..ab1c4c8 100644
--- a/Klassen.py
+++ b/Klassen.py
@@ -1,4 +1,4 @@
-from copy import deepcopy
+from copy import deepcop
 import math
 
 
@@ -18,41 +18,6 @@ class Groesse:
 
 
 class Formel:
-    class Solver:
-        def _solve_to_i(self):
-            self.
-            return (a**z) * (b**y) * (c**x) + d * e * f + g
-
-        def _solve_to_a(self):
-            pass
-
-        def _solve_to_b(self):
-            pass
-
-        def _solve_to_c(self):
-            pass
-
-        def _solve_to_d(self):
-            pass
-
-        def _solve_to_e(self):
-            pass
-
-        def _solve_to_f(self):
-            pass
-
-        def _solve_to_g(self):# fehlt
-            pass
-
-        def _solve_to_z(self): # fehlt
-            pass
-
-        def _solve_to_y(self):
-            pass
-
-        def _solve_to_x(self):
-            pass
-
     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),
@@ -98,6 +63,11 @@ class Formel:
     def solve(self, ges):
         pass
 
+    def _solve_to_i(self):
+        pass
+
+
+
 
 
 math.sqrt()