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

trunk/src/neuron/simulator.py

@@ -29 +29 @@
 
 from pyNN import __path__ as pyNN_path
-from pyNN import common, random, errors
+from pyNN import common, random, errors, standardmodels, core
 import platform
 import logging
@@ -284 +284 @@
             raise errors.InvalidModelError("There is no hoc template called %s" % cellclass)
         cell_parameters = cellparams or {}
-    elif isinstance(cellclass, type) and issubclass(cellclass, common.StandardCellType):
+    elif isinstance(cellclass, type) and issubclass(cellclass, standardmodels.StandardCellType):
         celltype = cellclass(cellparams)
         cell_model = celltype.model
@@ -464 +464 @@
             errmsg = "Invalid source ID: %s (gid_counter=%d)" % (source, state.gid_counter)
             raise errors.ConnectionError(errmsg)
-        if not common.is_listlike(targets):
+        if not core.is_listlike(targets):
             targets = [targets]
         if isinstance(weights, float):
@@ -533 +533 @@
                    matrix (as returned by `get(format='array')`).
         """
-        if common.is_number(value):
+        if numpy.isscalar(value):
             for c in self:
                 setattr(c, name, value)
@@ -548 +548 @@
                 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)