Changeset 477 for trunk

Timestamp:

01/20/11 14:12:39 (16 months ago)

Author:

mschmucker

Message:

adapt to id_list now being a property (and not a function anymore).

Location:

trunk

Files:

• src/io.py (modified) (2 diffs)
• src/signals/pairs.py (modified) (1 diff)
• test/test_spikes.py (modified) (8 diffs)

trunk/src/io.py

@@ -142 +142 @@
         """
         self.metadata['dimensions'] = str(object.dimensions)
-        if len(object.id_list() > 0):
-            self.metadata['first_id'] = numpy.min(object.id_list())
-            self.metadata['last_id']  = numpy.max(object.id_list())
+        if len(object.id_list > 0):
+            self.metadata['first_id'] = numpy.min(object.id_list)
+            self.metadata['last_id']  = numpy.max(object.id_list)
         if hasattr(object, "dt"):
             self.metadata['dt']     = object.dt
@@ -250 +250 @@
         """
         self.metadata['dimensions'] = str(object.dimensions)
-        self.metadata['first_id']   = numpy.min(object.id_list())
-        self.metadata['last_id']    = numpy.max(object.id_list())
+        self.metadata['first_id']   = numpy.min(object.id_list)
+        self.metadata['last_id']    = numpy.max(object.id_list)
         if hasattr(object, 'dt'):
             self.metadata['dt']     = object.dt

trunk/src/signals/pairs.py

@@ -47 +47 @@
     
     def _get_id_lists(self):
-        self.ids_1 = set(self.spk1.id_list())
-        self.ids_2 = set(self.spk2.id_list())
+        self.ids_1 = set(self.spk1.id_list)
+        self.ids_2 = set(self.spk2.id_list)
         if self.no_silent:
             n1 = set(self.spk1.select_ids("len(cell.spike_times) == 0"))

trunk/test/test_spikes.py

@@ -226 +226 @@
     
     def testCreateSpikeList(self):
-        assert numpy.all(self.spk.id_list() == numpy.arange(10))
+        assert numpy.all(self.spk.id_list == numpy.arange(10))
     
     def testGetItem(self):
@@ -262 +262 @@
     
     def testId_SliceList(self):
-        assert numpy.all(self.spk.id_slice([0,1,2,3]).id_list() == [0,1,2,3])
+        assert numpy.all(self.spk.id_slice([0,1,2,3]).id_list == [0,1,2,3])
     
     def testTime_Slice(self):
@@ -312 +312 @@
         correct = True
         rates = self.spk.mean_rates()
-        for idx in xrange(len(self.spk.id_list())):
+        for idx in xrange(len(self.spk.id_list)):
             if not(5 < rates[idx] < 15):
                 correct = False
@@ -339 +339 @@
         self.spk.save("tmp.txt")
         spk2 = spikes.load_spikelist("tmp.txt", id_list=[1,2,3])
-        assert numpy.all(spk2.id_list() == [1,2,3])
+        assert numpy.all(spk2.id_list == [1,2,3])
     
     def testSaveAndLoadTxtIdsPartInt(self):
@@ -345 +345 @@
         self.spk.save(file)
         spk2 = spikes.load_spikelist(file, id_list=5)
-        assert numpy.all(spk2.id_list() == [0,1,2,3,4])
+        assert numpy.all(spk2.id_list == [0,1,2,3,4])
 
     def testSaveAndLoadPickle(self):
@@ -363 +363 @@
         self.spk.save(file)
         spk2 = spikes.load_spikelist(file, id_list=[1,2,3])
-        assert numpy.all(spk2.id_list() == [1,2,3])
+        assert numpy.all(spk2.id_list == [1,2,3])
     
     def testSaveAndLoadPickleIdsPartInt(self):
@@ -369 +369 @@
         self.spk.save(file)
         spk2 = spikes.load_spikelist(file, id_list=5)
-        assert numpy.all(spk2.id_list() == [0,1,2,3,4])
+        assert numpy.all(spk2.id_list == [0,1,2,3,4])
 
     def testPairwise_Pearson_CorrCoeff(self):
@@ -399 +399 @@
     def testIdOffset(self):
         self.spk.id_offset(100)
-        assert numpy.all(self.spk.id_list() == numpy.arange(100,110))
+        assert numpy.all(self.spk.id_list == numpy.arange(100,110))