From 3a30e992cf022f4ec3c76506c070e59d093951d4 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Fri, 17 Feb 2017 19:02:52 -0500 Subject: Remove kernelparam array in favour of explicit kernel parameters This simplifies a lot of the code and will make it easier to link to other languages. --- include/gensvm_base.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'include/gensvm_base.h') diff --git a/include/gensvm_base.h b/include/gensvm_base.h index 999bf2f..dee1d80 100644 --- a/include/gensvm_base.h +++ b/include/gensvm_base.h @@ -49,7 +49,9 @@ * @param J pointer to regularization vector * @param Sigma eigenvalues from the reduced eigendecomposition * @param kerneltype kerneltype used in GenData::Z - * @param *kernelparam kernel parameters used in GenData::Z + * @param gamma kernel parameter for RBF, poly, and sigmoid + * @param coef kernel parameter for poly and sigmoid + * @param degree kernel parameter for poly * */ struct GenData { @@ -75,9 +77,12 @@ struct GenData { KernelType kerneltype; ///< kerneltype used to generate the kernel corresponding to the data ///< in Z - double *kernelparam; - ///< kernelparameters used to generate the kernel corresponding to the - ///< data in Z + double gamma; + ///< kernel parameter for RBF, poly, and sigmoid + double coef; + ///< kernel parameter for poly and sigmoid + double degree; + ///< kernel parameter for poly }; /** @@ -101,6 +106,12 @@ struct GenModel { ///< parameter for the Huber hinge function double lambda; ///< regularization parameter in the loss function + double gamma; + ///< kernel parameter for RBF, poly, and sigmoid + double coef; + ///< kernel parameter for poly and sigmoid + double degree; + ///< kernel parameter for poly double *V; ///< augmented weight matrix double *Vbar; @@ -122,8 +133,6 @@ struct GenModel { ///< filename of the data KernelType kerneltype; ///< type of kernel used in the model - double *kernelparam; - ///< array of kernel parameters, size depends on kernel type double kernel_eigen_cutoff; ///< cutoff value for the ratio of eigenvalues in the reduced //eigendecomposition. -- cgit v1.2.3