Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into dist/debian/dev

* master:
  BF: fixing the recent fixes in the unittests ;-)
  • Loading branch information...
commit 35a4231bac88578bb10cd3493ccb2131a781b833 2 parents d6058b5 + fd0f280
@yarikoptic yarikoptic authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  mvpa/tests/test_clf.py
  2. +2 −2 mvpa/tests/test_stats_sp.py
View
2  mvpa/tests/test_clf.py
@@ -611,7 +611,7 @@ def test_tree_classifier(self):
# That is why we use separate pool of classifiers here
clfs_mc = clfswh['multiclass'] # pool of classifiers
clfs_mc = [clfs_mc[i] for i in np.random.permutation(len(clfs_mc))
- if not '%' in str(clfs[i])]
+ if not '%' in str(clfs_mc[i])]
tclf = TreeClassifier(clfs_mc[0], {
'L0' : (('L0',), None),
View
4 mvpa/tests/test_stats_sp.py
@@ -15,8 +15,7 @@
from mvpa.tests.test_stats import *
from scipy import signal
-from mvpa.clfs.stats import match_distribution, rv_semifrozen, \
- plot_distribution_matches
+from mvpa.clfs.stats import match_distribution, rv_semifrozen
from mvpa.misc.stats import chisquare
from mvpa.misc.attrmap import AttributeMap
from mvpa.datasets.base import dataset_wizard
@@ -217,6 +216,7 @@ def test_match_distribution(self):
# Test plotting only once
if loc is None and externals.exists("pylab plottable"):
import pylab as pl
+ from mvpa.clfs.stats import plot_distribution_matches
fig = pl.figure()
plot_distribution_matches(data, matched, legend=1, nbest=5)
#pl.show()
Please sign in to comment.
Something went wrong with that request. Please try again.