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.

Sign up for GitHub

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

Jump to bottom

Fix issue #3612 #4127

Merged
merged 16 commits into from
Jan 29, 2018
Merged

Fix issue #3612 #4127

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
549e646
First attempt at fixing #3612
Jan 25, 2018
574922b
Attempt #1 to fix segfault
Jan 27, 2018
9e8e5e2
Revert "Attempt #1 to fix segfault"
Jan 27, 2018
214c8e4
segafault fix attempt no2
Jan 27, 2018
c801712
Whitespace fix
Jan 27, 2018
be69f9a
Formatting fix
Jan 27, 2018
70ab831
Added that single space character to make the style checker happy
Jan 27, 2018
599d4ed
Added unref for the two subset stacks
Jan 27, 2018
02ed8a9
adds unit test functions for combined kernel subsetting behaviour. Fi…
Jan 28, 2018
72dfbb9
Formatting
Jan 28, 2018
deb551f
More formatting changes
Jan 28, 2018
ebea19f
indent fix
Jan 28, 2018
cb0aa15
removed a line to make the style checker happy
Jan 28, 2018
3205bde
Replaced explicit casts with dynamic casts
Jan 28, 2018
d831611
tab fixes
Jan 28, 2018
a8a50ad
:(
Jan 28, 2018
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
27 changes: 16 additions & 11 deletions src/shogun/kernel/CombinedKernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ bool CCombinedKernel::init_with_extracted_subsets(
CFeatures* rf = NULL;
CKernel* k = NULL;

auto l_combined = dynamic_cast<CCombinedFeatures*>(l);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo this will be a formatting error :(

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh that's odd, no clue why my editor suddenly switched to spaces instead of tabs. (

auto r_combined = dynamic_cast<CCombinedFeatures*>(r);

bool result = true;
index_t f_idx = 0;

Expand All @@ -98,11 +101,11 @@ bool CCombinedKernel::init_with_extracted_subsets(
// skip over features - the custom kernel does not need any
if (k->get_kernel_type() != K_CUSTOM)
{
if (((CCombinedFeatures*)l)->get_num_feature_obj() > f_idx &&
((CCombinedFeatures*)r)->get_num_feature_obj() > f_idx)
if (l_combined->get_num_feature_obj() > f_idx &&
r_combined->get_num_feature_obj() > f_idx)
{
lf = ((CCombinedFeatures*)l)->get_feature_obj(f_idx);
rf = ((CCombinedFeatures*)r)->get_feature_obj(f_idx);
lf = l_combined->get_feature_obj(f_idx);
rf = r_combined->get_feature_obj(f_idx);
}

f_idx++;
Expand Down Expand Up @@ -134,14 +137,16 @@ bool CCombinedKernel::init_with_extracted_subsets(
SG_ERROR(
"No kernel matrix was assigned to this Custom kernel\n")

auto k_custom = dynamic_cast<CCustomKernel*>(k);

// clear all previous subsets
((CCustomKernel*)k)->remove_all_row_subsets();
k_custom->remove_all_row_subsets();
// apply new subset
((CCustomKernel*)k)->add_row_subset(lhs_subset);
k_custom->add_row_subset(lhs_subset);

((CCustomKernel*)k)->remove_all_col_subsets();
k_custom->remove_all_col_subsets();
// apply new subset
((CCustomKernel*)k)->add_col_subset(rhs_subset);
k_custom->add_col_subset(rhs_subset);

if (k->get_num_vec_lhs() != num_lhs)
SG_ERROR(
Expand Down Expand Up @@ -171,9 +176,9 @@ bool CCombinedKernel::init_with_extracted_subsets(
return false;
}

if (((CCombinedFeatures*)l)->get_num_feature_obj() <= 0 ||
((CCombinedFeatures*)l)->get_num_feature_obj() !=
((CCombinedFeatures*)r)->get_num_feature_obj())
if (l_combined->get_num_feature_obj() <= 0 ||
l_combined->get_num_feature_obj() !=
r_combined->get_num_feature_obj())
SG_ERROR(
"CombinedKernel: Number of features/kernels does not match - "
"bailing out\n")
Expand Down