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

trunk/src/nest/simulator.py

@@ -27 +27 @@
 
 import nest
-from pyNN import common, random, errors
+from pyNN import common, random, errors, standardmodels, core
 import logging
 import numpy
@@ -150 +150 @@
         nest_model = 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)
         nest_model = celltype.nest_name
@@ -310 +310 @@
         """
         # are we sure the targets are all on the current node?
-        if common.is_listlike(source):
+        if core.is_listlike(source):
             assert len(source) == 1
             source = source[0]
-        if not common.is_listlike(targets):
+        if not core.is_listlike(targets):
             targets = [targets]
         assert len(targets) > 0
@@ -351 +351 @@
         """
         # are we sure the targets are all on the current node?
-        if common.is_listlike(target):
+        if core.is_listlike(target):
             assert len(target) == 1
             target = target[0]
-        if not common.is_listlike(sources):
+        if not core.is_listlike(sources):
             sources = [sources]
         assert len(sources) > 0, sources
@@ -452 +452 @@
                    matrix (as returned by `get(format='array')`).
         """
-        if not (common.is_number(value) or common.is_listlike(value)):
+        if not (numpy.isscalar(value) or core.is_listlike(value)):
             raise TypeError("Argument should be a numeric type (int, float...), a list, or a numpy array.")   
         
@@ -470 +470 @@
                     value_list.append(val)
             value = value_list
-        if common.is_listlike(value):
+        if core.is_listlike(value):
             value = numpy.array(value)
         else: