Changeset 411 for trunk

Timestamp:

07/20/09 16:40:25 (3 years ago)

Author:

pierre

Message:

Change in the DistantDependentPairs? to ad a set_bounds function to fix d_min and d_max

Files:

• trunk/src/signals/pairs.py (modified) (5 diffs)

trunk/src/signals/pairs.py

@@ -6 +6 @@
 # of size NxN. Should then include a scaling parameter to allow
 # distances between distincts populations ?
-def distance(pos_1, pos_2, N):
-    # Since we deal with a toroidal space, we have to take the min distance
+def distance(pos_1, pos_2, N=None):
+    # If N is not None, it means that we are dealing with a toroidal space, 
+    # and we have to take the min distance
     # on the torus.
-    dx = numpy.minimum(abs(pos_1[0]-pos_2[0]), N-(abs(pos_1[0]-pos_2[0])))
-    dy = numpy.minimum(abs(pos_1[1]-pos_2[1]), N-(abs(pos_1[1]-pos_2[1])))
+    if N is None:
+        dx = pos_1[0]-pos_2[0]
+        dy = pos_1[1]-pos_2[1]
+    else:
+        dx = numpy.minimum(abs(pos_1[0]-pos_2[0]), N-(abs(pos_1[0]-pos_2[0])))
+        dy = numpy.minimum(abs(pos_1[1]-pos_2[1]), N-(abs(pos_1[1]-pos_2[1])))
     return numpy.sqrt(dx*dx + dy*dy)
 
@@ -166 +171 @@
         length    - the lenght (in mm) covered by the extend of spk1 and spk2. Currently, spk1
                     and spk2 should cover the same surface. Default is spk1.length
-        
+        d_min     - the minimal distance between cells
+        d_max     - the maximal distance between cells
+            
     Examples:
         >> p = DistantDependentPairs(spk1, spk1, True, False)
@@ -178 +185 @@
     See also RandomPairs, CustomPairs, AutoPairs
     """
-    def __init__(self, spk1, spk2, no_silent=False, no_auto=True, lenght=1.):
+    def __init__(self, spk1, spk2, no_silent=False, no_auto=True, lenght=1., d_min=0, dmax=1e6):
         PairsGenerator.__init__(self, spk1, spk2, no_silent)
-        
         self.lenght  = lenght
         self.no_auto = no_auto
-    
-    def get_pairs(self, nb_pairs, d_min, d_max):
+        self.d_min   = d_min
+        self.d_max   = d_max
+    
+    def set_bounds(self, d_min, d_max):
+        self.d_min = d_min
+        self.d_max = d_max
+    
+    def get_pairs(self, nb_pairs):
         """
         Function to obtain a certain number of cells from the generator
@@ -190 +202 @@
         Inputs:
             nb_pairs - int to specify the number of pairs desired
-            d_min    - the minimal distance between cells
-            d_max    - the maximal distance between cells
             
         The length parameter of the DistantDependentPairs should be defined correctly. It is the extent of the grid.
@@ -211 +221 @@
             pos_cell2 = numpy.array(self.spk2.id2position(cell2))*self.lenght/self.spk2.dimensions[0]
             dist      = distance(pos_cell1, pos_cell2, self.lenght)
-            idx       = numpy.where((dist >= d_min) & (dist < d_max))[0]
+            idx       = numpy.where((dist >= self.d_min) & (dist < self.d_max))[0]
             N         = len(idx)
             if N > 0: