Changeset 725

Timestamp:

03/10/10 11:16:33 (2 years ago)

Author:

apdavison

Message:

A few connector-related fixes, plus a new unit test for distance-dependent weights.

Location:

trunk

Files:

• src/connectors.py (modified) (9 diffs)
• src/nest/simulator.py (modified) (1 diff)
• test/unittests/generictests.py (modified) (2 diffs)

trunk/src/connectors.py

@@ -19 +19 @@
 from numpy import arccos, arcsin, arctan, arctan2, ceil, cos, cosh, e, exp, \
                   fabs, floor, fmod, hypot, ldexp, log, log10, modf, pi, power, \
-                  sin, sinh, sqrt, tan, tanh
+                  sin, sinh, sqrt, tan, tanh, maximum, minimum
 from pyNN import random, common, errors, core
 from pyNN.space import Space
@@ -58 +58 @@
     """Base class for Connector classes."""
     
-    def __init__(self, weights=0.0, delays=None):
+    def __init__(self, weights=0.0, delays=None, space=None):
         self.w_index = 0 # should probably use a generator
         self.d_index = 0 # rather than storing these values
@@ -71 +71 @@
         else:
             self.delays = delays
-        
         if delays is None:
             self.delays = common.get_min_delay()
+        if space is not None:
+            assert isinstance(space, Space)
+            self.space = space
         
     def connect(self, projection):
@@ -95 +97 @@
         return delays
 
+    def reset(self):
+        """
+        After running connect(), this should be called to reset attributes that
+        have been modified to their initial values.
+        """
+        if hasattr(self, "w_expr"):
+            self.weights = numpy.empty((1,0))
+        if hasattr(self, "d_expr"):
+            self.delays = numpy.empty((1,0))
+        self.w_index = 0 # should probably use a generator
+        self.d_index = 0 # rather than storing these values
+    
     
 class ProbabilisticConnector(Connector):
@@ -147 +161 @@
             if len(targets) > 0:
                 projection.connection_manager.connect(src, targets, weights, delays)
-
+        self.reset()        
 
 class AllToAllConnector(ProbabilisticConnector):
@@ -169 +183 @@
                      to the global minimum delay.
         """
-        Connector.__init__(self, weights, delays)
+        Connector.__init__(self, weights, delays, space)
         assert isinstance(allow_self_connections, bool)
         self.allow_self_connections = allow_self_connections
@@ -479 +493 @@
                      to the global minimum delay.
         """
-        Connector.__init__(self, weights, delays)
+        Connector.__init__(self, weights, delays, space)
         assert isinstance(allow_self_connections, bool)
         self.allow_self_connections = allow_self_connections
@@ -521 +535 @@
                      to the global minimum delay.
         """
-        Connector.__init__(self, weights, delays)
+        Connector.__init__(self, weights, delays, space)
         assert isinstance(d_expression, str)
         try:
@@ -529 +543 @@
             raise ZeroDivisionError("Error in the distance expression %s. %s" % (d_expression, err))
         self.d_expression = d_expression
-        self.space = space
         assert isinstance(allow_self_connections, bool)
         self.allow_self_connections = allow_self_connections
-        assert isinstance(space, Space)
-        self.space = space
         
         

trunk/src/nest/simulator.py

@@ -219 +219 @@
         """The ID of the post-synaptic neuron."""
         tgt = ID(nest.GetStatus([self.id()], 'target')[0])
-        tgt.parent = self.parent.parent.pre
+        tgt.parent = self.parent.parent.post
         tgt.local = nest.GetStatus([tgt], 'local')[0]
         return tgt

trunk/test/unittests/generictests.py

@@ -9 +9 @@
 import os
 import cPickle as pickle
-from pyNN import common, random, utility, recording, errors
+from pyNN import common, random, utility, recording, errors, space
 import glob
 
@@ -873 +873 @@
                     self.assertAlmostEqual(prj1.connections[0].delay, 0.4, 6) # nest rounds delays to the timestep
          
+    def testDistanceDependentWeights(self):
+        connectors = (
+            sim.AllToAllConnector(weights="exp(-d/10.0)", space=space.Space(scale_factor=0.9)),
+            sim.FixedProbabilityConnector(0.8, weights="maximum(3-d, 0)", space=space.Space(offset=0.1)),
+            sim.DistanceDependentProbabilityConnector("abs(d<3)", weights="sin(d)", space=space.Space(offset=0.1,
+                                                                                                      scale_factor=0.9)),
+        )
+        exp = numpy.exp
+        maximum = numpy.maximum
+        sin = numpy.sin
+        for srcP in [self.source5, self.source22]:
+            for tgtP in [self.target6, self.target33]:
+                for conn in connectors:
+                    print conn.w_expr
+                    prj = sim.Projection(srcP, tgtP, conn)
+                    first_connection = prj.connections[0]
+                    last_connection = prj.connections[-1]
+                    for c in first_connection, last_connection:
+                       d = space.distance(c.source, c.target)
+                       self.assertAlmostEqual(c.weight, eval(conn.w_expr), 10)
 
 class ProjectionSetTest(unittest.TestCase):