fix error and update results

girafe-ai · Jun 11, 2017 · 5ece1c6 · 5ece1c6
1 parent 1cc1bfa
commit 5ece1c6
Show file tree

Hide file tree

Showing 8 changed files with 994 additions and 965 deletions.
diff --git a/examples/MotorImagery/two_class_motor_imagery.py b/examples/MotorImagery/two_class_motor_imagery.py
@@ -40,7 +40,7 @@
 results = context.evaluate(verbose=True)
 
 for p in results.keys():
-    results[p].to_csv('../../results/MotorImagery/TwoClass/%s.csv' % p)
+    results[p].to_csv('../../results/MotorImagery/TwoClass/%s.csv2' % p)
 
 results = pd.concat(results.values())
 print(results.groupby('Pipeline').mean())

diff --git a/moabb/contexts/base.py b/moabb/contexts/base.py
@@ -92,12 +92,8 @@ def evaluate(self, verbose=False):
                 for pipeline in self.pipelines:
                     clf = self.pipelines[pipeline]
                     t_start = time()
-                    try:
-                        score = self.score(clf, X=X, y=y, groups=groups)
-                    except:
-                        e = sys.exc_info()[0]
-                        print(e)
-                        score = np.nan
+                    score = self.score(clf, X=X, y=y, groups=groups)
+
                     duration = time() - t_start
                     row = [score, dataset_name, subject, pipeline, duration]
                     results[pipeline].loc[len(results[pipeline])] = row

diff --git a/moabb/datasets/bnci.py b/moabb/datasets/bnci.py
@@ -38,7 +38,7 @@ def __init__(self, left_hand=True, right_hand=True, feets=True,
         if left_hand:
             event_id['left_hand'] = 1
         if right_hand:
-            event_id['left_hand'] = 2
+            event_id['right_hand'] = 2
         if feets:
             event_id['feets'] = 3
         if tongue:

diff --git a/notebooks/2 classes Motor Imagery .ipynb b/notebooks/2 classes Motor Imagery .ipynb
diff --git a/notebooks/2 classes Motor Imagery.ipynb b/notebooks/2 classes Motor Imagery.ipynb
diff --git a/results/MotorImagery/TwoClass/CSP+LDA.csv b/results/MotorImagery/TwoClass/CSP+LDA.csv
diff --git a/results/MotorImagery/TwoClass/MDM.csv b/results/MotorImagery/TwoClass/MDM.csv
diff --git a/results/MotorImagery/TwoClass/TS.csv b/results/MotorImagery/TwoClass/TS.csv