From ab00d7eb017a661dffea1d062985aa38f3c20ed7 Mon Sep 17 00:00:00 2001 From: lukew3 Date: Wed, 21 Oct 2020 21:41:57 -0400 Subject: [PATCH] quotient of power fixes --- mathgenerator/funcs/__init__.py | 2 ++ mathgenerator/funcs/quotient_of_power_same_base.py | 5 ++--- mathgenerator/funcs/quotient_of_power_same_power.py | 5 ++--- test.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py index 2a48ab3..7267a14 100644 --- a/mathgenerator/funcs/__init__.py +++ b/mathgenerator/funcs/__init__.py @@ -102,3 +102,5 @@ from .base_conversion import * from .curved_surface_area_cylinder import * from .perimeter_of_polygons import * from .power_of_powers import * +from .quotient_of_power_same_base import * +from .quotient_of_power_same_power import * diff --git a/mathgenerator/funcs/quotient_of_power_same_base.py b/mathgenerator/funcs/quotient_of_power_same_base.py index 4b74a7f..79449d2 100644 --- a/mathgenerator/funcs/quotient_of_power_same_base.py +++ b/mathgenerator/funcs/quotient_of_power_same_base.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def quotientOfPowerSameBaseFunc(maxBase=50, maxPower=10): @@ -17,5 +16,5 @@ def quotientOfPowerSameBaseFunc(maxBase=50, maxPower=10): return problem, solution -quotient_of_power_same_base = Generator("Quotient of Powers with Same Base", 82, - "6^4 / 6^2 = 6^(4-2) = 6^2", "36", quotientOfPowerSameBaseFunc()) +quotient_of_power_same_base = Generator("Quotient of Powers with Same Base", 98, + "6^4 / 6^2 = 6^(4-2) = 6^2", "36", quotientOfPowerSameBaseFunc) diff --git a/mathgenerator/funcs/quotient_of_power_same_power.py b/mathgenerator/funcs/quotient_of_power_same_power.py index d1383da..0c647db 100644 --- a/mathgenerator/funcs/quotient_of_power_same_power.py +++ b/mathgenerator/funcs/quotient_of_power_same_power.py @@ -1,5 +1,4 @@ from .__init__ import * -from ..__init__ import Generator def quotientOfPowerSamePowerFunc(maxBase=50, maxPower=10): @@ -17,5 +16,5 @@ def quotientOfPowerSamePowerFunc(maxBase=50, maxPower=10): return problem, solution -quotient_of_power_same_power = Generator("Quotient of Powers with Same Power", 83, - "6^4 / 3^4 = (6/3)^4 = 2^4", "16", quotientOfPowerSamePowerFunc()) +quotient_of_power_same_power = Generator("Quotient of Powers with Same Power", 99, + "6^4 / 3^4 = (6/3)^4 = 2^4", "16", quotientOfPowerSamePowerFunc) diff --git a/test.py b/test.py index 7af7f16..f331968 100644 --- a/test.py +++ b/test.py @@ -10,4 +10,4 @@ for item in list: print(item[2]) # print(mathgen.getGenList()) -print(mathgen.genById(97)) +print(mathgen.genById(99))