Merge pull request #82 from ErikBjare/dev/typefixes

fix: fixed passing of incorrect types (caught by mypy)
NeuroTechX · Feb 21, 2021 · af937bb · af937bb
2 parents f468802 + 1c0668f
commit af937bb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/eegnb/__init__.py b/eegnb/__init__.py
@@ -4,7 +4,13 @@
 DATA_DIR = path.join(path.expanduser("~/"), ".eegnb", "data")
 
 
-def generate_save_fn(board_name, experiment, subject_id, session_nb, data_dir=DATA_DIR):
+def generate_save_fn(
+    board_name: str,
+    experiment: str,
+    subject_id: int,
+    session_nb: int,
+    data_dir=DATA_DIR,
+):
     """Generates a file name with the proper trial number for the current subject/experiment combo"""
 
     # convert subject ID to 4-digit number

diff --git a/eegnb/experiments/auditory_oddball/aMMN.py b/eegnb/experiments/auditory_oddball/aMMN.py
@@ -12,7 +12,7 @@
 
 
 def present(
-    save_fn: None,
+    save_fn: str = None,
     duration=120,
     stim_types=None,
     itis=None,

diff --git a/examples/visual_n170/00x__n170_run_experiment.py b/examples/visual_n170/00x__n170_run_experiment.py
@@ -18,10 +18,11 @@
 from eegnb.experiments.visual_n170 import n170
 
 # Define some variables
-board_name = 'muse'
-experiment = 'visual_n170'
-subject = 'test'
-record_duration=120
+board_name = "muse"
+experiment = "visual_n170"
+subject_id = 0
+session_nb = 0
+record_duration = 120
 
 ###################################################################################################
 # Initiate EEG device
@@ -31,7 +32,7 @@
 eeg_device = EEG(device=board_name)
 
 # Create save file name
-save_fn = generate_save_fn(board_name, experiment, subject)
+save_fn = generate_save_fn(board_name, experiment, subject_id, session_nb)
 print(save_fn)
 
 ###################################################################################################  

diff --git a/examples/visual_p300/00x__p300_run_experiment.py b/examples/visual_p300/00x__p300_run_experiment.py
@@ -18,10 +18,11 @@
 from eegnb.experiments.visual_p300 import p300
 
 # Define some variables
-board_name = 'muse'
-experiment = 'visual_p300'
-subject = 'test'
-record_duration=120
+board_name = "muse"
+experiment = "visual_p300"
+subject_id = 0
+session_nb = 0
+record_duration = 120
 
 ###################################################################################################
 # Initiate EEG device
@@ -31,7 +32,7 @@
 eeg_device = EEG(device=board_name)
 
 # Create save file name
-save_fn = generate_save_fn(board_name, experiment, subject)
+save_fn = generate_save_fn(board_name, experiment, subject_id, session_nb)
 print(save_fn)
 
 ###################################################################################################  

diff --git a/examples/visual_ssvep/00x__ssvep_run_experiment.py b/examples/visual_ssvep/00x__ssvep_run_experiment.py
@@ -18,10 +18,11 @@
 from eegnb.experiments.visual_ssvep import ssvep
 
 # Define some variables
-board_name = 'muse'
-experiment = 'visual_ssvep'
-subject = 'test'
-record_duration=120
+board_name = "muse"
+experiment = "visual_ssvep"
+subject_id = 0
+session_nb = 0
+record_duration = 120
 
 ###################################################################################################
 # Initiate EEG device
@@ -31,7 +32,7 @@
 eeg_device = EEG(device=board_name)
 
 # Create save file name
-save_fn = generate_save_fn(board_name, experiment, subject)
+save_fn = generate_save_fn(board_name, experiment, subject_id, session_nb)
 print(save_fn)
 
 ###################################################################################################