fix most of octave_modular examples for new labels

shogun-toolbox · May 24, 2012 · 95c124d · 95c124d
1 parent 495a859
commit 95c124d
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 26 deletions.
diff --git a/examples/undocumented/octave_modular/classifier_domainadaptationsvm_modular.m b/examples/undocumented/octave_modular/classifier_domainadaptationsvm_modular.m
@@ -23,7 +23,7 @@
 	feats_train.set_features(fm_train_dna);
 	feats_test.set_features(fm_test_dna);
 	kernel=WeightedDegreeStringKernel(feats_train, feats_train, degree);
-	labels=Labels(label_train_dna);
+	labels=BinaryLabels(label_train_dna);
 	svm=SVMLight(C, kernel, labels);
 	svm.train();
 
@@ -39,7 +39,7 @@
 
 	kernel2=WeightedDegreeStringKernel(feats_train, feats_train, degree);
 
-	labels2=Labels(label_train_dna);
+	labels2=BinaryLabels(label_train_dna);
 
 	% we regularize versus the previously obtained solution
 	dasvm = DomainAdaptationSVM(C, kernel2, labels2, svm, 1.0);

diff --git a/examples/undocumented/octave_modular/classifier_gmnpsvm_modular.m b/examples/undocumented/octave_modular/classifier_gmnpsvm_modular.m
@@ -16,7 +16,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_multiclass);
+labels=MulticlassLabels(label_train_multiclass);
 
 svm=GMNPSVM(C, kernel, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_gpbtsvm_modular.m b/examples/undocumented/octave_modular/classifier_gpbtsvm_modular.m
@@ -16,7 +16,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=2;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=GPBTSVM(C, kernel, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_knn_modular.m b/examples/undocumented/octave_modular/classifier_knn_modular.m
@@ -14,7 +14,7 @@
 
 k=3;
 num_threads=1;
-labels=Labels(label_train_multiclass);
+labels=MulticlassLabels(label_train_multiclass);
 
 knn=KNN(k, distance, labels);
 knn.parallel.set_num_threads(num_threads);

diff --git a/examples/undocumented/octave_modular/classifier_lda_modular.m b/examples/undocumented/octave_modular/classifier_lda_modular.m
@@ -13,7 +13,7 @@
 
 gamma=3;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 lda=LDA(gamma, feats_train, labels);
 lda.parallel.set_num_threads(num_threads);

diff --git a/examples/undocumented/octave_modular/classifier_liblinear_modular.m b/examples/undocumented/octave_modular/classifier_liblinear_modular.m
@@ -18,7 +18,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=LibLinear(C, feats_train, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_libsvm_minimal_modular.m b/examples/undocumented/octave_modular/classifier_libsvm_minimal_modular.m
@@ -15,7 +15,7 @@
 feats_test=RealFeatures(testdata_real);
 kernel=GaussianKernel(feats_train, feats_train, width);
 
-labels=Labels(trainlab);
+labels=BinaryLabels(trainlab);
 svm=LibSVM(C, kernel, labels);
 svm.parallel.set_num_threads(8);
 svm.train();

diff --git a/examples/undocumented/octave_modular/classifier_libsvm_modular.m b/examples/undocumented/octave_modular/classifier_libsvm_modular.m
@@ -16,7 +16,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=2;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=LibSVM(C, kernel, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_mpdsvm_modular.m b/examples/undocumented/octave_modular/classifier_mpdsvm_modular.m
@@ -16,7 +16,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=MPDSVM(C, kernel, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_multiclasslibsvm_modular.m b/examples/undocumented/octave_modular/classifier_multiclasslibsvm_modular.m
@@ -15,7 +15,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=8;
-labels=Labels(label_train_multiclass);
+labels=MulticlassLabels(label_train_multiclass);
 
 svm=MulticlassLibSVM(C, kernel, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_newtonsvm_modular.m b/examples/undocumented/octave_modular/classifier_newtonsvm_modular.m
@@ -21,7 +21,7 @@
 epsilon=1e-5;
 num_threads=1;
 label=double(label);
-labels=Labels(label);
+labels=BinaryLabels(label);
 
 svm=NewtonSVM(C, feats_train, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_perceptron_modular.m b/examples/undocumented/octave_modular/classifier_perceptron_modular.m
@@ -14,7 +14,7 @@
 learn_rate=1.;
 max_iter=1000;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 perceptron=Perceptron(feats_train, labels);
 perceptron.set_learn_rate(learn_rate);

diff --git a/examples/undocumented/octave_modular/classifier_subgradientsvm_modular.m b/examples/undocumented/octave_modular/classifier_subgradientsvm_modular.m
@@ -19,7 +19,7 @@
 epsilon=1e-3;
 num_threads=1;
 max_train_time=1.;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=SubGradientSVM(C, feats_train, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_svm_serialize_modular.m b/examples/undocumented/octave_modular/classifier_svm_serialize_modular.m
@@ -21,7 +21,7 @@
 % create feature and label objects
 feats_train = RealFeatures(fm_train_real);
 feats_test = RealFeatures(fm_test_real);
-labels = Labels(fm_train_labels);
+labels = BinaryLabels(fm_train_labels);
 
 % create kernel
 kernel = GaussianKernel(feats_train, feats_train, width);

diff --git a/examples/undocumented/octave_modular/classifier_svmlight_modular.m b/examples/undocumented/octave_modular/classifier_svmlight_modular.m
@@ -22,7 +22,7 @@
 	C=1.2;
 	epsilon=1e-5;
 	num_threads=3;
-	labels=Labels(label_train_dna);
+	labels=BinaryLabels(label_train_dna);
 
 	svm=SVMLight(C, kernel, labels);
 	svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_svmlin_modular.m b/examples/undocumented/octave_modular/classifier_svmlin_modular.m
@@ -18,7 +18,7 @@
 C=0.9;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=SVMLin(C, feats_train, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_svmocas_modular.m b/examples/undocumented/octave_modular/classifier_svmocas_modular.m
@@ -18,7 +18,7 @@
 C=0.9;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=SVMOcas(C, feats_train, labels);
 svm.set_epsilon(epsilon);

diff --git a/examples/undocumented/octave_modular/classifier_svmsgd_modular.m b/examples/undocumented/octave_modular/classifier_svmsgd_modular.m
@@ -18,7 +18,7 @@
 C=0.9;
 num_iter=5
 num_threads=1;
-labels=Labels(label_train_twoclass);
+labels=BinaryLabels(label_train_twoclass);
 
 svm=SVMSGD(C, feats_train, labels);
 svm.set_epochs(num_iter)

diff --git a/examples/undocumented/octave_modular/kernel_auc_modular.m b/examples/undocumented/octave_modular/kernel_auc_modular.m
@@ -12,6 +12,6 @@
 subkernel=GaussianKernel(feats_train, feats_train, width);
 
 kernel=AUCKernel(0, subkernel);
-kernel.setup_auc_maximization( Labels(label_train_twoclass) );
+kernel.setup_auc_maximization( BinaryLabels(label_train_twoclass) );
 km_train=kernel.get_kernel_matrix();
 
diff --git a/examples/undocumented/octave_modular/kernel_histogramword_modular.m b/examples/undocumented/octave_modular/kernel_histogramword_modular.m
@@ -23,7 +23,7 @@
 feats_test.obtain_from_char(charfeat, order-1, order, gap, reverse);
 
 pie=PluginEstimate();
-labels=Labels(label_train_dna);
+labels=BinaryLabels(label_train_dna);
 pie.set_labels(labels);
 pie.set_features(feats_train);
 pie.train();

diff --git a/examples/undocumented/octave_modular/mkl_multiclass_modular.m b/examples/undocumented/octave_modular/mkl_multiclass_modular.m
@@ -41,7 +41,7 @@
 C=1.2;
 epsilon=1e-5;
 num_threads=1;
-labels=Labels(label_train_multiclass);
+labels=MulticlassLabels(label_train_multiclass);
 
 % MKL_MULTICLASS
 disp('MKL_MULTICLASS')
@@ -54,4 +54,4 @@
 
 kernel.init(feats_train, feats_test);
 result=mkl.apply().get_labels();
-result
+result
diff --git a/examples/undocumented/octave_modular/regression_kernel_ridge_modular.m b/examples/undocumented/octave_modular/regression_kernel_ridge_modular.m
@@ -16,7 +16,7 @@
 C=0.9;
 tau=1e-6;
 num_threads=1;
-labels=Labels(label_train);
+labels=RegressionLabels(label_train);
 
 krr=KernelRidgeRegression(tau, kernel, labels);
 krr.parallel.set_num_threads(num_threads);

diff --git a/examples/undocumented/octave_modular/regression_libsvr_modular.m b/examples/undocumented/octave_modular/regression_libsvr_modular.m
@@ -17,7 +17,7 @@
 epsilon=1e-5;
 tube_epsilon=1e-2;
 num_threads=3;
-labels=Labels(label_train);
+labels=RegressionLabels(label_train);
 
 svr=LibSVR(C, epsilon, kernel, labels);
 svr.set_tube_epsilon(tube_epsilon);

diff --git a/examples/undocumented/octave_modular/regression_svrlight_modular.m b/examples/undocumented/octave_modular/regression_svrlight_modular.m
@@ -18,7 +18,7 @@
 	epsilon=1e-5;
 	tube_epsilon=1e-2;
 	num_threads=3;
-	labels=Labels(label_train);
+	labels=RegressioLabels(label_train);
 
 	svr=SVRLight(C, epsilon, kernel, labels);
 	svr.set_tube_epsilon(tube_epsilon);