Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
4a4f795
Setting up GitHub Classroom Feedback
github-classroom[bot] Jun 3, 2022
9685db4
Create README.md
o0jolie0o Jun 3, 2022
fa18cf7
First commit
seba-arok Jun 6, 2022
b4d5961
Update README.md
seba-arok Jun 6, 2022
4f6a4de
Prueba de edicion - Fernando
FernandoGeronimo Jun 6, 2022
b13b686
Update README.md
Ariameg Jun 6, 2022
b04a50c
Update README.md
seba-arok Jun 6, 2022
8d1e3df
Update README.md
jochigallotti37 Jun 6, 2022
0ad9105
Update README.md
jochigallotti37 Jun 6, 2022
5ff23c0
Update README.md
agv-ispc Jun 6, 2022
94eb691
Update README.md
kina16 Jun 6, 2022
7ed191a
Update README.md
jochigallotti37 Jun 6, 2022
8b9956b
Update README.md
GamarraDavid Jun 7, 2022
8383334
Update README.md
o0jolie0o Jun 8, 2022
bad3da6
Update README.md
JulianGrosso Jun 8, 2022
42c3a84
Update README.md
eber102011 Jun 8, 2022
b15d593
probando archivos
eber102011 Jun 8, 2022
2ee58ab
Merge pull request #2 from ispc-programador2022/dev
eber102011 Jun 8, 2022
3bd4b73
Delete prueba.txt
eber102011 Jun 8, 2022
c181cd9
Delete prueba.txt
eber102011 Jun 8, 2022
e6e8312
Update README.md
fabiang78 Jun 10, 2022
12f5ff6
Crear Aplicacion A6G2.py
seba-arok Jun 11, 2022
6b0ab17
Crear Aplicacion que muestra cartel de bienvenida
seba-arok Jun 11, 2022
d7dc888
Crear Aplicacion que me permita ingresar dos numeros
seba-arok Jun 11, 2022
3713ea6
Modificacion de nombre de archivo que se importa
seba-arok Jun 11, 2022
20dfec4
Crear funcion que me permita ingresar dos cadenas
seba-arok Jun 11, 2022
6c75b82
Archivo .gitignore
seba-arok Jun 11, 2022
e6902c0
[REF] Modificar inputs de cadenas
seba-arok Jun 11, 2022
8bd123d
[REF] Mostrar el retorno de las funciones
seba-arok Jun 11, 2022
49d098b
[REF] Retornar los numeros ingresados
seba-arok Jun 11, 2022
f4e5250
[REF] Retornar las cadenas ingresadas
seba-arok Jun 11, 2022
8404a1a
Agregar archivo funcion_suma.py
kina16 Jun 11, 2022
1c332b7
Merge pull request #20 from ispc-programador2022/cdia-pedro
kina16 Jun 11, 2022
ec0228d
Delete funcion_suma.py
kina16 Jun 11, 2022
d63e6f0
Delete funcion_suma.py
kina16 Jun 11, 2022
f3e3374
Agregar archivo funcion_suma
kina16 Jun 11, 2022
d0e5241
agregar archivo funciongenrnd
fabiang78 Jun 12, 2022
c7b4a58
Funcion Resta (Ej_2) Terminada.
FernandoGeronimo834 Jun 12, 2022
b7837dc
agregar modificacion
fabiang78 Jun 12, 2022
c17649b
Merge pull request #17 from ispc-programador2022/cdia-100
seba-arok Jun 12, 2022
57ce5dd
[ADD] Funcion producto
seba-arok Jun 12, 2022
2558b2d
nueva modificacion
fabiang78 Jun 12, 2022
c2f4360
ultima modificacion
fabiang78 Jun 12, 2022
1213500
Update funcion_suma.py
kina16 Jun 12, 2022
1a41613
Merge pull request #24 from ispc-programador2022/cdia-103-2
seba-arok Jun 12, 2022
536cd74
Merge pull request #23 from ispc-programador2022/cdia-102
FernandoGeronimo Jun 13, 2022
74e38ba
resolucion del conflicto
kina16 Jun 13, 2022
2a40066
agregar funcion_suma.py
kina16 Jun 13, 2022
1c5b1e7
Agrega funcion_suma.py
kina16 Jun 13, 2022
8982875
Merge pull request #21 from ispc-programador2022/cdia-pedro
kina16 Jun 13, 2022
c1bdbfe
Update README.md
o0jolie0o Jun 8, 2022
23e647b
Update README.md
JulianGrosso Jun 8, 2022
c2a64de
Update README.md
eber102011 Jun 8, 2022
a9d1abe
Update README.md
fabiang78 Jun 10, 2022
3dc5f07
Creación del archivo y de la función necesaria
JulianGrosso Jun 11, 2022
d2632ff
Add Tests en consola
JulianGrosso Jun 11, 2022
c9d78ea
Clonado de la rama dev & Import "Fun_resta" y "producto" a la función…
JulianGrosso Jun 13, 2022
4ccca0b
Test función p1 con nuevos imports
JulianGrosso Jun 13, 2022
04e48d1
func_p1.py (v1)
JulianGrosso Jun 13, 2022
fdbee3b
Revert "Clonado de la rama dev & Import "Fun_resta" y "producto" a la…
JulianGrosso Jun 13, 2022
dbfe60d
func_p1.py (v1)
JulianGrosso Jun 13, 2022
9f8364e
Merge pull request #25 from ispc-programador2022/12-cdia-110
JulianGrosso Jun 13, 2022
3e9adb3
Update README: Add imagen y formato a textos
JulianGrosso Jun 13, 2022
bf85e93
Merge pull request #26 from ispc-programador2022/README-Update
JulianGrosso Jun 13, 2022
9ee29bd
Commit Inicial Radicacion
jochigallotti37 Jun 15, 2022
0a434d2
confirmar en "main"
jochigallotti37 Jun 15, 2022
242e8d1
creacion de archivo prueba
eber102011 Jun 15, 2022
f50db10
Merge pull request #30 from ispc-programador2022/Tomy
eber102011 Jun 15, 2022
fddbda5
Delete prueba.py
eber102011 Jun 15, 2022
be8c8fd
Update README.md
Fergigena1 Jun 15, 2022
5316d80
README // Actualización de lista de integrantes
JulianGrosso Jun 15, 2022
09154b7
Agregar archivo Funcion_P1
Jun 15, 2022
d18cd72
Merge pull request #31 from ispc-programador2022/11--cdia-109
Fergigena1 Jun 15, 2022
9c846c8
Merge pull request #28 from ispc-programador2022/radicacion-cdia
jochigallotti37 Jun 16, 2022
ed21e4d
Commit Radicacion
jochigallotti37 Jun 16, 2022
9f45361
Merge pull request #32 from ispc-programador2022/radicacion-cdia
jochigallotti37 Jun 16, 2022
f132d19
Merge pull request #22 from ispc-programador2022/13-cdia-111_fabian
fabiang78 Jun 16, 2022
d148f5a
archivo modulo
GamarraDavid Jun 16, 2022
77f10a5
Merge pull request #33 from ispc-programador2022/8-cdia-105
GamarraDavid Jun 16, 2022
ba032c3
[FIX] A DEV Sprint 1
seba-arok Jun 16, 2022
d852787
Merge branch 'main' into dev
seba-arok Jun 16, 2022
83a1c18
Merge pull request #34 from ispc-programador2022/dev
seba-arok Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__pycache__
10 changes: 10 additions & 0 deletions A6G2.py
Original file line number Diff line number Diff line change
@@ -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)
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<img src="./github-repo_assets/ISPC_CDIA.jpg" width="auto" height="auto">

# 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
- Fernando Gigena Neyra
7 changes: 7 additions & 0 deletions bienvenida.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
def bienvenida():

"""
Muestra un cartel de bienvenida
"""

print("Bienvenid@s!!")
23 changes: 23 additions & 0 deletions funcion_p1_resta.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
from resta import resta
from producto import producto

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:
p1 (int | float)
p2 (int | float)
p3 (int | float)
Returns:
int | float: Resultado final de las operaciones con redondeo de 2 decimales.
"""

op_resta = resta(param1, param2)
result = producto(op_resta, 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))
11 changes: 11 additions & 0 deletions funcion_p1_suma.py
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions genrnd.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import random as r
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
Binary file added github-repo_assets/ISPC_CDIA.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions ing2Enteros.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
def ing2i():
"""
Permite ingresar 2 numeros
"""
num1 = int(input('Ingrese numero 1: '))
num2 = int(input('Ingrese numero 2: '))
return num1, num2
7 changes: 7 additions & 0 deletions ing2Strings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
def ing2s():
"""
Permite ingresar 2 cadenas
"""
cadena1 = input('Ingrese cadena 1: ')
cadena2 = input('Ingrese cadena 2: ')
return cadena1, cadena2
7 changes: 7 additions & 0 deletions modulo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

def modulo(para1, para2):
""""
Función modulo
retorna el modulo de 2 parametros
"""
return para1 % para2
11 changes: 11 additions & 0 deletions producto.py
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions radicacion.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
def radicacion (base, indice):
"""retorna la raíz del primero respecto del segundos parámetros

Args:
base
indice
"""
return pow(base, 1/indice )

8 changes: 8 additions & 0 deletions resta.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
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
14 changes: 14 additions & 0 deletions suma.py
Original file line number Diff line number Diff line change
@@ -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