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

trunk/src/brian/simulator.py

@@ -32 +32 @@
 from itertools import izip
 import scipy.sparse
-from pyNN import common, cells, errors
+from pyNN import common, cells, errors, standardmodels, core
 
 mV = brian.mV
@@ -143 +143 @@
         return self._threshold.spiketimes
     def _set_spiketimes(self, spiketimes):
-        assert common.is_listlike(spiketimes)
-        if len(spiketimes) == 0 or common.is_number(spiketimes[0]):
+        assert core.is_listlike(spiketimes)
+        if len(spiketimes) == 0 or numpy.isscalar(spiketimes[0]):
             spiketimes = [spiketimes for i in xrange(len(self))]
         assert len(spiketimes) == len(self), "spiketimes (length %d) must contain as many iterables as there are cells in the group (%d)." % (len(spiketimes), len(self))
@@ -279 +279 @@
                                         max_delay=state.max_delay)
         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_parameters = celltype.parameters
@@ -469 +469 @@
         """
         #print "connecting", source, "to", targets, "with weights", weights, "and delays", delays
-        if not common.is_listlike(targets):
+        if not core.is_listlike(targets):
             targets = [targets]
         if isinstance(weights, float):
@@ -585 +585 @@
         else:
             raise Exception("Setting parameters other than weight and delay not yet supported.")
-        if common.is_number(value):
+        if numpy.isscalar(value):
             for row in M.data:
                 for i in range(len(row)):
@@ -593 +593 @@
             for (i,j) in address_gen:
                 M[i,j] = value[i,j]*units
-        elif common.is_listlike(value):
+        elif core.is_listlike(value):
             assert len(value) == M.getnnz()
             address_gen = ((i,j) for i,row in enumerate(bc.W.rows) for j in row)