From 50f8d199d12052726cbeae7f7a8c6a76f2ed8f13 Mon Sep 17 00:00:00 2001 From: Kommindiewhatsappgruppe Date: Wed, 24 Jul 2019 09:19:15 +0200 Subject: [PATCH 1/2] ggg --- .idea/misc.xml | 2 +- .idea/projekttage.iml | 2 +- Formeln.py | 2 +- 3 files changed, 3 insertions(+), 3 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 @@ - + \ No newline at end of file diff --git a/.idea/projekttage.iml b/.idea/projekttage.iml index 6711606..ca6e323 100644 --- a/.idea/projekttage.iml +++ b/.idea/projekttage.iml @@ -2,7 +2,7 @@ - + diff --git a/Formeln.py b/Formeln.py index 811ba88..0277d02 100644 --- a/Formeln.py +++ b/Formeln.py @@ -21,7 +21,7 @@ Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Gr y=k.Groesse(None, None, True, 2)), k.Formel('Elektrische Leistung', 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", i=k.Groesse ('v', 'm/s',False), a=k.Groesse('s', 'm', False), + k.Formel("Geschwindigkeit",'v=s/t', i=k.Groesse ('v', 'm/s',False), a=k.Groesse('s', 'm', False), b=k.Groesse ('t','s', False), z= konstante_eins, y= konstante_eins, x=k.Groesse(None,None,True,-1)), k.Formel('Wiederstand', i=k.Groesse('R', 'Ohm', False), a=k.Groesse('U', 'V', False), From bf5282fcb67e9b89c393815c3a3ec62535ac6075 Mon Sep 17 00:00:00 2001 From: michelar Date: Wed, 24 Jul 2019 10:22:37 +0200 Subject: [PATCH 2/2] ruweigfiwgfihuidfsp98uf --- Formeln.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formeln.py b/Formeln.py index 0277d02..6c780da 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,7 +8,7 @@ Formeln = [k.Formel('Kraftformel', "F=m*a", i=k.Groesse('F', 'N', False), a=k.Gr k.Formel('Gleichm. beschl. Bew.', i=k.Groesse('s', 'm', False), a=k.Groesse(None, None, True, 0.5), b=('a', 'm/s^2', False), c=k.Groesse('t', 's', False), z=konstante_eins, x=konstante_eins, y=k.Groesse(None, None, True, 2)), - k.Formel('Gewichtskraft', i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=('h','m',False), + k.Formel('Gewichtskraft',"Fg=9,81*h", i=k.Groesse('Fg', 'N',False), a=k.Groesse(None,None,True,9.81),b=('h','m',False), c=konstante_eins, z=konstante_eins,y=konstante_eins,x=konstante_eins), k.Formel('Spannenergie', 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,