Merge remote-tracking branch 'origin/master'

Formeln.py

@@ -37,4 +37,4 @@ def looper(geg, ges):
     for formel in Formeln:
         temp_is_solvable = formel.is_solvable(geg, ges)
         if temp_is_solvable[0]:
-            formel.solve(temp_is_solvable[1], [geg, ges])
+            return formel.solve(temp_is_solvable[1], [geg, ges])

Klassen.py

@@ -109,20 +109,23 @@ class Formel:
     def solve(self, ges, dicts):
         temp_dicts = dicts
         temp_dicts.append(self)
+        ret = None
         self.solver.set_dicts(temp_dicts)
         if 'i' == ges.equals_var:
-            self.solver.solve_to_i()
+            ret = self.solver.solve_to_i()
         elif 'e' == ges.equals_var:
-            self.solver.solve_to_e()
+            ret = self.solver.solve_to_e()
         elif 'c' == ges.equals_var:
-            self.solver.solve_to_c()
+            ret = self.solver.solve_to_c()
         elif 'b' == ges.equals_var:
-            self.solver.solve_to_b()
+            ret = self.solver.solve_to_b()
         elif 'a' == ges.equals_var:
-            self.solver.solve_to_a()
+            ret = self.solver.solve_to_a()
         elif 'x' == ges.equals_var:
-            self.solver.solve_to_x()
+            ret = self.solver.solve_to_x()
         elif 'd' == ges.equals_var:
-            self.solver. solve_to_d()
+            ret = self.solver. solve_to_d()
+
+        return ret
 
 

Main.py

@@ -1,5 +1,7 @@
-#import Formeln
+import Formeln
 import user_IO
-#import Klassen
+import Klassen
 while True:
-    _ = user_IO.user_Input()
+    dicts = user_IO.user_Input()
+    ret = Formeln.looper(dicts[0], dicts[1])
+    user_IO.user_Output(ret)