From 2bfa002022283b8cf0de1f713018088d8889f3ec Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Mon, 22 Jul 2019 10:21:09 +0200 Subject: [PATCH 1/6] =?UTF-8?q?rdrdrdrzzttuuvuctgutgcool=C3=BCjfeopwjfpiar?= =?UTF-8?q?ohgoiprhtj5ziohtriooirhiodh=C3=A4aoihoiahroi=C3=A4aoihg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Uebungen/dada.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Uebungen/dada.py diff --git a/Uebungen/dada.py b/Uebungen/dada.py new file mode 100644 index 0000000..e568a9d --- /dev/null +++ b/Uebungen/dada.py @@ -0,0 +1,21 @@ +name = input("Was ist dein name") +alter = input ("Wie alt bist du???") +Wohnort = input ("Wo wohnst du???") +name = ("Tim") +alter = (13) +Wohnort= ("Waldrennach") +print (name + str(alter)+ Wohnort) +print ("Dein halbes alter ist:" + str (alter /2)) +if alter >=18: + print ("Du bist älter als 17") +elif alter <=10: + print ("Du bist jünger als 11") +else: + print ("Du bist jünger als 18 und älter als 11") + + + + + + + From 6a8c4b5a184660abfd8289c5760cc2c70fedd3c1 Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Mon, 22 Jul 2019 10:27:10 +0200 Subject: [PATCH 2/6] =?UTF-8?q?rdrdrdrzzttuuvuctgutgcool=C3=BCjfeopwjfpiar?= =?UTF-8?q?ohgoiprhtj5ziohtriooirhiodh=C3=A4aoihoiahroi=C3=A4aoihg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Uebungen/dada.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Uebungen/dada.py b/Uebungen/dada.py index e568a9d..0c16358 100644 --- a/Uebungen/dada.py +++ b/Uebungen/dada.py @@ -19,3 +19,6 @@ else: + + + From 03a47dbf98053688282380652f059fb6988f047e Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Mon, 22 Jul 2019 10:28:33 +0200 Subject: [PATCH 3/6] =?UTF-8?q?rdrdrdrzzttuuvuctgutgcool=C3=BCjfeopwjfpiar?= =?UTF-8?q?ohgoiprhtj5ziohtriooirhiodh=C3=A4aoihoiahroi=C3=A4aoihg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Uebungen/dada.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Uebungen/dada.py b/Uebungen/dada.py index 0c16358..d3b5e00 100644 --- a/Uebungen/dada.py +++ b/Uebungen/dada.py @@ -22,3 +22,5 @@ else: + + From cf97961f8e27afa0f3fd1e77b7ecf5a46989795c Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Tue, 23 Jul 2019 06:57:53 +0200 Subject: [PATCH 4/6] =?UTF-8?q?rdrdrdrzzttuuvuctgutgcool=C3=BCjfeopwjfpiar?= =?UTF-8?q?ohgoiprhtj5ziohtriooirhiodh=C3=A4aoihoiahroi=C3=A4aoihg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Uebungen/dada.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Uebungen/dada.py b/Uebungen/dada.py index d3b5e00..5c06fda 100644 --- a/Uebungen/dada.py +++ b/Uebungen/dada.py @@ -1,10 +1,12 @@ name = input("Was ist dein name") alter = input ("Wie alt bist du???") Wohnort = input ("Wo wohnst du???") -name = ("Tim") +name = ("tim") alter = (13) -Wohnort= ("Waldrennach") -print (name + str(alter)+ Wohnort) +Wohnort = ("Waldrennach") +print (name) +print(alter) +print(Wohnort) print ("Dein halbes alter ist:" + str (alter /2)) if alter >=18: print ("Du bist älter als 17") @@ -12,6 +14,9 @@ elif alter <=10: print ("Du bist jünger als 11") else: print ("Du bist jünger als 18 und älter als 11") +while True: + zaehler =0 + zaehler = zaehler + 1 From 6b7153e8d37de99731065b82b9c09c56e993be2f Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Wed, 24 Jul 2019 07:55:23 +0200 Subject: [PATCH 5/6] =?UTF-8?q?rdrdrdrzzttuuvuctgutgcool=C3=BCjfeopwjfpiar?= =?UTF-8?q?ohgoiprhtj5ziohtriooirhiodh=C3=A4aoihoiahroi=C3=A4aoihg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/Projekttage.iml | 11 +++++++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Uebungen/dadas.py | 7 +++++++ Uebungen/hch | 0 Uebungen/jdj.py | 0 7 files changed, 36 insertions(+) create mode 100644 .idea/Projekttage.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Uebungen/dadas.py create mode 100644 Uebungen/hch create mode 100644 Uebungen/jdj.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/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9fb6e7a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Uebungen/dadas.py b/Uebungen/dadas.py new file mode 100644 index 0000000..11fedf4 --- /dev/null +++ b/Uebungen/dadas.py @@ -0,0 +1,7 @@ +print ("Hallo mein Name ist Kot") +name = input ("Und dein Name?") +print ("Ist dein Name wirklich" + name + "?") +print ("nein du lauch") +name2 = input("Wie heißt du dann???") +print ("ich heiße" + name2 + "du lauch") +print ("Ich heiße Karl Heinz der große du Lauch") diff --git a/Uebungen/hch b/Uebungen/hch new file mode 100644 index 0000000..e69de29 diff --git a/Uebungen/jdj.py b/Uebungen/jdj.py new file mode 100644 index 0000000..e69de29 From 5c385f7f18b47cdd35137ba1d83fa15305891334 Mon Sep 17 00:00:00 2001 From: Spongebob-Schwammkopf Date: Wed, 24 Jul 2019 08:10:31 +0200 Subject: [PATCH 6/6] Merge branch 'master' of C:\Users\maternti\PycharmProjects\Projekttage with conflicts. --- .idea/misc.xml | 2 +- Klassen.py | 42 ++++++------------------------------------ 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index a2e120d..cddc448 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Klassen.py b/Klassen.py index 4bce1ca..ab1c4c8 100644 --- a/Klassen.py +++ b/Klassen.py @@ -1,4 +1,4 @@ -from copy import deepcopy +from copy import deepcop import math @@ -18,41 +18,6 @@ class Groesse: class Formel: - class Solver: - def _solve_to_i(self): - self. - return (a**z) * (b**y) * (c**x) + d * e * f + g - - def _solve_to_a(self): - pass - - def _solve_to_b(self): - pass - - def _solve_to_c(self): - pass - - def _solve_to_d(self): - pass - - def _solve_to_e(self): - pass - - def _solve_to_f(self): - pass - - def _solve_to_g(self):# fehlt - pass - - def _solve_to_z(self): # fehlt - pass - - def _solve_to_y(self): - pass - - def _solve_to_x(self): - pass - def __init__(self, name, i, a=Groesse(None, None, True, 0), b=Groesse(None, None, True, 0), c=Groesse(None, None, True, 0), d=Groesse(None, None, True, 0), e=Groesse(None, None, True, 0), f=Groesse(None, None, True, 0), g=Groesse(None, None, True, 0), z=Groesse(None, None, True, 0), @@ -98,6 +63,11 @@ class Formel: def solve(self, ges): pass + def _solve_to_i(self): + pass + + + math.sqrt()