Skip to content

Commit

Permalink
doc(Calculator):docstring update
Browse files Browse the repository at this point in the history
  • Loading branch information
sdthinlay committed Dec 1, 2023
1 parent 77c1848 commit f225a94
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/python-beginner-projects.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added diff644.diff
Empty file.
61 changes: 60 additions & 1 deletion projects/Calculator/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,34 @@


def addition():
nums = list(map(int, input("Enter all numbers seperated by space: ").split()))
"""
Sums up the two numbers entered by the user.
Returns:
int: Sum of entered numbers
"""

nums = list(map(int, input("Enter all numbers separated by space: ").split()))
return sum(nums)


def subtraction():
"""
Subtracts the two numbers entered by the user.
Returns:
int: Difference between two numbers
"""
n1 = float(input("Enter first number: "))
n2 = float(input("Enter second number: "))

return n1 - n2


def multiplication():
"""
Multiplies two numbers entered by the user.
Returns:
int: Product of entered numbers
"""
nums = list(map(int, input("Enter all numbers seperated by space: ").split()))
res = 1
for num in nums:
Expand All @@ -23,6 +39,11 @@ def multiplication():


def division():
"""
Divides the two numbers entered by the user.
Returns:
int: Quotient of entered numbers
"""
n1 = float(input("Enter first number: "))
n2 = float(input("Enter second number: "))
if n2 == 0:
Expand All @@ -34,18 +55,47 @@ def division():


def average():
"""
Calculates the average of numbers entered.
Returns:
float:The average of the numbers entered.
"""

nums = list(map(int, input("Enter all numbers seperated by space: ").split()))
return sum(nums) / len(nums)


def factorial(num):
"""
Gives the factorial of a non-negative number.
Factorial is the product of all the integers up to the number entered.
Parameters:
num (int): A non-negative integer.
Returns:
int: The factorial of the input number.
"""
answer = 1
for i in range(num):
answer *= i + 1
return answer


7


def complexarithmetic():
"""
Performs complex arithmetic operations.
Asks the user to choose from complex operations and performs the selected operation.
Returns:
str: String representation of the complex arithmetic operation.
"""
print("Enter '1' for complex addition")
print("Enter '2' for complex substraction")
print("Enter '3' for complex multiplication")
Expand Down Expand Up @@ -101,6 +151,15 @@ def complexarithmetic():


def binomail(num):
"""
Calculates the binomial coefficient using the factorial function.
Parameters:
num (list): List containing two integers where the first number entered should be greater than the second number.
Returns:
int: Binomial coefficient.
"""
result = factorial(num[0]) / (factorial(num[1]) * factorial(num[0] - num[1]))
return result

Expand Down

0 comments on commit f225a94

Please sign in to comment.