Changeset 970 for trunk

Timestamp:

05/27/11 16:27:05 (12 months ago)

Author:

pierre

Message:

Caching also the data in NEST when recorded from memory and not to file, to have similar behaviours between to_file=True/False?. Fix also a minor bug in FastSmallWorldConnector?.

Location:

trunk/src/nest

Files:

• connectors.py (modified) (1 diff)
• recording.py (modified) (3 diffs)

trunk/src/nest/connectors.py

@@ -66 +66 @@
                 
         if (rewiring is not None) and (rewiring > 0):
+            idx = numpy.arange(0, self.N)          
             if not self.allow_self_connections and self.projection.pre == self.projection.post:
                 i   = numpy.where(self.candidates == tgt)[0]
-                idx = numpy.delete(self.candidates, i)
+                idx = numpy.delete(idx, i)
             
             rarr    = self.probas_generator.get(self.M)[precreate]

trunk/src/nest/recording.py

@@ -136 +136 @@
         if compatible_output:
             data = self.events_to_array(data)
-            data = self.scale_data(data)
+            data = self.scale_data(data)  
         if gather and simulator.state.num_processes > 1:
-            data = recording.gather(data)
+            data = recording.gather(data)     
+            self._gathered_file = tempfile.TemporaryFile()
+            numpy.save(self._gathered_file, data)
+            self._gathered = True
         return data
     
@@ -164 +167 @@
             non_empty_nest_files = [filename for filename in nest_files if os.stat(filename).st_size > 0]
             if len(non_empty_nest_files) > 0:
-                data = numpy.concatenate([numpy.loadtxt(nest_file) for nest_file in non_empty_nest_files])
+                data = numpy.concatenate([numpy.loadtxt(nest_file, dtype=float) for nest_file in non_empty_nest_files])
             if len(non_empty_nest_files) == 0 or data.size == 0:
                 if self.type is "spike_detector":
@@ -281 +284 @@
             data = self._device.read_subset(variables, gather, compatible_output, always_local)
         assert len(data.shape) == 2
-        if not self._device._gathered:
-            filtered_ids = self.filter_recorded(filter)
-            mask = reduce(numpy.add, (data[:,0]==id for id in filtered_ids))
+        if not self._device._gathered:            
+            filtered_ids = self.filter_recorded(filter)            
+            mask = reduce(numpy.add, (data[:,0]==id for id in filtered_ids))                
             if len(data) > 0:
                 data = data[mask]