From 9c8c33640dbcfc4c006af74e282ad6a697018700 Mon Sep 17 00:00:00 2001 From: michelar Date: Mon, 22 Jul 2019 10:32:20 +0200 Subject: [PATCH 01/10] Merge branch 'master' of C:\Users\michelar\PycharmProjects\Projekttage with conflicts. --- .idea/Projekttage.iml | 11 +++++++++++ Uebungen/test.txt | 1 - Uebungen/uff/__init__.py | 8 ++++++++ Uebungen/uff/asdfgh.py | 8 ++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .idea/Projekttage.iml create mode 100644 Uebungen/uff/__init__.py create mode 100644 Uebungen/uff/asdfgh.py 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/Uebungen/test.txt b/Uebungen/test.txt index 18c28f0..e69de29 100644 --- a/Uebungen/test.txt +++ b/Uebungen/test.txt @@ -1 +0,0 @@ -Mir fällt nix ein \ No newline at end of file diff --git a/Uebungen/uff/__init__.py b/Uebungen/uff/__init__.py new file mode 100644 index 0000000..0a89ef5 --- /dev/null +++ b/Uebungen/uff/__init__.py @@ -0,0 +1,8 @@ +alter = int(input ("Wie alt bist du?")) + +print (alter) + +if alter <=18: + print ("Du junges Schwein") +else: + print ("ehre") diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py new file mode 100644 index 0000000..0a89ef5 --- /dev/null +++ b/Uebungen/uff/asdfgh.py @@ -0,0 +1,8 @@ +alter = int(input ("Wie alt bist du?")) + +print (alter) + +if alter <=18: + print ("Du junges Schwein") +else: + print ("ehre") From 31347f24f54feafd2df66a82b5dcc2b35109bb76 Mon Sep 17 00:00:00 2001 From: michelar Date: Mon, 22 Jul 2019 10:32:33 +0200 Subject: [PATCH 02/10] ruweigfiwgfihuidfsp98uf --- Uebungen/uff/__init__.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Uebungen/uff/__init__.py diff --git a/Uebungen/uff/__init__.py b/Uebungen/uff/__init__.py deleted file mode 100644 index 0a89ef5..0000000 --- a/Uebungen/uff/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -alter = int(input ("Wie alt bist du?")) - -print (alter) - -if alter <=18: - print ("Du junges Schwein") -else: - print ("ehre") From bc3849024243b9750ce3298fc855fd35410aa143 Mon Sep 17 00:00:00 2001 From: michelar Date: Mon, 22 Jul 2019 10:37:15 +0200 Subject: [PATCH 03/10] ruweigfiwgfihuidfsp98uf --- Uebungen/uff/asdfgh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py index 0a89ef5..aa125bb 100644 --- a/Uebungen/uff/asdfgh.py +++ b/Uebungen/uff/asdfgh.py @@ -2,7 +2,7 @@ alter = int(input ("Wie alt bist du?")) print (alter) -if alter <=18: +if alter <18: print ("Du junges Schwein") else: print ("ehre") From b34bdae14c0de4ce80e8b586e7293ff9047e48ee Mon Sep 17 00:00:00 2001 From: michelar Date: Tue, 23 Jul 2019 10:00:59 +0200 Subject: [PATCH 04/10] ruweigfiwgfihuidfsp98uf --- Uebungen/uff/asdfgh.py | 49 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py index aa125bb..d71715a 100644 --- a/Uebungen/uff/asdfgh.py +++ b/Uebungen/uff/asdfgh.py @@ -1,8 +1,45 @@ -alter = int(input ("Wie alt bist du?")) +import random -print (alter) +guessesTaken = 0 -if alter <18: - print ("Du junges Schwein") -else: - print ("ehre") +print('Hello! What is your name?') + +myName = input() + +number = 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 guess is too low.') + + if guess > number: + + print('Your guess is too high.') + + if guess == number: + + break + +if guess == number: + + guessesTaken = str(guessesTaken) + + print('Good job, ' + myName + '! You guessed my number in ' + guessesTaken + ' guesses!') + +if guess != number: + + number = str(number) + + print('Nope. The number I was thinking of was ' + number) From dcff3aeabd852e27bf0446d59fac96a2bde379b5 Mon Sep 17 00:00:00 2001 From: dxnso Date: Tue, 23 Jul 2019 10:03:57 +0200 Subject: [PATCH 05/10] Merge branch 'master' of C:\Users\wurstda\PycharmProjects\Projekttage with conflicts. --- .idea/Projekttage.iml | 11 +++++++++++ .idea/modules.xml | 2 +- Uebungen/Hallolo/__init__.py | 0 Uebungen/test.txt | 4 +++- Uebungen/test2.py | 0 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .idea/Projekttage.iml create mode 100644 Uebungen/Hallolo/__init__.py create mode 100644 Uebungen/test2.py 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/.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/Uebungen/Hallolo/__init__.py b/Uebungen/Hallolo/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Uebungen/test.txt b/Uebungen/test.txt index 18c28f0..a131000 100644 --- a/Uebungen/test.txt +++ b/Uebungen/test.txt @@ -1 +1,3 @@ -Mir fällt nix ein \ No newline at end of file +name = "Huan" +text = "Hier bitte Text einfügen" +SDAfsv \ No newline at end of file diff --git a/Uebungen/test2.py b/Uebungen/test2.py new file mode 100644 index 0000000..e69de29 From f7f15f4aa16ca63e439d5aa31b85421110a34465 Mon Sep 17 00:00:00 2001 From: michelar Date: Tue, 23 Jul 2019 10:04:54 +0200 Subject: [PATCH 06/10] ruweigfiwgfihuidfsp98uf --- Uebungen/uff/asdfgh.py | 45 ------------------------------------------ 1 file changed, 45 deletions(-) diff --git a/Uebungen/uff/asdfgh.py b/Uebungen/uff/asdfgh.py index d71715a..e69de29 100644 --- a/Uebungen/uff/asdfgh.py +++ b/Uebungen/uff/asdfgh.py @@ -1,45 +0,0 @@ -import random - -guessesTaken = 0 - -print('Hello! What is your name?') - -myName = input() - -number = 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 guess is too low.') - - if guess > number: - - print('Your guess is too high.') - - if guess == number: - - break - -if guess == number: - - guessesTaken = str(guessesTaken) - - print('Good job, ' + myName + '! You guessed my number in ' + guessesTaken + ' guesses!') - -if guess != number: - - number = str(number) - - print('Nope. The number I was thinking of was ' + number) From 314465d9315aa82469b059b6a07ae70c96921e44 Mon Sep 17 00:00:00 2001 From: dxnso Date: Tue, 23 Jul 2019 10:22:12 +0200 Subject: [PATCH 07/10] Hallo --- Formeln.py | 2 +- Uebungen/test2.py | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Formeln.py b/Formeln.py index 0be8810..9be212c 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,4 +8,4 @@ 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 \ No newline at end of file diff --git a/Uebungen/test2.py b/Uebungen/test2.py index e69de29..8161720 100644 --- a/Uebungen/test2.py +++ 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 From 0246d05665e3a32cdf37a4187ad0b633b6bccd10 Mon Sep 17 00:00:00 2001 From: TimMcCool Date: Tue, 23 Jul 2019 11:06:42 +0200 Subject: [PATCH 08/10] Moin! --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 From 011338461d59072916242360bed063094adbea35 Mon Sep 17 00:00:00 2001 From: michelar Date: Tue, 23 Jul 2019 10:26:34 +0200 Subject: [PATCH 09/10] ruweigfiwgfihuidfsp98uf --- Formeln.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Formeln.py b/Formeln.py index 0be8810..2c6b418 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,4 +8,5 @@ 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('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))] From d7dc82b37fd7c7b534a92dc3c5b8119f4035492f Mon Sep 17 00:00:00 2001 From: michelar Date: Tue, 23 Jul 2019 10:28:47 +0200 Subject: [PATCH 10/10] ruweigfiwgfihuidfsp98uf --- Formeln.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formeln.py b/Formeln.py index 48cf11e..0908519 100644 --- a/Formeln.py +++ b/Formeln.py @@ -8,6 +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('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))]