Changeset 571

Timestamp:

05/06/09 14:20:07 (4 years ago)

Author:

apdavison

Message:

Created a new Exception type, RecordingError, for when we try to record membrane potential from a SpikeSource (see ticket:126). Added a corresponding unit test.

Location:

trunk

Files:

• src/brian/__init__.py (modified) (1 diff)
• src/common.py (modified) (1 diff)
• src/nest2/__init__.py (modified) (1 diff)
• src/neuron2/__init__.py (modified) (1 diff)
• test/unittests/generictests.py (modified) (1 diff)

trunk/src/brian/__init__.py

@@ -125 +125 @@
         Private method called by record() and record_v().
         """
+        if record_what not in self.celltype.recordable:
+            raise common.RecordingError(record_what, self.celltype)
         fixed_list=False
         if isinstance(record_from, list): #record from the fixed list specified by user

trunk/src/common.py

@@ -52 +52 @@
 class NothingToWriteError(Exception): pass
 class InvalidWeightError(Exception): pass
+
+class RecordingError(Exception):
+    
+    def __init__(self, variable, cell_type):
+        self.variable = variable
+        self.cell_type = cell_type
+        
+    def __str__(self):
+        return "Cannot record %s from cell type %s" % (self.variable, self.cell_type.__class__.__name__)
 
 # ==============================================================================

trunk/src/nest2/__init__.py

@@ -280 +280 @@
     def _record(self, variable, record_from=None, rng=None,to_file=True):
         if variable not in self.celltype.recordable:
-            raise Exception("Cannot record %s from cell type %s" % (variable, self.celltype.__class__.__name__))
+            raise common.RecordingError(variable, self.celltype)
         # create list of neurons
         fixed_list = False

trunk/src/neuron2/__init__.py

@@ -167 +167 @@
         Private method called by record() and record_v().
         """
+        if record_what not in self.celltype.recordable:
+            raise common.RecordingError(record_what, self.celltype)
         fixed_list=False
         if isinstance(record_from, list): #record from the fixed list specified by user

trunk/test/unittests/generictests.py

@@ -610 +610 @@
             self.assert_( max(spikes) == 100.0, str(spikes) )
 
-                
+    def testRecordVmFromSpikeSource(self):
+        self.assertRaises(common.RecordingError, self.pop1.record_v)
+        
+    
 #===============================================================================
 class SynapticPlasticityTest(unittest.TestCase):