Changeset 722

Timestamp:

03/03/10 10:53:42 (2 years ago)

Author:

pierre

Message:

Wrong commit, speed up was not complete...

Location:

trunk/src

Files:

• connectors.py (modified) (1 diff)
• space.py (modified) (1 diff)

trunk/src/connectors.py

@@ -534 +534 @@
         assert isinstance(space, Space)
         self.space = space
-
-        
-    def connect(self, projection):
-        """Connect-up a Projection."""
-        p = {}
-        for src in projection.pre.all():
-            local = projection.post._mask_local.flatten()
-            d   = self.space.distances(src.position, projection.post.positions, post_mask=local)
+        
+        
+    def connect(self, projection):
+        """Connect-up a Projection."""
+        p         = {}
+        local     = projection.post._mask_local.flatten()
+        positions = self.space.scale_factor*(projection.post.positions + self.space.offset)
+        
+        for src in projection.pre.all():            
+            d      = self.space.distances(src.position, positions, post_mask=local)
             p[src] = eval(self.d_expression).flatten()
             if p[src].dtype == 'bool':

trunk/src/space.py

@@ -63 +63 @@
         if len(B.shape) == 1:
             B = B.reshape(3, 1)
-        B = self.scale_factor*(B + self.offset)
+        # I'm not sure the following line should be here. Operations may be redundant and not very 
+        # transparent from the user point of view. I moved it into the DistanceDependentProbability Connector
+        #B = self.scale_factor*(B + self.offset)
         d = numpy.zeros((A.shape[1], B.shape[1]), dtype=A.dtype)
         for axis in self.axes: