From 47d2b91ed7c479101f087b95f0b3e0d66f0b8b29 Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Sun, 18 Aug 2024 18:45:00 -0400 Subject: [PATCH 01/12] TAREA 01 --- Tareas/Tarea_01 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Tareas/Tarea_01 diff --git a/Tareas/Tarea_01 b/Tareas/Tarea_01 new file mode 100644 index 0000000..e69de29 From 69dc366077097f8e2994e38558616648073a620a Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Fri, 27 Sep 2024 18:30:02 -0300 Subject: [PATCH 02/12] Update Tarea_01 --- Tareas/Tarea_01 | 1 + 1 file changed, 1 insertion(+) diff --git a/Tareas/Tarea_01 b/Tareas/Tarea_01 index e69de29..8b13789 100644 --- a/Tareas/Tarea_01 +++ b/Tareas/Tarea_01 @@ -0,0 +1 @@ + From 95b7325f7c970622457d8135ef1d0464d46dbc23 Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Fri, 27 Sep 2024 18:34:55 -0300 Subject: [PATCH 03/12] Add files via upload --- Tareas/Tarea_01.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Tareas/Tarea_01.md diff --git a/Tareas/Tarea_01.md b/Tareas/Tarea_01.md new file mode 100644 index 0000000..26737a0 --- /dev/null +++ b/Tareas/Tarea_01.md @@ -0,0 +1,4 @@ +#CONCLUSIONES +En nuestro trabajo de Miro visualizamos diferentes opciones para la próxima investigación. Dentro de los ejemplos que propusimos, rescatamos tres principales; cifras de denuncias de acoso sexual al interior de las Fuerzas Armadas, el porcentaje en que el mar está está avanzando en las costas chilenas . Por último, el que más nos convenció es el tema de las barberías en el Gran Santiago, trabajando bajo la hipótesis de que Estación Central es la que presenta más en relación a su superficie. +https://miro.com/app/board/uXjVKo515qw=/ + From d6e43240e889f0cabe6d4322fde0f3b1b74fb601 Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Sun, 29 Sep 2024 17:12:36 -0300 Subject: [PATCH 04/12] Add files via upload --- TAREA_2.ipynb | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100644 TAREA_2.ipynb diff --git a/TAREA_2.ipynb b/TAREA_2.ipynb new file mode 100644 index 0000000..93e9ea4 --- /dev/null +++ b/TAREA_2.ipynb @@ -0,0 +1,233 @@ +{ + "nbformat": 4, + "nbformat_minor": 0, + "metadata": { + "colab": { + "provenance": [] + }, + "kernelspec": { + "name": "python3", + "display_name": "Python 3" + }, + "language_info": { + "name": "python" + } + }, + "cells": [ + { + "cell_type": "markdown", + "source": [ + "\n", + "\n" + ], + "metadata": { + "id": "4iv7xpMhAVr2" + } + }, + { + "cell_type": "code", + "source": [], + "metadata": { + "id": "awKx7FTAQFfd" + }, + "execution_count": null, + "outputs": [] + }, + { + "cell_type": "code", + "source": [ + "# for\n", + "\n", + "# suma de los primeros 100 números\n", + "\n", + "suma = 0\n", + "for i in range(101):\n", + " suma = suma + i\n", + "print(\"dentro\" + str(suma))\n", + "\n", + "print(\"total\"+ str(suma))" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "0K1R_cktSvJp", + "outputId": "5ed5c92d-95aa-4a80-cd88-6c7590243c5a" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "dentro5050\n", + "total5050\n" + ] + } + ] + }, + { + "cell_type": "code", + "source": [ + "# Hacer un programa que imprima los números del 1 al 100 que sean divisibles entre 3 (con resto 0)\n", + "\n", + "for i in range(101):\n", + " if i % 3 == 0:\n", + " print(i)\n", + "\n" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "rMOlSxqmkGSd", + "outputId": "a6ec85a4-a616-4863-ad4c-3c863811dcf3" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "0\n", + "3\n", + "6\n", + "9\n", + "12\n", + "15\n", + "18\n", + "21\n", + "24\n", + "27\n", + "30\n", + "33\n", + "36\n", + "39\n", + "42\n", + "45\n", + "48\n", + "51\n", + "54\n", + "57\n", + "60\n", + "63\n", + "66\n", + "69\n", + "72\n", + "75\n", + "78\n", + "81\n", + "84\n", + "87\n", + "90\n", + "93\n", + "96\n", + "99\n" + ] + } + ] + }, + { + "cell_type": "markdown", + "source": [], + "metadata": { + "id": "v9rRn-BARirY" + } + }, + { + "cell_type": "code", + "source": [ + "# Pseudocódigo, Sumador y comparador de dos números\n", + "\n", + "# numeroi,numero2,suma,resultado\n", + "#Inicio\n", + "#Leer numeroi + numero2\n", + "#suma = numeroi + numero2\n", + "\n", + "numero1 = int(input(\"Ingrese el primer numero: \"))\n", + "numero2 = int(input(\"Ingrese el segundo numero: \"))\n", + "suma = numero1 + numero2\n", + "print(\"La suma es:\", suma)\n", + "if suma < 100:\n", + " resultado= \"es menor a 100\"\n", + "else:\n", + " if (suma > 100 and suma < 150):\n", + " resultado = \"es mayor a 100 y menor a 150\"\n", + " else:\n", + " resultado = \"es mayor a 150\"\n", + " print(resultado)\n", + "\n", + "\n" + ], + "metadata": { + "id": "muT-BETZSHKi", + "colab": { + "base_uri": "https://localhost:8080/" + }, + "outputId": "7cee6dd5-5ca8-45ec-88b7-164d8476fe1d" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "Ingrese el primer numero: 0\n", + "Ingrese el segundo numero: 1\n", + "La suma es: 1\n" + ] + } + ] + }, + { + "cell_type": "code", + "source": [ + "# @title Default title text\n", + "# Pseudocódigo\n", + "# Generar un programa que combine variables, tipos de datos y una condicional\n", + "# edad,gustar_programar\n", + "\n", + "# Inicio\n", + "# Leer edad y gusta_programar\n", + "edad = int(input(\"Ingresa tu edad: \")) # Se agrega la linea para leer la edad del usuario\n", + "gusta_programar = input(\"Te gusta programar? (responde con True o False): \")\n", + "# Se agrega la linea para leer si le gusta programar\n", + "gusta_programar = gusta_programar.lower() == 'true'\n", + "# Convertir la respuesta a booleano\n", + "if (edad > 18 and gusta_programar):\n", + " promedio = \"Eres mayor de edad y te gusta programar\"\n", + "else:\n", + " pass # or some other action if the condition is not met\n", + " promedio= \"Eres mayor de edad pero no te gusta programar\"\n", + "#Fin Si\n", + "print(promedio)\n" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "MIie5pwjpuL8", + "outputId": "62b54381-1111-4626-b226-662d62695a1c" + }, + "execution_count": 27, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "Ingresa tu edad: 20\n", + "Te gusta programar? (responde con True o False): True\n", + "Eres mayor de edad y te gusta programar\n" + ] + } + ] + }, + { + "cell_type": "markdown", + "source": [], + "metadata": { + "id": "hvetFznMXulc" + } + } + ] +} \ No newline at end of file From 798f794b863c919850b423a81b3f9bd6afc4edb2 Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Sun, 29 Sep 2024 17:13:23 -0300 Subject: [PATCH 05/12] Add files via upload --- Tareas/TAREA_2.ipynb | 233 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) create mode 100644 Tareas/TAREA_2.ipynb diff --git a/Tareas/TAREA_2.ipynb b/Tareas/TAREA_2.ipynb new file mode 100644 index 0000000..93e9ea4 --- /dev/null +++ b/Tareas/TAREA_2.ipynb @@ -0,0 +1,233 @@ +{ + "nbformat": 4, + "nbformat_minor": 0, + "metadata": { + "colab": { + "provenance": [] + }, + "kernelspec": { + "name": "python3", + "display_name": "Python 3" + }, + "language_info": { + "name": "python" + } + }, + "cells": [ + { + "cell_type": "markdown", + "source": [ + "\n", + "\n" + ], + "metadata": { + "id": "4iv7xpMhAVr2" + } + }, + { + "cell_type": "code", + "source": [], + "metadata": { + "id": "awKx7FTAQFfd" + }, + "execution_count": null, + "outputs": [] + }, + { + "cell_type": "code", + "source": [ + "# for\n", + "\n", + "# suma de los primeros 100 números\n", + "\n", + "suma = 0\n", + "for i in range(101):\n", + " suma = suma + i\n", + "print(\"dentro\" + str(suma))\n", + "\n", + "print(\"total\"+ str(suma))" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "0K1R_cktSvJp", + "outputId": "5ed5c92d-95aa-4a80-cd88-6c7590243c5a" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "dentro5050\n", + "total5050\n" + ] + } + ] + }, + { + "cell_type": "code", + "source": [ + "# Hacer un programa que imprima los números del 1 al 100 que sean divisibles entre 3 (con resto 0)\n", + "\n", + "for i in range(101):\n", + " if i % 3 == 0:\n", + " print(i)\n", + "\n" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "rMOlSxqmkGSd", + "outputId": "a6ec85a4-a616-4863-ad4c-3c863811dcf3" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "0\n", + "3\n", + "6\n", + "9\n", + "12\n", + "15\n", + "18\n", + "21\n", + "24\n", + "27\n", + "30\n", + "33\n", + "36\n", + "39\n", + "42\n", + "45\n", + "48\n", + "51\n", + "54\n", + "57\n", + "60\n", + "63\n", + "66\n", + "69\n", + "72\n", + "75\n", + "78\n", + "81\n", + "84\n", + "87\n", + "90\n", + "93\n", + "96\n", + "99\n" + ] + } + ] + }, + { + "cell_type": "markdown", + "source": [], + "metadata": { + "id": "v9rRn-BARirY" + } + }, + { + "cell_type": "code", + "source": [ + "# Pseudocódigo, Sumador y comparador de dos números\n", + "\n", + "# numeroi,numero2,suma,resultado\n", + "#Inicio\n", + "#Leer numeroi + numero2\n", + "#suma = numeroi + numero2\n", + "\n", + "numero1 = int(input(\"Ingrese el primer numero: \"))\n", + "numero2 = int(input(\"Ingrese el segundo numero: \"))\n", + "suma = numero1 + numero2\n", + "print(\"La suma es:\", suma)\n", + "if suma < 100:\n", + " resultado= \"es menor a 100\"\n", + "else:\n", + " if (suma > 100 and suma < 150):\n", + " resultado = \"es mayor a 100 y menor a 150\"\n", + " else:\n", + " resultado = \"es mayor a 150\"\n", + " print(resultado)\n", + "\n", + "\n" + ], + "metadata": { + "id": "muT-BETZSHKi", + "colab": { + "base_uri": "https://localhost:8080/" + }, + "outputId": "7cee6dd5-5ca8-45ec-88b7-164d8476fe1d" + }, + "execution_count": null, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "Ingrese el primer numero: 0\n", + "Ingrese el segundo numero: 1\n", + "La suma es: 1\n" + ] + } + ] + }, + { + "cell_type": "code", + "source": [ + "# @title Default title text\n", + "# Pseudocódigo\n", + "# Generar un programa que combine variables, tipos de datos y una condicional\n", + "# edad,gustar_programar\n", + "\n", + "# Inicio\n", + "# Leer edad y gusta_programar\n", + "edad = int(input(\"Ingresa tu edad: \")) # Se agrega la linea para leer la edad del usuario\n", + "gusta_programar = input(\"Te gusta programar? (responde con True o False): \")\n", + "# Se agrega la linea para leer si le gusta programar\n", + "gusta_programar = gusta_programar.lower() == 'true'\n", + "# Convertir la respuesta a booleano\n", + "if (edad > 18 and gusta_programar):\n", + " promedio = \"Eres mayor de edad y te gusta programar\"\n", + "else:\n", + " pass # or some other action if the condition is not met\n", + " promedio= \"Eres mayor de edad pero no te gusta programar\"\n", + "#Fin Si\n", + "print(promedio)\n" + ], + "metadata": { + "colab": { + "base_uri": "https://localhost:8080/" + }, + "id": "MIie5pwjpuL8", + "outputId": "62b54381-1111-4626-b226-662d62695a1c" + }, + "execution_count": 27, + "outputs": [ + { + "output_type": "stream", + "name": "stdout", + "text": [ + "Ingresa tu edad: 20\n", + "Te gusta programar? (responde con True o False): True\n", + "Eres mayor de edad y te gusta programar\n" + ] + } + ] + }, + { + "cell_type": "markdown", + "source": [], + "metadata": { + "id": "hvetFznMXulc" + } + } + ] +} \ No newline at end of file From e09522bbefb70451810ada2c94c5feaf43c0eba9 Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:59:19 -0300 Subject: [PATCH 06/12] Create ENTREGA 2 --- ENTREGA 2 | 1 + 1 file changed, 1 insertion(+) create mode 100644 ENTREGA 2 diff --git a/ENTREGA 2 b/ENTREGA 2 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/ENTREGA 2 @@ -0,0 +1 @@ + From c06b6e9ef831ed9a2d5de7bc24a446ee6e21e6bc Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Sun, 10 Nov 2024 11:57:08 -0300 Subject: [PATCH 07/12] Create tarea 3 --- Tareas/tarea 3 | 1 + 1 file changed, 1 insertion(+) create mode 100644 Tareas/tarea 3 diff --git a/Tareas/tarea 3 b/Tareas/tarea 3 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Tareas/tarea 3 @@ -0,0 +1 @@ + From abd865775914ac88f3f37f27f990be858b0695df Mon Sep 17 00:00:00 2001 From: vicholueiza <91570334+Vichosilvad@users.noreply.github.com> Date: Sun, 10 Nov 2024 12:05:19 -0300 Subject: [PATCH 08/12] tarea 3 --- Tareas/docs/index.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Tareas/docs/index.html diff --git a/Tareas/docs/index.html b/Tareas/docs/index.html new file mode 100644 index 0000000..c05ab23 --- /dev/null +++ b/Tareas/docs/index.html @@ -0,0 +1,20 @@ + + +
+ ++ Este es un párrafo +
+ + + + +Estudiante de periodismo de la Pontificia Universidad Católica, en mi cuarto año de carrera. Soy eficiente trabajando bajando bajo presión y muy comprometido con los proyectos. +
+