Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e916179
Commit Prueba
codeman-13 Feb 6, 2020
01a04fc
Commit prueba 2
IFEE09 Feb 6, 2020
6311273
Merge pull request #2 from JoshuaMeza/master
Feb 6, 2020
576c62d
Commit
IFEE09 Feb 6, 2020
afc5159
Merge pull request #3 from JoshuaMeza/master
Feb 6, 2020
b914949
Funciones
JoshuaMeza Feb 19, 2020
e5b8974
PY DOC
JoshuaMeza Feb 20, 2020
526cf8f
Ejercicios 13 y 19
irvingpoot Feb 20, 2020
e11484d
Correcciones
irvingpoot Feb 20, 2020
506fbae
Ejercicios 1 y 7
JonathanGGB Feb 20, 2020
9e7a462
Update Ejercicio13.c
irvingpoot Feb 20, 2020
00b34a4
Update Ejercicio13.c
irvingpoot Feb 20, 2020
7101587
Create Ejercicio25.c
AldebaranLP Feb 20, 2020
c26b58b
C finished
JoshuaMeza Feb 20, 2020
6757a89
Update Ejercicio13.c
JonathanGGB Feb 20, 2020
06c06be
Merge branch 'master' of https://github.com/JoshuaMeza/ProgramacionEs…
JoshuaMeza Feb 20, 2020
0826300
Merge branch 'master' of https://github.com/JoshuaMeza/ProgramacionEs…
JonathanGGB Feb 20, 2020
c1b7ebf
PY DOC
AldebaranLP Feb 20, 2020
c30c9e8
Ejercicios 31 y 37
IFEE09 Feb 20, 2020
8e56f53
Modificacion logica matematica
IFEE09 Feb 20, 2020
08682cb
Merge pull request #6 from IvanFarid13/master
Feb 20, 2020
92401eb
PYDOC WORKS
JoshuaMeza Feb 23, 2020
72d7e52
PyDoc y Correccion
irvingpoot Feb 24, 2020
bd54bf2
Pydoc 1 y 7
JonathanGGB Feb 24, 2020
4ee4ed9
Ejercicios Corregidos, 31 y 37
IFEE09 Feb 24, 2020
3975ead
Correccion
IFEE09 Feb 24, 2020
635402f
Merge pull request #7 from IvanFarid13/master
JoshuaMeza Feb 24, 2020
cea6cd0
Details
JoshuaMeza Feb 24, 2020
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
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"files.associations": {
"stdio.h": "c"
}
}
3 changes: 2 additions & 1 deletion Unidad 2-Estructuras de Control/Ejercicio8.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
elif aMult%bNum==0:
print("Si es multiplo")
else:
print("No es multiplo")
print("No es multiplo")

24 changes: 24 additions & 0 deletions Unidad 2-Estructuras de Control/Prueba_1-7_C/pefmat-ejercicio2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include <stdio.h>

int main (){
//Holi clase :v

float aNum, bNum;

scanf("%f",&aNum);
scanf("%f",&bNum);

if (aNum > bNum){
printf("%.1f > %.1f",aNum,bNum);
}
else if (aNum < bNum){
printf("%.1f > %.1f",bNum,aNum);

}
else{
printf("Son iguales");
}

//Holi clase :v
return 0;
}
Binary file not shown.
49 changes: 49 additions & 0 deletions Unidad 3-Funciones/Ejercicio1.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//Autor: Jonathan Gómez
// Program that determines if an integer N number is even or odd
//Version 1.0
#include <stdio.h>

int readNumber(int);
int calculateTypeNumber(int, int);
void printTypeNumber(int);

int main(){
int Number=0, typeNumber=0;
//Input: A integer Number
Number= readNumber(Number);

//Process: Determines if the module of 2 of Number is 0, which means that is an even number
//Then the value of typeNumber change to 1, which for this program represents even and 0 represents odd
typeNumber= calculateTypeNumber(Number,typeNumber);

//Output: 1 for even Number or 0 for odd Number
printTypeNumber(typeNumber);

}

int readNumber (int Number){
//Read the number which want to know is even or odd and returns the value to the original variable Number

scanf("%d", &Number);

return Number;
}

int calculateTypeNumber (int Number, int typeNumber){
//Using the module function we compare the result with 0, that means _Number is even or odd
//The _typeNumber is even when the module give us 0 and odd when is >0, in the moment when the _Number
//is a even number the value of the flag change and if is not == 0 then the flag still being the same
//This function returns the value of _typeNumber because we are going to use it for the output

typeNumber=0;
if (Number%2 == 0){
typeNumber=1;
}
return typeNumber;
}

void printTypeNumber(int typeNumber){
//Using the value of _typeNumber we have the output of our program

printf("%d", typeNumber);
}
70 changes: 70 additions & 0 deletions Unidad 3-Funciones/Ejercicio1.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
"""
Autor: Jonathan Gómez
Version 1.0
Program that determines if an integer N number is even or odd
"""

#Functions
def readNumber():
"""
Read the number which want to know is even or odd and returns the value to the original variable Number
Args:
_Number: Read the number which the user wants to know if is even or odd
Returns:
_Number: The value entered
"""
_Number= int(input())

return _Number

def calculateTypeNumber(_Number):
"""
Using the module function we compare the result with 0, that means _Number is even or odd
#The _typeNumber is even when the module give us 0 and odd when is >0, in the moment when the _Number
#is a even number the value of the flag change and if is not == 0 then the flag still being the same
#This function returns the value of _typeNumber because we are going to use it for the output
Args:
typeNumber: Flag who determinates the type of _Number
_Number: The value entered by the user
Returns:
_typeNumber: The type of number, even or odd
"""
_typeNumber=0
if _Number%2==0 :
_typeNumber=1

return _typeNumber

def printTypeNumber(_typeNumber):
"""
Using the value of _typeNumber we have the output of our program
Args:
_typeNumber: The final output with the type of number
"""
print(_typeNumber)

def main():
#Input
"""
Number (int): A integer Number
typeNumber (int): Type number, even or odd
"""
Number=0
typeNumber=0
Number=(readNumber())

#Process
"""
Determines if the module of 2 of Number is 0, which means that is an even number
Then the value of typeNumber change to 1, which for this program represents even and 0 represents odd
"""
typeNumber= calculateTypeNumber(Number)

#Output
"""
1 for even Number or 0 for odd Number
"""
printTypeNumber(typeNumber)

if __name__== "__main__":
main()
55 changes: 55 additions & 0 deletions Unidad 3-Funciones/Ejercicio13.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
//Autor Irving Eduardo Poot Moo
//Version 1.0
//Program who translate a militar hour to a normal hour

#include <stdio.h>

int readHour(int);
char traduceHour(int, char);
int translateHour(int)
int translateMinutes(int)
void printHour(int, int, char)


int main(){
// Entrada de la hora
int originalHour, hour, amPm, min;
originalHour = readHour(originalHour);
hour = traduceHour(originalHour);
min = translateMinutes(originalHour);
amPm = traduceHour(amPm, hour);
printHour(hour, min, amPm);
}

// Reeds the hour
int readHour(int originalHour){
scanf("%d",&originalHour);
return originalHour;
}

int translateHour(int originalHour){
hour = originalHour / 100;
return hour
}

int translateMinutes(int originalHour){
min = originalHour - (originalHour / 100 ) * 100
return min
}

// Translate the hour
char traduceHour(char amPm, int hour){

amPm= "am";
if (hour > 12) {
hour = hour - 12;
amPm= "pm";
}
return amPm
}

void printHour(int hour, int min, char amPm){
//Print the translated hour
printf("%1.2d : %1.2d %c", hour, min, amPm);

}
99 changes: 99 additions & 0 deletions Unidad 3-Funciones/Ejercicio13.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
'''
Author Irving Eduardo Poot Moo
Version 1.0
Program who translate a military hour to a normal hour
'''


def inputNumber():
'''
It gets the military hour that we will translate
Args:
N (int):Value of the military hour
Returns:
The original hour
'''
N = 0
N = int(input())
return N


def timeTranslate(hours):
'''
Determinate if the given hour is Am or Pm
Args:
amPm (char): Default time
hours (int): previously modified hour
Returns:
The modified time
'''
amPm = "am"
if (hours > 12):
hours = hours - 12
amPm = "pm"

return amPm

def hoursTranslate(time):
'''
Gets the hours from the military time
Args:
time (int): The original hour
hours (int): The hours of the original hour
Returns:
The modified hours
'''
hours = time // 100
return hours

def minutesTranslate(time):
'''
Gets the minutes from the military time
Args:
time (int): The original hour
minutes (int): The minutes of the original hour
Returns:
The modified minutes
'''
minutes = time - (time // 100)*100
return minutes

def printHour(hours, minutes, amPm):
'''
Print the translated hour
Args:
hours (int): The hours of the original hour
minutes (int): The minutes of the original hour
amPm (char): Determinated time
Returns:
Nothing
'''
print(str(hours).zfill(2)+":"+str(minutes).zfill(2)+ " " + amPm)

#Input
'''
It recives the military hour
Args:
time (int): Given hour
'''

time = inputNumber()

#Process
'''
Translate the militry hour step by step, beggining from the time to the hours and finally the minutes
Args:
time (int): Given hour
hours (int): Translated hours
minutes (int): Translated minutes
amPM (char): Translated time
'''
hours = hoursTranslate(time)
minutes = minutesTranslate(time)
amPm = timeTranslate(time)

#Output
'''
Print the translated hour
'''
printHour(hours, minutes, amPm)
Loading