fix svr and krr examples

shogun-toolbox · Sep 2, 2012 · 7bb1224 · 7bb1224
1 parent 684cd3a
commit 7bb1224
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/examples/undocumented/python_modular/graphical/kernel_ridge_regression_sinc.py b/examples/undocumented/python_modular/graphical/kernel_ridge_regression_sinc.py
@@ -22,7 +22,7 @@
 plot(X, Y, '.', label='train data')
 plot(X[0], krr.apply().get_labels(), hold=True, label='train output')
 
-XE, YE=util.compute_output_plot_isolines_sine(krr, gk, feat)
+XE, YE=util.compute_output_plot_isolines_sine(krr, gk, feat, regression=True)
 YE200=krr.apply_one(200)
 
 plot(XE[0], YE, hold=True, label='test output')

diff --git a/examples/undocumented/python_modular/graphical/svr_sinc.py b/examples/undocumented/python_modular/graphical/svr_sinc.py
@@ -19,9 +19,9 @@
 svr.train()
 
 plot(X, Y, '.', label='train data')
-plot(X[0], svr.apply().get_confidences(), hold=True, label='train output')
+plot(X[0], svr.apply().get_labels(), hold=True, label='train output')
 
-XE, YE=util.compute_output_plot_isolines_sine(svr, gk, feat)
+XE, YE=util.compute_output_plot_isolines_sine(svr, gk, feat, regression=True)
 plot(XE[0], YE, hold=True, label='test output')
 
 connect('key_press_event', util.quit)

diff --git a/examples/undocumented/python_modular/graphical/util.py b/examples/undocumented/python_modular/graphical/util.py
@@ -101,11 +101,15 @@ def get_sinedata():
 	return x, y
 
 
-def compute_output_plot_isolines_sine(classifier, kernel, train):
+def compute_output_plot_isolines_sine(classifier, kernel, train, regression=False):
 	x=4*rand(1, 500)-2
 	x.sort()
 	test=RealFeatures(x)
 	kernel.init(train, test)
-	y=classifier.apply().get_confidences()
+
+	if regression:
+		y=classifier.apply().get_labels()
+	else:
+		y=classifier.apply().get_confidences()
 
 	return x, y