mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 06:25:23 +01:00
Added latex and cleaned wording on all basic_math generators
This commit is contained in:
@@ -1,14 +1,17 @@
|
|||||||
from .__init__ import *
|
from .__init__ import *
|
||||||
|
|
||||||
|
|
||||||
def absoluteDifferenceFunc(maxA=100, maxB=100):
|
def absoluteDifferenceFunc(maxA=100, maxB=100, style='raw'):
|
||||||
a = random.randint(-1 * maxA, maxA)
|
a = random.randint(-1 * maxA, maxA)
|
||||||
b = random.randint(-1 * maxB, maxB)
|
b = random.randint(-1 * maxB, maxB)
|
||||||
absDiff = abs(a - b)
|
absDiff = abs(a - b)
|
||||||
|
|
||||||
problem = "Absolute difference between numbers " + \
|
if style == 'latex':
|
||||||
str(a) + " and " + str(b) + " = "
|
problem = "\\(|" + str(a) + "-" + str(b) + "|=\\)"
|
||||||
solution = absDiff
|
solution = f"\\({absDiff}\\)"
|
||||||
|
else:
|
||||||
|
problem = "|" + str(a) + "-" + str(b) + "|="
|
||||||
|
solution = absDiff
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from .__init__ import *
|
from .__init__ import *
|
||||||
|
|
||||||
|
|
||||||
def compareFractionsFunc(maxVal=10):
|
def compareFractionsFunc(maxVal=10, style='raw'):
|
||||||
a = random.randint(1, maxVal)
|
a = random.randint(1, maxVal)
|
||||||
b = random.randint(1, maxVal)
|
b = random.randint(1, maxVal)
|
||||||
c = random.randint(1, maxVal)
|
c = random.randint(1, maxVal)
|
||||||
@@ -21,8 +21,11 @@ def compareFractionsFunc(maxVal=10):
|
|||||||
solution = "<"
|
solution = "<"
|
||||||
else:
|
else:
|
||||||
solution = "="
|
solution = "="
|
||||||
|
|
||||||
problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?"
|
if style == 'latex':
|
||||||
|
problem = f"Which symbol represents the comparison between \\(\\frac{{{a}}}{{{b}}}\\) and \\(\\frac{{{c}}}{{{d}}}\\)?"
|
||||||
|
else:
|
||||||
|
problem = f"Which symbol represents the comparison between {a}/{b} and {c}/{d}?"
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
from .__init__ import *
|
from .__init__ import *
|
||||||
|
|
||||||
|
|
||||||
def cubeRootFunc(minNo=1, maxNo=1000):
|
def cubeRootFunc(minNo=1, maxNo=1000, style='raw'):
|
||||||
b = random.randint(minNo, maxNo)
|
b = random.randint(minNo, maxNo)
|
||||||
a = b**(1 / 3)
|
a = b**(1 / 3)
|
||||||
|
|
||||||
problem = "cuberoot of " + str(b) + " upto 2 decimal places is:"
|
if style == 'latex':
|
||||||
solution = str(round(a, 2))
|
problem = f"\\(\\sqrt[3]{{{b}}}=\\)"
|
||||||
|
solution = "\\(" + str(round(a, 2)) + "\\)"
|
||||||
|
else:
|
||||||
|
problem = "What is the cube root of " + str(b) + " up to 2 decimal places?"
|
||||||
|
solution = str(round(a, 2))
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
from .__init__ import *
|
from .__init__ import *
|
||||||
|
|
||||||
|
|
||||||
def exponentiationFunc(maxBase=20, maxExpo=10):
|
def exponentiationFunc(maxBase=20, maxExpo=10, style='raw'):
|
||||||
base = random.randint(1, maxBase)
|
base = random.randint(1, maxBase)
|
||||||
expo = random.randint(1, maxExpo)
|
expo = random.randint(1, maxExpo)
|
||||||
|
|
||||||
problem = f"{base}^{expo} ="
|
if style == 'latex':
|
||||||
solution = str(base**expo)
|
problem = f"\\({base}^{{{expo}}}\\)"
|
||||||
|
solution = "\\(" + str(base**expo) + "\\)"
|
||||||
|
else:
|
||||||
|
problem = f"{base}^{expo} ="
|
||||||
|
solution = str(base**expo)
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,18 +3,18 @@ from .__init__ import *
|
|||||||
|
|
||||||
def isprime(max_a=100):
|
def isprime(max_a=100):
|
||||||
a = random.randint(2, max_a)
|
a = random.randint(2, max_a)
|
||||||
problem = a
|
problem = f"Is {a} prime?"
|
||||||
if a == 2:
|
if a == 2:
|
||||||
solution = True
|
solution = "Yes"
|
||||||
return (problem, solution)
|
return (problem, solution)
|
||||||
if a % 2 == 0:
|
if a % 2 == 0:
|
||||||
solution = False
|
solution = "No"
|
||||||
return (problem, solution)
|
return (problem, solution)
|
||||||
for i in range(3, a // 2 + 1, 2):
|
for i in range(3, a // 2 + 1, 2):
|
||||||
if a % i == 0:
|
if a % i == 0:
|
||||||
solution = False
|
solution = "No"
|
||||||
return (problem, solution)
|
return (problem, solution)
|
||||||
solution = True
|
solution = "Yes"
|
||||||
return (problem, solution)
|
return (problem, solution)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ def percentageFunc(maxValue=99, maxpercentage=99):
|
|||||||
problem = f"What is {a}% of {b}?"
|
problem = f"What is {a}% of {b}?"
|
||||||
percentage = a / 100 * b
|
percentage = a / 100 * b
|
||||||
formatted_float = "{:.2f}".format(percentage)
|
formatted_float = "{:.2f}".format(percentage)
|
||||||
solution = f"Required percentage = {formatted_float}%"
|
solution = f"{formatted_float}"
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,18 @@
|
|||||||
from .__init__ import *
|
from .__init__ import *
|
||||||
|
|
||||||
|
|
||||||
def powerOfPowersFunc(maxBase=50, maxPower=10):
|
def powerOfPowersFunc(maxBase=50, maxPower=10, style='raw'):
|
||||||
base = random.randint(1, maxBase)
|
base = random.randint(1, maxBase)
|
||||||
power1 = random.randint(1, maxPower)
|
power1 = random.randint(1, maxPower)
|
||||||
power2 = random.randint(1, maxPower)
|
power2 = random.randint(1, maxPower)
|
||||||
step = power1 * power2
|
step = power1 * power2
|
||||||
|
|
||||||
problem = "The {base}^{power1}^{power2} = ".format(base=base,
|
if style == 'latex':
|
||||||
power1=power1,
|
problem = "Simplify \\(" + str(base) + "^{" + str(power1) + "^{" + str(power2) + "}}\\)"
|
||||||
power2=power2)
|
solution = f"\\({base}^{{{step}}}\\)"
|
||||||
solution = str(base) + '^' + str(step)
|
else:
|
||||||
|
problem = f"Simplify {base}^{power1}^{power2}="
|
||||||
|
solution = str(base) + '^' + str(step)
|
||||||
return problem, solution
|
return problem, solution
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user