changed the name of function to sum_dotproduct

SnShine · SnShine · commit c1295f2ddf4c · 2016-03-16T17:53:09.000+05:30
diff --git a/learning.py b/learning.py
@@ -447,7 +447,7 @@ def predict(example):
         for layer in learned_net[1:]:
             for node in layer:
                 inc = [n.value for n in node.inputs]
-                in_val = dotproduct(inc, node.weights)
+                in_val = sum_dotproduct(inc, node.weights)
                 node.value = node.activation(in_val)
 
         # Hypothesis
@@ -530,7 +530,7 @@ def BackPropagationLearner(dataset, net, learning_rate, epoches):
             for layer in net[1:]:
                 for node in layer:
                     inc = [n.value for n in node.inputs]
-                    in_val = dotproduct(inc, node.weights)
+                    in_val = sum_dotproduct(inc, node.weights)
                     node.value = node.activation(in_val)
 
             # Initialize delta
@@ -554,7 +554,7 @@ def BackPropagationLearner(dataset, net, learning_rate, epoches):
                      for k in range(h_units)]
 
                 delta[i] = [(layer[j].value) * (1 - layer[j].value) *
-                            dotproduct(w[j], delta[i+1])
+                            sum_dotproduct(w[j], delta[i+1])
                             for j in range(h_units)]
 
             #  Update weights
@@ -591,7 +591,7 @@ def predict(example):
         for layer in learned_net[1:]:
             for node in layer:
                 inc = [n.value for n in node.inputs]
-                in_val = dotproduct(inc, node.weights)
+                in_val = sum_dotproduct(inc, node.weights)
                 node.value = node.activation(in_val)
 
         # Hypothesis
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -83,8 +83,8 @@ def test_histogram():
                                                             (7, 1), (5, 1)]
 
 
-def test_dotproduct():
-    assert dotproduct([1, 2, 3], [1000, 100, 10]) == 1230
+def test_sum_dotproduct():
+    assert sum_dotproduct([1, 2, 3], [1000, 100, 10]) == 1230
 
 
 def test_vector_add():
@@ -117,9 +117,9 @@ def f():
 
 
 def test_sigmoid():
-    assert isclose(0.5, sigmoid(0)) 
-    assert isclose(0.7310585786300049, sigmoid(1)) 
-    assert isclose(0.2689414213699951, sigmoid(-1)) 
+    assert isclose(0.5, sigmoid(0))
+    assert isclose(0.7310585786300049, sigmoid(1))
+    assert isclose(0.2689414213699951, sigmoid(-1))
 
 
 def test_step():
diff --git a/utils.py b/utils.py
@@ -162,11 +162,17 @@ def histogram(values, mode=0, bin_function=None):
         return sorted(bins.items())
 
 
-def dotproduct(X, Y):
+def sum_dotproduct(X, Y):
     """Return the sum of the element-wise product of vectors x and y."""
     return sum(x * y for x, y in zip(X, Y))
 
 
+def dotproduct(X, Y):
+    """Return element-wise product of vectors x and y"""
+    assert len(X) == len(Y)
+    return(list(x * y for x, y in zip(X, Y)))
+
+
 def vector_add(a, b):
     """Component-wise addition of two vectors."""
     return tuple(map(operator.add, a, b))
