X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdunshire%2Fmatrices.py;h=2006fd20427b999fd8061a74e89e03508b55f0f1;hb=4bf45d1711033bc419e1c48a7906f21de67ef791;hp=7bfc429bdd5651b10e07cae79a653e1e3cc925b5;hpb=dae85d103fae8b7247667f2a621fd245f95b5db4;p=dunshire.git

diff --git a/src/dunshire/matrices.py b/src/dunshire/matrices.py
index 7bfc429..2006fd2 100644
--- a/src/dunshire/matrices.py
+++ b/src/dunshire/matrices.py
@@ -83,6 +83,37 @@ def identity(domain_dim):
     return matrix(entries, (domain_dim, domain_dim))
 
 
+def inner_product(vec1, vec2):
+    """
+    Compute the (Euclidean) inner product of the two vectors ``vec1``
+    and ``vec2``.
+
+    EXAMPLES:
+
+        >>> x = [1,2,3]
+        >>> y = [3,4,1]
+        >>> inner_product(x,y)
+        14
+
+        >>> x = matrix([1,1,1])
+        >>> y = matrix([2,3,4], (1,3))
+        >>> inner_product(x,y)
+        9
+
+        >>> x = [1,2,3]
+        >>> y = [1,1]
+        >>> inner_product(x,y)
+        Traceback (most recent call last):
+        ...
+        TypeError: the lengths of vec1 and vec2 must match
+
+    """
+    if not len(vec1) == len(vec2):
+        raise TypeError('the lengths of vec1 and vec2 must match')
+
+    return sum([x*y for (x, y) in zip(vec1, vec2)])
+
+
 def norm(matrix_or_vector):
     """
     Return the Frobenius norm of ``matrix_or_vector``, which is the same
@@ -100,7 +131,7 @@ def norm(matrix_or_vector):
         2.0
 
     """
-    return sqrt(sum([x**2 for x in matrix_or_vector]))
+    return sqrt(inner_product(matrix_or_vector, matrix_or_vector))
 
 
 def vec(real_matrix):