Changeset 716

Timestamp:

02/19/10 16:58:37 (2 years ago)

Author:

apdavison

Message:

Using distance-dependent expressions for weights or delays in Connectors was broken. This needs to be back-ported to 0.6.

Location:

trunk

Files:

• doc/highlevelapi.txt (modified) (1 diff)
• src/connectors.py (modified) (2 diffs)

trunk/doc/highlevelapi.txt

@@ -405 +405 @@
 In more abstract models, it is often useful to be able to avoid edge effects by specifying periodic boundary conditions, e.g.::
 
-    >>> connector = DistanceDependentProbabilityConnector("exp(-abs(d))", space=Space(periodic_boundaries=(500, 500, 0)))
+    >>> connector = DistanceDependentProbabilityConnector("exp(-abs(d))", space=Space(periodic_boundaries=((0,500), (0,500), None)))
     
 calculates distance on the surface of a torus of circumference 500 µm (wrap-around in the x- and y-dimensions but not z).

trunk/src/connectors.py

@@ -61 +61 @@
         self.w_index = 0 # should probably use a generator
         self.d_index = 0 # rather than storing these values
-        self.weights = weights
-        self.delays = delays
+        if isinstance(weights, basestring):
+            self.w_expr = weights
+            self.weights = numpy.empty((1,0))
+        else:
+            self.weights = weights
+        if isinstance(delays, basestring):
+            self.d_expr = delays
+            self.delays = numpy.empty((1,0))
+        else:
+            self.delays = delays
         
         if delays is None:
@@ -540 +548 @@
                 self.weights = numpy.concatenate((self.weights, eval(self.w_expr)), axis=1)
             if hasattr(self, 'd_expr'):
+                delays = eval(self.d_expr)
                 self.delays = numpy.concatenate((self.delays, eval(self.d_expr)), axis=1)
         if hasattr(self.weights, 'shape'): self.weights = self.weights.flatten()