Skip to content

Commit

Permalink
SG_ADD refactor (shogun-toolbox#4417)
Browse files Browse the repository at this point in the history
* replaced variable macro with a single macro [ci skip] 

* with the new AnyParameterProperties we can clean up the macros a bit and have a single macro with four parameters
* inside the macro we still have exactly the same process

* refactored all SG_ADD macros to use ParameterProperties [ci skip]

* added SG_ADD3 for default parameters [ci skip] 

also refactored the SG_ADD calls respectively
  • Loading branch information
Gil authored and vigsterkr committed Mar 9, 2019
1 parent 54249cc commit 7e06d3e
Show file tree
Hide file tree
Showing 323 changed files with 1,233 additions and 1,463 deletions.
35 changes: 16 additions & 19 deletions src/shogun/base/SGObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
* Authors: Heiko Strathmann, Soeren Sonnenburg, Sergey Lisitsyn,
* Giovanni De Toni, Jacob Walker, Thoralf Klein, Chiyuan Zhang,
* Fernando Iglesias, Sanuj Sharma, Roman Votyakov, Yuyu Zhang,
* Viktor Gal, Bjoern Esser, Evangelos Anagnostopoulos, Pan Deng
* Viktor Gal, Bjoern Esser, Evangelos Anagnostopoulos, Pan Deng,
* Gil Hoben
*/

#ifndef __SGOBJECT_H__
Expand Down Expand Up @@ -56,55 +57,51 @@ template <class T> class SGStringList;
#define SG_UNREF_NO_NULL(x) { if (x) { (x)->unref(); } }

/*******************************************************************************
* Macros for registering parameters/model selection parameters
* Macros for registering parameter properties
******************************************************************************/

#ifdef _MSC_VER

#define VA_NARGS(...) INTERNAL_EXPAND_ARGS_PRIVATE(INTERNAL_ARGS_AUGMENTER(__VA_ARGS__))
#define INTERNAL_ARGS_AUGMENTER(...) unused, __VA_ARGS__
#define INTERNAL_EXPAND(x) x
#define INTERNAL_EXPAND_ARGS_PRIVATE(...) INTERNAL_EXPAND(INTERNAL_GET_ARG_COUNT_PRIVATE(__VA_ARGS__, 5, 4, 3, 2, 1, 0))
#define INTERNAL_GET_ARG_COUNT_PRIVATE(_0_, _1_, _2_, _3_, _4_, _5_, count, ...) count
#define INTERNAL_EXPAND_ARGS_PRIVATE(...) INTERNAL_EXPAND(INTERNAL_GET_ARG_COUNT_PRIVATE(__VA_ARGS__, 4, 3, 2, 1, 0))
#define INTERNAL_GET_ARG_COUNT_PRIVATE(_0_, _1_, _2_, _3_, _4_, count, ...) count

#else

#define VA_NARGS_IMPL(_1, _2, _3, _4, _5, N, ...) N
#define VA_NARGS(...) VA_NARGS_IMPL(__VA_ARGS__, 5, 4, 3, 2, 1)
#define VA_NARGS_IMPL(_1, _2, _3, _4, N, ...) N
#define VA_NARGS(...) VA_NARGS_IMPL(__VA_ARGS__, 4, 3, 2, 1)

#endif

#define VARARG_IMPL2(base, count, ...) base##count(__VA_ARGS__)
#define VARARG_IMPL(base, count, ...) VARARG_IMPL2(base, count, __VA_ARGS__)
#define VARARG(base, ...) VARARG_IMPL(base, VA_NARGS(__VA_ARGS__), __VA_ARGS__)

#define SG_ADD4(param, name, description, ms_available) \
#define SG_ADD3(param, name, description) \
{ \
this->m_parameters->add(param, name, description); \
this->watch_param( \
name, param, \
AnyParameterProperties( \
description, ms_available, GRADIENT_NOT_AVAILABLE)); \
if (ms_available) \
this->m_model_selection_parameters->add(param, name, description); \
name, param, AnyParameterProperties()); \
}

#define SG_ADD5(param, name, description, ms_available, gradient_available) \
#define SG_ADD4(param, name, description, param_properties) \
{ \
AnyParameterProperties pprop = \
AnyParameterProperties(description, param_properties); \
this->m_parameters->add(param, name, description); \
this->watch_param( \
name, param, AnyParameterProperties( \
description, ms_available, gradient_available)); \
if (ms_available) \
this->watch_param(name, param, pprop); \
if (pprop.get_model_selection()) \
this->m_model_selection_parameters->add(param, name, description); \
if (gradient_available) \
if (pprop.get_gradient()) \
this->m_gradient_parameters->add(param, name, description); \
}

#define SG_ADD(...) VARARG(SG_ADD, __VA_ARGS__)

/*******************************************************************************
* End of macros for registering parameters/model selection parameters
* End of macros for registering parameter properties
******************************************************************************/

/** @brief Class SGObject is the base class of all shogun objects.
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/classifier/AveragedPerceptron.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ void CAveragedPerceptron::init()
{
max_iter = 1000;
learn_rate = 0.1;
SG_ADD(&max_iter, "max_iter", "Maximum number of iterations.", MS_AVAILABLE);
SG_ADD(&learn_rate, "learn_rate", "Learning rate.", MS_AVAILABLE);
SG_ADD(&max_iter, "max_iter", "Maximum number of iterations.", ParameterProperties::HYPER);
SG_ADD(&learn_rate, "learn_rate", "Learning rate.", ParameterProperties::HYPER);
}

bool CAveragedPerceptron::train_machine(CFeatures* data)
Expand Down
6 changes: 3 additions & 3 deletions src/shogun/classifier/LDA.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ void CLDA::init()

SG_ADD(
(machine_int_t*)&m_method, "m_method",
"Method used for LDA calculation", MS_NOT_AVAILABLE);
SG_ADD(&m_gamma, "m_gamma", "Regularization parameter", MS_AVAILABLE);
SG_ADD(&m_bdc_svd, "m_bdc_svd", "Use BDC-SVD algorithm", MS_NOT_AVAILABLE);
"Method used for LDA calculation");
SG_ADD(&m_gamma, "m_gamma", "Regularization parameter", ParameterProperties::HYPER);
SG_ADD(&m_bdc_svd, "m_bdc_svd", "Use BDC-SVD algorithm");
}

CLDA::~CLDA()
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/classifier/Perceptron.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ CPerceptron::CPerceptron() : CIterativeMachine<CLinearMachine>()
m_initialize_hyperplane = true;
SG_ADD(
&m_initialize_hyperplane, "initialize_hyperplane",
"Whether to initialize hyperplane.", MS_AVAILABLE);
SG_ADD(&learn_rate, "learn_rate", "Learning rate.", MS_AVAILABLE);
"Whether to initialize hyperplane.", ParameterProperties::HYPER);
SG_ADD(&learn_rate, "learn_rate", "Learning rate.", ParameterProperties::HYPER);
}

CPerceptron::~CPerceptron()
Expand Down
14 changes: 5 additions & 9 deletions src/shogun/classifier/PluginEstimate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,14 @@ CPluginEstimate::CPluginEstimate(float64_t pos_pseudo, float64_t neg_pseudo)
pos_model(NULL), neg_model(NULL), features(NULL)
{
SG_ADD(
&m_pos_pseudo, "pos_pseudo", "pseudo count for positive class",
MS_NOT_AVAILABLE);
&m_pos_pseudo, "pos_pseudo", "pseudo count for positive class");
SG_ADD(
&m_neg_pseudo, "neg_pseudo", "pseudo count for negative class",
MS_NOT_AVAILABLE);
&m_neg_pseudo, "neg_pseudo", "pseudo count for negative class");
SG_ADD(
&pos_model, "pos_model", "LinearHMM modelling positive class.",
MS_NOT_AVAILABLE);
&pos_model, "pos_model", "LinearHMM modelling positive class.");
SG_ADD(
&neg_model, "neg_model", "LinearHMM modelling negative class.",
MS_NOT_AVAILABLE);
SG_ADD(&features, "features", "String Features.", MS_NOT_AVAILABLE);
&neg_model, "neg_model", "LinearHMM modelling negative class.");
SG_ADD(&features, "features", "String Features.");
}

CPluginEstimate::~CPluginEstimate()
Expand Down
24 changes: 13 additions & 11 deletions src/shogun/classifier/mkl/MKL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -271,21 +271,23 @@ void CMKL::register_params()
rho = 0;
lp_initialized = false;

SG_ADD((CMachine**)&svm, "svm", "wrapper svm", MS_NOT_AVAILABLE);
SG_ADD(&C_mkl, "C_mkl", "C mkl", MS_NOT_AVAILABLE);
SG_ADD(&mkl_norm, "mkl_norm", "norm used in mkl", MS_NOT_AVAILABLE);
SG_ADD(&ent_lambda, "ent_lambda", "elastic net sparsity trade-off parameter", MS_NOT_AVAILABLE);
SG_ADD(&mkl_block_norm, "mkl_block_norm", "mkl sparse trade-off parameter", MS_NOT_AVAILABLE);
SG_ADD((CMachine**)&svm, "svm", "wrapper svm");
SG_ADD(&C_mkl, "C_mkl", "C mkl", ParameterProperties::HYPER);
SG_ADD(&mkl_norm, "mkl_norm", "norm used in mkl");
SG_ADD(&ent_lambda, "ent_lambda", "elastic net sparsity trade-off parameter",
ParameterProperties::HYPER);
SG_ADD(&mkl_block_norm, "mkl_block_norm", "mkl sparse trade-off parameter",
ParameterProperties::HYPER);

m_parameters->add_vector(&beta_local, &beta_local_size, "beta_local", "subkernel weights on L1 term of elastic net mkl");
watch_param("beta_local", &beta_local, &beta_local_size);

SG_ADD(&mkl_iterations, "mkl_iterations", "number of mkl steps", MS_NOT_AVAILABLE);
SG_ADD(&mkl_epsilon, "mkl_epsilon", "mkl epsilon", MS_NOT_AVAILABLE);
SG_ADD(&interleaved_optimization, "interleaved_optimization", "whether to use mkl wrapper or interleaved opt.", MS_NOT_AVAILABLE);
SG_ADD(&w_gap, "w_gap", "gap between interactions", MS_NOT_AVAILABLE);
SG_ADD(&rho, "rho", "objective after mkl iterations", MS_NOT_AVAILABLE);
SG_ADD(&lp_initialized, "lp_initialized", "if lp is Initialized", MS_NOT_AVAILABLE);
SG_ADD(&mkl_iterations, "mkl_iterations", "number of mkl steps");
SG_ADD(&mkl_epsilon, "mkl_epsilon", "mkl epsilon");
SG_ADD(&interleaved_optimization, "interleaved_optimization", "whether to use mkl wrapper or interleaved opt.");
SG_ADD(&w_gap, "w_gap", "gap between interactions");
SG_ADD(&rho, "rho", "objective after mkl iterations");
SG_ADD(&lp_initialized, "lp_initialized", "if lp is Initialized");
// Missing: self (3rd party specific, handled in clone())
}

Expand Down
15 changes: 7 additions & 8 deletions src/shogun/classifier/svm/LibLinear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,17 @@ void CLibLinear::init()
set_max_iterations();
set_epsilon(1e-5);

SG_ADD(&C1, "C1", "C Cost constant 1.", MS_AVAILABLE);
SG_ADD(&C2, "C2", "C Cost constant 2.", MS_AVAILABLE);
SG_ADD(&C1, "C1", "C Cost constant 1.", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "C Cost constant 2.", ParameterProperties::HYPER);
SG_ADD(
&use_bias, "use_bias", "Indicates if bias is used.", MS_NOT_AVAILABLE);
SG_ADD(&epsilon, "epsilon", "Convergence precision.", MS_NOT_AVAILABLE);
&use_bias, "use_bias", "Indicates if bias is used.");
SG_ADD(&epsilon, "epsilon", "Convergence precision.");
SG_ADD(
&max_iterations, "max_iterations", "Max number of iterations.",
MS_NOT_AVAILABLE);
SG_ADD(&m_linear_term, "linear_term", "Linear Term", MS_NOT_AVAILABLE);
&max_iterations, "max_iterations", "Max number of iterations.");
SG_ADD(&m_linear_term, "linear_term", "Linear Term");
SG_ADD(
(machine_int_t*)&liblinear_solver_type, "liblinear_solver_type",
"Type of LibLinear solver.", MS_NOT_AVAILABLE);
"Type of LibLinear solver.");
}

CLibLinear::~CLibLinear()
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/classifier/svm/LibSVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CLibSVM::~CLibSVM()

void CLibSVM::register_params()
{
SG_ADD((machine_int_t*) &solver_type, "libsvm_solver_type", "LibSVM Solver type", MS_NOT_AVAILABLE);
SG_ADD((machine_int_t*) &solver_type, "libsvm_solver_type", "LibSVM Solver type");
}

bool CLibSVM::train_machine(CFeatures* data)
Expand Down
6 changes: 3 additions & 3 deletions src/shogun/classifier/svm/OnlineLibLinear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ void COnlineLibLinear::init()
Cn=1;
use_bias=false;

SG_ADD(&C1, "C1", "C Cost constant 1.", MS_AVAILABLE);
SG_ADD(&C2, "C2", "C Cost constant 2.", MS_AVAILABLE);
SG_ADD(&C1, "C1", "C Cost constant 1.", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "C Cost constant 2.", ParameterProperties::HYPER);
SG_ADD(
&use_bias, "use_bias", "Indicates if bias is used.", MS_NOT_AVAILABLE);
&use_bias, "use_bias", "Indicates if bias is used.");

PG = 0;
PGmax_old = CMath::INFTY;
Expand Down
20 changes: 10 additions & 10 deletions src/shogun/classifier/svm/OnlineSVMSGD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,17 @@ void COnlineSVMSGD::init()
loss=new CHingeLoss();
SG_REF(loss);

SG_ADD(&C1, "C1", "Cost constant 1.", MS_AVAILABLE);
SG_ADD(&C2, "C2", "Cost constant 2.", MS_AVAILABLE);
SG_ADD(&lambda, "lambda", "Regularization parameter.", MS_AVAILABLE);
SG_ADD(&wscale, "wscale", "W scale", MS_NOT_AVAILABLE);
SG_ADD(&bscale, "bscale", "b scale", MS_NOT_AVAILABLE);
SG_ADD(&epochs, "epochs", "epochs", MS_NOT_AVAILABLE);
SG_ADD(&skip, "skip", "skip", MS_NOT_AVAILABLE);
SG_ADD(&count, "count", "count", MS_NOT_AVAILABLE);
SG_ADD(&C1, "C1", "Cost constant 1.", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "Cost constant 2.", ParameterProperties::HYPER);
SG_ADD(&lambda, "lambda", "Regularization parameter.", ParameterProperties::HYPER);
SG_ADD(&wscale, "wscale", "W scale");
SG_ADD(&bscale, "bscale", "b scale");
SG_ADD(&epochs, "epochs", "epochs");
SG_ADD(&skip, "skip", "skip");
SG_ADD(&count, "count", "count");
SG_ADD(
&use_bias, "use_bias", "Indicates if bias is used.", MS_NOT_AVAILABLE);
&use_bias, "use_bias", "Indicates if bias is used.");
SG_ADD(
&use_regularized_bias, "use_regularized_bias",
"Indicates if bias is regularized.", MS_NOT_AVAILABLE);
"Indicates if bias is regularized.");
}
10 changes: 5 additions & 5 deletions src/shogun/classifier/svm/SGDQN.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ void CSGDQN::init()
loss=new CHingeLoss();
SG_REF(loss);

SG_ADD(&C1, "C1", "Cost constant 1.", MS_AVAILABLE);
SG_ADD(&C2, "C2", "Cost constant 2.", MS_AVAILABLE);
SG_ADD(&epochs, "epochs", "epochs", MS_AVAILABLE);
SG_ADD(&skip, "skip", "skip", MS_NOT_AVAILABLE);
SG_ADD(&count, "count", "count", MS_NOT_AVAILABLE);
SG_ADD(&C1, "C1", "Cost constant 1.", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "Cost constant 2.", ParameterProperties::HYPER);
SG_ADD(&epochs, "epochs", "epochs", ParameterProperties::HYPER);
SG_ADD(&skip, "skip", "skip");
SG_ADD(&count, "count", "count");
}
25 changes: 11 additions & 14 deletions src/shogun/classifier/svm/SVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,18 @@ CSVM::~CSVM()

void CSVM::set_defaults(int32_t num_sv)
{
SG_ADD(&C1, "C1", "", MS_AVAILABLE);
SG_ADD(&C2, "C2", "", MS_AVAILABLE);
SG_ADD(&svm_loaded, "svm_loaded", "SVM is loaded.", MS_NOT_AVAILABLE);
SG_ADD(&epsilon, "epsilon", "", MS_AVAILABLE);
SG_ADD(&C1, "C1", "", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "", ParameterProperties::HYPER);
SG_ADD(&svm_loaded, "svm_loaded", "SVM is loaded.");
SG_ADD(&epsilon, "epsilon", "", ParameterProperties::HYPER);
SG_ADD(&tube_epsilon, "tube_epsilon",
"Tube epsilon for support vector regression.", MS_AVAILABLE);
SG_ADD(&nu, "nu", "", MS_AVAILABLE);
SG_ADD(&objective, "objective", "", MS_NOT_AVAILABLE);
SG_ADD(&qpsize, "qpsize", "", MS_NOT_AVAILABLE);
SG_ADD(&use_shrinking, "use_shrinking", "Shrinking shall be used.",
MS_NOT_AVAILABLE);
SG_ADD((CSGObject**) &mkl, "mkl", "MKL object that svm optimizers need.",
MS_NOT_AVAILABLE);
SG_ADD(&m_linear_term, "linear_term", "Linear term in qp.",
MS_NOT_AVAILABLE);
"Tube epsilon for support vector regression.", ParameterProperties::HYPER);
SG_ADD(&nu, "nu", "", ParameterProperties::HYPER);
SG_ADD(&objective, "objective", "");
SG_ADD(&qpsize, "qpsize", "");
SG_ADD(&use_shrinking, "use_shrinking", "Shrinking shall be used.");
SG_ADD((CSGObject**) &mkl, "mkl", "MKL object that svm optimizers need.");
SG_ADD(&m_linear_term, "linear_term", "Linear term in qp.");

callback=NULL;
mkl=NULL;
Expand Down
14 changes: 6 additions & 8 deletions src/shogun/classifier/svm/SVMOcas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -345,17 +345,15 @@ void CSVMOcas::init()

primal_objective = 0.0;

SG_ADD(&C1, "C1", "Cost constant 1.", MS_AVAILABLE);
SG_ADD(&C2, "C2", "Cost constant 2.", MS_AVAILABLE);
SG_ADD(&C1, "C1", "Cost constant 1.", ParameterProperties::HYPER);
SG_ADD(&C2, "C2", "Cost constant 2.", ParameterProperties::HYPER);
SG_ADD(
&use_bias, "use_bias", "Indicates if bias is used.", MS_NOT_AVAILABLE);
SG_ADD(&epsilon, "epsilon", "Convergence precision.", MS_NOT_AVAILABLE);
&use_bias, "use_bias", "Indicates if bias is used.");
SG_ADD(&epsilon, "epsilon", "Convergence precision.");
SG_ADD(
&bufsize, "bufsize", "Maximum number of cutting planes.",
MS_NOT_AVAILABLE);
&bufsize, "bufsize", "Maximum number of cutting planes.");
SG_ADD(
(machine_int_t*)&method, "method", "SVMOcas solver type.",
MS_NOT_AVAILABLE);
(machine_int_t*)&method, "method", "SVMOcas solver type.");
}

float64_t CSVMOcas::compute_primal_objective() const
Expand Down
3 changes: 1 addition & 2 deletions src/shogun/clustering/GMM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,5 @@ void CGMM::register_params()
//TODO serialization broken
//m_parameters->add((SGVector<CSGObject*>*) &m_components, "m_components", "Mixture components");
SG_ADD(
&m_coefficients, "m_coefficients", "Mixture coefficients.",
MS_NOT_AVAILABLE);
&m_coefficients, "m_coefficients", "Mixture coefficients.");
}
8 changes: 4 additions & 4 deletions src/shogun/clustering/KMeansBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,10 @@ void CKMeansBase::init()
dimensions=0;
fixed_centers=false;
use_kmeanspp=false;
SG_ADD(&max_iter, "max_iter", "Maximum number of iterations", MS_AVAILABLE);
SG_ADD(&k, "k", "k, the number of clusters", MS_AVAILABLE);
SG_ADD(&dimensions, "dimensions", "Dimensions of data", MS_NOT_AVAILABLE);
SG_ADD(&R, "radiuses", "Cluster radiuses", MS_NOT_AVAILABLE);
SG_ADD(&max_iter, "max_iter", "Maximum number of iterations", ParameterProperties::HYPER);
SG_ADD(&k, "k", "k, the number of clusters", ParameterProperties::HYPER);
SG_ADD(&dimensions, "dimensions", "Dimensions of data");
SG_ADD(&R, "radiuses", "Cluster radiuses");

watch_method("cluster_centers", &CKMeansBase::get_cluster_centers);
}
Expand Down
3 changes: 1 addition & 2 deletions src/shogun/clustering/KMeansMiniBatch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ void CKMeansMiniBatch::init_mb_params()
batch_size=-1;

SG_ADD(
&batch_size, "batch_size", "batch size for mini-batch KMeans",
MS_NOT_AVAILABLE);
&batch_size, "batch_size", "batch size for mini-batch KMeans");
}

bool CKMeansMiniBatch::train_machine(CFeatures* data)
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/converter/DiffusionMaps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ CDiffusionMaps::CDiffusionMaps() :

void CDiffusionMaps::init()
{
SG_ADD(&m_t, "t", "number of steps", MS_AVAILABLE);
SG_ADD(&m_width, "width", "gaussian kernel width", MS_AVAILABLE);
SG_ADD(&m_t, "t", "number of steps", ParameterProperties::HYPER);
SG_ADD(&m_width, "width", "gaussian kernel width", ParameterProperties::HYPER);
}

CDiffusionMaps::~CDiffusionMaps()
Expand Down
6 changes: 3 additions & 3 deletions src/shogun/converter/EmbeddingConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ CKernel* CEmbeddingConverter::get_kernel() const
void CEmbeddingConverter::init()
{
SG_ADD(&m_target_dim, "target_dim",
"target dimensionality of preprocessor", MS_AVAILABLE);
"target dimensionality of preprocessor", ParameterProperties::HYPER);
SG_ADD(
&m_distance, "distance", "distance to be used for embedding",
MS_AVAILABLE);
ParameterProperties::HYPER);
SG_ADD(
&m_kernel, "kernel", "kernel to be used for embedding", MS_AVAILABLE);
&m_kernel, "kernel", "kernel to be used for embedding", ParameterProperties::HYPER);
}
}
4 changes: 2 additions & 2 deletions src/shogun/converter/FactorAnalysis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ CFactorAnalysis::CFactorAnalysis() :

void CFactorAnalysis::init()
{
SG_ADD(&m_max_iteration, "max_iteration", "maximum number of iterations", MS_NOT_AVAILABLE);
SG_ADD(&m_epsilon, "epsilon", "convergence parameter", MS_NOT_AVAILABLE);
SG_ADD(&m_max_iteration, "max_iteration", "maximum number of iterations");
SG_ADD(&m_epsilon, "epsilon", "convergence parameter");
}

CFactorAnalysis::~CFactorAnalysis()
Expand Down
Loading

0 comments on commit 7e06d3e

Please sign in to comment.