Changes done to use factory methods instead of meta examples

shogun-toolbox · Jan 23, 2018 · cad5543 · cad5543
1 parent 2e6dc14
commit cad5543
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/examples/meta/src/evaluation/cross_validation_multiple_kernel_learning_weights_storage.sg b/examples/meta/src/evaluation/cross_validation_multiple_kernel_learning_weights_storage.sg
@@ -12,16 +12,22 @@ BinaryLabels labels(f_labels)
 
 #![create_kernels]
 CombinedKernel kernel()
-GaussianKernel k_1(10, 0.1)
-GaussianKernel k_2(10, 1)
-GaussianKernel k_3(10, 2)
+Kernel k_1 = kernel("GaussianKernel")
+k_1.set_cache_size(10)
+k_1.set_width(0.1)
+Kernel k_2 = kernel("GaussianKernel")
+k_2.set_cache_size(10)
+k_2.set_width(1)
+Kernel k_3 = kernel("GaussianKernel")
+k_3.set_cache_size(10)
+k_3.set_width(2)
 kernel.append_kernel(k_1)
 kernel.append_kernel(k_2)
 kernel.append_kernel(k_3)
 #![create_kernels]
 
 #![create_classifier]
-LibSVM libsvm()
+KernelMachine libsvm = kernel_machine("LibSVM")
 MKLClassification svm(libsvm)
 svm.set_interleaved_optimization_enabled(False)
 svm.set_kernel(kernel)

diff --git a/examples/meta/src/gaussian_process/classifier.sg b/examples/meta/src/gaussian_process/classifier.sg
@@ -12,7 +12,8 @@ MulticlassLabels labels_test(f_labels_test)
 #![create_features]
 
 #![create_appropriate_kernel_and_mean_function]
-GaussianKernel kernel(2.0)
+Kernel kernel =  kernel("GaussianKernel")
+kernel.set_width(2.0)
 ConstMean mean_function()
 #![create_appropriate_kernel_and_mean_function]
 

diff --git a/examples/meta/src/meta_api/calls.sg b/examples/meta/src/meta_api/calls.sg
@@ -5,5 +5,5 @@ Math:init_random(1)
 get_global_io()
 
 # member function call
-GaussianKernel k()
+Kernel k = kernel("GaussianKernel")
 k.set_width(1)
diff --git a/examples/meta/src/multiclass/relaxed_tree.sg b/examples/meta/src/multiclass/relaxed_tree.sg
@@ -12,7 +12,7 @@ MulticlassLabels labels_test(f_labels_test)
 
 #![set_parameters]
 MulticlassLibLinear mll()
-GaussianKernel kernel()
+Kernel kernel = kernel("GaussianKernel")
 #![set_parameters]
 
 #![create_instance]

diff --git a/examples/meta/src/regression/multiple_kernel_learning.sg b/examples/meta/src/regression/multiple_kernel_learning.sg
@@ -12,8 +12,10 @@ RegressionLabels labels_test(f_labels_test)
 
 #![create_kernel]
 PolyKernel poly_kernel(10,2)
-GaussianKernel gauss_kernel_1(2.0)
-GaussianKernel gauss_kernel_2(3.0)
+Kernel gauss_kernel_1 = kernel("GaussianKernel")
+k.set_width(2.0)
+Kernel gauss_kernel_2 = kernel("GaussianKernel")
+k.set_width(3.0)
 #![create_kernel]
 
 #![create_combined_train]

diff --git a/examples/meta/src/regression/support_vector_regression.sg b/examples/meta/src/regression/support_vector_regression.sg
@@ -12,7 +12,8 @@ RegressionLabels labels_test(f_labels_test)
 
 #![create_appropriate_kernel]
 real width = 1.0
-GaussianKernel kernel(width)
+Kernel kernel = kernel("GaussianKernel")
+kernel.set_width(width)
 #![create_appropriate_kernel]
 
 #![create_instance]