Add some tests for the Synapses class

brian2/synapses/synapses.py

@@ -910,6 +910,7 @@ def _allocate_memory(self, dtype=None):
         logger.debug("NeuronGroup memory allocated successfully.")
         return arrays             
 
+
     def connect_one_to_one(self):
         ''' Manually create a one to one connectivity pattern '''
 

brian2/tests/test_synapses.py

@@ -76,6 +76,119 @@ def test_connection_string_deterministic():
         _compare(S, expected)
 
 
+def test_connection_random():
+    '''
+    Test random connections.
+    '''
+    # We can only test probabilities 0 and 1 for strict correctness
+    G = NeuronGroup(42, 'v: 1')
+    G2 = NeuronGroup(17, 'v: 1')
+
+    for language in languages:
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect(True, p=0.0)
+        assert len(S) == 0
+        S.connect(True, p=1.0)
+        _compare(S, np.ones((len(G), len(G2))))
+
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect('rand() < 0.')
+        assert len(S) == 0
+        S.connect('rand() < 1.', p=1.0)
+        _compare(S, np.ones((len(G), len(G2))))
+
+        # Just make sure using values between 0 and 1 work in principle
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect(True, p=0.3)
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect('rand() < 0.3')
+
+        S = Synapses(G, G, 'w:1', 'v+=w', language=language)
+        S.connect('i!=j', p=0.0)
+        assert len(S) == 0
+        S.connect('i!=j', p=1.0)
+        expected = np.ones((len(G), len(G))) - np.eye(len(G))
+        _compare(S, expected)
+
+        S = Synapses(G, G, 'w:1', 'v+=w', language=language)
+        S.connect('i!=j', p=0.3)
+
+
+def test_connection_multiple_synapses():
+    '''
+    Test multiple synapses per connection.
+    '''
+    G = NeuronGroup(42, 'v: 1')
+    G2 = NeuronGroup(17, 'v: 1')
+
+    for language in languages:
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect(True, n=0)
+        assert len(S) == 0
+        S.connect(True, n=2)
+        _compare(S, 2*np.ones((len(G), len(G2))))
+
+        S = Synapses(G, G2, 'w:1', 'v+=w', language=language)
+        S.connect(True, n='j')
+
+        _compare(S, np.arange(len(G2)).reshape(1, len(G2)).repeat(len(G),
+                                                                  axis=0))
+
+
+def test_state_variable_assignment():
+    '''
+    Assign values to state variables in various ways
+    '''
+    G = NeuronGroup(10, 'v: volt')
+    S = Synapses(G, G, 'w:volt')
+    S.connect(True)
+
+    # with unit checking
+    assignment_expected = [
+        (5*mV, np.ones(100)*5*mV),
+        (7*mV, np.ones(100)*7*mV),
+        (S.i[:] * mV, S.i[:]*np.ones(100)*mV),
+        ('5*mV', np.ones(100)*5*mV),
+        ('i*mV', np.ones(100)*S.i[:]*mV),
+        ('i*mV +j*mV', S.i[:]*mV + S.j[:]*mV),
+        #('i*mV + j*mV + k*mV', S.i[:]*mV + S.j[:]*mV + S.k[:]*mV) #not supported yet
+    ]
+
+    for assignment, expected in assignment_expected:
+        S.w = 0*volt
+        S.w = assignment
+        assert_equal(S.w[:], expected,
+                     'Assigning %r gave incorrect result' % assignment)
+        S.w = 0*volt
+        S.w[:] = assignment
+        assert_equal(S.w[:], expected,
+                     'Assigning %r gave incorrect result' % assignment)
+
+    # without unit checking
+    assignment_expected = [
+        (5, np.ones(100)*5*volt),
+        (7, np.ones(100)*7*volt),
+        (S.i[:], S.i[:]*np.ones(100)*volt),
+        ('5', np.ones(100)*5*volt),
+        ('i', np.ones(100)*S.i[:]*volt),
+        ('i +j', S.i[:]*volt + S.j[:]*volt),
+        #('i + j + k', S.i[:]*volt + S.j[:]*volt + S.k[:]*volt) #not supported yet
+    ]
+
+    for assignment, expected in assignment_expected:
+        S.w = 0*volt
+        S.w_ = assignment
+        assert_equal(S.w[:], expected,
+                     'Assigning %r gave incorrect result' % assignment)
+        S.w = 0*volt
+        S.w_[:] = assignment
+        assert_equal(S.w[:], expected,
+                     'Assigning %r gave incorrect result' % assignment)
+
+
 if __name__ == '__main__':
     test_creation()
     test_connection_string_deterministic()
+    test_connection_random()
+    test_connection_multiple_synapses()
+    test_state_variable_assignment()