Changeset 711 for trunk/src/pcsim/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/pcsim/simulator.py (modified) (6 diffs)

trunk/src/pcsim/simulator.py

@@ -30 +30 @@
 import types
 import numpy
-from pyNN import common
+from pyNN import common, errors
 
 recorder_list = []
@@ -156 +156 @@
             cellfactory = cellclass(**cellparams)
         else:
-            raise common.InvalidModelError("Trying to create non-existent cellclass %s" % cellclass.__name__)
+            raise errors.InvalidModelError("Trying to create non-existent cellclass %s" % cellclass.__name__)
     else:
-        raise common.InvalidModelError("Trying to create non-existent cellclass %s" % cellclass)
+        raise errors.InvalidModelError("Trying to create non-existent cellclass %s" % cellclass)
 
     all_ids = numpy.array([i for i in net.add(cellfactory, n)], ID)
@@ -275 +275 @@
         if not isinstance(source, (int, long)) or source < 0:
             errmsg = "Invalid source ID: %s" % source
-            raise common.ConnectionError(errmsg)
+            raise errors.ConnectionError(errmsg)
         if not common.is_listlike(targets):
             targets = [targets]
@@ -285 +285 @@
         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]):
@@ -300 +300 @@
             syn_factory = synapse_type
         else:
-            raise common.ConnectionError("synapse_type must be a string or a PCSIM synapse factory. Actual type is %s" % type(synapse_type))
+            raise errors.ConnectionError("synapse_type must be a string or a PCSIM synapse factory. Actual type is %s" % type(synapse_type))
         for target, weight, delay in zip(targets, weights, delays):
             syn_factory.W = weight*weight_scale_factor
@@ -307 +307 @@
                 c = net.connect(source, target, syn_factory)
             except RuntimeError, e:
-                raise common.ConnectionError(e)
+                raise errors.ConnectionError(e)
             if target.local:
                 self.connections.append(Connection(source, target, net.object(c), 1.0/weight_scale_factor))