Merge remote-tracking branch 'origin/master'

This commit is contained in:
michelar
2019-07-23 10:03:31 +02:00
+6 -2
View File
@@ -2,6 +2,10 @@ import Klassen as k
konstante_eins = k.Groesse(None, None, True, 1)
Formeln = [k.Formel('Kraftformel', k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False),
Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m', 'kg', False),
b=k.Groesse('a', 'm/s²', False), z=k.Groesse(None, None, True, 1), y=k.Groesse(None, None, True, 1),
x=k.Groesse(None, None, True, 1))]
x=k.Groesse(None, None, True, 1)),
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)),
]