From 201b925908eaa07c7e7bb82975c8d850c18c3ffa Mon Sep 17 00:00:00 2001 From: Yida Wang Date: Fri, 27 Apr 2018 15:01:46 -0700 Subject: [PATCH 1/3] clearify the data to be shuffled at fcma preprocess is the image data --- brainiak/fcma/preprocessing.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/brainiak/fcma/preprocessing.py b/brainiak/fcma/preprocessing.py index 9ea3121f7..cfded944e 100644 --- a/brainiak/fcma/preprocessing.py +++ b/brainiak/fcma/preprocessing.py @@ -39,7 +39,7 @@ def _separate_epochs(activity_data, epoch_list): - """ create data epoch by epoch + """ create image data epoch by epoch Separate data into epochs of interest specified in epoch_list and z-score them for computing correlation @@ -101,7 +101,7 @@ def _randomize_single_subject(data, seed=None): Parameters ---------- data: 2D array in shape [nVoxels, nTRs] - Activity data to be shuffled. + Activity image data to be shuffled. seed: Optional[int] Seed for random state used implicitly for shuffling. @@ -123,7 +123,7 @@ def _randomize_subject_list(data_list, random): Parameters ---------- data_list: list of 2D array in shape [nVxels, nTRs] - Activity data list to be shuffled. + Activity image data list to be shuffled. random: RandomType Randomization type. @@ -142,11 +142,11 @@ def _randomize_subject_list(data_list, random): class RandomType(Enum): """Define the random types as enumeration - NORANDOM means do not randomize the data; - REPRODUCIBLE means randomize the data with a fixed seed so that the + NORANDOM means do not randomize the image data; + REPRODUCIBLE means randomize the image data with a fixed seed so that the permutation holds between different runs; - UNREPRODUCIBLE means truly randomize the data which returns different - results in different runs. + UNREPRODUCIBLE means truly randomize the image data which returns + different results in different runs. """ NORANDOM = 0 REPRODUCIBLE = 1 From 13c0fafce5ede6aff1e99185c93fb1058ef26906 Mon Sep 17 00:00:00 2001 From: Yida Wang Date: Fri, 27 Apr 2018 22:12:58 -0700 Subject: [PATCH 2/3] fix trailing whitespace --- brainiak/fcma/preprocessing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brainiak/fcma/preprocessing.py b/brainiak/fcma/preprocessing.py index cfded944e..9bbb43497 100644 --- a/brainiak/fcma/preprocessing.py +++ b/brainiak/fcma/preprocessing.py @@ -39,7 +39,7 @@ def _separate_epochs(activity_data, epoch_list): - """ create image data epoch by epoch + """ create data epoch by epoch Separate data into epochs of interest specified in epoch_list and z-score them for computing correlation @@ -145,7 +145,7 @@ class RandomType(Enum): NORANDOM means do not randomize the image data; REPRODUCIBLE means randomize the image data with a fixed seed so that the permutation holds between different runs; - UNREPRODUCIBLE means truly randomize the image data which returns + UNREPRODUCIBLE means truly randomize the image data which returns different results in different runs. """ NORANDOM = 0 From 29679f0c8d88f0204a6aeafa00f1716b9114dc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihai=20Capot=C4=83?= Date: Mon, 30 Apr 2018 09:45:19 -0700 Subject: [PATCH 3/3] Also clarify prepare_*_data --- brainiak/fcma/preprocessing.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/brainiak/fcma/preprocessing.py b/brainiak/fcma/preprocessing.py index 9bbb43497..8ef715af9 100644 --- a/brainiak/fcma/preprocessing.py +++ b/brainiak/fcma/preprocessing.py @@ -173,8 +173,7 @@ def prepare_fcma_data(images, conditions, mask1, mask2=None, variable raw_data2 and the self-correlation on raw_data1 will be computed random: Optional[RandomType] - Randomize the data within subject or not. - Default NORANDOM + Randomize the image data within subject or not. comm: MPI.Comm MPI communicator to use for MPI operations. @@ -344,7 +343,7 @@ def prepare_searchlight_mvpa_data(images, conditions, data_type=np.float32, data_type Type to cast image to. random: Optional[RandomType] - Randomize the data within subject or not. + Randomize the image data within subject or not. Returns -------