diff --git a/.idea/misc.xml b/.idea/misc.xml index cddc448..a2e120d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 9fb6e7a..9ac0270 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/projekttage.iml b/.idea/projekttage.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/.idea/projekttage.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Klassen.py b/Klassen.py index 51a4241..0b0ec21 100644 --- a/Klassen.py +++ b/Klassen.py @@ -19,18 +19,20 @@ class Groesse: class Formel: class Solver: + def __init__(self, formel): + self.formel = formel + def _solve_to_i(self): - self. return (a**z) * (b**y) * (c**x) + d * e * f + g def _solve_to_a(self): - pass + return ((b**y) * (c**x) + d * e *f + g * i)**1/z def _solve_to_b(self): - pass + return ((a**z) * (c**x) +d * e * f + g)**1/y def _solve_to_c(self): - pass + return ((a**z) * (b**y) + d * e * f + g * i)**1/x def _solve_to_d(self): return i - g - (a**z) * (b**y)* (c**x) / e * f @@ -39,16 +41,16 @@ class Formel: return i - g - (a**2) * (b**y) * (c**x) / d * f def _solve_to_f(self): - pass + return (i-g-(a**z)*(b**y)*(c**x)) / (d * e) - def _solve_to_g(self):# fehlt - pass + def _solve_to_g(self): + return - ((a**z) * (b**y) * (c**x) + d * e * f - i) - def _solve_to_z(self): # fehlt - pass + def _solve_to_z(self): + return math.log((i-d*e*f-g) / ((b**y) * (c**x)), a) def _solve_to_y(self): - pass + return math.log((i-d*e*f-g)/((a**z) * (c**x)), b) def _solve_to_x(self): return math.log(i-d*e*f-g)/(a**z)*(b**y, c) @@ -81,6 +83,7 @@ class Formel: self.i = i self.i.set_equals_var('i') self.liste = [] + self.solver = self.Solver(self) for var in [self.a, self.b, self.c, self.d, self.e, self.f, self.g, self.z, self.y, self.x, self.i]: if var.konst is False: self.liste.append(var) diff --git a/Uebungen/jajaja.py b/Uebungen/jajaja.py new file mode 100644 index 0000000..f68c1a3 --- /dev/null +++ b/Uebungen/jajaja.py @@ -0,0 +1,20 @@ +print("Wie alt bist du?") +name = input ("Wie heißt du?") +alter = int (input("Wie alt bist du?")) +print(name) +print(alter) + +#if alter >=10; +#print ("Sie sind älter als 10") +#elif alter <= 10; + +Produkte = {"Apfel", "Banane", "Birne", "Ananas"} +#print (Produkte(-31)) +woerterbuch = {"Apfel":1, "Birne":2, "Banane":34} +#print(woerterbuch("Banane)) +#for produkt in produkte + print(produkte) +zaehler = 0 + +def addiere(Zahl1, Zahl2) + print(Zahl1 + Zahl2) \ No newline at end of file diff --git a/gzgzgzgzgzgzgz/test.txt b/gzgzgzgzgzgzgz/test.txt new file mode 100644 index 0000000..85c94c2 --- /dev/null +++ b/gzgzgzgzgzgzgz/test.txt @@ -0,0 +1,2 @@ +print("Wie heißt du?") +name = input ("Wie alt bist du?")) \ No newline at end of file