Thread locks

typos

Author: mdovgialo

obci/interfaces/bci/p300_MD/p300_classm.py

@@ -7,7 +7,11 @@
 import scipy.stats
 import scipy.signal as ss
 from sklearn.externals import joblib
-from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
+try:
+    from sklearn.lda import LDA as LinearDiscriminantAnalysis
+except ImportError:
+    from sklearn.discriminant_analysis import LinearDiscriminantAnalysis
+    
 from collections import deque
 from obci.interfaces.bci.abstract_classifier import AbstractClassifier
 import pickle

obci/interfaces/bci/p300_MD/tests/synthetic_generator.py

@@ -156,7 +156,8 @@ def send_isi(self):
 
     def send_target(self):
         self.logger.info('Sending target, focus: {}'.format(self.focus))
-        self.sent_targets+=1
+        with self.lock:
+            self.sent_targets+=1
         length_window = int(self.window*self.sampling_rate)
         length_packet_aligned = length_window - length_window % self.samples_per_packet
         gauss_w = gaussian(length_packet_aligned, length_packet_aligned/10)
@@ -200,10 +201,8 @@ def run(self):
         for i in xrange(self.test_trials_n):
             for k in xrange(len(self.fields)-1):
                 #handle_message can wait a while
-                with self.lock:
-                    self.send_isi()
-            with self.lock:
-                self.send_target()
+                self.send_isi()
+            self.send_target()
         with self.lock:
             self.save_statistics()
         sys.exit(0)
@@ -226,7 +225,7 @@ def save_statistics(self):
         self.logger.info(
             '''Basic statistics:
         correct classifications: {:.2f}\% {} out of {}
-        mean targets required {:.2f}'''.format(channel_names, correct, N, mean_targets)
+        mean targets required {:.2f}'''.format(correctperc, correct, N, mean_targets)
             )