Merge remote-tracking branch 'origin/master'

This commit is contained in:
TimMcCool
2019-07-24 12:20:23 +02:00
+6 -1
View File
@@ -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()]