Changeset 962 for trunk

Timestamp:

05/10/11 16:21:47 (13 months ago)

Author:

pierre

Message:

Some patch in the Brian module when using Short term plasticity. Fix also the bug in the FastConnector? when allow_autapses is False

Location:

trunk/src/brian

Files:

• __init__.py (modified) (1 diff)
• connectors.py (modified) (1 diff)

trunk/src/brian/__init__.py

@@ -244 +244 @@
         self.connection_manager._finalize()
         if self._plasticity_model != "static_synapse":
-            for key in self.connections.key():
+            for key in self.connections.keys:
                 synapses = self.connections.brian_connections[key]
                 if self._plasticity_model is "stdp_synapse": 

trunk/src/brian/connectors.py

@@ -49 +49 @@
         self.distance_matrix.set_source(src.position)        
         if not self.allow_self_connections and self.projection.pre == self.projection.post:
-            i         = numpy.where(self.candidates == src)[0]
-            precreate = numpy.delete(precreate, i)
+            idx_src   = numpy.where(self.candidates == src)
+            if len(idx_src) > 0:
+                i     = numpy.where(precreate == idx_src[0])
+                if len(i) > 0:
+                    precreate = numpy.delete(precreate, i[0])
                 
         if (n_connections is not None) and (len(precreate) > 0):