Changeset 1045

Timestamp:

12/22/11 14:54:26 (5 months ago)

Author:

pierre

Message:

Add the FastSmallWorldConnector? for Brian, and update NEST docstring to reflect the fact that FastConnectors? are using afferent instead of efferent for n_connections

Location:

trunk/src

Files:

• brian/connectors.py (modified) (1 diff)
• nest/connectors.py (modified) (2 diffs)

trunk/src/brian/connectors.py

@@ -144 +144 @@
         else:
             raise errors.InvalidDimensionsError("OneToOneConnector does not support presynaptic and postsynaptic Populations of different sizes.")
+
+
+class FastSmallWorldConnector(SmallWorldConnector):
+    
+    __doc__ = SmallWorldConnector.__doc__
+    
+    def connect(self, projection):
+        """Connect-up a Projection."""
+        connector       = FastProbabilisticConnector(projection, self.weights, self.delays, self.allow_self_connections, self.space, safe=self.safe)
+        proba_generator = ProbaGenerator(self.d_expression, connector.local)
+        self.progressbar(len(projection.pre.local_cells))
+        for count, tgt in enumerate(projection.pre.local_cells):
+            connector.distance_matrix.set_source(tgt.position)
+            proba  = proba_generator.get(connector.N, connector.distance_matrix)
+            connector._probabilistic_connect(tgt, proba, self.n_connections, self.rewiring)
+            self.progression(count, projection._simulator.state.mpi_rank)

trunk/src/nest/connectors.py

@@ -130 +130 @@
 class FastDistanceDependentProbabilityConnector(DistanceDependentProbabilityConnector):
     
-    __doc__ = DistanceDependentProbabilityConnector.__doc__
+    """
+        Create a new connector.
+        
+        `d_expression` -- the right-hand side of a valid python expression for
+            probability, involving 'd', e.g. "exp(-abs(d))", or "d<3"
+        `n_connections`  -- The number of afferent synaptic connections per neuron.                 
+        `space` -- a Space object.
+        `weights` -- may either be a float, a RandomDistribution object, a list/
+                     1D array with at least as many items as connections to be
+                     created, or a distance expression as for `d_expression`. Units nA.
+        `delays`  -- as `weights`. If `None`, all synaptic delays will be set
+                     to the global minimum delay.
+        """
     
     def connect(self, projection):
@@ -201 +213 @@
 class FastSmallWorldConnector(SmallWorldConnector):
     
-    __doc__ = SmallWorldConnector.__doc__
+    """
+        Create a new connector.
+        
+        `degree` -- the region lenght where nodes will be connected locally
+        `rewiring` -- the probability of rewiring each eadges 
+        `space` -- a Space object.
+        `allow_self_connections` -- if the connector is used to connect a
+            Population to itself, this flag determines whether a neuron is
+            allowed to connect to itself, or only to other neurons in the
+            Population.        
+        `n_connections`  -- The number of afferent synaptic connections per neuron. 
+        `weights` -- may either be a float, a RandomDistribution object, a list/
+                     1D array with at least as many items as connections to be
+                     created, or a DistanceDependence object. Units nA.
+        `delays`  -- as `weights`. If `None`, all synaptic delays will be set
+                     to the global minimum delay.
+        """
     
     def connect(self, projection):