One exp. iter. Added test for two elements.

williampeer · Mar 19, 2016 · a9d3e5e · a9d3e5e
1 parent 80a599e
commit a9d3e5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/ExperimentExecution.py b/ExperimentExecution.py
@@ -30,7 +30,7 @@
     uppercase_letter = training_patterns_associative[letter_ctr][0]
     training_patterns_heterogeneous.append([uppercase_letter, lowercase_letter])
 
-for trial in range(5):
+for trial in range(1):
     for train_set_size_ctr in range(5, 6):
         # dims,
         # connection_rate_input_ec, perforant_path, mossy_fibers,

diff --git a/Tests/TestSuite.py b/Tests/TestSuite.py
@@ -97,14 +97,17 @@ def test_equation_constrained_hebbian_learning_ec_ca3(self):
 
         activation_values_l1 = np.zeros_like(hpc.ec_values.get_value()).astype(np.float32)
         activation_values_l1.put([0, 0], 1)
+        activation_values_l1.put([0, 1], 1)
         hpc.set_ec_values(activation_values_l1)
 
         activation_values_l2 = np.zeros_like(hpc.ca3_values.get_value()).astype(np.float32)
         activation_values_l2.put([0, 0], 1)
         hpc.set_ca3_values(activation_values_l2)
 
-        current_weight_element = hpc.ec_ca3_weights.get_value()[0][0]
-        next_weight_element = current_weight_element + hpc._nu * (1 - current_weight_element)
+        current_weight_element_0 = hpc.ec_ca3_weights.get_value()[0][0]
+        next_weight_element_0 = current_weight_element_0 + hpc._nu * (1 - current_weight_element_0)
+        current_weight_element_1 = hpc.ec_ca3_weights.get_value()[1][0]
+        next_weight_element_1 = current_weight_element_1 + hpc._nu * (1 - current_weight_element_1)
 
         # wire EC to CA3
         n_rows = hpc.ec_values.get_value(return_internal_type=True).shape[1]
@@ -114,10 +117,14 @@ def test_equation_constrained_hebbian_learning_ec_ca3(self):
         hpc.wire_ec_to_ca3(u_prev_for_elemwise_ops_transposed, u_next_for_elemwise_ops,
                             hpc.ec_ca3_weights.get_value(return_internal_type=True))
 
-        self.assertAlmostEqual(hpc.ec_ca3_weights.get_value()[0][0], next_weight_element, places=6,
+        self.assertAlmostEqual(hpc.ec_ca3_weights.get_value()[0][0], next_weight_element_0, places=6,
                          msg="Weight update did not correspond to the predicted update value of the equation: "
-                             "next_weight_el != w_el : "+str(next_weight_element)+" != " +
+                             "next_weight_el_0 != w_el : "+str(next_weight_element_0)+" != " +
                              str(hpc.ec_ca3_weights.get_value()[0][0]))
+        self.assertAlmostEqual(hpc.ec_ca3_weights.get_value()[1][0], next_weight_element_1, places=6,
+                         msg="Weight update did not correspond to the predicted update value of the equation: "
+                             "next_weight_el_0 != w_el : "+str(next_weight_element_1)+" != " +
+                             str(hpc.ec_ca3_weights.get_value()[1][0]))
 
         # last element in weight matrix:
         weight_rows = activation_values_l1.shape[1]