From fe0c86b33e09ee962c373e3ba01b9c0e1bd77a94 Mon Sep 17 00:00:00 2001
From: lukew3 <lukew25073@gmail.com>
Date: Mon, 19 Oct 2020 09:28:09 -0400
Subject: [PATCH] Fix euclidianNorm and angleBtwVectors issues

---
 mathgenerator/funcs/__init__.py                             | 2 ++
 .../funcs/{AngleBtwVectors.py => angleBtwVectorsFunc.py}    | 6 +++---
 .../funcs/{eucldianNorm.py => euclidianNormFunc.py}         | 2 +-
 mathgenerator/mathgen.py                                    | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename mathgenerator/funcs/{AngleBtwVectors.py => angleBtwVectorsFunc.py} (65%)
 rename mathgenerator/funcs/{eucldianNorm.py => euclidianNormFunc.py} (83%)

diff --git a/mathgenerator/funcs/__init__.py b/mathgenerator/funcs/__init__.py
index efb1ce7..25fb266 100644
--- a/mathgenerator/funcs/__init__.py
+++ b/mathgenerator/funcs/__init__.py
@@ -71,3 +71,5 @@ from .multiplyComplexNumbersFunc import *
 from .geomProgrFunc import *
 from .geometricMeanFunc import *
 from .harmonicMeanFunc import *
+from .euclidianNormFunc import *
+from .angleBtwVectorsFunc import *
diff --git a/mathgenerator/funcs/AngleBtwVectors.py b/mathgenerator/funcs/angleBtwVectorsFunc.py
similarity index 65%
rename from mathgenerator/funcs/AngleBtwVectors.py
rename to mathgenerator/funcs/angleBtwVectorsFunc.py
index 09e0a11..bd2d0b5 100644
--- a/mathgenerator/funcs/AngleBtwVectors.py
+++ b/mathgenerator/funcs/angleBtwVectorsFunc.py
@@ -1,15 +1,15 @@
-import eucldianNorm
+from .euclidianNormFunc import euclidianNormFunc
 import math
 from .__init__ import *
 
 
-def AngleBtwVectors(v1: list, v2: list):
+def angleBtwVectorsFunc(v1: list, v2: list):
     sum = 0
     for i in v1:
         for j in v2:
             sum += i * j
 
-    mags = euclidianNorm(v1) * euclidianNorm(v2)
+    mags = euclidianNormFunc(v1) * euclidianNormFunc(v2)
     problem = f"angle between the vectors {v1} and {v2} is:"
     solution = math.acos(sum / mags)
     # would return the answer in radians
diff --git a/mathgenerator/funcs/eucldianNorm.py b/mathgenerator/funcs/euclidianNormFunc.py
similarity index 83%
rename from mathgenerator/funcs/eucldianNorm.py
rename to mathgenerator/funcs/euclidianNormFunc.py
index b672add..f66329e 100644
--- a/mathgenerator/funcs/eucldianNorm.py
+++ b/mathgenerator/funcs/euclidianNormFunc.py
@@ -1,7 +1,7 @@
 from .__init__ import *
 
 
-def euclidianNorm(v1: list):
+def euclidianNormFunc(v1: list):
     problem = f"Euclidian norm or L2 norm of the vector{v1} is:"
     solution = sqrt(sum([i**2 for i in v1]))
     return problem, solution
diff --git a/mathgenerator/mathgen.py b/mathgenerator/mathgen.py
index 4062a96..fa8fd91 100644
--- a/mathgenerator/mathgen.py
+++ b/mathgenerator/mathgen.py
@@ -156,5 +156,5 @@ complexNumMultiply = Generator("Multiplication of 2 complex numbers", 65, "(x +
 geometricprogression=Generator("Geometric Progression", 66, "Initial value,Common Ratio,nth Term,Sum till nth term =", "a,r,ar^n-1,sum(ar^n-1", geomProgrFunc)
 geometricMean=Generator("Geometric Mean of N Numbers",67,"Geometric mean of n numbers A1 , A2 , ... , An = ","(A1*A2*...An)^(1/n) = ans",geometricMeanFunc)
 harmonicMean=Generator("Harmonic Mean of N Numbers",68,"Harmonic mean of n numbers A1 , A2 , ... , An = "," n/((1/A1) + (1/A2) + ... + (1/An)) = ans",harmonicMeanFunc)
-eucldianNorm=Generator("Euclidian norm or L2 norm of a vector", 69, "Euclidian Norm of a vector V:[v1, v2, ......., vn]", "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNorm)
-angleBtwVectors=Generator("Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", AngleBtwVectors)
+eucldianNorm=Generator("Euclidian norm or L2 norm of a vector", 69, "Euclidian Norm of a vector V:[v1, v2, ......., vn]", "sqrt(v1^2 + v2^2 ........ +vn^2)", euclidianNormFunc)
+angleBtwVectors=Generator("Angle between 2 vectors", 70, "Angle Between 2 vectors V1=[v11, v12, ..., v1n] and V2=[v21, v22, ....., v2n]", "V1.V2 / (euclidNorm(V1)*euclidNorm(V2))", angleBtwVectorsFunc)