[med-svn] [python-mne] 153/376: adding __repr__ in Evoked, Raw and Epochs

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to annotated tag v0.1
in repository python-mne.

commit d496d3bef3b5935bdfa7486c1d4fad69340e8569
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Mon Mar 21 14:43:41 2011 -0400

    adding __repr__ in Evoked, Raw and Epochs
---
 mne/epochs.py      | 23 +++++++++++++++++------
 mne/fiff/evoked.py |  7 +++++++
 mne/fiff/raw.py    |  6 ++++++
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/mne/epochs.py b/mne/epochs.py
index 6420f38..e4b0c9c 100644
--- a/mne/epochs.py
+++ b/mne/epochs.py
@@ -221,7 +221,14 @@ class Epochs(object):
         self._current += 1
         return epoch
 
-    def average(self, comment="Epoked data"):
+    def __repr__(self):
+        s = "n_epochs : %s" % len(self)
+        s += ", tmin : %s (s)" % self.tmin
+        s += ", tmax : %s (s)" % self.tmax
+        s += ", baseline : %s" % str(self.baseline)
+        return "Epochs (%s)" % s
+
+    def average(self, comment="Evoked data"):
         """Compute average of epochs
 
         Parameters
@@ -231,7 +238,7 @@ class Epochs(object):
 
         Returns
         -------
-        data : array of shape [n_channels, n_times]
+        evoked : Evoked instance
             The averaged epochs
         """
         evoked = Evoked(None)
@@ -239,10 +246,14 @@ class Epochs(object):
         n_channels = len(self.ch_names)
         n_times = len(self.times)
         n_events = len(self.events)
-        data = np.zeros((n_channels, n_times))
-        for e in self:
-            data += e
-        evoked.data = data / n_events
+        if self.preload:
+            data = np.mean(self._data, axis=0)
+        else:
+            data = np.zeros((n_channels, n_times))
+            for e in self:
+                data += e
+            data /= n_events
+        evoked.data = data
         evoked.times = self.times.copy()
         evoked.comment = comment
         evoked.aspect_kind = np.array([100]) # XXX
diff --git a/mne/fiff/evoked.py b/mne/fiff/evoked.py
index 46ce122..c85692b 100644
--- a/mne/fiff/evoked.py
+++ b/mne/fiff/evoked.py
@@ -389,6 +389,13 @@ class Evoked(object):
 
         end_file(fid)
 
+    def __repr__(self):
+        s = "comment : %s" % self.comment
+        s += ", time : [%f, %f]" % (self.times[0], self.times[-1])
+        s += ", n_epochs : %d" % self.nave
+        s += ", n_channels x n_times : %s x %s" % self.data.shape
+        return "Evoked (%s)" % s
+
 
 def read_evoked(fname, setno=0, baseline=None):
     """Read an evoked dataset
diff --git a/mne/fiff/raw.py b/mne/fiff/raw.py
index 33cefc1..4bc609f 100644
--- a/mne/fiff/raw.py
+++ b/mne/fiff/raw.py
@@ -246,6 +246,12 @@ class Raw(dict):
         self.fid.close()
 
 
+    def __repr__(self):
+        s = "n_channels x n_times : %s x %s" % (len(self.info['ch_names']),
+                                               self.last_samp - self.first_samp + 1)
+        return "Raw (%s)" % s
+
+
 def read_raw_segment(raw, start=None, stop=None, sel=None):
     """Read a chunck of raw data
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git