Changeset 954 for trunk

Timestamp:

04/21/11 13:43:23 (13 months ago)

Author:

pierre

Message:

Some confusions again in the commit. Re Sorry. Is there a way to delete commits from the trac, if I'm again confusing some files ?

Location:

trunk/src

Files:

• connectors.py (modified) (1 diff)
• nest/connectors.py (modified) (1 diff)

trunk/src/connectors.py

@@ -324 +324 @@
         self.distance_matrix.set_source(src.position)        
         if not self.allow_self_connections and self.projection.pre == self.projection.post:
-            i         = numpy.where(precreate == src)
-            if len(i) > 0:
-                precreate = numpy.delete(precreate, i[0])
+            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):            

trunk/src/nest/connectors.py

@@ -56 +56 @@
         
         if not self.allow_self_connections and self.projection.pre == self.projection.post:
-            i         = numpy.where(self.candidates == tgt)
-            if len(i) > 0:
-                precreate = numpy.delete(precreate, i[0])
+            idx_tgt   = numpy.where(self.candidates == tgt)
+            if len(idx_tgt) > 0:
+                i     = numpy.where(precreate == idx_tgt[0])
+                if len(i) > 0:
+                    precreate = numpy.delete(precreate, i[0])
                 
         if (rewiring is not None) and (rewiring > 0):