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

trunk/src/connectors2.py

@@ -1 +1 @@
 import numpy
-from pyNN import common
+from pyNN import common, core
 from pyNN.space import Space
 from pyNN.random import RandomDistribution
@@ -15 +15 @@
     def get(self, connectivity_matrix, distance_matrix):
         local_value_mask = self.local_mask[connectivity_matrix]
-        if common.is_number(self.source):
+        if numpy.isscalar(self.source):
             return numpy.ones((local_value_mask.sum(),))*self.source
         elif isinstance(self.source, RandomDistribution):
@@ -69 +69 @@
             self.delays = min_delay
         else:
-            if common.is_listlike(delays):
+            if core.is_listlike(delays):
                 assert min(delays) >= min_delay
             else:
@@ -169 +169 @@
             N = projection.post.size
             rarr = projection.rng.next(N, 'uniform', (0,1), mask_local=False)
-            if not common.is_listlike(rarr) and common.is_number(rarr): # if N=1, rarr will be a single number
+            if not core.is_listlike(rarr) and numpy.isscalar(rarr): # if N=1, rarr will be a single number
                 rarr = numpy.array([rarr])
             global_target_mask = rarr < p