Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes done to use factory methods instead of meta examples for Issue #4043 #4115

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/readme/INTERFACES.md
Expand Up @@ -58,6 +58,7 @@ Running an example:

### Ruby
This needs `shogun.rb` to be visible, which is either in `path/to/build/src/interfaces/ruby_modular/` or in something similar to `path/to/shogun-install/lib/x86_64-linux-gnu/site_ruby`

export RUBYLIB="path/to/shogun.rb:$RUBYLIB"

Running an example:
Expand Down
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion examples/meta/src/gaussian_process/classifier.sg
Expand Up @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion examples/meta/src/meta_api/calls.sg
Expand Up @@ -5,5 +5,5 @@ Math:init_random(1)
get_global_io()

# member function call
GaussianKernel k()
Kernel k = kernel("GaussianKernel")
k.set_width(1)
2 changes: 1 addition & 1 deletion examples/meta/src/multiclass/relaxed_tree.sg
Expand Up @@ -12,7 +12,7 @@ MulticlassLabels labels_test(f_labels_test)

#![set_parameters]
MulticlassLibLinear mll()
GaussianKernel kernel()
Kernel kernel = kernel("GaussianKernel")
#![set_parameters]

#![create_instance]
Expand Down
6 changes: 4 additions & 2 deletions examples/meta/src/regression/multiple_kernel_learning.sg
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion examples/meta/src/regression/support_vector_regression.sg
Expand Up @@ -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]
Expand Down