Remove mathgen (#396)

* Improve generator __init__ function

* Move Generator to new file, remove mathgen

* Remove getGenList redundancies

* Add backwards compatibility import mathgen from

* Insort to genList

* Linter fixes

* Lint fixes

mathgenerator/__init__.py

@@ -1,37 +1,10 @@
-import os
+from .funcs import *
-import traceback
+from .generator import getGenList
+
+genList = getGenList()
 
 
-genList = []
+# || Non-generator Functions
-
+def genById(id, *args, **kwargs):
-SEP = os.sep
+    generator = genList[id][2]
-
+    return (generator(*args, **kwargs))
-
-class Generator:
-    def __init__(self, title, id, func, kwargs):
-        self.title = title
-        self.id = id
-        self.func = func
-        self.kwargs = kwargs
-
-        (filename, line_number, function_name,
-         text) = traceback.extract_stack()[-2]
-        funcname = filename[filename.rfind(SEP):].strip()
-        funcname = funcname[1:-3]
-        subjectname = filename[:filename.rfind(SEP)].strip()
-        subjectname = subjectname[subjectname.rfind(SEP):].strip()
-        subjectname = subjectname[1:]
-        genList.append([id, title, self, funcname, subjectname, kwargs])
-
-    def __str__(self):
-        return str(self.id) + " " + self.title
-
-    def __call__(self, *args, **kwargs):
-        return self.func(*args, **kwargs)
-
-
-def getGenList():
-    correctedList = genList[-1:] + genList[:-1]
-    # Orders list by id
-    correctedList.sort()
-    return correctedList

mathgenerator/funcs/algebra/basic_algebra.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/combine_like_terms.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/complex_quadratic.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/compound_interest.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/distance_two_points.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/expanding.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/factoring.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/int_matrix_22_determinant.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/intersection_of_two_lines.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import fractions
 

mathgenerator/funcs/algebra/invert_matrix.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 import sympy

mathgenerator/funcs/algebra/linear_equations.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/log.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/matrix_multiplication.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/midpoint_of_two_points.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/multiply_complex_numbers.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/multiply_int_to_22_matrix.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/quadratic_equation.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/algebra/simple_interest.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/system_of_equations.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/vector_cross.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/algebra/vector_dot.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/absolute_difference.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/addition.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/compare_fractions.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/cube_root.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/divide_fractions.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/division.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/exponentiation.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/factorial.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/fraction_multiplication.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/fraction_to_decimal.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/greatest_common_divisor.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/is_composite.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/is_prime.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/multiplication.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/percentage.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/percentage_difference.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/percentage_error.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/power_of_powers.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/square.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/square_root.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/basic_math/subtraction.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/calculus/definite_integral.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 from scipy.integrate import quad
 

mathgenerator/funcs/calculus/differentiation.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import sympy
 

mathgenerator/funcs/calculus/power_rule_differentiation.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/calculus/power_rule_integration.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/calculus/stationary_points.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import sympy
 

mathgenerator/funcs/computer_science/bcd_to_decimal.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/binary_2s_complement.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/binary_complement_1s.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/binary_to_decimal.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/binary_to_hex.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/decimal_to_bcd.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/decimal_to_binary.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/decimal_to_hexadeci.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/decimal_to_octal.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/fibonacci_series.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/modulo_division.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/computer_science/nth_fibonacci_number.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/angle_btw_vectors.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/angle_regular_polygon.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/arc_length.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/area_of_circle.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/area_of_circle_given_center_and_point.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 from math import cos, sin, pi
 

mathgenerator/funcs/geometry/area_of_triangle.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/basic_trigonometry.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/circumference.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/curved_surface_area_cylinder.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/degree_to_rad.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/equation_of_line_from_two_points.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/fourth_angle_of_quadrilateral.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/perimeter_of_polygons.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/pythagorean_theorem.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/radian_to_deg.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/sector_area.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/sum_of_polygon_angles.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/surface_area_cone.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/surface_area_cube.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/surface_area_cuboid.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/surface_area_cylinder.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/surface_area_pyramid.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 # List of Pythagorean triplets

mathgenerator/funcs/geometry/surface_area_sphere.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/third_angle_of_triangle.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/valid_triangle.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/volume_cone.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/volume_cube.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/volume_cuboid.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/volume_cylinder.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/volume_frustum.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/volume_hemisphere.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/geometry/volume_pyramid.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/geometry/volume_sphere.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math
 

mathgenerator/funcs/misc/arithmetic_progression_sum.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/arithmetic_progression_term.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/base_conversion.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/binomial_distribution.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/celsius_to_fahrenheit.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/common_factors.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 
 

mathgenerator/funcs/misc/complex_to_polar.py

@@ -1,4 +1,4 @@
-from ...__init__ import Generator
+from ...generator import Generator
 import random
 import math