diff --git a/mathgenerator/__pycache__/__init__.cpython-37.pyc b/mathgenerator/__pycache__/__init__.cpython-37.pyc index 893336f..8b0d083 100644 Binary files a/mathgenerator/__pycache__/__init__.cpython-37.pyc and b/mathgenerator/__pycache__/__init__.cpython-37.pyc differ diff --git a/mathgenerator/__pycache__/mathgen.cpython-37.pyc b/mathgenerator/__pycache__/mathgen.cpython-37.pyc index 82bcec4..26c552d 100644 Binary files a/mathgenerator/__pycache__/mathgen.cpython-37.pyc and b/mathgenerator/__pycache__/mathgen.cpython-37.pyc differ diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py index fc1fc53..4e6c751 100644 --- a/mathgenerator/mathgen.py +++ b/mathgenerator/mathgen.py @@ -798,21 +798,21 @@ def surdsComparisonFunc(maxValue = 100, maxRoot = 10): solution = "<" return problem, solution -def fibonacciSeriesFunc(minNo=1): - n = random.randint(minNo,20) - def createFibList(n): - l=[] - for i in range(n): - if i<2: - l.append(i) - else: - val = l[i-1]+l[i-2] - l.append(val) - return l - fibList=createFibList(n) - problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" - solution = fibList - return problem,solution +# def fibonacciSeriesFunc(minNo=1): +# n = random.randint(minNo,20) +# def createFibList(n): +# l=[] +# for i in range(n): +# if i<2: +# l.append(i) +# else: +# val = l[i-1]+l[i-2] +# l.append(val) +# return l +# fibList=createFibList(n) +# problem = "The Fibonacci Series of the first "+str(n)+" numbers is ?" +# solution = fibList +# return problem,solution def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): #Handles degrees in quadrant one angle=random.choice(angles) @@ -826,6 +826,29 @@ def basicTrigonometryFunc(angles=[0,30,45,60,90],functions=["sin","cos","tan"]): return problem,solution + +def data_desc(number_values=15,minval=5,maxval=50): + random_list=[] + for i in range(number_values): + n=random.randint(minval,maxval) + random_list.append(n) + a=sum(random_list) + mean=a/number_values + var=0 + for i in range(number_values): + var+=(random_list[i]-mean)**2 + print(random_list) + print(mean) + print(var/number_values) + print((var/number_values)**0.5) + problem="Find the mean,standard deviation and variance for the data"+str(random_list) + solution="The Mean is {} , Standard Deviation is {}, Variance is {}".format(mean,var/number_values,(var/number_values)**0.5) + return problem,solution + + + + + # || Class Instances #Format is: @@ -887,5 +910,6 @@ diceSumProbability=Generator("Probability of a certain sum appearing on faces of exponentiation = Generator("Exponentiation", 53,"a^b = ","c",exponentiationFunc) confidenceInterval = Generator("Confidence interval For sample S", 54, "With X% confidence", "is (A,B)", confidenceIntervalFunc) surdsComparison = Generator("Comparing surds", 55, "Fill in the blanks a^(1/b) _ c^(1/d)", "/=", surdsComparisonFunc) -fibonacciSeries = Generator("Fibonacci Series",56,"fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a",fibonacciSeriesFunc) +# fibonacciSeries = Generator("Fibonacci Series",56,"fibonacci series of first a numbers","prints the fibonacci series starting from 0 to a",fibonacciSeriesFunc) basicTrigonometry=Generator("Trigonometric Values",57,"What is sin(X)?","ans",basicTrigonometryFunc) +data_summary=Generator("Mean,Standard Deviation,Variance",58,"a,b,c","Mean:a+b+c/3,Std,Var",data_desc) \ No newline at end of file