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

trunk/src/pcsim/__init__.py

@@ -15 +15 @@
 
 import pyNN.random
-from pyNN import common, recording, __doc__
+from pyNN import common, recording, errors, __doc__
 from pyNN.pcsim import simulator
 common.simulator = simulator
@@ -223 +223 @@
 #    if delay  is None:  delay = simulator.state.min_delay
 #    if delay < get_min_delay():
-#        raise common.ConnectionError("Delay (%g ms) must be >= the minimum delay (%g ms)" % (delay, get_min_delay()))
+#        raise errors.ConnectionError("Delay (%g ms) must be >= the minimum delay (%g ms)" % (delay, get_min_delay()))
 #    # Convert units
 #    delay = delay / 1000 # Delays in pcsim are specified in seconds
@@ -236 +236 @@
 #            weight = 1e-9 * weight # Convert from nA to A
 #    except exceptions.Exception, e: # non-existent connection
-#        raise common.ConnectionError(e)
+#        raise errors.ConnectionError(e)
 #    # Create synapse factory
 #    syn_factory = 0
@@ -274 +274 @@
 #            return connections.idVector()
 #    except exceptions.TypeError, e:
-#        raise common.ConnectionError(e)
+#        raise errors.ConnectionError(e)
 #    except exceptions.Exception, e:
-#        raise common.ConnectionError(e)
+#        raise errors.ConnectionError(e)
 connect = common.connect
 set = common.set    
@@ -333 +333 @@
         if isinstance(cellclass, str):
             if not cellclass in dir(pypcsim):
-                raise common.InvalidModelError('Trying to create non-existent cellclass ' + cellclass )
+                raise errors.InvalidModelError('Trying to create non-existent cellclass ' + cellclass )
             cellclass = getattr(pypcsim, cellclass)
             self.celltype = cellclass
@@ -379 +379 @@
     ##        addr = (addr,)
     ##    if len(addr) != self.actual_ndim:
-    ##       raise common.InvalidDimensionsError, "Population has %d dimensions. Address was %s" % (self.actual_ndim, str(addr))
+    ##       raise errors.InvalidDimensionsError, "Population has %d dimensions. Address was %s" % (self.actual_ndim, str(addr))
     ##    orig_addr = addr;
     ##    while len(addr) < 3:
@@ -427 +427 @@
     ##        coords = (id,)
     ##    else:
-    ##        raise common.InvalidDimensionsError
+    ##        raise errors.InvalidDimensionsError
     ##    if self.actual_ndim == 1:
     ##        if coords[0] > self.dim[0]:
@@ -470 +470 @@
     ##            setattr(cell, parametername, val)
     ##    else:
-    ##        raise common.InvalidDimensionsError
+    ##        raise errors.InvalidDimensionsError
         
     ##def rset(self, parametername, rand_distr):
@@ -655 +655 @@
                 
             if len(possible_models) == 0:
-                raise common.NoModelAvailableError("The synapse model requested is not available.")
+                raise errors.NoModelAvailableError("The synapse model requested is not available.")
             synapse_type = getattr(pypcsim, list(possible_models)[0])
             try: