deadvey/mathgenerator
1
0
Fork 0
mirror of https://github.com/DeaDvey/mathgenerator.git synced 2025-11-28 14:35:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Todarith/mathgenerator

Browse Source 
 Conflicts:
	mathgenerator/funcs/celsiustofahrenheit.py
This commit is contained in:
Nitsujed
2020-10-19 14:20:54 -04:00
parent 5adeaf733d f204de60f6
commit 8699f89c0d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mathgenerator/funcs/__init__.py
View File

@@ -83,3 +83,4 @@ from .determinantToMatrix22 import *
from .compoundInterestFunc import * from .compoundInterestFunc import *
from .deciToHexaFunc import * from .deciToHexaFunc import *
from .percentageFunc import * from .percentageFunc import *
from .celsiustofahrenheit import *

11
mathgenerator/funcs/celsiustofahrenheit.py
View File

@@ -1,11 +1,14 @@
from .__init__ import * from .__init__ import *
from ..__init__ import Generator from ..__init__ import Generator
def celsiustofahrenheitFunc(maxTemp=100): def celsiustofahrenheitFunc(maxTemp=100):
celsius = random.randint(-50, maxTemp) celsius = random.randint(-50, maxTemp)
fahrenheit = (celsius * (9/5)) +32 fahrenheit = (celsius * (9 / 5)) + 32
problem = "Convert " + str(celsius) + " degrees Celsius to degrees Fahrenheit = " problem = "Convert", str(celsius), "degrees Celsius to degrees Fahrenheit ="
solution = str(fahrenheit) solution = str(fahrenheit)
return problem, solution return problem, solution
celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81, "(C +(9/5))+32=", "F", celsiustofahrenheitFunc)
celsiustofahrenheit = Generator("Celsius To Fahrenheit", 81,
"(C +(9/5))+32=", "F", celsiustofahrenheitFunc)