Changeset 287

Timestamp:

11/05/08 14:14:42 (2 months ago)

Author:

pierre

Message:

Minors functions added. Tests are also slightly modified. Now, if you have updated pyNN to the trunk version, and if you have nest2 installed, you should see that tests on the headers are passed. Two populations are created and recorded, and the numbers or cells saved/loaded is correct

Files:

• trunk/src/signals.py (modified) (3 diffs)
• trunk/test/test_signals.py (modified) (2 diffs)

trunk/src/signals.py

@@ -2165 +2165 @@
-    def min(self):
-        return self.signal.min()
+    
+    def mean(self):
+        return numpy.mean(self.signal)
-
-    def copy(self):
@@ -2321 +2324 @@
-
-        Inputs:
- 
+
-                      of times
-            t_min   - Time (>0) to cut the signal before an event, in ms (default 100)
-            t_max   - Time (>0) to cut the signal after an event, in ms  (default 100)
-        
+        Examples:
+            >> res = aslist.slice_by_events([100,200,300], t_min=0, t_max =100)
+            >> print len(res)
+                3
-        """
-        if isinstance(events, SpikeTrain):
@@ -2545 +2552 @@
-        new_AnalogSignalList.__calc_startstop()
-        return new_AnalogSignalList
+
+    def select_ids(self, criteria=None):
+        """
+        Return the list of all the cells in the AnalogSignalList that will match the criteria
+        expressed with the following syntax. 
+        
+        Inputs : 
+            criteria - a string that can be evaluated on a AnalogSignal object, where the 
+                       AnalogSignal should be named ``cell''.
+        
+        Exemples:
+            >> aslist.select_ids("mean(cell.signal) > 20")
+            >> aslist.select_ids("cell.std() < 0.2")
+        """
+        selected_ids = []
+        for id in self.id_list():
+            cell = self.analog_signals[id]
+            if eval(criteria):
+                selected_ids.append(id)
+        return selected_ids
-
-    def convert(self, format="[values, ids]"):

trunk/test/test_signals.py

@@ -508 +508 @@
-        assert len(self.analog.std()) == len(self.analog[0])
-
+    def testSelectIds(self):
+        assert type(self.analog.select_ids("cell.mean() > 0")) == list
-
-
@@ -604 +606 @@
-        p1.print_v("Simulation/p1.v")
-        p1.print_c("Simulation/p1.c")
-rec.StandardPickleFile("Simulation/p2.spikes")
-rec.StandardPickleFile("Simulation/p2.v")
-rec.StandardPickleFile("Simulation/p2.c")
+"Simulation/p2.spikes"
+"Simulation/p2.v"
+"Simulation/p2.c"
-    
-    def testLoadFirstPopulationData(self):
-io.StandardTextFile("Simulation/p1.spikes")
-io.StandardTextFile("Simulation/p1.v")
-io.StandardTextFile("Simulation/p1.c")
+"Simulation/p1.spikes"
+"Simulation/p1.v"
+"Simulation/p1.c"
-        assert len(spikes) == 10 and len(vm) == 10 and len(ge) == 10 and len(gi) == 10
-
-    def testLoadSecondPopulationData(self):
-
-
-
-
+
+
+
-        assert len(spikes) == 10 and len(vm) == 10 and len(ge) == 10 and len(gi) == 10
-