From 05217f700e033f3f4960e5ad01cd7d3b803acf5d Mon Sep 17 00:00:00 2001 From: Swaroop Guntupalli Date: Thu, 23 Jan 2014 16:35:08 -0500 Subject: [PATCH 1/2] BF: DissimilarityMultiRegressMeasure doesn't initialize X ENH: Added check to correct if X is not a matrix instance --- mvpa2/measures/rsa.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mvpa2/measures/rsa.py b/mvpa2/measures/rsa.py index 89537e9bfe..d15062358a 100644 --- a/mvpa2/measures/rsa.py +++ b/mvpa2/measures/rsa.py @@ -267,6 +267,10 @@ def __init__(self, X, pairwise_metric='correlation', center_data=False,**kwargs) for i in range(m): X[i,:] = rankdata(X[i,:]) + if isinstance(X, np.matrix): + self.X = X + else: + self.X = np.matrix(X) self.pairwise_metric = pairwise_metric self.center_data = center_data From c6bb58ee4e2b3bb24e2913235f572f9a4511c48e Mon Sep 17 00:00:00 2001 From: Swaroop Guntupalli Date: Thu, 23 Jan 2014 17:16:09 -0500 Subject: [PATCH 2/2] ENH: Modified the return dataset of DissimilarityMultiRegressMeasure to np.array type to prevent subsequent errors while using reshape (eg. during map2nifti) --- mvpa2/measures/rsa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mvpa2/measures/rsa.py b/mvpa2/measures/rsa.py index d15062358a..c54bacddb6 100644 --- a/mvpa2/measures/rsa.py +++ b/mvpa2/measures/rsa.py @@ -297,7 +297,7 @@ def _call(self,ds): b[np.isnan(b)] = 0 - return Dataset(b) + return Dataset(np.asarray(b))