diff --git a/ejercicio2.ipynb b/ejercicio2.ipynb index 74f539af937a0d4d623e4e1c2e43a0c4be844a32..05c71f5a23eac52d4d6a9b9cce7048233fbd6fc0 100644 --- a/ejercicio2.ipynb +++ b/ejercicio2.ipynb @@ -36,7 +36,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 41, "metadata": {}, "outputs": [], "source": [ @@ -59,7 +59,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 48, "metadata": {}, "outputs": [], "source": [ @@ -71,26 +71,22 @@ " imprime un mensaje en pantalla solicitando un entero\n", " \"\"\"\n", " \n", - " for x in n:\n", - " if x==\".\":\n", - " print(\"El numero ingresado no es entero\")\n", - " break\n", - " elif x==\",\":\n", - " print(\"El numero ingresado no es entero\")\n", - " break\n", - " elif x==\"j\":\n", - " print(\"El numero ingresado no es entero\")\n", - " break\n", - " else:\n", - " n=int(n)\n", - " return corazon_pascal(n)\n", + " es_entero=n.isdecimal()\n", + " \n", + " if es_entero:\n", + " return corazon_pascal(int(n))\n", + " else:\n", + " print(\"\"\"El numero introducido NO es un numero entero, \n", + " por favor introduzca un numero ENTERO\"\"\")\n", + " \n", + " return \"\"\n", " \n", " " ] }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 50, "metadata": {}, "outputs": [ { @@ -101,26 +97,15 @@ "Introduzca un numero entero mayor que cero,\n", "se retornará la fila n del triangulo de Pascal\n", "\n", - " 3.\n" + " 5\n" ] }, { "name": "stdout", "output_type": "stream", "text": [ - "\n" - ] - }, - { - "ename": "ValueError", - "evalue": "invalid literal for int() with base 10: '3.'", - "output_type": "error", - "traceback": [ - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[0;31mValueError\u001b[0m Traceback (most recent call last)", - "\u001b[0;32m<ipython-input-28-e4e9f4a68874>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 5\u001b[0m \"\"\")\n\u001b[1;32m 6\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"\"\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 7\u001b[0;31m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mtriangulo_pascal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mnumero_usuario\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m", - "\u001b[0;32m<ipython-input-27-24d483c36d8d>\u001b[0m in \u001b[0;36mtriangulo_pascal\u001b[0;34m(n)\u001b[0m\n\u001b[1;32m 18\u001b[0m \u001b[0;32mbreak\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 19\u001b[0m \u001b[0;32melse\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 20\u001b[0;31m \u001b[0mn\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mn\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 21\u001b[0m \u001b[0;32mreturn\u001b[0m \u001b[0mcorazon_pascal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mn\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 22\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n", - "\u001b[0;31mValueError\u001b[0m: invalid literal for int() with base 10: '3.'" + "\n", + "[1, 4, 6, 4, 1]\n" ] } ], @@ -143,6 +128,58 @@ "Modifique la rutina anterior para que reciba un número variable de argumentos: n1, n2, n3,... y retorne una lista cuyo primer elemento es una lista conteniendo los números en la fila n1 del triángulo de Pascal, el segundo elemento una lista con los números en la fila n2, y asà sucesivamente." ] }, + { + "cell_type": "code", + "execution_count": 33, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "El numero no es entero\n" + ] + } + ], + "source": [ + "def f(x):\n", + " aux=0\n", + " try:\n", + " print(int(x))\n", + " except:\n", + " print(\"El numero no es entero\")\n", + "\n", + "f(3+4j)" + ] + }, + { + "cell_type": "code", + "execution_count": 36, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "1\n" + ] + } + ], + "source": [ + "print(6//4)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Bibliografia utilizada:\n", + "\n", + "+ https://stackoverflow.com/questions/44891070/whats-the-difference-between-str-isdigit-isnumeric-and-isdecimal-in-python\n", + "\n", + "+ " + ] + }, { "cell_type": "code", "execution_count": null,