From 57456ca1ad34b3c76acfb8c1efaf1626bd06c70e Mon Sep 17 00:00:00 2001 From: adit098 Date: Mon, 19 Oct 2020 21:44:18 +0530 Subject: [PATCH] fix #252 --- mathgenerator/funcs/DecimalToOctalFunc.py | 11 +++++++++++ mathgenerator/funcs/__init__.py | 2 ++ mathgenerator/mathgen.py | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 mathgenerator/funcs/DecimalToOctalFunc.py diff --git a/mathgenerator/funcs/DecimalToOctalFunc.py b/mathgenerator/funcs/DecimalToOctalFunc.py new file mode 100644 index 0000000..703ef45 --- /dev/null +++ b/mathgenerator/funcs/DecimalToOctalFunc.py @@ -0,0 +1,11 @@ +from .__init__ import * + + +def DecimalToHexFunc(max_dec=99): + a = random.randint(1, max_dec) + b = oct(a) + + problem = "Octal of " + str(a) + "=" + solution = str(b) + + return problem, solution diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index efb1ce7..d9e880a 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -71,3 +71,5 @@ from .multiplyComplexNumbersFunc import * from .geomProgrFunc import * from .geometricMeanFunc import * from .harmonicMeanFunc import * +from .DegreeToRadian import * +from .DecimalToOctal import * \ No newline at end of file diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index 4fca697..2d2697d 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -158,4 +158,6 @@ geometricMean=Generator("Geometric Mean of N Numbers",66,"Geometric mean of n nu harmonicMean=Generator("Harmonic Mean of N Numbers",67,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc) decimalToHexadecimal = Generator("Decimal to Hexadecimal", 68, "Hexadecimal of a=", "b", DecimalToHexFunc) -degreeToRadian = Generator("Degree To Radian", 69, "Radian of angle=", "radian", DegreeToRadian) \ No newline at end of file +degreeToRadian = Generator("Degree To Radian", 69, "Radian of angle=", "radian", DegreeToRadian) +decimalToOctal = Generator("Decimal to Octal", 70, + "Octal of a=", "b", DecimalToOctalFunc) \ No newline at end of file