From 7477a758c631249ce5bdb64bfea24c9110170b13 Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 14:27:23 +0000 Subject: [PATCH 01/20] Setting up GitHub Classroom Feedback From ff2e1d19ffc7eb65854f75274f1258dd37b3c4fe Mon Sep 17 00:00:00 2001 From: epontoni Date: Sun, 5 Jun 2022 00:19:11 -0300 Subject: [PATCH 02/20] =?UTF-8?q?issue=201=20-=20Creando=20archivo=20de=20?= =?UTF-8?q?aplicaci=C3=B3n=20a11g1.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/a11g1.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 sp1/funciones/a11g1.py diff --git a/sp1/funciones/a11g1.py b/sp1/funciones/a11g1.py new file mode 100644 index 0000000..6a0b6a3 --- /dev/null +++ b/sp1/funciones/a11g1.py @@ -0,0 +1 @@ +# App A11G1 \ No newline at end of file From 0f2d4b2b9d7e1506c903a316ce621c17d9cbef70 Mon Sep 17 00:00:00 2001 From: epontoni Date: Sun, 5 Jun 2022 00:30:14 -0300 Subject: [PATCH 03/20] =?UTF-8?q?issue=20#1=20-=20Creando=20el=20archivo?= =?UTF-8?q?=20de=20apliaci=C3=B3n=20a11g1.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/{funciones => }/a11g1.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sp1/{funciones => }/a11g1.py (100%) diff --git a/sp1/funciones/a11g1.py b/sp1/a11g1.py similarity index 100% rename from sp1/funciones/a11g1.py rename to sp1/a11g1.py From 11a507aedd85f6b57d66e859ac8719a4b80be7cc Mon Sep 17 00:00:00 2001 From: epontoni Date: Sun, 5 Jun 2022 00:38:29 -0300 Subject: [PATCH 04/20] =?UTF-8?q?issue=20#2=20-=20Funci=C3=B3n=20cartel=20?= =?UTF-8?q?de=20presentaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sp1/a11g1.py | 7 ++++++- sp1/funciones/bienvenida.py | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 sp1/funciones/bienvenida.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7e99e36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc \ No newline at end of file diff --git a/sp1/a11g1.py b/sp1/a11g1.py index 6a0b6a3..01828f6 100644 --- a/sp1/a11g1.py +++ b/sp1/a11g1.py @@ -1 +1,6 @@ -# App A11G1 \ No newline at end of file +# App A11G1 + +# Importamos la función bienvenida +from funciones.bienvenida import bienvenida + +bienvenida() \ No newline at end of file diff --git a/sp1/funciones/bienvenida.py b/sp1/funciones/bienvenida.py new file mode 100644 index 0000000..e14f7ac --- /dev/null +++ b/sp1/funciones/bienvenida.py @@ -0,0 +1,2 @@ +def bienvenida(): + print("*Bienvenidos, esta es la aplicación A11G1*") \ No newline at end of file From 841735d54ed9d229cfe1ef30dff7c21b22dd2a5f Mon Sep 17 00:00:00 2001 From: epontoni Date: Sun, 5 Jun 2022 00:44:09 -0300 Subject: [PATCH 05/20] =?UTF-8?q?issue=20#4=20-=20Creaci=C3=B3n=20de=20la?= =?UTF-8?q?=20funci=C3=B3n=20ing2i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/a11g1.py | 5 ++++- sp1/funciones/ing2i.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 sp1/funciones/ing2i.py diff --git a/sp1/a11g1.py b/sp1/a11g1.py index 01828f6..bc66137 100644 --- a/sp1/a11g1.py +++ b/sp1/a11g1.py @@ -2,5 +2,8 @@ # Importamos la función bienvenida from funciones.bienvenida import bienvenida +from funciones.ing2i import ing2i -bienvenida() \ No newline at end of file +bienvenida() +enteros = ing2i() +print('Los enteros intresados son: ', enteros[0], enteros[1]) \ No newline at end of file diff --git a/sp1/funciones/ing2i.py b/sp1/funciones/ing2i.py new file mode 100644 index 0000000..8a186f3 --- /dev/null +++ b/sp1/funciones/ing2i.py @@ -0,0 +1,5 @@ +#permita el ingreso de 2 valores enteros. +def ing2i(): + i1 = int(input("Ingrese el primer entero: ")) + i2 = int(input("Ingrese el segundo entero: ")) + return [i1, i2] From ca330ac4d6818a5e2741c46edaa7caa6dfe10512 Mon Sep 17 00:00:00 2001 From: epontoni Date: Sun, 5 Jun 2022 00:47:09 -0300 Subject: [PATCH 06/20] =?UTF-8?q?issue=20#5=20-=20Creaci=C3=B3n=20de=20la?= =?UTF-8?q?=20funci=C3=B3n=20ing2s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/a11g1.py | 7 ++++++- sp1/funciones/ing2s.py | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 sp1/funciones/ing2s.py diff --git a/sp1/a11g1.py b/sp1/a11g1.py index bc66137..a98d891 100644 --- a/sp1/a11g1.py +++ b/sp1/a11g1.py @@ -3,7 +3,12 @@ # Importamos la función bienvenida from funciones.bienvenida import bienvenida from funciones.ing2i import ing2i +from funciones.ing2s import ing2s bienvenida() + enteros = ing2i() -print('Los enteros intresados son: ', enteros[0], enteros[1]) \ No newline at end of file +print('Los enteros intresados son: ', enteros[0], enteros[1]) + +cadenas = ing2s() +print('Los strings intresados son: ', cadenas[0], cadenas[1]) \ No newline at end of file diff --git a/sp1/funciones/ing2s.py b/sp1/funciones/ing2s.py new file mode 100644 index 0000000..bec3847 --- /dev/null +++ b/sp1/funciones/ing2s.py @@ -0,0 +1,4 @@ +def ing2s(): + s1 = input() + s2 = input() + return [s1, s2] \ No newline at end of file From c3a988e516d591f8ea10cd2eeae4882bb4090a2d Mon Sep 17 00:00:00 2001 From: "tam.posse" Date: Sun, 5 Jun 2022 23:28:01 -0300 Subject: [PATCH 07/20] =?UTF-8?q?issue=20#6=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?ncion=20(1)=20suma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/suma.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sp1/funciones/suma.py diff --git a/sp1/funciones/suma.py b/sp1/funciones/suma.py new file mode 100644 index 0000000..a0916d4 --- /dev/null +++ b/sp1/funciones/suma.py @@ -0,0 +1,5 @@ +n1 = int(input("Ingrese el primer numero: ")) +n2 = int(input("Ingrese el segundo numero: ")) +sum = n1 + n2 +print("La suma es: ",sum) + From a0abf19dd33411262082a6932f6395b527e57a02 Mon Sep 17 00:00:00 2001 From: agustinarr Date: Tue, 7 Jun 2022 18:47:22 +0000 Subject: [PATCH 08/20] =?UTF-8?q?issue=20#6=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?ncion=20potencia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/potencia.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 sp1/funciones/potencia.py diff --git a/sp1/funciones/potencia.py b/sp1/funciones/potencia.py new file mode 100644 index 0000000..3f6987e --- /dev/null +++ b/sp1/funciones/potencia.py @@ -0,0 +1,6 @@ +def potencia (num1, num2): + num1 = int(input("Ingrese un numero: ")) + num1 = int(input("Ingrese un numero: ")) + return num1 ** num2 + + \ No newline at end of file From b5ff3c1a3cd3d41b5a5cdc52323576beacb446ed Mon Sep 17 00:00:00 2001 From: agustinarr Date: Tue, 7 Jun 2022 19:15:49 +0000 Subject: [PATCH 09/20] =?UTF-8?q?issue=20#6=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?ncion=20potencia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/potencia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sp1/funciones/potencia.py b/sp1/funciones/potencia.py index 3f6987e..60e9a70 100644 --- a/sp1/funciones/potencia.py +++ b/sp1/funciones/potencia.py @@ -3,4 +3,4 @@ def potencia (num1, num2): num1 = int(input("Ingrese un numero: ")) return num1 ** num2 - \ No newline at end of file + \ No newline at end of file From c1677f62af917a691a77f12991f1de43f76c95aa Mon Sep 17 00:00:00 2001 From: Agustina <90060694+agustinarr@users.noreply.github.com> Date: Tue, 7 Jun 2022 17:43:28 -0300 Subject: [PATCH 10/20] Delete potencia.py --- sp1/funciones/potencia.py | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 sp1/funciones/potencia.py diff --git a/sp1/funciones/potencia.py b/sp1/funciones/potencia.py deleted file mode 100644 index 60e9a70..0000000 --- a/sp1/funciones/potencia.py +++ /dev/null @@ -1,6 +0,0 @@ -def potencia (num1, num2): - num1 = int(input("Ingrese un numero: ")) - num1 = int(input("Ingrese un numero: ")) - return num1 ** num2 - - \ No newline at end of file From 3af3c49f2113d1214af1bbb35c2ea1b79d4e33c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Jun 2022 18:17:44 -0300 Subject: [PATCH 11/20] =?UTF-8?q?issue=20#6=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?ncion=20(1)=20suma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/suma.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sp1/funciones/suma.py b/sp1/funciones/suma.py index a0916d4..75710ee 100644 --- a/sp1/funciones/suma.py +++ b/sp1/funciones/suma.py @@ -1,5 +1,2 @@ -n1 = int(input("Ingrese el primer numero: ")) -n2 = int(input("Ingrese el segundo numero: ")) -sum = n1 + n2 -print("La suma es: ",sum) - +def suma(param1, param2): + return param1+param2 \ No newline at end of file From ad70cd89339e807870c57fb30024538bdf63f1a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Jun 2022 18:54:07 -0300 Subject: [PATCH 12/20] =?UTF-8?q?issue=20#9=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?nci=C3=B3n=20(4)=20cociente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/cociente.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sp1/funciones/cociente.py diff --git a/sp1/funciones/cociente.py b/sp1/funciones/cociente.py new file mode 100644 index 0000000..2dab7ee --- /dev/null +++ b/sp1/funciones/cociente.py @@ -0,0 +1,2 @@ +def cociente(param1, param2): + return param1/param2 From 02c9b0a4fabc717aa68471392ae8a28f8b2debbb Mon Sep 17 00:00:00 2001 From: agustinarr Date: Wed, 8 Jun 2022 14:43:27 +0000 Subject: [PATCH 13/20] =?UTF-8?q?issue=20#11=20creaci=C3=B3n=20de=20la=20f?= =?UTF-8?q?uncion=20potencia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/potencia.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sp1/funciones/potencia.py diff --git a/sp1/funciones/potencia.py b/sp1/funciones/potencia.py new file mode 100644 index 0000000..eb5a79b --- /dev/null +++ b/sp1/funciones/potencia.py @@ -0,0 +1,2 @@ +def potencia (num1, num2): + return num1 ** num2 \ No newline at end of file From 93b5c492fd854d7cfc54d1bec8144e876a8779ab Mon Sep 17 00:00:00 2001 From: agustinarr Date: Wed, 8 Jun 2022 15:27:39 +0000 Subject: [PATCH 14/20] =?UTF-8?q?issue=20#14=20creaci=C3=B3n=20de=20la=20f?= =?UTF-8?q?uncion=20p1sum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/p1sum.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sp1/funciones/p1sum.py diff --git a/sp1/funciones/p1sum.py b/sp1/funciones/p1sum.py new file mode 100644 index 0000000..50fbaa2 --- /dev/null +++ b/sp1/funciones/p1sum.py @@ -0,0 +1,4 @@ +def p1sum (param1, param2, param3): + resultado = suma(param1, param2) + resultado = resultado + param3 + return resultado From a092d96164b934958636563e2ca2bf564ac9df16 Mon Sep 17 00:00:00 2001 From: agustinarr Date: Thu, 9 Jun 2022 13:48:12 +0000 Subject: [PATCH 15/20] =?UTF-8?q?issue=20#14=20creaci=C3=B3n=20de=20la=20f?= =?UTF-8?q?uncion=20p1sum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/p1sum.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sp1/funciones/p1sum.py b/sp1/funciones/p1sum.py index 50fbaa2..764095d 100644 --- a/sp1/funciones/p1sum.py +++ b/sp1/funciones/p1sum.py @@ -1,4 +1,4 @@ +from funciones.suma import suma + def p1sum (param1, param2, param3): - resultado = suma(param1, param2) - resultado = resultado + param3 - return resultado + return suma(suma(param1,param2), param3) \ No newline at end of file From 3a14b89414791b5a2ccc789832e3c032ca2ad27a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jun 2022 15:45:00 -0300 Subject: [PATCH 16/20] =?UTF-8?q?issue=20#16=20creaci=C3=B3n=20de=20la=20F?= =?UTF-8?q?unci=C3=B3n=20(12)=20genrnd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/genrnd.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 sp1/funciones/genrnd.py diff --git a/sp1/funciones/genrnd.py b/sp1/funciones/genrnd.py new file mode 100644 index 0000000..215654b --- /dev/null +++ b/sp1/funciones/genrnd.py @@ -0,0 +1,11 @@ +from random import random +import random + +def genrnd(): + lista=[] + for i in range(0,50): + i = random.randint + lista.append(i) + print(lista) + +genrnd() \ No newline at end of file From 46464b2abd46d3794f8bd4615670579988051b0d Mon Sep 17 00:00:00 2001 From: agustinarr Date: Mon, 13 Jun 2022 22:51:05 +0000 Subject: [PATCH 17/20] =?UTF-8?q?issue=20#7=20creaci=C3=B3n=20de=20la=20fu?= =?UTF-8?q?ncion=20resta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/resta.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sp1/funciones/resta.py diff --git a/sp1/funciones/resta.py b/sp1/funciones/resta.py new file mode 100644 index 0000000..5988174 --- /dev/null +++ b/sp1/funciones/resta.py @@ -0,0 +1,2 @@ +def resta(param1, param2): + return param1-param2 \ No newline at end of file From 62fa8cb0c4216556c40abb029427f04f115d4d7a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2022 22:22:07 -0300 Subject: [PATCH 18/20] =?UTF-8?q?issue=20#16=20creaci=C3=B3n=20de=20la=20F?= =?UTF-8?q?unci=C3=B3n=20(12)=20genrnd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/genrnd.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sp1/funciones/genrnd.py b/sp1/funciones/genrnd.py index 215654b..c6ada63 100644 --- a/sp1/funciones/genrnd.py +++ b/sp1/funciones/genrnd.py @@ -1,11 +1,10 @@ -from random import random import random def genrnd(): - lista=[] - for i in range(0,50): - i = random.randint + lista= [] + for i in range(0,50): + i = random.randint(0,50) lista.append(i) - print(lista) - -genrnd() \ No newline at end of file + return(lista) + +genrnd() From 89f15c3a35f86c7777ac98cb61be7cffee3f186d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Jun 2022 22:39:00 -0300 Subject: [PATCH 19/20] =?UTF-8?q?issue=20#16=20creaci=C3=B3n=20de=20la=20F?= =?UTF-8?q?unci=C3=B3n=20(12)=20genrnd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/funciones/genrnd.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sp1/funciones/genrnd.py b/sp1/funciones/genrnd.py index c6ada63..878103f 100644 --- a/sp1/funciones/genrnd.py +++ b/sp1/funciones/genrnd.py @@ -5,6 +5,4 @@ def genrnd(): for i in range(0,50): i = random.randint(0,50) lista.append(i) - return(lista) - -genrnd() + return(lista) \ No newline at end of file From 3f40f46f57574ff4ae072b29c640d60cd83380b0 Mon Sep 17 00:00:00 2001 From: agustinarr Date: Mon, 27 Jun 2022 17:50:19 +0000 Subject: [PATCH 20/20] =?UTF-8?q?issue=20#5=20-=20Creaci=C3=B3n=20de=20la?= =?UTF-8?q?=20funci=C3=B3n=20ing2s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sp1/a11g1.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sp1/a11g1.py b/sp1/a11g1.py index a98d891..15fa54d 100644 --- a/sp1/a11g1.py +++ b/sp1/a11g1.py @@ -4,6 +4,11 @@ from funciones.bienvenida import bienvenida from funciones.ing2i import ing2i from funciones.ing2s import ing2s +from funciones.resta import resta +from funciones.potencia import potencia +from funciones.p1sum import p1sum + + bienvenida()