Merge remote-tracking branch 'origin/master'

.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 (Projekttage)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
 </project>

.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>

.idea/projekttage.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>

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):
-            pass
+            return ((b**y) * (c**x) + d * e *f + g * i)**1/z
 
         def _solve_to_b(self):
-            pass
+            return ((a**z) * (c**x) +d * e * f + g)**1/y
 
         def _solve_to_c(self):
-            pass
+            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,16 +41,16 @@ 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
+        def _solve_to_g(self):
+            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):
-            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)

Uebungen/jajaja.py

@@ -0,0 +1,20 @@
+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}
+#print(woerterbuch("Banane))
+#for produkt in produkte
+    print(produkte)
+zaehler = 0
+
+def addiere(Zahl1, Zahl2)
+    print(Zahl1 + Zahl2)

gzgzgzgzgzgzgz/test.txt

@@ -0,0 +1,2 @@
+print("Wie heißt du?")
+name = input ("Wie alt bist du?"))