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

trunk/src/nest/simulator.py

@@ -27 +27 @@
 
 import nest
-from pyNN import common, random
+from pyNN import common, random, errors
 import logging
 import numpy
@@ -120 +120 @@
             exc_type, exc_value, traceback = sys.exc_info()
             if exc_type == 'NESTError' and "Unsupported Numpy array type" in exc_value:
-                raise common.InvalidParameterValueError()
+                raise errors.InvalidParameterValueError()
             else:
                 raise
@@ -159 +159 @@
         cell_gids = nest.Create(nest_model, n)
     except nest.NESTError, errmsg:
-        raise common.InvalidModelError(errmsg)
+        raise errors.InvalidModelError(errmsg)
     if cell_parameters:
         try:
@@ -317 +317 @@
         assert len(targets) > 0
         if self.synapse_type not in ('excitatory', 'inhibitory', None):
-            raise common.ConnectionError("synapse_type must be 'excitatory', 'inhibitory', or None (equivalent to 'excitatory')")
+            raise errors.ConnectionError("synapse_type must be 'excitatory', 'inhibitory', or None (equivalent to 'excitatory')")
         weights = weights*1000.0 # weights should be in nA or uS, but iaf_neuron uses pA and iaf_cond_neuron uses nS.
                                  # Using convention in this way is not ideal. We should
@@ -335 +335 @@
             nest.DivergentConnect([source], targets, weights, delays, self.synapse_model)            
         except nest.NESTError, e:
-            raise common.ConnectionError("%s. source=%s, targets=%s, weights=%s, delays=%s, synapse model='%s'" % (
+            raise errors.ConnectionError("%s. source=%s, targets=%s, weights=%s, delays=%s, synapse model='%s'" % (
                                          e, source, targets, weights, delays, self.synapse_model))
         self._connections = None # reset the caching of the connection list, since this will have to be recalculated
@@ -358 +358 @@
         assert len(sources) > 0, sources
         if self.synapse_type not in ('excitatory', 'inhibitory', None):
-            raise common.ConnectionError("synapse_type must be 'excitatory', 'inhibitory', or None (equivalent to 'excitatory')")
+            raise errors.ConnectionError("synapse_type must be 'excitatory', 'inhibitory', or None (equivalent to 'excitatory')")
         weights = weights*1000.0 # weights should be in nA or uS, but iaf_neuron uses pA and iaf_cond_neuron uses nS.
                                  # Using convention in this way is not ideal. We should
@@ -376 +376 @@
             nest.ConvergentConnect(sources, [target], weights, delays, self.synapse_model)            
         except nest.NESTError, e:
-            raise common.ConnectionError("%s. sources=%s, target=%s, weights=%s, delays=%s, synapse model='%s'" % (
+            raise errors.ConnectionError("%s. sources=%s, target=%s, weights=%s, delays=%s, synapse model='%s'" % (
                                          e, sources, target, weights, delays, self.synapse_model))
         self._connections = None # reset the caching of the connection list, since this will have to be recalculated