From b73fe7688b830fa2869bb8a2469579d1cc0a8027 Mon Sep 17 00:00:00 2001 From: Sankari Karthik Date: Mon, 11 Oct 2021 08:54:35 +0530 Subject: [PATCH 1/2] Added generator for percentage difference --- .../funcs/basic_math/percentage_difference.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 mathgenerator/funcs/basic_math/percentage_difference.py diff --git a/mathgenerator/funcs/basic_math/percentage_difference.py b/mathgenerator/funcs/basic_math/percentage_difference.py new file mode 100644 index 0000000..d93a6c6 --- /dev/null +++ b/mathgenerator/funcs/basic_math/percentage_difference.py @@ -0,0 +1,24 @@ +from .__init__ import * + + +def gen_func(maxValue=200, minValue=0, format='string'): + value_a = random.randint(minValue, maxValue) + value_b = random.randint(minValue, maxValue) + + diff = 2 * (abs(value_a - value_b) / abs(value_a + value_b)) * 100 + diff = round(diff, 2) + + if format == 'string': + problem = f"What is the percentage difference between {value_a} and {value_b}?" + solution = str(diff) + "%" + return problem, solution + + elif format == 'latex': + return 'Latex unavailable' + + else: + return value_a, value_b, diff + + +percentage_difference = Generator("Percentage difference", , gen_func, + ["maxValue=200", "minValue=0"]) From 5b997b1a75331e155cb9c534bb7066d0677d2dee Mon Sep 17 00:00:00 2001 From: Sankari Karthik Date: Mon, 11 Oct 2021 18:30:55 +0530 Subject: [PATCH 2/2] Updated __init__.py --- mathgenerator/funcs/basic_math/__init__.py | 1 + mathgenerator/funcs/misc/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mathgenerator/funcs/basic_math/__init__.py b/mathgenerator/funcs/basic_math/__init__.py index 1ec3ede..c003f1c 100644 --- a/mathgenerator/funcs/basic_math/__init__.py +++ b/mathgenerator/funcs/basic_math/__init__.py @@ -14,6 +14,7 @@ from .greatest_common_divisor import * from .is_prime import * from .multiplication import * from .percentage import * +from .percentage_difference import * from .percentage_error import * from .power_of_powers import * from .square import * diff --git a/mathgenerator/funcs/misc/__init__.py b/mathgenerator/funcs/misc/__init__.py index 5ea41d1..a7be655 100644 --- a/mathgenerator/funcs/misc/__init__.py +++ b/mathgenerator/funcs/misc/__init__.py @@ -19,10 +19,10 @@ from .is_leap_year import * from .lcm import * from .minutes_to_hours import * from .prime_factors import * +from .product_of_scientific_notations import * from .profit_loss_percent import * from .quotient_of_power_same_base import * from .quotient_of_power_same_power import * from .set_operation import * from .signum_function import * from .surds_comparison import * -from .product_of_scientific_notations import *