Changeset 1009

Timestamp:

11/22/11 15:52:42 (6 months ago)

Author:

apdavison

Message:

Fixes to CSAConnector in 0.7 branch

Location:

branches/0.7

Files:

• examples/VAbenchmarks2-csa.py (modified) (1 diff)
• src/connectors.py (modified) (4 diffs)

branches/0.7/examples/VAbenchmarks2-csa.py

@@ -126 +126 @@
 inh_cells = all_cells[n_exc:]
 if benchmark == "COBA":
-    ext_stim = Population(20, SpikeSourcePoisson,{'rate' : rate, 'duration' : stim_dur},"expoisson")
+    ext_stim = Population(20, SpikeSourcePoisson, {'rate' : rate, 'duration' : stim_dur}, label="expoisson")
     rconn = 0.01
     ext_conn = FixedProbabilityConnector(rconn, weights=0.1)
 
 print "%s Initialising membrane potential to random values..." % node_id
-rng = NumpyRNG(seed=rngseed, parallel_safe=parallel_safe, rank=node_id, num_processes=np)
+rng = NumpyRNG(seed=rngseed, parallel_safe=parallel_safe)
 uniformDistr = RandomDistribution('uniform', [v_reset,v_thresh], rng=rng)
 all_cells.initialize('v', uniformDistr)

branches/0.7/src/connectors.py

@@ -895 +895 @@
             Connector.__init__(self, None, None, safe=safe, verbose=verbose)
             self.cset = cset
-            if cset.arity == 0:
+            if csa.arity(cset) == 0:
                 #assert weights is not None and delays is not None, \
                 #       'must specify weights and delays in addition to a CSA mask'
@@ -905 +905 @@
                     self.delays = common.get_min_delay()
             else:
-                assert cset.arity == 2, 'must specify mask or connection-set with arity 2'
+                assert csa.arity(cset) == 2, 'must specify mask or connection-set with arity 2'
                 assert weights is None and delays is None, \
                        "weights or delays specified both in connection-set and as CSAConnector argument"
@@ -923 +923 @@
     def connect(self, projection):
         """Connect-up a Projection."""
-        i0 = projection.pre.first_id
-        size1 = projection.pre.last_id - i0
-        j0 = projection.post.first_id
-        targets = [j - j0 for j in projection.post]
-
-        # Cut out finite part and shift to global ids
-        c = csa.shift (i0, j0) * csa.cross ((0, size1), targets) * self.cset
-        
-        if csa.arity (self.cset) == 2:
+        # Cut out finite part
+        c = csa.cross((0, projection.pre.size-1), (0, projection.post.size-1)) * self.cset
+        
+        if csa.arity(self.cset) == 2:
             # Connection-set with arity 2
             for (i, j, weight, delay) in c:
-                projection.connection_manager.connect (i, [j], weight, delay)
+                projection.connection_manager.connect (projection.pre[i], [projection.post[j]], weight, delay)
         elif CSAConnector.isConstant (self.weights) \
              and CSAConnector.isConstant (self.delays):
             # Mask with constant weights and delays
             for (i, j) in c:
-                projection.connection_manager.connect (i, [j], self.weights, self.delays)
+                projection.connection_manager.connect (projection.pre[i], [projection.post[j]], self.weights, self.delays)
         else:
             # Mask with weights and/or delays iterable
@@ -949 +944 @@
                 delays = CSAConnector.constantIterator (delays)
             for (i, j), weight, delay in zip (c, weights, delays):
-                projection.connection_manager.connect (i, [j], weight, delay)
+                projection.connection_manager.connect (projection.pre[i], [projection.post[j]], weight, delay)