Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Formeln.py

.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage1.iml" filepath="$PROJECT_DIR$/.idea/Projekttage1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Projekttage.iml" filepath="$PROJECT_DIR$/.idea/Projekttage.iml" />
     </modules>
   </component>
 </project>

Formeln.py

@@ -8,6 +8,19 @@ Formeln = [k.Formel('Kraftformel', i=k.Groesse('F', 'N', False), a=k.Groesse('m'
            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),
+                    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,
+                    z=k.Groesse(None, None, True, 2)),
+           k.Formel('Potentielle Energie' , i=k.Groesse('Epot','J',False),b=k.Groesse('m','kg', False),
+                    c=k.Groesse('Höhe','m',False), z=konstante_eins,y=konstante_eins,x=konstante_eins),
+           k.Formel('Kinetische Energie',i=k.Groesse('Ekin','J', False), a=k.Groesse(None, None, True, 0.5),
+                    b=('m', 'kg', False), c=('v', 'm/s', False), z=konstante_eins, x=konstante_eins,
+                    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),
-                    b=k.Groesse ('t','s', False), z= konstante_eins, y= konstante_eins, x=k.Groesse(None,None,True,-1))]
+                    b=k.Groesse ('t','s', False), z= konstante_eins, y= konstante_eins, x=k.Groesse(None,None,True,-1))
+           ]
 

Klassen.py

@@ -1,9 +1,19 @@
+from copy import deepcopy
+
+
 class Groesse:
     def __init__(self, formelsymbol, einheit, konst, wert=None):
         self.formelsymbol = formelsymbol
         self.einheit = einheit
         self.wert = wert
         self.konst = konst
+        self.equals_var = None
+
+    def set(self, wert):
+        self.wert = wert
+
+    def set_equals_var(self, var):
+        self.equals_var = var
 
 
 class Formel:
@@ -12,19 +22,45 @@ class Formel:
                  f=Groesse(None, None, True, 0), g=Groesse(None, None, True, 0), z=Groesse(None, None, True, 0),
                  y=Groesse(None, None, True, 0), x=Groesse(None, None, True, 0)):
         self.a = a
+        self.a.set_equals_var('a')
         self.b = b
+        self.b.set_equals_var('b')
         self.c = c
+        self.c.set_equals_var('c')
         self.d = d
+        self.d.set_equals_var('d')
         self.e = e
+        self.e.set_equals_var('e')
         self.f = f
+        self.f.set_equals_var('f')
         self.g = g
+        self.g.set_equals_var('g')
         self.z = z
+        self.z.set_equals_var('z')
         self.y = y
+        self.y.set_equals_var('y')
         self.x = x
+        self.x.set_equals_var('x')
         self.name = name
         self.i = i
+        self.i.set_equals_var('i')
         self.liste = []
-        for var in [self.a, self.b, self.c]:
+        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)
 
+    def is_solvable(self, geg, ges):
+        temp_liste = deepcopy(self.liste)
+        for geg_element in geg:
+            for liste_element in temp_liste:
+                # serach for element with fitting formelsymbol and then del it
+                pass
+        if len(temp_liste) == 1 and ges[0] == temp_liste[0]: # has to be changed accordingly
+            return [True, temp_liste[0]]
+        return [False, None]
+
+    def solve(self, ges):
+        pass
+
+
+

README.md

@@ -1,4 +1 @@
-# Projekttage
-
-Taschenrechner in den man gegeben und gesucht eingibt, und er er umformt und einsetzt sowie ausrechnet.
-
+# Projekttage

Uebungen/NASCHISPROGRAMM

@@ -1,4 +1,4 @@
-name= Flo
+#name= Flo
 print(name)
 alter= 16
 print(alter)
@@ -7,4 +7,5 @@ if alter>=10
 elif alter <=9
     print("ehren bra")
 zaehler = 0
+while True:
 

Uebungen/test/Jonne.py

@@ -0,0 +1,14 @@
+import random
+geheimzahl=random.randrange(30)
+Zahl=0
+
+while Zahl != geheimzahl :
+    Zahl = int(input ("Errate die Zahl"))
+    if Zahl>geheimzahl:
+        print("zu groß du Lappen")
+
+
+    elif Zahl<geheimzahl:
+        print("zu klein")
+    else:
+        print("du hast die Zahl erraten")

Uebungen/test/naschikathy.py

@@ -0,0 +1,18 @@
+import random
+geheimzahl =random.randrange(40)
+zahl = 0
+
+while zahl != geheimzahl:
+    zahl = int(input ('Errate die Zahl!!'))
+
+    print ("Errate die Zahl!!")
+    print (zahl)
+
+    if zahl>geheimzahl:
+        print ("zu groß")
+
+    elif zahl<geheimzahl:
+        print ("zu kleen")
+
+    else:
+        print ("JÖAR GANZ GENAU!!!")

Uebungen/test2.py

@@ -0,0 +1,36 @@
+import random
+
+guessesTaken = 0
+
+print ("Hello! What is your Name?")
+
+myName = input()
+
+niumber =random.randint(1, 20)
+
+print ("Well, ' + myName + ', I am thinking of a number between 1 and 20.")
+
+while guessesTaken < 6:
+    print ("Take a guess")
+    guess = input()
+    guess = int(guess)
+    guessesTaken = guessesTaken + 1
+
+    if guess < number:
+        print ("Your Number is too low")
+
+    if guess > number:
+        print ("Your Number is too high")
+
+    if guess == number:
+
+        break
+if guess == number:
+
+    guessesTaken = str(guessesTaken)
+
+    print("Good Job! You guessed my number in ' + guessesTaken + ' guesses!")
+
+if guess !=number:
+    number = str(number)
+    print ("Nope. The number I was tihinking of was " + number)