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

trunk/src/pcsim/__init__.py

@@ -15 +15 @@
 
 import pyNN.random
-from pyNN import common, recording, errors, space, __doc__
+from pyNN import common, recording, errors, space, core, __doc__
 from pyNN.pcsim import simulator
 common.simulator = simulator
@@ -74 +74 @@
     """Return a list of all the StandardCellType classes available for this simulator."""
     setup()
-    standard_cell_types = [obj for obj in globals().values() if isinstance(obj, type) and issubclass(obj, common.StandardCellType)]
+    standard_cell_types = [obj for obj in globals().values() if isinstance(obj, type) and issubclass(obj, standardmodels.StandardCellType)]
     for cell_class in standard_cell_types:
         try:
@@ -261 +261 @@
 #        if type(source) != types.ListType and type(target) != types.ListType:
 #            connections = simulator.net.connect(source, target, syn_factory)
-#            if not common.is_listlike(connections):
+#            if not core.is_listlike(connections):
 #                connections = [connections]
 #            return connections
@@ -304 +304 @@
           e.g., (10,10) will create a two-dimensional population of size 10x10.
         cellclass should either be a standardized cell class (a class inheriting
-        from common.StandardCellType) or a string giving the name of the
+        from standardmodels.StandardCellType) or a string giving the name of the
         simulator-specific model that makes up the population.
         cellparams should be a dict which is passed to the neuron model
@@ -336 +336 @@
             cellclass = getattr(pypcsim, cellclass)
             self.celltype = cellclass
-        if issubclass(cellclass, common.StandardCellType):
+        if issubclass(cellclass, standardmodels.StandardCellType):
             self.celltype = cellclass(cellparams)
             self.cellfactory = self.celltype.simObjFactory
@@ -582 +582 @@
         ##
         # handle synapse dynamics
-        if common.is_listlike(method.weights):
+        if core.is_listlike(method.weights):
             w = method.weights[0]
         elif hasattr(method.weights, "next"): # random distribution
@@ -588 +588 @@
         else:
             w = method.weights
-        if common.is_listlike(method.delays):
+        if core.is_listlike(method.delays):
             d = min(method.delays)
         elif hasattr(method.delays, "next"): # random distribution