Changeset 1051

Timestamp:

01/23/12 14:57:54 (4 months ago)

Author:

apdavison

Message:

Previous commit was in wrong directory. Here are the rest of the changes.

Location:

branches/neo_output

Files:

• src/common/populations.py (modified) (3 diffs)
• src/recording/__init__.py (modified) (4 diffs)
• test/unittests/test_basepopulation.py (modified) (3 diffs)

branches/neo_output/src/common/populations.py

@@ -469 +469 @@
         self.record(['gsyn_exc', 'gsyn_inh'], to_file)
 
-    def write_data(self, io, variables='all', gather=True):
+    def write_data(self, io, variables='all', gather=True, clear=False):
         """
         Write recorded data to file, using one of the file formats supported by
@@ -483 +483 @@
         file will be written on each node, containing only data from the cells
         simulated on that node.
+        
+        If `clear` is True, recorded data will be deleted from the `Population`.
         """
         self.recorder.write(variables, io, gather, self.record_filter)
 
-    def get_data(self, variables='all', gather=True):
+    def get_data(self, variables='all', gather=True, clear=False):
         """
         Return a Neo `Block` containing the data (spikes, state variables)
@@ -499 +501 @@
         Otherwise, the Neo `Block` will contain only data from the cells
         simulated on the local node.
-        """
-        return self.recorder.get(variables, gather, self.record_filter)
+        
+        If `clear` is True, recorded data will be deleted from the `Population`.
+        """
+        return self.recorder.get(variables, gather, self.record_filter, clear)
 
     @deprecated("write_data(file, 'spikes')")

branches/neo_output/src/recording/__init__.py

@@ -135 +135 @@
             self._data.append(obj)
 
+    def clear(self):
+        self._data = []
+
 
 class Recorder(object):
@@ -180 +183 @@
             return self.recorded[variable]
     
-    def get(self, variables, gather=False, filter_ids=None):
+    def get(self, variables, gather=False, filter_ids=None, clear=False):
         """Return the recorded data as a Neo `Block`."""
         variables = normalize_variables_arg(variables)
@@ -194 +197 @@
         if gather and self._simulator.state.num_processes > 1:
             data = gather_array(data)
+        if clear:
+            self.cache.clear()
         return data
     
-    def write(self, variables, file=None, gather=False, filter_ids=None):
+    def write(self, variables, file=None, gather=False, filter_ids=None, clear=False):
         """Write recorded data to a Neo IO"""
         io = file or self.file
@@ -203 +208 @@
         logger.debug("Recorder is writing '%s' to file '%s' with gather=%s" % (
                                                variables, io.filename, gather))
-        data = self.get(variables, gather, filter_ids)
+        data = self.get(variables, gather, filter_ids, clear)
         if self._simulator.state.mpi_rank == 0 or gather == False:
             # Open the output file, if necessary and write the data

branches/neo_output/test/unittests/test_basepopulation.py

@@ -368 +368 @@
     meth, args, kwargs = p.recorder.method_calls[0]
     assert_equal(meth, 'get')
-    assert_equal(args, ("spikes", "gather", "filter"))
+    assert_equal(args, ("spikes", "gather", "filter", False))
 
 def test_print_v():
@@ -386 +386 @@
     meth, args, kwargs = p.recorder.method_calls[0]
     assert_equal(meth, 'get')
-    assert_equal(args, ("v", "gather", "filter"))
+    assert_equal(args, ("v", "gather", "filter", False))
     
 def test_print_gsyn():
@@ -404 +404 @@
     meth, args, kwargs = p.recorder.method_calls[0]
     assert_equal(meth, 'get')
-    assert_equal(args, (["gsyn_exc", "gsyn_inh"], "gather", "filter"))
+    assert_equal(args, (["gsyn_exc", "gsyn_inh"], "gather", "filter", False))
     
 def test_get_spike_counts():