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

trunk/src/connectors.py

@@ -20 +20 @@
                   fabs, floor, fmod, hypot, ldexp, log, log10, modf, pi, power, \
                   sin, sinh, sqrt, tan, tanh
-from pyNN import random, common, errors
+from pyNN import random, common, errors, core
 from pyNN.space import Space
 
@@ -116 +116 @@
             # returned.
             rarr = rng.next(N, 'uniform', (0, 1), mask_local=local)
-            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])
-            if common.is_number(p):
+            if numpy.isscalar(p):
                 create = rarr < p
             else: