Skip to content

Commit 2852fbd

Browse files
Update Basic_Maths.
1 parent 824d18f commit 2852fbd

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

Basic_Maths/Basic_Maths.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ def Division(x,y,ResultDialog,check_zero_control_msg):
5151
print("{0} {1} {2} / {3} = {4}". format(select_func,ResultDialog,x,y,result))
5252

5353
def Percentage(x,y,ResultDialog):
54+
result = (x*y)/100
55+
print("{0} {1} ({2} * {3})/100 = {4}". format(select_func,ResultDialog,x,y,result))
56+
57+
def Mod(x,y,ResultDialog):
5458
result=x%y
5559
print("{0} {1} {2} % {3} = {4}". format(select_func,ResultDialog,x,y,result))
5660

@@ -82,7 +86,7 @@ def SqaureRoot(x,ResultDialog):
8286
NOTE3: Along with the "nod" and "ntd" variables, developers can use the "InputN1N2()" function in the "all_math_operations()" function and add the 1st issue and 2nd issue dialogs through these variables.
8387
SUGGESTION: If your wishes or needs are different, it is recommended that you change it according to your needs before using the "all_math_operations()" function. """
8488

85-
def all_math_operations(optDialog,first_opt_dialog,second_opt_dialog,third_opt_dialog,fourth_opt_dialog,fifth_opt_dialog,sixth_opt_dialog,seventh_opt_dialog,eighth_opt_dialog,ninth_opt_dialog,SelectOptDialog,nod,ntd,resdialog,divisionzerocheckdialog,errdg,addition_options_one,addition_options_two,addition_options_three,addition_options_four,addition_options_five,extraction_options_one,extraction_options_two,extraction_options_three,extraction_options_four,extraction_options_five,multiplication_options_one,multiplication_options_two,multiplication_options_three,multiplication_options_four,multiplication_options_five,division_options_one,division_options_two,division_options_three,division_options_four,division_options_five,percentage_options_one,percentage_options_two,percentage_options_three,percentage_options_four,percentage_options_five,fulldivision_options_one,fulldivision_options_two,fulldivision_options_three,fulldivision_options_four,fulldivision_options_five,takingexponents_options_one,takingexponents_options_two,takingexponents_options_three,takingexponents_options_four,takingexponents_options_five,takingroots_options_one,takingroots_options_two,takingroots_options_three,takingroots_options_four,takingroots_options_five,squareroot_options_one,squareroot_options_two,squareroot_options_three,squareroot_options_four,squareroot_options_five):
89+
def all_math_operations(optDialog,first_opt_dialog,second_opt_dialog,third_opt_dialog,fourth_opt_dialog,fifth_opt_dialog,sixth_opt_dialog,seventh_opt_dialog,eighth_opt_dialog,ninth_opt_dialog,tenth_opt_dialog,SelectOptDialog,nod,ntd,resdialog,divisionzerocheckdialog,errdg,addition_options_one,addition_options_two,addition_options_three,addition_options_four,addition_options_five,extraction_options_one,extraction_options_two,extraction_options_three,extraction_options_four,extraction_options_five,multiplication_options_one,multiplication_options_two,multiplication_options_three,multiplication_options_four,multiplication_options_five,division_options_one,division_options_two,division_options_three,division_options_four,division_options_five,percentage_options_one,percentage_options_two,percentage_options_three,percentage_options_four,percentage_options_five,fulldivision_options_one,fulldivision_options_two,fulldivision_options_three,fulldivision_options_four,fulldivision_options_five,takingexponents_options_one,takingexponents_options_two,takingexponents_options_three,takingexponents_options_four,takingexponents_options_five,takingroots_options_one,takingroots_options_two,takingroots_options_three,takingroots_options_four,takingroots_options_five,squareroot_options_one,squareroot_options_two,squareroot_options_three,squareroot_options_four,squareroot_options_five,mod_options_one,mod_options_two,mod_options_three,mod_options_four,mod_options_five):
8690
print(optDialog)
8791
print(first_opt_dialog)
8892
print(second_opt_dialog)
@@ -93,6 +97,7 @@ def all_math_operations(optDialog,first_opt_dialog,second_opt_dialog,third_opt_d
9397
print(seventh_opt_dialog)
9498
print(eighth_opt_dialog)
9599
print(ninth_opt_dialog)
100+
print(tenth_opt_dialog)
96101
select_func = str(input(SelectOptDialog))
97102
InputN1N2(nod,ntd)
98103
if select_func == addition_options_one or select_func == addition_options_two or select_func == addition_options_three or select_func == addition_options_four or select_func == addition_options_five:
@@ -112,6 +117,8 @@ def all_math_operations(optDialog,first_opt_dialog,second_opt_dialog,third_opt_d
112117
elif select_func == takingroots_options_one or select_func == takingroots_options_two or select_func == takingroots_options_three or select_func == takingroots_options_four or select_func == takingroots_options_five:
113118
TakingRoots(number_one,number_two,resdialog)
114119
elif select_func == squareroot_options_one or select_func == squareroot_options_two or select_func == squareroot_options_three or select_func == squareroot_options_four or select_func == squareroot_options_five:
115-
SqaureRoot(number_one,resdialog)
120+
SqaureRoot(number_one,resdialog)
121+
elif select_func == mod_options_one or select_func == mod_options_two or select_func == mod_options_three or select_func == mod_options_four or select_func == mod_options_five:
122+
Mod(number_one,number_two,resdialog)
116123
else:
117124
error_msg(errdg)

Basic_Maths/lib_ver_info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
PYTHON_LIB_LICENCE="GPL2"
1010
PYTHON_LIB_IMPLEMENTED_CONTRACTS="LinuxUsersLinuxMint Privacy and Security Agreement , LinuxUsersLinuxMint Web (Site) Agreement"
1111
PYTHON_LIB_IMPLEMENTED_CONTRACTS_WEB_SITE="https://linuxuserslinuxmint.github.io/Contracts/privacyandsecutryagreement/en/privacyandsecutryagreement.html , https://linuxuserslinuxmint.github.io/Contracts/linuxuserslinuxmintwebsiteagreement/en/linuxuserslinuxmintwebsiteagreement.html"
12-
PYTHON_LIB_VER="5.2"
12+
PYTHON_LIB_VER="5.3"
1313
PYTHON_LIB_SUPPORT_PLATFORM="Windows/Linux/macOS/otherOS"
1414
PYTHON_LIB_RELEASE_DATE="9/30/2023, Time: XX:XX"
15-
PYTHON_LIB_LAST_UPDATE_DATE="1/1/2025, Time: 20:02 / 10:02 PM"
15+
PYTHON_LIB_LAST_UPDATE_DATE="1/5/2025, Time: 20:43 / 8:43 PM"
1616
PYTHON_LIB_AUTHOR="LinuxUsersLinuxMint"
1717
PYTHON_LIB_AUTHOR_WEB_SITE="https://linuxuserslinuxmint.github.io"

basic_maths_calc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from Basic_Maths.Basic_Maths import *
88

99
LibAbout()
10-
all_math_operations("Select Operations: ","1. Addition","2. Extraction","3. Multiplication","4. Division","5. Percentage","6. FullDivision","7. TakingExponents","8. TakingRoots","9. SquareRoot","Select a transaction?: ","Enter the 1st number: ","Enter the 2nd number: ","Result:","Numbers cannot be zero in division!","Invalid Process!","1","add","addition","Addition","Toplama","2","ext","extraction","Extraction","Çıkarma","3","mul","multiplication","Multiplication","Çarpma","4","div","division","Division","Bölme","5","per","percentage","Percentage","Yüzdelik hesaplama","6","fulldiv","fulldivision","FullDivision","Tam bölüm","7","takingexp","takingexponents","TakingExponents","Üslü sayı alma","8","takingrt","takingroots","TakingRoots","Kök Alma","9","sqrt","squareroot","SquareRoot","Karekök")
10+
all_math_operations("Select Operations: ","1. Addition","2. Extraction","3. Multiplication","4. Division","5. Percentage","6. FullDivision","7. TakingExponents","8. TakingRoots","9. SquareRoot","10. Mod","Select a transaction?: ","Enter the 1st number: ","Enter the 2nd number: ","Result:","Numbers cannot be zero in division!","Invalid Process!","1","add","addition","Addition","Toplama","2","ext","extraction","Extraction","Çıkarma","3","mul","multiplication","Multiplication","Çarpma","4","div","division","Division","Bölme","5","per","percentage","Percentage","Yüzdelik hesaplama","6","fulldiv","fulldivision","FullDivision","Tam bölüm","7","takingexp","takingexponents","TakingExponents","Üslü sayı alma","8","takingrt","takingroots","TakingRoots","Kök Alma","9","sqrt","squareroot","SquareRoot","Karekök","10","Mod","Modulus operation","","")
1111
error_msg("error msg [TEST_FUNCTION]")
1212

1313
exit_program_time(10)

0 commit comments

Comments
 (0)