From ce79a2a94b67f06ddec87937135e9708b4a8dd53 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Mon, 19 Oct 2020 20:42:49 -0400 Subject: [PATCH] Fixed all ordering except for addition --- mathgenerator/funcs/__init__.py | 8 ++++---- test.py | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index bf9803e..8937e2c 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -11,8 +11,8 @@ from .moduloFunc import * from .squareRootFunc import * from .powerRuleDifferentiationFunc import * from .squareFunc import * -from .gcdFunc import * from .lcmFunc import * +from .gcdFunc import * from .basicAlgebraFunc import * from .logFunc import * from .divisionToIntFunc import * @@ -35,10 +35,10 @@ from .regularPolygonAngleFunc import * from .combinationsFunc import * from .factorialFunc import * from .surfaceAreaCube import * -from .volumeCube import * from .surfaceAreaCuboid import * -from .volumeCuboid import * from .surfaceAreaCylinder import * +from .volumeCube import * +from .volumeCuboid import * from .volumeCylinder import * from .surfaceAreaCone import * from .volumeCone import * @@ -84,5 +84,5 @@ from .compoundInterestFunc import * from .deciToHexaFunc import * from .percentageFunc import * from .celsiustofahrenheit import * -from .arithmeticProgressionSumFunc import * from .arithmeticProgressionTermFunc import * +from .arithmeticProgressionSumFunc import * diff --git a/test.py b/test.py index 1302ce5..7f2d993 100644 --- a/test.py +++ b/test.py @@ -4,3 +4,9 @@ from mathgenerator import mathgen print(mathgen.addition()) print(mathgen.genById(79)) +print(mathgen.getGenList()) +list = mathgen.getGenList() + +# prints the order of generators in the list +for item in list: + print(item[2])