[med-svn] [python-mne] 170/353: added tests

[Yaroslav Halchenko]

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

yoh pushed a commit to tag 0.4
in repository python-mne.

commit 6c191df0c91eeb2920432fac57a25054fe980603
Author: Martin Luessi <mluessi at nmr.mgh.harvard.edu>
Date:   Thu May 3 15:23:27 2012 -0400

    added tests
---
 mne/preprocessing/ssp.py            | 12 ++++--------
 mne/preprocessing/tests/__init__.py |  0
 mne/preprocessing/tests/test_ssp.py | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/mne/preprocessing/ssp.py b/mne/preprocessing/ssp.py
index 9c5aa98..1d77f9b 100644
--- a/mne/preprocessing/ssp.py
+++ b/mne/preprocessing/ssp.py
@@ -91,8 +91,7 @@ def _compute_exg_proj(mode, raw, tmin, tmax,
         projs = []
     else:
         projs = raw.info['projs']
-        print ('Including %d SSP projectors from %s'
-               % (len(projs), in_fif_fname))
+        print 'Including %d SSP projectors from raw file' % len(projs)
 
     if avg_ref:
         print 'Adding average EEG reference projection.'
@@ -141,9 +140,6 @@ def _compute_exg_proj(mode, raw, tmin, tmax,
                                         n_eeg=n_eeg)
     projs.extend(ev_projs)
 
-    if preload is not None and os.path.exists(preload):
-        os.remove(preload)
-
     print 'Done.'
 
     return projs, events
@@ -153,7 +149,7 @@ def compute_proj_ecg(raw, tmin=-0.2, tmax=0.4,
                      n_grad=2, n_mag=2, n_eeg=2, l_freq=1.0, h_freq=35.0,
                      average=False, filter_length=2048, n_jobs=1, ch_name=None,
                      reject=dict(grad=2000e-13, mag=3000e-15, eeg=50e-6,
-                     eog=250e-6), bads=None, avg_ref=False, excl_proj=True,
+                     eog=250e-6), bads=[], avg_ref=False, excl_proj=True,
                      event_id=999):
     """Compute SSP/PCA projections for ECG artifacts
 
@@ -233,8 +229,8 @@ def compute_proj_ecg(raw, tmin=-0.2, tmax=0.4,
 def compute_proj_eog(raw, tmin=-0.15, tmax=0.15,
                      n_grad=2, n_mag=2, n_eeg=2, l_freq=1.0, h_freq=35.0,
                      average=False, filter_length=2048, n_jobs=1,
-                     reject=dict(grad=2000e-13, mag=3000e-15, eeg=50e-6,
-                     eog=1e9), bads=None, avg_ref=False, excl_proj=True,
+                     reject=dict(grad=2000e-13, mag=3000e-15, eeg=500e-6,
+                     eog=1e9), bads=[], avg_ref=False, excl_proj=True,
                      event_id=998):
     """Compute SSP/PCA projections for EOG artifacts
 
diff --git a/mne/preprocessing/tests/__init__.py b/mne/preprocessing/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/mne/preprocessing/tests/test_ssp.py b/mne/preprocessing/tests/test_ssp.py
new file mode 100644
index 0000000..6277a6e
--- /dev/null
+++ b/mne/preprocessing/tests/test_ssp.py
@@ -0,0 +1,32 @@
+import os.path as op
+
+from nose.tools import assert_true
+
+from ...fiff import Raw
+from ..ssp import compute_proj_ecg, compute_proj_eog
+
+data_path = op.join(op.dirname(__file__), '..', '..', 'fiff', 'tests', 'data')
+raw_fname = op.join(data_path, 'test_raw.fif')
+
+
+def test_compute_proj_ecg():
+    """Test computation of ECG SSP projectors"""
+    for average in [False, True]:
+        raw = Raw(raw_fname, preload=True)
+        projs, events = compute_proj_ecg(raw, n_mag=2, n_grad=2, n_eeg=2,
+                                         ch_name='MEG 1531', bads=['MEG 2443'],
+                                         average=average)
+        raw.close()
+        assert_true(len(projs) == 6)
+        #XXX: better tests
+
+
+def test_compute_proj_eog():
+    """Test computation of EOG SSP projectors"""
+    for average in [False, True]:
+        raw = Raw(raw_fname, preload=True)
+        projs, events = compute_proj_eog(raw, n_mag=2, n_grad=2, n_eeg=2,
+                                     bads=['MEG 2443'], average=average)
+        raw.close()
+        assert_true(len(projs) == 6)
+        #XXX: better tests

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