fix a few regressions

shogun-toolbox · Aug 31, 2011 · 419a67b · 419a67b
1 parent fc4625c
commit 419a67b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/testsuite/python_modular/kernel.py b/testsuite/python_modular/kernel.py
@@ -156,7 +156,7 @@ def _evaluate_pie (indata, prefix):
 	km_test=max(abs(
 		indata[prefix+'matrix_test']-kernel.get_kernel_matrix()).flat)
 	classified=max(abs(
-		pie.classify().get_labels()-indata['classifier_classified']))
+		pie.apply().get_labels()-indata['classifier_classified']))
 
 	return util.check_accuracy(indata[prefix+'accuracy'],
 		km_train=km_train, km_test=km_test, classified=classified)

diff --git a/testsuite/python_modular/test_all.sh b/testsuite/python_modular/test_all.sh
@@ -9,6 +9,12 @@ DATAPATH='../data'
 
 function test_all () {
 	datapath="$1"
+
+	if echo "$datapath" | grep -q '\.\./data/tests'
+	then
+		continue
+	fi
+
 	echo "*** Testing in $datapath"
 	sleep 1
 	for file in $datapath; do

diff --git a/testsuite/python_modular/test_svm_kernel_multiple.py b/testsuite/python_modular/test_svm_kernel_multiple.py
@@ -37,7 +37,7 @@
 	svm.train()
 
 	kernel.init(feats_train, feats_test)
-	print svm.classify().get_labels()
+	print svm.apply().get_labels()
 
 	#kernel.remove_lhs_and_rhs()