Skip to content

Added Power Functionality #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added Power Functionality #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde3074
Update calc.py
varunvjha Sep 16, 2020
28ffdd1
Update README.md
varunvjha Sep 16, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ A python calculator project to be cloned by CS 193 students
| - | subtraction |
| * | multiplication |
| / | division |
| ^ | power |

## License
See [License](https://github.com/Purdue-CSUSB/pycalc/blob/master/LICENSE).
5 changes: 5 additions & 0 deletions calc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ def mult(a, b):
def div(a, b):
return a / b

def power(a, b):
return a**b


# -------------------------------------------------------- #

Expand Down Expand Up @@ -71,6 +74,8 @@ def div(a, b):
print "Product: ", mult(a, b)
elif (op == "/"):
print "Quotient: ", div(a, b)
elif (op == "^" || op == "**"):
print "Power: ", power(a, b)
else:
print "Invalid operation..."

Expand Down