Changeset 711 for trunk/src/brian/simulator.py

Timestamp:

02/16/10 10:59:22 (2 years ago)

Author:

apdavison

Message:

Moved Error classes out of common into an errors module (see ticket:157)

Files:

• trunk/src/brian/simulator.py (modified) (4 diffs)

trunk/src/brian/simulator.py

@@ -32 +32 @@
 from itertools import izip
 import scipy.sparse
-from pyNN import common, cells
+from pyNN import common, cells, errors
 
 mV = brian.mV
@@ -267 +267 @@
             eqs = brian.Equations(cellclass)
         except Exception, errmsg:
-            raise common.InvalidModelError(errmsg)
+            raise errors.InvalidModelError(errmsg)
         v_thresh   = cellparams['v_thresh']
         v_reset    = cellparams['v_reset']
@@ -477 +477 @@
         assert len(targets) > 0
         if not isinstance(source, common.IDMixin):
-            raise common.ConnectionError("source should be an ID object, actually %s" % type(source))
+            raise errors.ConnectionError("source should be an ID object, actually %s" % type(source))
         for target in targets:
             if not isinstance(target, common.IDMixin):
-                raise common.ConnectionError("Invalid target ID: %s" % target)
+                raise errors.ConnectionError("Invalid target ID: %s" % target)
         assert len(targets) == len(weights) == len(delays), "%s %s %s" % (len(targets),len(weights),len(delays))
         if common.is_conductance(targets[0]):
@@ -492 +492 @@
             source_group = source.parent_group
         except AttributeError, errmsg:
-            raise common.ConnectionError("%s. Maybe trying to connect from non-existing cell (ID=%s)." % (errmsg, source))
+            raise errors.ConnectionError("%s. Maybe trying to connect from non-existing cell (ID=%s)." % (errmsg, source))
         target_group = targets[0].parent_group # we assume here all the targets belong to the same NeuronGroup
         bc = self._get_brian_connection(source_group,