diff --git a/Modules/Module1/Module1.md b/Modules/Module1/Module1.md index 06a6d487d..57c3bf567 100644 --- a/Modules/Module1/Module1.md +++ b/Modules/Module1/Module1.md @@ -181,19 +181,19 @@ You may update both simultaneously from Visual Studio by selecting. What is the difference between Git and GitHub? - - Answer: + - Answer: The difference is that Github uses Git in order to share the codes. What is the difference between a git commit and a git push? - - Answer: + - Answer: The difference is that commit is saving it and push is uploading it. What is the difference between a pull, and an upstream pull? - - Answer: + - Answer: The difference between a pull and a upstream pull is that upstream pull is merging that one that you forked and pull is forking. What part of these instructions was unclear or incomplete? - - Answer: + - Answer: None I understand them. Type down any class notes below this sentence: diff --git "a/Modules/Module2/Daniel Cintr\303\263n.PNG" "b/Modules/Module2/Daniel Cintr\303\263n.PNG" new file mode 100644 index 000000000..a2be049db Binary files /dev/null and "b/Modules/Module2/Daniel Cintr\303\263n.PNG" differ diff --git a/Modules/Module2/Module2.md b/Modules/Module2/Module2.md index 24913ea9a..d43ff9505 100644 --- a/Modules/Module2/Module2.md +++ b/Modules/Module2/Module2.md @@ -131,23 +131,23 @@ Typing `python` *(or `python3`)* into the terminal will enter the Python console What is a benefit of using Markdown? https://www.markdownguide.org/getting-started/ - - Answer: + - Answer: Markdown is portable. Files containing Markdown-formatted text can be opened using virtually any application.It can also be used to create websites What does "cd" stand for? - - Answer: + - Answer: It stands for changing directory Did you get stuck at any point or become confused with your console? (yes/no) If so, what happened? How did you solve it? - - Answer: + - Answer: No Did you consider searching google for other commands to run? What did you try? - - Answer: + - Answer: I never considered. What would you like to program? - - Answer: + - Answer: I would like to program computers. Type down any class notes below this sentence: diff --git a/Modules/Module3/Daniel-Cintron-Ticketera.py b/Modules/Module3/Daniel-Cintron-Ticketera.py new file mode 100644 index 000000000..aea04bcab --- /dev/null +++ b/Modules/Module3/Daniel-Cintron-Ticketera.py @@ -0,0 +1,20 @@ +print("Miss World 2021") +print("The cost of each seat is as follow: Club Seat = $350, Nivel Principal = $350, Nivel Superior = $75") + +Club_Seat = int(input("How many tickets sold for Club Seat? =")) +Nivel_Principal = int(input("How many tickets sold for Nivel Principal=")) +Nivel_Superior = int(input("How many tickets sold for Nivel Superior=")) + +def SectionSales(Club_Seat, Nivel_Principal, Nivel_Superior): + print(f"The cost for Club Seat Tickets is: {int(Club_Seat) * 350}") + print(f"The cost for Nivel Principal Tickets is: {int(Nivel_Principal) * 350}") + print(f"The cost for Nivel Superior Tickets is: {int(Nivel_Superior) *75}") + print() +SectionSales(Club_Seat, Nivel_Principal, Nivel_Superior) +Sales_CS = Club_Seat * 350 +Sales_NP = Nivel_Principal * 350 +Sales_NS = Nivel_Superior * 75 +def TicketsTotal( Sales_CS, Sales_NP, Sales_NS): + print(f"The total of tickets sales is ${int(Sales_CS) + int(Sales_NP) + int(Sales_NS)}") +print() +TicketsTotal(Sales_CS, Sales_NP, Sales_NS) \ No newline at end of file diff --git a/Modules/Module3/Module3.md b/Modules/Module3/Module3.md index 44d718e32..3a419abca 100644 --- a/Modules/Module3/Module3.md +++ b/Modules/Module3/Module3.md @@ -96,24 +96,24 @@ print(type(age)) What is the difference between "42" and 42. - - Answer: + - Answer: first is a spring and the other is an intenger Define the boolean operators: >, <, ==, >=, <= - - Answer: + - Answer:>:grester than <: less than ==:equals >=: more or equal than <=:less or equal than How do you address an index in an list? Write a python code that assigns 34 to a new variable by accessing the value stored in: arr = [4, 3, -1, 4, 34] - - Answer: + - Answer:arr{4} What is the first index of a list? Why? - - Answer: + - Answer:0 Because pyhton starts with 0 Provide an original example of a null value. It must prove your understanding of the concept. - - Answer: + - Answer:If there is othing it is a null value. Type down any class notes below this sentence: diff --git a/Modules/Module4/Daniel Cintron-Calculator.py b/Modules/Module4/Daniel Cintron-Calculator.py new file mode 100644 index 000000000..0db9061fc --- /dev/null +++ b/Modules/Module4/Daniel Cintron-Calculator.py @@ -0,0 +1,27 @@ +# print("Hello World") +# print(input("What is your name?: ")) +# myName = input () +# print("It is good to mmet you", myName) +# print("What is your age? :") +# myAge = input() +# print("You will be " + str(int(myAge)+5)+" in 5 years") +print("Rectangle Area Calculator") +print(""" +----------------------- +| | +| | +| | +| | +| | +----------------------- +""") +mywidth = int(input("What is the base or width of the square: ")) +myheight = int(input("What is the height of the figure: ")) +print("The Area of the rectangle is: ", mywidth * myheight) +print() +def AreaOfRectangle(width, height): + print(f"Area of the rectangle is {int(width) * int(height)}") +print("Width is 15 cm") +print("Height is 11 cm") +AreaOfRectangle(15, 11) + diff --git a/Modules/Module4/Daniel-Cintron-Calculator.PNG b/Modules/Module4/Daniel-Cintron-Calculator.PNG new file mode 100644 index 000000000..6c9a5c1d7 Binary files /dev/null and b/Modules/Module4/Daniel-Cintron-Calculator.PNG differ diff --git a/Modules/Module4/Daniel-Cintron-Ticketera.PNG b/Modules/Module4/Daniel-Cintron-Ticketera.PNG new file mode 100644 index 000000000..b853aefcb Binary files /dev/null and b/Modules/Module4/Daniel-Cintron-Ticketera.PNG differ diff --git a/Modules/Module4/Module4-1.PNG b/Modules/Module4/Module4-1.PNG new file mode 100644 index 000000000..3457c951c Binary files /dev/null and b/Modules/Module4/Module4-1.PNG differ diff --git a/Modules/Module4/Module4.md b/Modules/Module4/Module4.md index afc1e494f..fb8e1dbc0 100644 --- a/Modules/Module4/Module4.md +++ b/Modules/Module4/Module4.md @@ -126,9 +126,7 @@ print(f"Or use the print directly {myNumber}") ### [The Geometric-Functions project corresponds to this lecture.]((/../../tree/main/Projects/Geometric-Functions/Geometric-Functions.md)) -# Class Discussion -## Answer the questions on the Markdown file located within your `Module4` directory (Module4.md)`(12pts)` - +!-- Welcome! These are your questions. -->