lars/Projekttage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix (calculating won't work for exponents)

Browse Source 
Formeln fixed
This commit is contained in:
Lars Bogner
2019-07-24 16:30:46 +02:00
parent dc92eb903d
commit feb72b7c5a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Formeln.py
+6 -6
View File
@@ -6,19 +6,19 @@ Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Gr
b=k.Groesse('a', 'm/s', False), c=konstante_eins, z=konstante_eins,
y=konstante_eins, x=konstante_eins),
k.Formel('Gleichm. beschl. Bew.',"s=0.5*a*t^2", i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5),
b=k.Groesse('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins,
y=k.Groesse(None, None, True, 2)),
b=k.Groesse('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, y=konstante_eins,
x=k.Groesse(None, None, True, 2)),
k.Formel('Gewichtskraft',"Fg=9,81*h", i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=k.Groesse('h','m',False),
c=konstante_eins, z=konstante_eins,y=konstante_eins,x=konstante_eins),
k.Formel('Spannenergie',"Espann=0,5*D*s^2", i=k.Groesse('Espann','J', False), a=k.Groesse(None, None, True, 0.5),
b=k.Groesse('D', 'N/m', False), c=k.Groesse('s', 'm', False), x=konstante_eins, y=konstante_eins,
z=k.Groesse(None, None, True, 2)),
b=k.Groesse('D', 'N/m', False), c=k.Groesse('s', 'm', False), z=konstante_eins, y=konstante_eins,
x=k.Groesse(None, None, True, 2)),
k.Formel('Potentielle Energie',"Epot=m*9.81*h", i=k.Groesse('Epot','J',False),a=k.Groesse('m','kg', False),
b=k.Groesse(None, None, True, 9.81), c=k.Groesse('h','m',False), z=konstante_eins,
y=konstante_eins,x=konstante_eins),
k.Formel('Kinetische Energie',"Ekin=0,5*m*v^2",i=k.Groesse('Ekin','J', False), a=k.Groesse(None, None, True, 0.5),
b=k.Groesse('m', 'kg', False), c=k.Groesse('v', 'm/s', False), z=konstante_eins, x=konstante_eins,
y=k.Groesse(None, None, True, 2)),
b=k.Groesse('m', 'kg', False), c=k.Groesse('v', 'm/s', False), z=konstante_eins, y=konstante_eins,
x=k.Groesse(None, None, True, 2)),
k.Formel('Elektrische Leistung',"P=U*I", i=k.Groesse('P', 'W', False), a=k.Groesse('U', 'V', False),
b=k.Groesse('I','A', False), c=konstante_eins, z=konstante_eins, x=konstante_eins, y=konstante_eins),
k.Formel("Geschwindigkeit",'v=s/t', i=k.Groesse ('v', 'm/s',False), a=k.Groesse('s', 'm', False),
Klassen.py
+1 -1
View File
@@ -45,7 +45,7 @@ class Formel:
return [((self.formel.i.wert - self.formel.d.wert * self.formel.e.wert * self.formel.f.wert - self.formel.g.wert)/((self.formel.a.wert ** self.formel.z.wert) * (self.formel.c.wert ** self.formel.x.wert)))**(1/self.formel.y.wert), self.get_dicts()]
def solve_to_c(self):
return [((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.a.wert ** self.formel.z.wert))) ** (1 / self.formel.x.wert),self.get_dicts()]
return [((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.a.wert ** self.formel.z.wert))) ** (1 / self.formel.x.wert), self.get_dicts()]
def solve_to_d(self):
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.wert**self.formel.x.wert) / self.formel.e.wert * self.formel.f.wert, self.get_dicts()]