Changeset 713 for trunk/src/pcsim/simulator.py

Timestamp:

02/17/10 22:45:18 (2 years ago)

Author:

apdavison

Message:

Moved standard model (cells and synapses) machinery out of the common module into its own module

Files:

• trunk/src/pcsim/simulator.py (modified) (5 diffs)

trunk/src/pcsim/simulator.py

@@ -30 +30 @@
 import types
 import numpy
-from pyNN import common, errors
+from pyNN import common, errors, standardmodels, core
 
 recorder_list = []
@@ -150 +150 @@
     assert n > 0, 'n must be a positive integer'
     if isinstance(cellclass, type):
-        if issubclass(cellclass, common.StandardCellType):
+        if issubclass(cellclass, standardmodels.StandardCellType):
             cellfactory = cellclass(cellparams).simObjFactory
         elif issubclass(cellclass, pypcsim.SimObject):
@@ -276 +276 @@
             errmsg = "Invalid source ID: %s" % source
             raise errors.ConnectionError(errmsg)
-        if not common.is_listlike(targets):
+        if not core.is_listlike(targets):
             targets = [targets]
         if isinstance(weights, float):
@@ -352 +352 @@
                    matrix (as returned by `get(format='array')`)
         """
-        if common.is_number(value):
+        if numpy.isscalar(value):
             for c in self:
                 setattr(c, name, value)
@@ -367 +367 @@
                 else:
                     setattr(c, name, val)
-        elif common.is_listlike(value):
+        elif core.is_listlike(value):
             for c,val in zip(self.connections, value):
                 setattr(c, name, val)