diff --git a/.idea/modules.xml b/.idea/modules.xml index 3d624ce..9fb6e7a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/Formeln.py b/Formeln.py index 0be8810..0908519 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,4 +8,6 @@ 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', '', False), c=k.Groesse('s', 'm', False), x=konstante_eins, y=konstante_eins, z=k.Groesse(None, None, True, 2))] diff --git a/README.md b/README.md index 162a8f7..fad89ab 100644 --- a/README.md +++ b/README.md @@ -1,4 +1 @@ -# Projekttage - -Taschenrechner in den man gegeben und gesucht eingibt, und er er umformt und einsetzt sowie ausrechnet. - +# Projekttage \ No newline at end of file diff --git a/Uebungen/Hallolo/__init__.py b/Uebungen/Hallolo/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Uebungen/test2.py b/Uebungen/test2.py new file mode 100644 index 0000000..8161720 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py new file mode 100644 index 0000000..e69de29