cleanup

Signed-off-by: Andrey Parfenov <[email protected]>

cpp-package/src/inc/board_shim.h

@@ -177,7 +177,7 @@ class BoardShim
     void release_session ();
     /// get latest collected data, doesnt remove it from ringbuffer
     double **get_current_board_data (int num_samples, int *num_data_points);
-    /// Get board id in case of PLAYBACK or STREAMING board
+    /// Get board id, for some boards can be different than provided (playback, streaming)
     int get_board_id ();
     /// get number of packages in ringbuffer
     int get_board_data_count ();

csharp-package/brainflow/brainflow/board_shim.cs

@@ -590,10 +590,10 @@ public bool is_prepared ()
         }
 
         ///<summary>
-        /// Get Master board id in case of PLAYBACK or STREAMING board
+        /// Get Board Id, for some boards can be different than provided
         ///</summary>
         /// <returns> Master board id </returns>
-        public int get_board_id()
+        public int get_board_id ()
         {
             return master_board_id;
         }

csharp-package/brainflow/eeg_metrics/eeg_metrics.cs

@@ -15,9 +15,9 @@ static void Main (string[] args)
             BrainFlowInputParams input_params = new BrainFlowInputParams ();
             int board_id = parse_args (args, input_params);
             BoardShim board_shim = new BoardShim (board_id, input_params);
-            int sampling_rate = BoardShim.get_sampling_rate (board_shim.get_board_id());
-            int nfft = DataFilter.get_nearest_power_of_two(sampling_rate);
-            int[] eeg_channels = BoardShim.get_eeg_channels(board_shim.get_board_id());
+            int sampling_rate = BoardShim.get_sampling_rate (board_shim.get_board_id ());
+            int nfft = DataFilter.get_nearest_power_of_two (sampling_rate);
+            int[] eeg_channels = BoardShim.get_eeg_channels (board_shim.get_board_id ());
 
             board_shim.prepare_session ();
             board_shim.start_stream (3600);

csharp-package/brainflow/eeg_metrics_ci/eeg_metrics_ci.cs

@@ -16,9 +16,9 @@ static void Main (string[] args)
             BrainFlowModelParams model_params = new BrainFlowModelParams (0,0);
             int board_id = parse_args (args, input_params,model_params);
             BoardShim board_shim = new BoardShim (board_id, input_params);
-            int sampling_rate = BoardShim.get_sampling_rate (board_shim.get_board_id());
-            int nfft = DataFilter.get_nearest_power_of_two(sampling_rate);
-            int[] eeg_channels = BoardShim.get_eeg_channels(board_shim.get_board_id());
+            int sampling_rate = BoardShim.get_sampling_rate (board_shim.get_board_id ());
+            int nfft = DataFilter.get_nearest_power_of_two (sampling_rate);
+            int[] eeg_channels = BoardShim.get_eeg_channels (board_shim.get_board_id ());
 
             board_shim.prepare_session ();
             board_shim.start_stream (3600);
@@ -31,7 +31,8 @@ static void Main (string[] args)
             double[] feature_vector = bands.Item1.Concatenate (bands.Item2);
             MLModel concentration = new MLModel (model_params);
             concentration.prepare ();
-            Console.WriteLine (Enum.GetName(typeof(BrainFlowMetrics),model_params.metric) + " " + Enum.GetName(typeof(BrainFlowClassifiers),model_params.classifier) + " : "  + concentration.predict (feature_vector));
+            Console.WriteLine (Enum.GetName (typeof (BrainFlowMetrics), model_params.metric) + " " + Enum.GetName (typeof (BrainFlowClassifiers), model_params.classifier) +
+                " : "  + concentration.predict (feature_vector));
             concentration.release ();
         }
 
@@ -83,11 +84,11 @@ static int parse_args (string[] args, BrainFlowInputParams input_params,  BrainF
                 }
                 if (args[i].Equals ("--metric"))
                 {
-                    model_params.metric = Convert.ToInt32(args[i + 1]);
+                    model_params.metric = Convert.ToInt32 (args[i + 1]);
                 }
                 if (args[i].Equals ("--classifier"))
                 {
-                    model_params.classifier = Convert.ToInt32(args[i + 1]);
+                    model_params.classifier = Convert.ToInt32 (args[i + 1]);
                 }
             }
             return board_id;

java-package/brainflow/src/main/java/brainflow/BoardShim.java

@@ -554,7 +554,7 @@ public void prepare_session () throws BrainFlowError
     }
 
     /**
-     * Get master board id incase of Playback or streaming board
+     * Get Board Id, can be different than provided (playback or streaming board)
      */
     public int get_board_id ()
     {

java-package/brainflow/src/main/java/brainflow/examples/EEGMetrics.java

@@ -29,7 +29,8 @@ public static void main (String[] args) throws Exception
         board_shim.prepare_session ();
         board_shim.start_stream (3600);
         BoardShim.log_message (LogLevels.LEVEL_INFO.get_code (), "Start sleeping in the main thread");
-        // recommended window size for eeg metric calculation is at least 4 seconds, bigger is better
+        // recommended window size for eeg metric calculation is at least 4 seconds,
+        // bigger is better
         Thread.sleep (5000);
         board_shim.stop_stream ();
         double[][] data = board_shim.get_board_data ();

java-package/brainflow/src/main/java/brainflow/examples/EEGMetricsCi.java

@@ -20,8 +20,8 @@ public static void main (String[] args) throws Exception
     {
         BoardShim.enable_board_logger ();
         BrainFlowInputParams params = new BrainFlowInputParams ();
-        BrainFlowModelParams model_params = new BrainFlowModelParams (0,0);
-        int board_id = parse_args (args, params,model_params);
+        BrainFlowModelParams model_params = new BrainFlowModelParams (0, 0);
+        int board_id = parse_args (args, params, model_params);
         BoardShim board_shim = new BoardShim (board_id, params);
         int master_board_id = board_shim.get_board_id ();
         int sampling_rate = BoardShim.get_sampling_rate (master_board_id);
@@ -30,7 +30,8 @@ public static void main (String[] args) throws Exception
         board_shim.prepare_session ();
         board_shim.start_stream (3600);
         BoardShim.log_message (LogLevels.LEVEL_INFO.get_code (), "Start sleeping in the main thread");
-        // recommended window size for eeg metric calculation is at least 4 seconds, bigger is better
+        // recommended window size for eeg metric calculation is at least 4 seconds,
+        // bigger is better
         Thread.sleep (5000);
         board_shim.stop_stream ();
         double[][] data = board_shim.get_board_data ();
@@ -40,11 +41,13 @@ public static void main (String[] args) throws Exception
         double[] feature_vector = ArrayUtils.addAll (bands.getLeft (), bands.getRight ());
         MLModel concentration = new MLModel (model_params);
         concentration.prepare ();
-        System.out.println (BrainFlowMetrics.string_from_code(model_params.metric) + " " + BrainFlowClassifiers.string_from_code(model_params.classifier) + " : " + concentration.predict (feature_vector));
+        System.out.println (BrainFlowMetrics.string_from_code (model_params.metric) + " "
+                + BrainFlowClassifiers.string_from_code (model_params.classifier) + " : "
+                + concentration.predict (feature_vector));
         concentration.release ();
     }
 
-    private static int parse_args (String[] args, BrainFlowInputParams params,BrainFlowModelParams model_params)
+    private static int parse_args (String[] args, BrainFlowInputParams params, BrainFlowModelParams model_params)
     {
         int board_id = -1;
         for (int i = 0; i < args.length; i++)
@@ -87,11 +90,11 @@ private static int parse_args (String[] args, BrainFlowInputParams params,BrainF
             }
             if (args[i].equals ("--metric"))
             {
-                model_params.metric = Integer.parseInt(args[i + 1]);
+                model_params.metric = Integer.parseInt (args[i + 1]);
             }
             if (args[i].equals ("--classifier"))
             {
-                model_params.classifier = Integer.parseInt(args[i + 1]);
+                model_params.classifier = Integer.parseInt (args[i + 1]);
             }
         }
         return board_id;

python-package/brainflow/board_shim.py

@@ -890,8 +890,8 @@ def get_board_data_count (self) -> int:
             raise BrainFlowError ('unable to obtain buffer size', res)
         return data_size[0]
 
-    def get_board_id(self) -> int:
-        """Get's the actual board id in case of playback or streaming board
+    def get_board_id (self) -> int:
+        """Get's the actual board id, can be different than provided
 
         :return: board id
         :rtype: int

src/ml/train/focus_classifiers.py

@@ -195,7 +195,6 @@ def main ():
         test_brainflow_svm (data)
         test_brainflow_lda (data)
     else:
-        train_knn(data)
         train_regression (data)
         # Don't use grid search method unless you have to as it takes a while to complete
         train_brainflow_search_svm (data) if args.grid_search else train_brainflow_svm (data)

tests/cpp/ml_demo/src/eeg_metrics_ci.cpp

@@ -19,10 +19,11 @@ using namespace std::chrono;
 bool parse_args (int argc, char *argv[], struct BrainFlowInputParams *params, int *board_id,
     struct BrainFlowModelParams *model_params);
 
+
 int main (int argc, char *argv[])
 {
     struct BrainFlowInputParams params;
-    struct BrainFlowModelParams model_params (0,0);
+    struct BrainFlowModelParams model_params (0, 0);
     int board_id = 0;
     if (!parse_args (argc, argv, &params, &board_id, &model_params))
     {

tests/python/eeg_metrics.py

@@ -39,9 +39,10 @@ def main ():
     params.ip_protocol = args.ip_protocol
     params.timeout = args.timeout
     params.file = args.file
+
     board = BoardShim (args.board_id, params)
-    master_board_id = board.get_board_id()
-    sampling_rate = BoardShim.get_sampling_rate (int(master_board_id))
+    master_board_id = board.get_board_id ()
+    sampling_rate = BoardShim.get_sampling_rate (master_board_id)
     board.prepare_session ()
     board.start_stream (45000, args.streamer_params)
     BoardShim.log_message (LogLevels.LEVEL_INFO.value, 'start sleeping in the main thread')

tests/python/eeg_metrics_ci.py

@@ -41,9 +41,10 @@ def main ():
     params.ip_protocol = args.ip_protocol
     params.timeout = args.timeout
     params.file = args.file
+
     board = BoardShim (args.board_id, params)
-    master_board_id = board.get_board_id()
-    sampling_rate = BoardShim.get_sampling_rate (int (master_board_id))
+    master_board_id = board.get_board_id ()
+    sampling_rate = BoardShim.get_sampling_rate (master_board_id)
     board.prepare_session ()
     board.start_stream (45000, args.streamer_params)
     BoardShim.log_message (LogLevels.LEVEL_INFO.value, 'start sleeping in the main thread')