diff --git a/ejercicio2.html b/ejercicio2.html index de78ac6f2bfd644bfbd4b736a040b6523878efa4..62b99b246cd6643ad02f050a27028b2ed2bad729 100644 --- a/ejercicio2.html +++ b/ejercicio2.html @@ -14304,6 +14304,7 @@ $$ {n\choose k} = \frac{n!}{k!(n-k)!} .$$ <div class="jp-CodeMirrorEditor jp-Editor jp-InputArea-editor" data-type="inline"> <div class="CodeMirror cm-s-jupyter"> <div class=" highlight hl-ipython3"><pre><span></span><span class="k">def</span> <span class="nf">pascal1</span><span class="p">(</span><span class="n">n</span><span class="p">):</span> + <span class="sd">"""Prints the n-row of Pascal's triangle."""</span> <span class="k">if</span> <span class="nb">int</span><span class="p">(</span><span class="n">n</span><span class="p">)</span><span class="o">==</span><span class="n">n</span><span class="p">:</span> <span class="c1"># reviso que el número sea entero</span> <span class="n">row</span> <span class="o">=</span> <span class="s1">''</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">n</span><span class="o">+</span><span class="mi">1</span><span class="p">):</span> <span class="c1"># calculo cada uno de los coeficientes binomiales y lo almaceno en fila </span> @@ -14441,6 +14442,7 @@ $$ {n\choose k} = \frac{n!}{k!(n-k)!} .$$ <div class="jp-CodeMirrorEditor jp-Editor jp-InputArea-editor" data-type="inline"> <div class="CodeMirror cm-s-jupyter"> <div class=" highlight hl-ipython3"><pre><span></span><span class="k">def</span> <span class="nf">pascal2</span><span class="p">(</span><span class="n">n</span><span class="p">):</span> + <span class="sd">"""Prints the nth-row of Pascal's triangle."""</span> <span class="k">if</span> <span class="nb">int</span><span class="p">(</span><span class="n">n</span><span class="p">)</span> <span class="o">!=</span> <span class="n">n</span><span class="p">:</span> <span class="nb">print</span><span class="p">(</span><span class="s1">'Error: el número ingresado no es entero'</span><span class="p">)</span> <span class="k">elif</span> <span class="n">n</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span> <span class="c1"># sabemos que la primera fila es un 1</span> @@ -14659,6 +14661,7 @@ $$ {n\choose k} = \frac{n!}{k!(n-k)!} .$$ <div class="jp-CodeMirrorEditor jp-Editor jp-InputArea-editor" data-type="inline"> <div class="CodeMirror cm-s-jupyter"> <div class=" highlight hl-ipython3"><pre><span></span><span class="k">def</span> <span class="nf">multipascal</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">):</span> + <span class="sd">"""Returns a list with the arg1, arg2, arg3 th-row of Pascal's triangle."""</span> <span class="n">nmax</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">)</span> <span class="n">rows</span> <span class="o">=</span> <span class="p">[]</span> <span class="k">if</span> <span class="ow">not</span> <span class="nb">all</span><span class="p">(</span><span class="nb">int</span><span class="p">(</span><span class="n">n</span><span class="p">)</span> <span class="o">==</span> <span class="n">n</span> <span class="k">for</span> <span class="n">n</span> <span class="ow">in</span> <span class="n">args</span><span class="p">):</span> <span class="c1"># usando all() para verificar que todos los números sean enteros</span> diff --git a/ejercicio2.ipynb b/ejercicio2.ipynb index 205b1c567e8a85a5f5d135a27c2327d86007f084..d9cd2be3171323ba9b26cbd85a85afb47dfd1ce5 100644 --- a/ejercicio2.ipynb +++ b/ejercicio2.ipynb @@ -53,6 +53,7 @@ "outputs": [], "source": [ "def pascal1(n):\n", + " \"\"\"Prints the n-row of Pascal's triangle.\"\"\"\n", " if int(n)==n: # reviso que el número sea entero\n", " row = ''\n", " for i in range(n+1): # calculo cada uno de los coeficientes binomiales y lo almaceno en fila \n", @@ -134,6 +135,7 @@ "outputs": [], "source": [ "def pascal2(n):\n", + " \"\"\"Prints the nth-row of Pascal's triangle.\"\"\"\n", " if int(n) != n:\n", " print('Error: el número ingresado no es entero')\n", " elif n == 0: # sabemos que la primera fila es un 1\n", @@ -259,6 +261,7 @@ "outputs": [], "source": [ "def multipascal(*args):\n", + " \"\"\"Returns a list with the arg1, arg2, arg3 th-row of Pascal's triangle.\"\"\"\n", " nmax = max(*args)\n", " rows = []\n", " if not all(int(n) == n for n in args): # usando all() para verificar que todos los números sean enteros\n",