Changeset 428

Timestamp:

08/25/09 15:10:34 (3 years ago)

Author:

pierre

Message:

Try to optimize the Interval methods. Now, package is almost fully operationnal for SpikeList and SpikeTrains?, should perform similar implementations for AnalogSignal? and I guess that the interval stuffs could be merged into the trunk

Files:

• branches/interval/src/signals/spikes.py (modified) (6 diffs)

branches/interval/src/signals/spikes.py

@@ -108 +108 @@
 
 
-    def create_intervals(self, t_start=None, t_stop=None, interval=None) :
-        if interval is not None:
+    def create_intervals(self, t_start=None, t_stop=None, interval=None):
+        if hasattr(self, 'interval') and t_start is None and t_stop is None and interval is None:
+            interval_out = self.interval.copy()
+        elif interval is not None:
             # interval is fully defined by the user
             if type(interval) == Interval:
@@ -301 +303 @@
                 34.2
         """
-        
-        interval = self.create_intervals(t_start, t_stop, interval)
-        
+        interval     = self.create_intervals(t_start, t_stop, interval)
         if interval.is_equal(self.interval):
             idx      = self.spike_times
@@ -309 +309 @@
             interval = interval.intersect(self.interval)
             idx      = interval.slice_times(self.spike_times)
+        
         return 1000.*len(idx)/interval.total_duration()
 
@@ -873 +874 @@
         return spklist
 
-    def create_intervals(self, t_start, t_stop, interval) : 
-        if interval is not None:
+    def create_intervals(self, t_start=None, t_stop=None, interval=None):
+        if hasattr(self, 'interval') and t_start is None and t_stop is None and interval is None:
+            interval_out = self.interval.copy()
+        elif interval is not None:
             # interval is fully defined by the user
             if type(interval) == Interval:
@@ -1041 +1044 @@
         """
         if newnum:
-            axis = numpy.arange(self.interval.t_start(), self.interval.t_stop() + time_bin, time_bin)
-        else:
-            axis = numpy.arange(self.interval.t_start(), self.interval.t_stop(), time_bin)
+            axis = numpy.arange(self.t_start, self.t_stop + time_bin, time_bin)
+        else:
+            axis = numpy.arange(self.t_start, self.t_stop, time_bin)
         return axis
 
@@ -1582 +1585 @@
             mean_rate, mean_rate_std
         """
-        interval = self.create_intervals(t_start, t_stop, interval)
-        rates    = []
-        for id in self.id_list():
-            rates.append(self.spiketrains[id].mean_rate(interval))
+        interval = self.create_intervals(t_start, t_stop, interval)
+        if interval.is_equal(self.interval):
+            rates    = [self.spiketrains[idx].mean_rate() for idx in self.id_list()]
+        else:
+            interval = interval.intersect(self.interval)
+            rates    = [self.spiketrains[idx].mean_rate(interval=interval) for idx in self.id_list()]
         return rates