From 4a4f7951a2c03d80bfc8c302167c1f41488b35b1 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 19:38:16 +0000 Subject: [PATCH 01/65] Setting up GitHub Classroom Feedback From 9685db437966bd68d94d057d3fc9b506b5a632f1 Mon Sep 17 00:00:00 2001 From: o0jolie0o <69598597+o0jolie0o@users.noreply.github.com> Date: Fri, 3 Jun 2022 17:31:23 -0300 Subject: [PATCH 02/65] Create README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..ebcb308 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# a6g2-team-1 +a6g2-team-1 created by GitHub Classroom + +Prueba online de readme.txt + From fa18cf7c6f543b18e0888e2f79039a270afd5e72 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 6 Jun 2022 14:20:27 +0000 Subject: [PATCH 03/65] First commit --- main.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 main.py diff --git a/main.py b/main.py new file mode 100644 index 0000000..c37ecb1 --- /dev/null +++ b/main.py @@ -0,0 +1 @@ +print("Hola") \ No newline at end of file From b4d5961751ee3ff1dca234ba3e4a8ed044fa80fb Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Mon, 6 Jun 2022 12:28:32 -0300 Subject: [PATCH 04/65] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prueba de edición --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebcb308..e754523 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ a6g2-team-1 created by GitHub Classroom Prueba online de readme.txt - +Sebastian Galvan From 4f6a4deaa6b9d1cc939021b13282104ae9f4f4f1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Geronimo Date: Mon, 6 Jun 2022 14:45:15 -0300 Subject: [PATCH 05/65] Prueba de edicion - Fernando --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e754523..58ed6ac 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,5 @@ a6g2-team-1 created by GitHub Classroom Prueba online de readme.txt Sebastian Galvan + +Fernando Geronimo From b13b68664ea8b3bd12818a5adc76745e158e4607 Mon Sep 17 00:00:00 2001 From: Ariameg <94706001+Ariameg@users.noreply.github.com> Date: Mon, 6 Jun 2022 14:51:04 -0300 Subject: [PATCH 06/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 58ed6ac..cad9b80 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ Prueba online de readme.txt Sebastian Galvan Fernando Geronimo + +Maira Gaytan From b04a50c1dbab48821ad96e0014b596da0edefc0f Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Mon, 6 Jun 2022 15:23:28 -0300 Subject: [PATCH 07/65] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cad9b80..e58b66f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ a6g2-team-1 created by GitHub Classroom Prueba online de readme.txt -Sebastian Galvan + +Sebastian Galvan 🐱‍👤 Fernando Geronimo From 8d1e3dfdd733b98f5446f7173563a2d0b97559c7 Mon Sep 17 00:00:00 2001 From: jochigallotti37 <105987122+jochigallotti37@users.noreply.github.com> Date: Mon, 6 Jun 2022 18:44:39 -0300 Subject: [PATCH 08/65] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e58b66f..a146773 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,4 @@ Sebastian Galvan 🐱‍👤 Fernando Geronimo Maira Gaytan +Jose Pablo Gallotti From 0ad91056ed1f12763fbab61e6f0c7ab575e920ea Mon Sep 17 00:00:00 2001 From: jochigallotti37 <105987122+jochigallotti37@users.noreply.github.com> Date: Mon, 6 Jun 2022 18:45:19 -0300 Subject: [PATCH 09/65] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a146773..ced6a70 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,5 @@ Sebastian Galvan 🐱‍👤 Fernando Geronimo Maira Gaytan -Jose Pablo Gallotti + +Jose Pablo Gallotti. From 5ff23c06776c9aaea99c8c20ccb9e5c8f4c143c1 Mon Sep 17 00:00:00 2001 From: agv-ispc <106855460+agv-ispc@users.noreply.github.com> Date: Mon, 6 Jun 2022 18:45:51 -0300 Subject: [PATCH 10/65] Update README.md de Gimenez Adrian --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ced6a70..ca21156 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ Fernando Geronimo Maira Gaytan -Jose Pablo Gallotti. +Gimenez Veron Adrian From 94eb6911869976f20a29289a988b94adb37cfb9e Mon Sep 17 00:00:00 2001 From: pedroispc <106284729+pedroispc@users.noreply.github.com> Date: Mon, 6 Jun 2022 19:02:19 -0300 Subject: [PATCH 11/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ca21156..ab392c9 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,5 @@ Fernando Geronimo Maira Gaytan Gimenez Veron Adrian + +Pedro Ghirardi From 7ed191a923141167f6193ceee804d8605b06b1ca Mon Sep 17 00:00:00 2001 From: jochigallotti37 <105987122+jochigallotti37@users.noreply.github.com> Date: Mon, 6 Jun 2022 19:28:35 -0300 Subject: [PATCH 12/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ab392c9..0c297ca 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,5 @@ Maira Gaytan Gimenez Veron Adrian Pedro Ghirardi + +Jose Pablo Gallotti From 8b9956bc2c4bbbd006ef9d2adf9bcc18b2e6669b Mon Sep 17 00:00:00 2001 From: GamarraDavid <106995607+GamarraDavid@users.noreply.github.com> Date: Tue, 7 Jun 2022 08:51:09 -0300 Subject: [PATCH 13/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0c297ca..cae384d 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,5 @@ Gimenez Veron Adrian Pedro Ghirardi Jose Pablo Gallotti + +David Gamarra From 8383334f28f9de9b5c3207619cc1fd7aa62f62b2 Mon Sep 17 00:00:00 2001 From: o0jolie0o <69598597+o0jolie0o@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:17:43 -0300 Subject: [PATCH 14/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cae384d..4c78214 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ a6g2-team-1 created by GitHub Classroom Prueba online de readme.txt +Ma. Inés García B.🦄 + Sebastian Galvan 🐱‍👤 Fernando Geronimo From bad3da63a4c2628f5f78e382635b33e721729458 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:20:12 -0300 Subject: [PATCH 15/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4c78214..6b9d615 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,5 @@ Pedro Ghirardi Jose Pablo Gallotti David Gamarra + +Julian Grosso \ No newline at end of file From 42c3a845f7d84b51d5718eb4139f36094a6a9f94 Mon Sep 17 00:00:00 2001 From: eber102011 <53438888+eber102011@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:37:03 -0300 Subject: [PATCH 16/65] Update README.md Me agregue e hice la prueba en el readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b9d615..686753d 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,6 @@ Jose Pablo Gallotti David Gamarra -Julian Grosso \ No newline at end of file +Julian Grosso + +Eber Gonzalez From b15d593b43eed1618db52325a8e33e00e04a9e8b Mon Sep 17 00:00:00 2001 From: eber102011 Date: Wed, 8 Jun 2022 14:42:59 -0300 Subject: [PATCH 17/65] probando archivos --- prueba.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 prueba.txt diff --git a/prueba.txt b/prueba.txt new file mode 100644 index 0000000..a854851 --- /dev/null +++ b/prueba.txt @@ -0,0 +1,2 @@ +estoy probando la rama y hacer un push y un pool request + \ No newline at end of file From 3bd4b73d6d08c58cc79997a3b2f8f9160a64643e Mon Sep 17 00:00:00 2001 From: eber102011 <53438888+eber102011@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:48:16 -0300 Subject: [PATCH 18/65] Delete prueba.txt borro porque era solo de prueba --- prueba.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 prueba.txt diff --git a/prueba.txt b/prueba.txt deleted file mode 100644 index a854851..0000000 --- a/prueba.txt +++ /dev/null @@ -1,2 +0,0 @@ -estoy probando la rama y hacer un push y un pool request - \ No newline at end of file From c181cd918638576b439c9b8c542aacbd7f8edaf5 Mon Sep 17 00:00:00 2001 From: eber102011 <53438888+eber102011@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:48:51 -0300 Subject: [PATCH 19/65] Delete prueba.txt borro porque era de prueba --- prueba.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 prueba.txt diff --git a/prueba.txt b/prueba.txt deleted file mode 100644 index a854851..0000000 --- a/prueba.txt +++ /dev/null @@ -1,2 +0,0 @@ -estoy probando la rama y hacer un push y un pool request - \ No newline at end of file From e6e83129baaa849bd5746ffe77601d9dc03d2817 Mon Sep 17 00:00:00 2001 From: fabiang78 <105511071+fabiang78@users.noreply.github.com> Date: Fri, 10 Jun 2022 11:53:50 -0300 Subject: [PATCH 20/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 686753d..2afdbf1 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ David Gamarra Julian Grosso Eber Gonzalez + +fabian gomez From 12f5ff6b4812867466717535dfc69fabb19d9837 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:29:49 -0300 Subject: [PATCH 21/65] Crear Aplicacion A6G2.py --- A6G2.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 A6G2.py diff --git a/A6G2.py b/A6G2.py new file mode 100644 index 0000000..ce61b65 --- /dev/null +++ b/A6G2.py @@ -0,0 +1,7 @@ +from bienvenida import bienvenida +from ing2Enteros import ing2i +from ing2Stirngs import ing2s + +bienvenida() +ing2i() +ing2s() \ No newline at end of file From 6b0ab177319fca51b9f09207fe79fb30470bd524 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:30:18 -0300 Subject: [PATCH 22/65] Crear Aplicacion que muestra cartel de bienvenida --- bienvenida.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 bienvenida.py diff --git a/bienvenida.py b/bienvenida.py new file mode 100644 index 0000000..d4f239c --- /dev/null +++ b/bienvenida.py @@ -0,0 +1,7 @@ +def bienvenida(): + + """ + Muestra un cartel de bienvenida + """ + + print("Bienvenid@s!!") \ No newline at end of file From d7dc8881837ade18fcf961f49e9aafcaee106278 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:30:57 -0300 Subject: [PATCH 23/65] Crear Aplicacion que me permita ingresar dos numeros --- ing2Enteros.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 ing2Enteros.py diff --git a/ing2Enteros.py b/ing2Enteros.py new file mode 100644 index 0000000..ba335ba --- /dev/null +++ b/ing2Enteros.py @@ -0,0 +1,8 @@ +def ing2i(): + + """ + Permite ingresar 2 numeros + """ + + num1 = int(input('Ingrese numero 1: ')) + num2 = int(input('Ingrese numero 2: ')) \ No newline at end of file From 3713ea6e6fb94c0adbaf34e1af2557b380ebee6f Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:33:53 -0300 Subject: [PATCH 24/65] Modificacion de nombre de archivo que se importa --- A6G2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A6G2.py b/A6G2.py index ce61b65..41c9948 100644 --- a/A6G2.py +++ b/A6G2.py @@ -1,6 +1,6 @@ from bienvenida import bienvenida from ing2Enteros import ing2i -from ing2Stirngs import ing2s +from ing2Strings import ing2s bienvenida() ing2i() From 20dfec478c98ba7d54f8e75f09e303592a370985 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:34:32 -0300 Subject: [PATCH 25/65] Crear funcion que me permita ingresar dos cadenas --- ing2Strings.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 ing2Strings.py diff --git a/ing2Strings.py b/ing2Strings.py new file mode 100644 index 0000000..9ba4c33 --- /dev/null +++ b/ing2Strings.py @@ -0,0 +1,8 @@ +def ing2s(): + """ + Permite ingresar 2 cadenas + """ + + + cadena1 = input('Ingrese numero 1: ') + cadena2 = input('Ingrese numero 2: ') \ No newline at end of file From 6c75b82dae45d6f7e952bff82fac672b4b75ca66 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 03:35:08 -0300 Subject: [PATCH 26/65] Archivo .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed8ebf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ \ No newline at end of file From e6902c033cc35f05bed24c0a46fa077ea4588447 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 10:54:55 -0300 Subject: [PATCH 27/65] [REF] Modificar inputs de cadenas --- ing2Strings.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ing2Strings.py b/ing2Strings.py index 9ba4c33..6e5e77e 100644 --- a/ing2Strings.py +++ b/ing2Strings.py @@ -2,7 +2,5 @@ def ing2s(): """ Permite ingresar 2 cadenas """ - - - cadena1 = input('Ingrese numero 1: ') - cadena2 = input('Ingrese numero 2: ') \ No newline at end of file + cadena1 = input('Ingrese cadena 1: ') + cadena2 = input('Ingrese cadena 2: ') \ No newline at end of file From 8bd123de389719dca21f89b0954639ef652b68b1 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 15:31:16 -0300 Subject: [PATCH 28/65] [REF] Mostrar el retorno de las funciones --- A6G2.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/A6G2.py b/A6G2.py index 41c9948..b471aad 100644 --- a/A6G2.py +++ b/A6G2.py @@ -3,5 +3,8 @@ from ing2Strings import ing2s bienvenida() -ing2i() -ing2s() \ No newline at end of file +nums = ing2i() +cadenas = ing2s() + +print(nums) +print(cadenas) \ No newline at end of file From 49d098b1950759b43cf5d2f66f1b6a2004cf3387 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 15:31:56 -0300 Subject: [PATCH 29/65] [REF] Retornar los numeros ingresados --- ing2Enteros.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ing2Enteros.py b/ing2Enteros.py index ba335ba..e04aaaf 100644 --- a/ing2Enteros.py +++ b/ing2Enteros.py @@ -3,6 +3,6 @@ def ing2i(): """ Permite ingresar 2 numeros """ - num1 = int(input('Ingrese numero 1: ')) - num2 = int(input('Ingrese numero 2: ')) \ No newline at end of file + num2 = int(input('Ingrese numero 2: ')) + return num1, num2 \ No newline at end of file From f4e5250e74a94713ebf41c09b36bc8daa867f973 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sat, 11 Jun 2022 15:32:15 -0300 Subject: [PATCH 30/65] [REF] Retornar las cadenas ingresadas --- ing2Strings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ing2Strings.py b/ing2Strings.py index 6e5e77e..0b26d90 100644 --- a/ing2Strings.py +++ b/ing2Strings.py @@ -3,4 +3,5 @@ def ing2s(): Permite ingresar 2 cadenas """ cadena1 = input('Ingrese cadena 1: ') - cadena2 = input('Ingrese cadena 2: ') \ No newline at end of file + cadena2 = input('Ingrese cadena 2: ') + return cadena1, cadena2 \ No newline at end of file From 8404a1a18aaa0c532a4853d30b794d87f0de7d12 Mon Sep 17 00:00:00 2001 From: Pedro Ghirardi Date: Sat, 11 Jun 2022 20:16:06 -0300 Subject: [PATCH 31/65] Agregar archivo funcion_suma.py --- funcion_suma.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 funcion_suma.py diff --git a/funcion_suma.py b/funcion_suma.py new file mode 100644 index 0000000..e69de29 From ec0228d19dab136ee05e3e24c5a29ec063a49647 Mon Sep 17 00:00:00 2001 From: pedroispc <106284729+pedroispc@users.noreply.github.com> Date: Sat, 11 Jun 2022 20:32:49 -0300 Subject: [PATCH 32/65] Delete funcion_suma.py --- funcion_suma.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 funcion_suma.py diff --git a/funcion_suma.py b/funcion_suma.py deleted file mode 100644 index e69de29..0000000 From d63e6f02edd37b2f1df2617462d4a8aaea198af7 Mon Sep 17 00:00:00 2001 From: pedroispc <106284729+pedroispc@users.noreply.github.com> Date: Sat, 11 Jun 2022 20:33:07 -0300 Subject: [PATCH 33/65] Delete funcion_suma.py --- funcion_suma.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 funcion_suma.py diff --git a/funcion_suma.py b/funcion_suma.py deleted file mode 100644 index e69de29..0000000 From f3e3374a4ef00e73307547df544e00475e1bf3da Mon Sep 17 00:00:00 2001 From: Pedro Ghirardi Date: Sat, 11 Jun 2022 20:39:20 -0300 Subject: [PATCH 34/65] Agregar archivo funcion_suma --- funcion_suma.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 funcion_suma.py diff --git a/funcion_suma.py b/funcion_suma.py new file mode 100644 index 0000000..c626739 --- /dev/null +++ b/funcion_suma.py @@ -0,0 +1,10 @@ + +#para1=hace referencia al parametro1 +#para2=hace referencia al parametro2 +#rtdo=hace referencia al resultado de la funcion suma + + +def suma(para1, para2): + global rtdo + rtdo= para1+para2 + print(f"El resultado de la suma entre el parametro 1 y el parametro 2 es: {rtdo}") \ No newline at end of file From d0e524141657f3ab1d058bf15aa0b294bf127f87 Mon Sep 17 00:00:00 2001 From: fabiang78 Date: Sun, 12 Jun 2022 17:03:07 -0300 Subject: [PATCH 35/65] agregar archivo funciongenrnd --- funciongenrnd.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 funciongenrnd.py diff --git a/funciongenrnd.py b/funciongenrnd.py new file mode 100644 index 0000000..e270645 --- /dev/null +++ b/funciongenrnd.py @@ -0,0 +1,17 @@ + +import random as r +def genrnd (): + + + for i in range (50): + print( r.randint (0,100)) + + return +#prueba +#genrnd () + + + + + + From c7b4a586dbdf549e31f87a512df732f3350cf1a5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Geronimo Date: Sun, 12 Jun 2022 18:24:59 -0300 Subject: [PATCH 36/65] Funcion Resta (Ej_2) Terminada. --- Func_Resta.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Func_Resta.py diff --git a/Func_Resta.py b/Func_Resta.py new file mode 100644 index 0000000..e5c962d --- /dev/null +++ b/Func_Resta.py @@ -0,0 +1,8 @@ +def Fun_resta(num_1,num_2): + """" + === Función Resta === + Parametros: "num_1" y "num_2" + Descripcion: Esta funcion recibe dos parametros del tipo numéricos y retorna la resta entre dichos parametros. + + """ + return (num_1 - num_2) \ No newline at end of file From b7837dc3c529b887fd18dc5891f5aae90c10402a Mon Sep 17 00:00:00 2001 From: fabiang78 Date: Sun, 12 Jun 2022 18:28:01 -0300 Subject: [PATCH 37/65] agregar modificacion --- funciongenrnd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/funciongenrnd.py b/funciongenrnd.py index e270645..f84143d 100644 --- a/funciongenrnd.py +++ b/funciongenrnd.py @@ -1,12 +1,12 @@ import random as r def genrnd (): - + my_list= [] for i in range (50): print( r.randint (0,100)) - return + return my_list #prueba #genrnd () From 57ce5dd77931e05c7963e8009cf62c8f6f402f0e Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Sun, 12 Jun 2022 19:07:57 -0300 Subject: [PATCH 38/65] [ADD] Funcion producto --- producto.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 producto.py diff --git a/producto.py b/producto.py new file mode 100644 index 0000000..18e8e9f --- /dev/null +++ b/producto.py @@ -0,0 +1,11 @@ +def producto(n1, n2): + """Devuelve el producto entre dos parametros + + Args: + n1 (int | float) + n2 (int | float) + + Returns: + (int | float) + """ + return n1 * n2 \ No newline at end of file From 2558b2d6b9d4aa3295341a603f021684e9a7ca0b Mon Sep 17 00:00:00 2001 From: fabiang78 Date: Sun, 12 Jun 2022 20:22:30 -0300 Subject: [PATCH 39/65] nueva modificacion --- funciongenrnd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/funciongenrnd.py b/funciongenrnd.py index f84143d..ad1ff20 100644 --- a/funciongenrnd.py +++ b/funciongenrnd.py @@ -4,11 +4,11 @@ def genrnd (): my_list= [] for i in range (50): - print( r.randint (0,100)) + my_list.append( r.randint (0,100)) return my_list -#prueba -#genrnd () +lista= genrnd() +lista From c2f4360bf3e54cabecfaf46a75a46fbf41fae430 Mon Sep 17 00:00:00 2001 From: fabiang78 Date: Sun, 12 Jun 2022 20:26:21 -0300 Subject: [PATCH 40/65] ultima modificacion --- funciongenrnd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/funciongenrnd.py b/funciongenrnd.py index ad1ff20..649e487 100644 --- a/funciongenrnd.py +++ b/funciongenrnd.py @@ -7,8 +7,7 @@ def genrnd (): my_list.append( r.randint (0,100)) return my_list -lista= genrnd() -lista + From 12135007c1db1ebca1acf0f5a4fb8820b30b0b33 Mon Sep 17 00:00:00 2001 From: pedroispc <106284729+pedroispc@users.noreply.github.com> Date: Sun, 12 Jun 2022 20:35:13 -0300 Subject: [PATCH 41/65] Update funcion_suma.py --- funcion_suma.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/funcion_suma.py b/funcion_suma.py index c626739..e55d801 100644 --- a/funcion_suma.py +++ b/funcion_suma.py @@ -1,10 +1,15 @@ #para1=hace referencia al parametro1 #para2=hace referencia al parametro2 -#rtdo=hace referencia al resultado de la funcion suma + def suma(para1, para2): - global rtdo - rtdo= para1+para2 - print(f"El resultado de la suma entre el parametro 1 y el parametro 2 es: {rtdo}") \ No newline at end of file + """Devuelve el la suma entre dos parametros + Args: + n1 (int | float) + n2 (int | float) + Returns: + (int | float) + """ + return para1+para2 From 2a400669fa2dc79e3e41d946c975c2691d1215a9 Mon Sep 17 00:00:00 2001 From: Pedro Ghirardi Date: Sun, 12 Jun 2022 21:42:49 -0300 Subject: [PATCH 42/65] agregar funcion_suma.py --- funcion_suma.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 funcion_suma.py diff --git a/funcion_suma.py b/funcion_suma.py new file mode 100644 index 0000000..e69de29 From 1c5b1e779cd6c9360f5f93755f05fb969bebde64 Mon Sep 17 00:00:00 2001 From: Pedro Ghirardi Date: Sun, 12 Jun 2022 21:48:02 -0300 Subject: [PATCH 43/65] Agrega funcion_suma.py --- funcion_suma.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/funcion_suma.py b/funcion_suma.py index e69de29..54eb801 100644 --- a/funcion_suma.py +++ b/funcion_suma.py @@ -0,0 +1,14 @@ +#para1=hace referencia al parametro1 +#para2=hace referencia al parametro2 + + + +def suma(para1, para2): + """Devuelve el la suma entre dos parametros + Args: + para1 (int | float) + para2 (int | float) + Returns: + (int | float) + """ + return para1+para2 \ No newline at end of file From c1bdbfea88238db29e5cd547ee62c2f9a1b47949 Mon Sep 17 00:00:00 2001 From: o0jolie0o <69598597+o0jolie0o@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:17:43 -0300 Subject: [PATCH 44/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cae384d..4c78214 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ a6g2-team-1 created by GitHub Classroom Prueba online de readme.txt +Ma. Inés García B.🦄 + Sebastian Galvan 🐱‍👤 Fernando Geronimo From 23e647bab5b836a08a00e831b906ae8a001216c4 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:20:12 -0300 Subject: [PATCH 45/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4c78214..6b9d615 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,5 @@ Pedro Ghirardi Jose Pablo Gallotti David Gamarra + +Julian Grosso \ No newline at end of file From c2a64decb8df889af0d253dc9912d82d70eb7442 Mon Sep 17 00:00:00 2001 From: eber102011 <53438888+eber102011@users.noreply.github.com> Date: Wed, 8 Jun 2022 14:37:03 -0300 Subject: [PATCH 46/65] Update README.md Me agregue e hice la prueba en el readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b9d615..686753d 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,6 @@ Jose Pablo Gallotti David Gamarra -Julian Grosso \ No newline at end of file +Julian Grosso + +Eber Gonzalez From a9d1abeaf47100e1fe2103ff6a8bcc9364709819 Mon Sep 17 00:00:00 2001 From: fabiang78 <105511071+fabiang78@users.noreply.github.com> Date: Fri, 10 Jun 2022 11:53:50 -0300 Subject: [PATCH 47/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 686753d..2afdbf1 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,5 @@ David Gamarra Julian Grosso Eber Gonzalez + +fabian gomez From 3dc5f0785554081ed0ef5eaa4aa9fcf7ff929194 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sat, 11 Jun 2022 01:50:36 -0300 Subject: [PATCH 48/65] =?UTF-8?q?Creaci=C3=B3n=20del=20archivo=20y=20de=20?= =?UTF-8?q?la=20funci=C3=B3n=20necesaria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- func_p1.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 func_p1.py diff --git a/func_p1.py b/func_p1.py new file mode 100644 index 0000000..4c06634 --- /dev/null +++ b/func_p1.py @@ -0,0 +1,31 @@ +# Simulación de funciones necesarias de otros archivos: +# (Una vez creadas por los demás las importo) + +# Resta entre 2 parametros +def resta(p1, p2): + return p1 - p2 + +# Producto entre 2 parametros +def producto(p1, p2): + return p1 * p2 + +# -------------------------------------- + +def p1(param1, param2, param3): + """Función que resta los dos primeros parámetros "p1" y "p2" y los + multipica por el parámetro "p3" usando las funciones externas "resta" y "producto". + + Args: + p1 (float): Numero tipo float. + p2 (float): Numero tipo float. + p3 (float): Numero tipo float. + + Returns: + float: Resultado final de las operaciones con redondeo a 2 decimales. + """ + + op_resta = resta(param1, param2) + result = round(producto(op_resta, param3), 2) + + return result + From d2632ff0ca8a7961f8b1c5d5b598cfc92c92709d Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sat, 11 Jun 2022 01:56:57 -0300 Subject: [PATCH 49/65] Add Tests en consola --- func_p1.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/func_p1.py b/func_p1.py index 4c06634..c3a13d7 100644 --- a/func_p1.py +++ b/func_p1.py @@ -29,3 +29,8 @@ def p1(param1, param2, param3): return result + +# Test en consola de la función "p1" +# print("Test func_p1 01 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) +# print("Test func_p1 02 (Resultado esperado: 80):", p1(30, 10, 4)) +# print("Test func_p1 03 (Resultado esperado: -32):", p1(2, 10, 4)) From c9d78eafcf4ab41a71e90ca9185f56f1ddae0f41 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:16:46 -0300 Subject: [PATCH 50/65] =?UTF-8?q?Clonado=20de=20la=20rama=20dev=20&=20Impo?= =?UTF-8?q?rt=20"Fun=5Fresta"=20y=20"producto"=20a=20la=20funci=C3=B3n=20"?= =?UTF-8?q?p1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/.keep | 0 .gitignore | 1 - A6G2.py | 10 ---------- README.md | 26 -------------------------- bienvenida.py | 7 ------- func_p1.py | 30 ++++++++++-------------------- funcion_suma.py | 14 -------------- ing2Enteros.py | 8 -------- ing2Strings.py | 7 ------- main.py | 1 - 10 files changed, 10 insertions(+), 94 deletions(-) delete mode 100644 .github/.keep delete mode 100644 .gitignore delete mode 100644 A6G2.py delete mode 100644 README.md delete mode 100644 bienvenida.py delete mode 100644 funcion_suma.py delete mode 100644 ing2Enteros.py delete mode 100644 ing2Strings.py delete mode 100644 main.py diff --git a/.github/.keep b/.github/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ed8ebf5..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -__pycache__ \ No newline at end of file diff --git a/A6G2.py b/A6G2.py deleted file mode 100644 index b471aad..0000000 --- a/A6G2.py +++ /dev/null @@ -1,10 +0,0 @@ -from bienvenida import bienvenida -from ing2Enteros import ing2i -from ing2Strings import ing2s - -bienvenida() -nums = ing2i() -cadenas = ing2s() - -print(nums) -print(cadenas) \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 2afdbf1..0000000 --- a/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# a6g2-team-1 -a6g2-team-1 created by GitHub Classroom - -Prueba online de readme.txt - -Ma. Inés García B.🦄 - -Sebastian Galvan 🐱‍👤 - -Fernando Geronimo - -Maira Gaytan - -Gimenez Veron Adrian - -Pedro Ghirardi - -Jose Pablo Gallotti - -David Gamarra - -Julian Grosso - -Eber Gonzalez - -fabian gomez diff --git a/bienvenida.py b/bienvenida.py deleted file mode 100644 index d4f239c..0000000 --- a/bienvenida.py +++ /dev/null @@ -1,7 +0,0 @@ -def bienvenida(): - - """ - Muestra un cartel de bienvenida - """ - - print("Bienvenid@s!!") \ No newline at end of file diff --git a/func_p1.py b/func_p1.py index c3a13d7..693ec35 100644 --- a/func_p1.py +++ b/func_p1.py @@ -1,36 +1,26 @@ -# Simulación de funciones necesarias de otros archivos: -# (Una vez creadas por los demás las importo) - -# Resta entre 2 parametros -def resta(p1, p2): - return p1 - p2 - -# Producto entre 2 parametros -def producto(p1, p2): - return p1 * p2 - -# -------------------------------------- +from Func_Resta import Fun_resta +from producto import producto def p1(param1, param2, param3): """Función que resta los dos primeros parámetros "p1" y "p2" y los multipica por el parámetro "p3" usando las funciones externas "resta" y "producto". Args: - p1 (float): Numero tipo float. - p2 (float): Numero tipo float. - p3 (float): Numero tipo float. + p1 (int | float) + p2 (int | float) + p3 (int | float) Returns: - float: Resultado final de las operaciones con redondeo a 2 decimales. + int | float: Resultado final de las operaciones con redondeo de 2 decimales. """ - op_resta = resta(param1, param2) + op_resta = Fun_resta(param1, param2) result = round(producto(op_resta, param3), 2) return result # Test en consola de la función "p1" -# print("Test func_p1 01 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) -# print("Test func_p1 02 (Resultado esperado: 80):", p1(30, 10, 4)) -# print("Test func_p1 03 (Resultado esperado: -32):", p1(2, 10, 4)) +# print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) +# print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) +# print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) diff --git a/funcion_suma.py b/funcion_suma.py deleted file mode 100644 index 54eb801..0000000 --- a/funcion_suma.py +++ /dev/null @@ -1,14 +0,0 @@ -#para1=hace referencia al parametro1 -#para2=hace referencia al parametro2 - - - -def suma(para1, para2): - """Devuelve el la suma entre dos parametros - Args: - para1 (int | float) - para2 (int | float) - Returns: - (int | float) - """ - return para1+para2 \ No newline at end of file diff --git a/ing2Enteros.py b/ing2Enteros.py deleted file mode 100644 index e04aaaf..0000000 --- a/ing2Enteros.py +++ /dev/null @@ -1,8 +0,0 @@ -def ing2i(): - - """ - Permite ingresar 2 numeros - """ - num1 = int(input('Ingrese numero 1: ')) - num2 = int(input('Ingrese numero 2: ')) - return num1, num2 \ No newline at end of file diff --git a/ing2Strings.py b/ing2Strings.py deleted file mode 100644 index 0b26d90..0000000 --- a/ing2Strings.py +++ /dev/null @@ -1,7 +0,0 @@ -def ing2s(): - """ - Permite ingresar 2 cadenas - """ - cadena1 = input('Ingrese cadena 1: ') - cadena2 = input('Ingrese cadena 2: ') - return cadena1, cadena2 \ No newline at end of file diff --git a/main.py b/main.py deleted file mode 100644 index c37ecb1..0000000 --- a/main.py +++ /dev/null @@ -1 +0,0 @@ -print("Hola") \ No newline at end of file From 4ccca0b1d073bac2b271250bfac15a90484c2dd1 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:21:48 -0300 Subject: [PATCH 51/65] =?UTF-8?q?Test=20funci=C3=B3n=20p1=20con=20nuevos?= =?UTF-8?q?=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- func_p1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/func_p1.py b/func_p1.py index 693ec35..3ad303f 100644 --- a/func_p1.py +++ b/func_p1.py @@ -21,6 +21,6 @@ def p1(param1, param2, param3): # Test en consola de la función "p1" -# print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) -# print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) -# print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) +print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) +print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) +print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) From 04e48d1f6dd496c655d2380cbddb5d1b37acf941 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:23:10 -0300 Subject: [PATCH 52/65] func_p1.py (v1) --- func_p1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/func_p1.py b/func_p1.py index 3ad303f..693ec35 100644 --- a/func_p1.py +++ b/func_p1.py @@ -21,6 +21,6 @@ def p1(param1, param2, param3): # Test en consola de la función "p1" -print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) -print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) -print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) +# print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) +# print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) +# print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) From fdbee3b561072bb6cc53f3def9a35dcc06d0634a Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:45:15 -0300 Subject: [PATCH 53/65] =?UTF-8?q?Revert=20"Clonado=20de=20la=20rama=20dev?= =?UTF-8?q?=20&=20Import=20"Fun=5Fresta"=20y=20"producto"=20a=20la=20funci?= =?UTF-8?q?=C3=B3n=20"p1""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c9d78eafcf4ab41a71e90ca9185f56f1ddae0f41. --- .github/.keep | 0 .gitignore | 1 + A6G2.py | 10 ++++++++++ README.md | 26 ++++++++++++++++++++++++++ bienvenida.py | 7 +++++++ func_p1.py | 30 ++++++++++++++++++++---------- funcion_suma.py | 14 ++++++++++++++ ing2Enteros.py | 8 ++++++++ ing2Strings.py | 7 +++++++ main.py | 1 + 10 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 .github/.keep create mode 100644 .gitignore create mode 100644 A6G2.py create mode 100644 README.md create mode 100644 bienvenida.py create mode 100644 funcion_suma.py create mode 100644 ing2Enteros.py create mode 100644 ing2Strings.py create mode 100644 main.py diff --git a/.github/.keep b/.github/.keep new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed8ebf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__ \ No newline at end of file diff --git a/A6G2.py b/A6G2.py new file mode 100644 index 0000000..b471aad --- /dev/null +++ b/A6G2.py @@ -0,0 +1,10 @@ +from bienvenida import bienvenida +from ing2Enteros import ing2i +from ing2Strings import ing2s + +bienvenida() +nums = ing2i() +cadenas = ing2s() + +print(nums) +print(cadenas) \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..2afdbf1 --- /dev/null +++ b/README.md @@ -0,0 +1,26 @@ +# a6g2-team-1 +a6g2-team-1 created by GitHub Classroom + +Prueba online de readme.txt + +Ma. Inés García B.🦄 + +Sebastian Galvan 🐱‍👤 + +Fernando Geronimo + +Maira Gaytan + +Gimenez Veron Adrian + +Pedro Ghirardi + +Jose Pablo Gallotti + +David Gamarra + +Julian Grosso + +Eber Gonzalez + +fabian gomez diff --git a/bienvenida.py b/bienvenida.py new file mode 100644 index 0000000..d4f239c --- /dev/null +++ b/bienvenida.py @@ -0,0 +1,7 @@ +def bienvenida(): + + """ + Muestra un cartel de bienvenida + """ + + print("Bienvenid@s!!") \ No newline at end of file diff --git a/func_p1.py b/func_p1.py index 693ec35..c3a13d7 100644 --- a/func_p1.py +++ b/func_p1.py @@ -1,26 +1,36 @@ -from Func_Resta import Fun_resta -from producto import producto +# Simulación de funciones necesarias de otros archivos: +# (Una vez creadas por los demás las importo) + +# Resta entre 2 parametros +def resta(p1, p2): + return p1 - p2 + +# Producto entre 2 parametros +def producto(p1, p2): + return p1 * p2 + +# -------------------------------------- def p1(param1, param2, param3): """Función que resta los dos primeros parámetros "p1" y "p2" y los multipica por el parámetro "p3" usando las funciones externas "resta" y "producto". Args: - p1 (int | float) - p2 (int | float) - p3 (int | float) + p1 (float): Numero tipo float. + p2 (float): Numero tipo float. + p3 (float): Numero tipo float. Returns: - int | float: Resultado final de las operaciones con redondeo de 2 decimales. + float: Resultado final de las operaciones con redondeo a 2 decimales. """ - op_resta = Fun_resta(param1, param2) + op_resta = resta(param1, param2) result = round(producto(op_resta, param3), 2) return result # Test en consola de la función "p1" -# print("Test-01 p1 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) -# print("Test-02 p1 (Resultado esperado: 80):", p1(30, 10, 4)) -# print("Test-03 p1 (Resultado esperado: -32):", p1(2, 10, 4)) +# print("Test func_p1 01 (Resultado esperado: 74.64):", p1(12.4, 0.4, 6.22)) +# print("Test func_p1 02 (Resultado esperado: 80):", p1(30, 10, 4)) +# print("Test func_p1 03 (Resultado esperado: -32):", p1(2, 10, 4)) diff --git a/funcion_suma.py b/funcion_suma.py new file mode 100644 index 0000000..54eb801 --- /dev/null +++ b/funcion_suma.py @@ -0,0 +1,14 @@ +#para1=hace referencia al parametro1 +#para2=hace referencia al parametro2 + + + +def suma(para1, para2): + """Devuelve el la suma entre dos parametros + Args: + para1 (int | float) + para2 (int | float) + Returns: + (int | float) + """ + return para1+para2 \ No newline at end of file diff --git a/ing2Enteros.py b/ing2Enteros.py new file mode 100644 index 0000000..e04aaaf --- /dev/null +++ b/ing2Enteros.py @@ -0,0 +1,8 @@ +def ing2i(): + + """ + Permite ingresar 2 numeros + """ + num1 = int(input('Ingrese numero 1: ')) + num2 = int(input('Ingrese numero 2: ')) + return num1, num2 \ No newline at end of file diff --git a/ing2Strings.py b/ing2Strings.py new file mode 100644 index 0000000..0b26d90 --- /dev/null +++ b/ing2Strings.py @@ -0,0 +1,7 @@ +def ing2s(): + """ + Permite ingresar 2 cadenas + """ + cadena1 = input('Ingrese cadena 1: ') + cadena2 = input('Ingrese cadena 2: ') + return cadena1, cadena2 \ No newline at end of file diff --git a/main.py b/main.py new file mode 100644 index 0000000..c37ecb1 --- /dev/null +++ b/main.py @@ -0,0 +1 @@ +print("Hola") \ No newline at end of file From dbfe60df0d8e3d5fb6dd6a9d6c9cd30a92f977cc Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 22:48:24 -0300 Subject: [PATCH 54/65] func_p1.py (v1) --- func_p1.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/func_p1.py b/func_p1.py index c3a13d7..68ec5c1 100644 --- a/func_p1.py +++ b/func_p1.py @@ -1,32 +1,19 @@ -# Simulación de funciones necesarias de otros archivos: -# (Una vez creadas por los demás las importo) - -# Resta entre 2 parametros -def resta(p1, p2): - return p1 - p2 - -# Producto entre 2 parametros -def producto(p1, p2): - return p1 * p2 - -# -------------------------------------- +from Func_Resta import Fun_resta +from producto import producto def p1(param1, param2, param3): """Función que resta los dos primeros parámetros "p1" y "p2" y los multipica por el parámetro "p3" usando las funciones externas "resta" y "producto". - Args: - p1 (float): Numero tipo float. - p2 (float): Numero tipo float. - p3 (float): Numero tipo float. - + p1 (int | float) + p2 (int | float) + p3 (int | float) Returns: - float: Resultado final de las operaciones con redondeo a 2 decimales. + int | float: Resultado final de las operaciones con redondeo de 2 decimales. """ - op_resta = resta(param1, param2) + op_resta = Fun_resta(param1, param2) result = round(producto(op_resta, param3), 2) - return result From 3e9adb30af72b0cd624edc23054179b6af7ffc8e Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Sun, 12 Jun 2022 23:36:03 -0300 Subject: [PATCH 55/65] Update README: Add imagen y formato a textos --- README.md | 42 ++++++++++++------------------- github-repo_assets/ISPC_CDIA.jpg | Bin 0 -> 48571 bytes 2 files changed, 16 insertions(+), 26 deletions(-) create mode 100644 github-repo_assets/ISPC_CDIA.jpg diff --git a/README.md b/README.md index 2afdbf1..51bfb51 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,16 @@ -# a6g2-team-1 -a6g2-team-1 created by GitHub Classroom - -Prueba online de readme.txt - -Ma. Inés García B.🦄 - -Sebastian Galvan 🐱‍👤 - -Fernando Geronimo - -Maira Gaytan - -Gimenez Veron Adrian - -Pedro Ghirardi - -Jose Pablo Gallotti - -David Gamarra - -Julian Grosso - -Eber Gonzalez - -fabian gomez + + +# A6G2 - Cohorte 2022 +### Colaboradores + +- Ma. Inés García B.🦄 +- Sebastian Galvan 🐱‍👤 +- Fernando Geronimo +- Maira Gaytan +- Gimenez Veron Adrian +- Pedro Ghirardi +- Jose Pablo Gallotti +- David Gamarra +- Julian Grosso +- Eber Gonzalez +- Fabian Gomez diff --git a/github-repo_assets/ISPC_CDIA.jpg b/github-repo_assets/ISPC_CDIA.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d7a600c5ed7a4bf0f0f5a103f4a223fad68232ee GIT binary patch literal 48571 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

?-HIDtD3WxTvD0aQe|p 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 Date: Tue, 14 Jun 2022 22:30:01 -0300 Subject: [PATCH 56/65] Commit Inicial Radicacion --- radicacion.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 radicacion.py diff --git a/radicacion.py b/radicacion.py new file mode 100644 index 0000000..9878f94 --- /dev/null +++ b/radicacion.py @@ -0,0 +1,4 @@ +num_1 = 9 +num_2 = 2 + +print(pow(num_1,num_2)) \ No newline at end of file From 0a434d25dc07ad0a198381c7f8c5433ae9673230 Mon Sep 17 00:00:00 2001 From: Jochi Gallotti Date: Wed, 15 Jun 2022 00:32:14 -0300 Subject: [PATCH 57/65] confirmar en "main" --- radicacion.py | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 radicacion.py diff --git a/radicacion.py b/radicacion.py new file mode 100644 index 0000000..8c3ffe0 --- /dev/null +++ b/radicacion.py @@ -0,0 +1,3 @@ +def radicacion (p1, p2): + return pow (p2, 1 / p1) + From 242e8d160d31afad22e1b9834e67812b1870d009 Mon Sep 17 00:00:00 2001 From: eber102011 Date: Wed, 15 Jun 2022 17:20:53 -0300 Subject: [PATCH 58/65] creacion de archivo prueba --- prueba.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 prueba.py diff --git a/prueba.py b/prueba.py new file mode 100644 index 0000000..23b93bf --- /dev/null +++ b/prueba.py @@ -0,0 +1 @@ +print("Hola me llamo tomas") From fddbda551878b09f906d4ca911c741559e8427b7 Mon Sep 17 00:00:00 2001 From: eber102011 <53438888+eber102011@users.noreply.github.com> Date: Wed, 15 Jun 2022 17:27:36 -0300 Subject: [PATCH 59/65] Delete prueba.py elimino archivo porque era solo de prueba para commint, push, rama, y pull request --- prueba.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 prueba.py diff --git a/prueba.py b/prueba.py deleted file mode 100644 index 23b93bf..0000000 --- a/prueba.py +++ /dev/null @@ -1 +0,0 @@ -print("Hola me llamo tomas") From be8c8fd41dde0da2072d532c97cb7e1174d9c60f Mon Sep 17 00:00:00 2001 From: Fergigena1 <106841321+Fergigena1@users.noreply.github.com> Date: Wed, 15 Jun 2022 17:55:53 -0300 Subject: [PATCH 60/65] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2afdbf1..6749b51 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,5 @@ Julian Grosso Eber Gonzalez fabian gomez + +Fernando Gigena Neyra From 5316d802bc97f3d8b4b4a685ae198477dae21bc5 Mon Sep 17 00:00:00 2001 From: Julian Grosso <81781648+JulianGrosso@users.noreply.github.com> Date: Wed, 15 Jun 2022 19:09:49 -0300 Subject: [PATCH 61/65] =?UTF-8?q?README=20//=20Actualizaci=C3=B3n=20de=20l?= =?UTF-8?q?ista=20de=20integrantes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 51bfb51..bf134c4 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,4 @@ - Julian Grosso - Eber Gonzalez - Fabian Gomez +- Fernando Gigena Neyra \ No newline at end of file From 09154b7839c88c26a88606e744c9460a68634a1d Mon Sep 17 00:00:00 2001 From: Fernando Gigena Neyra <> Date: Wed, 15 Jun 2022 22:47:25 +0000 Subject: [PATCH 62/65] Agregar archivo Funcion_P1 --- Funcion_P1.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Funcion_P1.py diff --git a/Funcion_P1.py b/Funcion_P1.py new file mode 100644 index 0000000..a719410 --- /dev/null +++ b/Funcion_P1.py @@ -0,0 +1,11 @@ +#9- función p1, retorna la suma de los 2 primero por el 3er parámetros, usando las +#funciones anteriores +from funcion_suma import funcion_suma +from producto import producto + +def funcion_P1 (num1, num2, num3): + + suma = funcion_suma(num1,num2) + operacion = producto(suma) + +return operacion \ No newline at end of file From ed21e4d6ee7222b593d21e76d9a3c7a86b174929 Mon Sep 17 00:00:00 2001 From: Jochi Gallotti Date: Wed, 15 Jun 2022 21:36:37 -0300 Subject: [PATCH 63/65] Commit Radicacion --- radicacion.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/radicacion.py b/radicacion.py index 9878f94..d684e10 100644 --- a/radicacion.py +++ b/radicacion.py @@ -1,4 +1,2 @@ -num_1 = 9 -num_2 = 2 - -print(pow(num_1,num_2)) \ No newline at end of file +def radicacion (p1, p2): + return pow (p2, 1 / p1) \ No newline at end of file From d148f5aa4eb40dcf995c3c56966bc7b6e32d2c20 Mon Sep 17 00:00:00 2001 From: Gamarra David Date: Thu, 16 Jun 2022 15:06:07 -0300 Subject: [PATCH 64/65] archivo modulo --- Funcion_modulo.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Funcion_modulo.py diff --git a/Funcion_modulo.py b/Funcion_modulo.py new file mode 100644 index 0000000..357febb --- /dev/null +++ b/Funcion_modulo.py @@ -0,0 +1,7 @@ + +def modulo(para1, para2): + """" + Función modulo + retorna el modulo de 2 parametros + """ + return para1+para2 From ba032c34027ccbd849e66a0735404097ec6ab193 Mon Sep 17 00:00:00 2001 From: Sebastian Galvan Date: Thu, 16 Jun 2022 20:04:15 -0300 Subject: [PATCH 65/65] [FIX] A DEV Sprint 1 --- Funcion_P1.py | 11 ----------- func_p1.py => funcion_p1_resta.py | 8 ++++---- funcion_p1_suma.py | 11 +++++++++++ funciongenrnd.py => genrnd.py | 14 ++++---------- ing2Enteros.py | 1 - main.py | 1 - Funcion_modulo.py => modulo.py | 2 +- radicacion.py | 10 ++++++++-- Func_Resta.py => resta.py | 4 ++-- funcion_suma.py => suma.py | 0 10 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 Funcion_P1.py rename func_p1.py => funcion_p1_resta.py (80%) create mode 100644 funcion_p1_suma.py rename funciongenrnd.py => genrnd.py (51%) delete mode 100644 main.py rename Funcion_modulo.py => modulo.py (81%) rename Func_Resta.py => resta.py (78%) rename funcion_suma.py => suma.py (100%) diff --git a/Funcion_P1.py b/Funcion_P1.py deleted file mode 100644 index a719410..0000000 --- a/Funcion_P1.py +++ /dev/null @@ -1,11 +0,0 @@ -#9- función p1, retorna la suma de los 2 primero por el 3er parámetros, usando las -#funciones anteriores -from funcion_suma import funcion_suma -from producto import producto - -def funcion_P1 (num1, num2, num3): - - suma = funcion_suma(num1,num2) - operacion = producto(suma) - -return operacion \ No newline at end of file diff --git a/func_p1.py b/funcion_p1_resta.py similarity index 80% rename from func_p1.py rename to funcion_p1_resta.py index 68ec5c1..4ea4961 100644 --- a/func_p1.py +++ b/funcion_p1_resta.py @@ -1,7 +1,7 @@ -from Func_Resta import Fun_resta +from resta import resta from producto import producto -def p1(param1, param2, param3): +def funcion_p1_resta(param1, param2, param3): """Función que resta los dos primeros parámetros "p1" y "p2" y los multipica por el parámetro "p3" usando las funciones externas "resta" y "producto". Args: @@ -12,8 +12,8 @@ def p1(param1, param2, param3): int | float: Resultado final de las operaciones con redondeo de 2 decimales. """ - op_resta = Fun_resta(param1, param2) - result = round(producto(op_resta, param3), 2) + op_resta = resta(param1, param2) + result = producto(op_resta, param3) return result diff --git a/funcion_p1_suma.py b/funcion_p1_suma.py new file mode 100644 index 0000000..6f6710f --- /dev/null +++ b/funcion_p1_suma.py @@ -0,0 +1,11 @@ +#9- función p1, retorna la suma de los 2 primero por el 3er parámetros, usando las +#funciones anteriores +from suma import suma +from producto import producto + +def funcion_p1_suma (num1, num2, num3): + + suma = suma(num1,num2) + operacion = producto(suma, num3) + + return operacion \ No newline at end of file diff --git a/funciongenrnd.py b/genrnd.py similarity index 51% rename from funciongenrnd.py rename to genrnd.py index 649e487..d4c09e2 100644 --- a/funciongenrnd.py +++ b/genrnd.py @@ -1,16 +1,10 @@ - import random as r -def genrnd (): +def genrnd(): + """retorna una lista con 50 números aleatorios. [0-100] + """ my_list= [] for i in range (50): my_list.append( r.randint (0,100)) - return my_list - - - - - - - + return my_list \ No newline at end of file diff --git a/ing2Enteros.py b/ing2Enteros.py index e04aaaf..8cc2586 100644 --- a/ing2Enteros.py +++ b/ing2Enteros.py @@ -1,5 +1,4 @@ def ing2i(): - """ Permite ingresar 2 numeros """ diff --git a/main.py b/main.py deleted file mode 100644 index c37ecb1..0000000 --- a/main.py +++ /dev/null @@ -1 +0,0 @@ -print("Hola") \ No newline at end of file diff --git a/Funcion_modulo.py b/modulo.py similarity index 81% rename from Funcion_modulo.py rename to modulo.py index 357febb..e43b5b7 100644 --- a/Funcion_modulo.py +++ b/modulo.py @@ -4,4 +4,4 @@ def modulo(para1, para2): Función modulo retorna el modulo de 2 parametros """ - return para1+para2 + return para1 % para2 \ No newline at end of file diff --git a/radicacion.py b/radicacion.py index d684e10..6c6114d 100644 --- a/radicacion.py +++ b/radicacion.py @@ -1,2 +1,8 @@ -def radicacion (p1, p2): - return pow (p2, 1 / p1) \ No newline at end of file +def radicacion (base, indice): + """retorna la raíz del primero respecto del segundos parámetros + + Args: + base + indice + """ + return pow(base, 1/indice ) \ No newline at end of file diff --git a/Func_Resta.py b/resta.py similarity index 78% rename from Func_Resta.py rename to resta.py index e5c962d..3b8ca97 100644 --- a/Func_Resta.py +++ b/resta.py @@ -1,8 +1,8 @@ -def Fun_resta(num_1,num_2): +def resta(num_1, num_2): """" === Función Resta === Parametros: "num_1" y "num_2" Descripcion: Esta funcion recibe dos parametros del tipo numéricos y retorna la resta entre dichos parametros. """ - return (num_1 - num_2) \ No newline at end of file + return num_1 - num_2 \ No newline at end of file diff --git a/funcion_suma.py b/suma.py similarity index 100% rename from funcion_suma.py rename to suma.py