Changeset 397

Timestamp:

06/26/08 13:49:29 (5 months ago)

Author:

pierre

Message:

Great improvement of the distance dependant distance. Speed up considerably the building time

Files:

• trunk/src/common.py (modified) (2 diffs)
• trunk/src/nest2/connectors.py (modified) (1 diff)

trunk/src/common.py

@@ -214 +214 @@
-    
-    if not periodic_boundaries == None:
-
+
+
-    if mask is not None:
-        d = d[mask]
@@ -244 +245 @@
-            dims  = diff2.shape
-            diff2 = diff2.flatten()
+            #diff2 = numpy.minimum(diff2, periodic_boundaries[i]-diff2)
-            diff2 = numpy.array(map(min, ((x_i, y_i) for (x_i, y_i) in zip(diff2, periodic_boundaries[i]-diff2))))
-            diff2 = diff2.reshape(dims)

trunk/src/nest2/connectors.py

@@ -137 +137 @@
-                                         periodic_boundaries)
-            for post in postsynaptic_neurons:
+                func = eval("lambda d: %s" %self.d_expression)
+                distances[0] = func(distances[0])
+                #probabilities = map(func,distances[0])
+                
-                if self.allow_self_connections or pre != post: 
-                    # calculate the distance between the two cells :
-
-
+
+
+
-                    if p >= 1 or (0 < p < 1 and rarr[j] < p):
-                        target_list.append(post)