Changeset 977

Timestamp:

06/08/11 17:34:51 (12 months ago)

Author:

pierre

Message:

Fix a bug when assemblies are launched in parallel and some population are empty on some nodes. Fix also minor syntax in Nemo backend

Location:

trunk/src

Files:

• common.py (modified) (1 diff)
• nemo/simulator.py (modified) (1 diff)

trunk/src/common.py

@@ -1215 +1215 @@
     @property
     def _homogeneous_synapses(self):
-        syn = is_conductance(self.populations[0].all_cells[0])
-        for p in self.populations[1:]:
-            if syn != is_conductance(p.all_cells[0]):
-                return False
+        syn   = None
+        for count, p in enumerate(self.populations):
+             if len(p.all_cells) > 0:
+                syn = is_conductance(p.all_cells[0])
+                
+        if syn is not None:
+            for p in self.populations[count:]:
+                if len(p.all_cells) > 0:
+                    if syn != is_conductance(p.all_cells[0]):
+                        return False
         return True
     

trunk/src/nemo/simulator.py

@@ -307 +307 @@
         assert len(targets) == len(weights) == len(delays), "%s %s %s" % (len(targets),len(weights),len(delays))
         synapse_type = self.synapse_type or "excitatory"
-        if isinstance(delays, numpy.ndarray):
-            delays = delays.astype(int).tolist()
+        delays = numpy.array(delays).astype(int).tolist()
         if isinstance(weights, numpy.ndarray):
             weights = weights.tolist()    
-        source   = int(source)
-        if len(targets) == 1:
-            targets = int(targets[0])
-            delays  = int(delays[0])
-            weights = weights[0]
+        source   = int(source)        
         synapses = state.net.add_synapse(source, targets, delays, weights, self.is_plastic)
         self.sources.append(source)