From d3b4e9c6ccd2d8cc0d0d4117be7470cd91133763 Mon Sep 17 00:00:00 2001 From: Chiyuan Zhang Date: Tue, 22 May 2012 20:41:28 +0800 Subject: [PATCH 1/3] Ensure related kernels call labels->ensure_valid --- src/shogun/kernel/AUCKernel.cpp | 2 +- src/shogun/kernel/SalzbergWordStringKernel.cpp | 1 + src/shogun/kernel/ScatterKernelNormalizer.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shogun/kernel/AUCKernel.cpp b/src/shogun/kernel/AUCKernel.cpp index b5894fa20ff..e3c6f8c7c81 100644 --- a/src/shogun/kernel/AUCKernel.cpp +++ b/src/shogun/kernel/AUCKernel.cpp @@ -48,9 +48,9 @@ CLabels* CAUCKernel::setup_auc_maximization(CLabels* labels) SG_INFO( "setting up AUC maximization\n") ; ASSERT(labels); ASSERT(labels->get_label_type() == LT_BINARY); + labels->ensure_valid(); // get the original labels - ASSERT(labels); SGVector int_labels=((CBinaryLabels*) labels)->get_int_labels(); ASSERT(subkernel->get_num_vec_rhs()==int_labels.vlen); diff --git a/src/shogun/kernel/SalzbergWordStringKernel.cpp b/src/shogun/kernel/SalzbergWordStringKernel.cpp index 7459ceeb2f8..757d29076c9 100644 --- a/src/shogun/kernel/SalzbergWordStringKernel.cpp +++ b/src/shogun/kernel/SalzbergWordStringKernel.cpp @@ -354,6 +354,7 @@ void CSalzbergWordStringKernel::set_prior_probs_from_labels(CLabels* labels) { ASSERT(labels); ASSERT(labels->get_label_type() == LT_BINARY); + labels->ensure_valid(); int32_t num_pos=0, num_neg=0; for (int32_t i=0; iget_num_labels(); i++) diff --git a/src/shogun/kernel/ScatterKernelNormalizer.h b/src/shogun/kernel/ScatterKernelNormalizer.h index b7bcb9637f5..d5190fba759 100644 --- a/src/shogun/kernel/ScatterKernelNormalizer.h +++ b/src/shogun/kernel/ScatterKernelNormalizer.h @@ -47,6 +47,7 @@ class CScatterKernelNormalizer: public CKernelNormalizer SG_REF(labels); m_labels=labels; ASSERT(labels->get_label_type()==LT_MULTICLASS); + labels->ensure_valid(); if (normalizer==NULL) normalizer=new CIdentityKernelNormalizer(); From 8d10a3a59ccf2458106876fc6264957e3cfe0e6e Mon Sep 17 00:00:00 2001 From: Chiyuan Zhang Date: Tue, 22 May 2012 20:54:33 +0800 Subject: [PATCH 2/3] Fix indentation convention --- src/shogun/kernel/AUCKernel.cpp | 2 +- src/shogun/kernel/SalzbergWordStringKernel.cpp | 2 +- src/shogun/kernel/ScatterKernelNormalizer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shogun/kernel/AUCKernel.cpp b/src/shogun/kernel/AUCKernel.cpp index e3c6f8c7c81..d74ad72c27a 100644 --- a/src/shogun/kernel/AUCKernel.cpp +++ b/src/shogun/kernel/AUCKernel.cpp @@ -48,7 +48,7 @@ CLabels* CAUCKernel::setup_auc_maximization(CLabels* labels) SG_INFO( "setting up AUC maximization\n") ; ASSERT(labels); ASSERT(labels->get_label_type() == LT_BINARY); - labels->ensure_valid(); + labels->ensure_valid(); // get the original labels SGVector int_labels=((CBinaryLabels*) labels)->get_int_labels(); diff --git a/src/shogun/kernel/SalzbergWordStringKernel.cpp b/src/shogun/kernel/SalzbergWordStringKernel.cpp index 757d29076c9..1163cf65e73 100644 --- a/src/shogun/kernel/SalzbergWordStringKernel.cpp +++ b/src/shogun/kernel/SalzbergWordStringKernel.cpp @@ -354,7 +354,7 @@ void CSalzbergWordStringKernel::set_prior_probs_from_labels(CLabels* labels) { ASSERT(labels); ASSERT(labels->get_label_type() == LT_BINARY); - labels->ensure_valid(); + labels->ensure_valid(); int32_t num_pos=0, num_neg=0; for (int32_t i=0; iget_num_labels(); i++) diff --git a/src/shogun/kernel/ScatterKernelNormalizer.h b/src/shogun/kernel/ScatterKernelNormalizer.h index d5190fba759..121e37e9ac5 100644 --- a/src/shogun/kernel/ScatterKernelNormalizer.h +++ b/src/shogun/kernel/ScatterKernelNormalizer.h @@ -47,7 +47,7 @@ class CScatterKernelNormalizer: public CKernelNormalizer SG_REF(labels); m_labels=labels; ASSERT(labels->get_label_type()==LT_MULTICLASS); - labels->ensure_valid(); + labels->ensure_valid(); if (normalizer==NULL) normalizer=new CIdentityKernelNormalizer(); From 6fb43dadf5cdb0d959b345d16739e7f78fb50bd7 Mon Sep 17 00:00:00 2001 From: Chiyuan Zhang Date: Tue, 22 May 2012 21:07:28 +0800 Subject: [PATCH 3/3] fixed more indent conventions --- src/shogun/kernel/ScatterKernelNormalizer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shogun/kernel/ScatterKernelNormalizer.h b/src/shogun/kernel/ScatterKernelNormalizer.h index 121e37e9ac5..8c91d9f2203 100644 --- a/src/shogun/kernel/ScatterKernelNormalizer.h +++ b/src/shogun/kernel/ScatterKernelNormalizer.h @@ -47,7 +47,7 @@ class CScatterKernelNormalizer: public CKernelNormalizer SG_REF(labels); m_labels=labels; ASSERT(labels->get_label_type()==LT_MULTICLASS); - labels->ensure_valid(); + labels->ensure_valid(); if (normalizer==NULL) normalizer=new CIdentityKernelNormalizer();