diff --git a/nltools/stats.py b/nltools/stats.py index faeec319..ffa07dfe 100644 --- a/nltools/stats.py +++ b/nltools/stats.py @@ -101,7 +101,7 @@ def fdr(p, q=.05): discovery rate q. Written by Tal Yarkoni Args: - p: (np.array) vector of p-values (only considers non-zero p-values) + p: (np.array) vector of p-values q: (float) false discovery rate level Returns: @@ -523,7 +523,7 @@ def one_sample_permutation(data, n_permute=5000, tail=2, n_jobs=-1, return_perms data = np.array(data) stats = dict() - stats['mean'] = np.mean(data) + stats['mean'] = np.nanmean(data) all_p = Parallel(n_jobs=n_jobs)(delayed(_permute_sign)(data, random_state=seeds[i]) for i in range(n_permute)) @@ -554,7 +554,7 @@ def two_sample_permutation(data1, data2, n_permute=5000, seeds = random_state.randint(MAX_INT, size=n_permute) stats = dict() - stats['mean'] = np.mean(data1)-np.mean(data2) + stats['mean'] = np.nanmean(data1)-np.nanmean(data2) data = pd.DataFrame(data={'Values': data1, 'Group': np.ones(len(data1))}) data = data.append(pd.DataFrame(data={ 'Values': data2, diff --git a/nltools/version.py b/nltools/version.py index 48f08682..0ade2aa4 100644 --- a/nltools/version.py +++ b/nltools/version.py @@ -1,4 +1,4 @@ """Specifies current version of nltools to be used by setup.py and __init__.py """ -__version__ = '0.3.14' +__version__ = '0.3.15' diff --git a/requirements.txt b/requirements.txt index f8cada09..f22e8ccb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ nibabel>=2.0.1 - scikit-learn>=0.19.1 + scikit-learn>=0.21.0 nilearn>=0.5.0 pandas>=0.20 numpy>=1.9