diff --git a/notebooks/seminar05.ipynb b/notebooks/seminar05.ipynb index 0f438783332518bdc959b8b53b27a896e6284a7b..64d0a176b7c949fec77b514de3e7912b232e1639 100644 --- a/notebooks/seminar05.ipynb +++ b/notebooks/seminar05.ipynb @@ -655,15 +655,11 @@ "outputs": [], "source": [ "# implementieren Sie hier die Funktion do_n\n", - "def do_n(f, n):\n", - " if n<=0:\n", - " return\n", - " f\n", - " do_n(f,n-1)\n", + "\n", "# eine Testfunktion\n", "def testfunktion():\n", " print(\"Ich wurde aufgerufen!\")\n", - "do_n(testfunktion(),5)\n", + "\n", "# rufen Sie hier die Funktion do_n auf, indem Sie die Funktion testfunktion sowie den Wert 7 als Argument übergeben " ] }, @@ -906,13 +902,8 @@ "outputs": [], "source": [ "import time\n", - "seconds=time.time()\n", - "minutes=seconds/60\n", - "hours=minutes/60\n", - "days=hours/24\n", - "weeks=days/7\n", - "years=days/365\n", - "print(seconds, minutes, hours, days, weeks, years, sep='\\t')\n" + "time.time()\n", + "\n" ] }, { @@ -930,18 +921,7 @@ "source": [ "import time\n", "\n", - "def print_time():\n", - " seconds=time.time()\n", - " days=seconds/(60*60*24)\n", - " whole_days=seconds//(60*60*24)\n", - " hours=(days-whole_days)*24\n", - " whole_hours=int((days-whole_days)*24)\n", - " minutes= (hours-whole_hours)*60\n", - " whole_minutes=int((hours-whole_hours)*60)\n", - " seconds_left=(minutes-whole_minutes)*60\n", - " whole_seconds=int((minutes-whole_minutes)*60)\n", - " print('days passed since January 1st 1970: ',int(whole_days),'\\nthe time (GMT) is :' ,whole_hours, ' hh : ',whole_minutes,' mm : ',whole_seconds, ' ss')\n", - " \n", + "\n", "# Testaufruf\n", "print_time()" ] @@ -979,31 +959,7 @@ "metadata": {}, "outputs": [], "source": [ - "def check_fermat(a,b,c,n):\n", - " if n>2:\n", - " a_n=a\n", - " b_n=b\n", - " c_n=c\n", - " for i in range(1,n):\n", - " a_n=a_n*a\n", - " b_n=b_n*b\n", - " c_n=c_n*c\n", - " if a_n+b_n==c_n:\n", - " print('Unglaublich, Fermat lag falsch!')\n", - " else:\n", - " print('Nein, das funktioniert nicht.')\n", - " else: \n", - " print('n muss größer als 2 sein, um Fermats Satz zu überprüfen')\n", - "\n", - "\n", - "def check_fermat2(a,b,c,n):\n", - " a=int(a)\n", - " b=int(b)\n", - " c=int(c)\n", - " n=int(n)\n", - " check_fermat(a,b,c,n)\n", - "\n", - "check_fermat2(3,4,5,3) " + "\n" ] }, { @@ -1025,22 +981,7 @@ "execution_count": null, "metadata": {}, "outputs": [], - "source": [ - "def is_triangle(a,b,c):\n", - " total=a+b+c\n", - " k=0\n", - " for i in (a,b,c): \n", - " if(total-2*i)<0:\n", - " print('Nein nein nein!')\n", - " k=1\n", - " break\n", - " if k==0:\n", - " print('oh yes')\n", - "\n", - "\n", - "is_triangle(2,1,4)\n", - " " - ] + "source": [] }, { "cell_type": "markdown",