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

use get and set in SVM class #3701

Merged
merged 1 commit into from
Mar 23, 2017
Merged

use get and set in SVM class #3701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 16 additions & 17 deletions src/shogun/classifier/svm/SVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,24 @@ void CSVM::set_defaults(int32_t num_sv)
callback=NULL;
mkl=NULL;

svm_loaded=false;
set_loaded_status(false);

epsilon=1e-5;
tube_epsilon=1e-2;
set_epsilon(1e-5);
set_tube_epsilon(1e-2);

nu=0.5;
C1=1;
C2=1;
set_nu(0.5);
set_C(1,1);

objective=0;
set_objective(0);

qpsize=41;
use_bias=true;
use_shrinking=true;
use_batch_computation=true;
use_linadd=true;
set_qpsize(41);
set_bias_enabled(true);
set_linadd_enabled(true);
set_shrinking_enabled(true);
set_batch_computation_enabled(true);

if (num_sv>0)
create_new_model(num_sv);
if (num_sv>0)
create_new_model(num_sv);
}

bool CSVM::load(FILE* modelfl)
Expand Down Expand Up @@ -194,7 +193,7 @@ bool CSVM::load(FILE* modelfl)
line_number++;
}

svm_loaded=result;
set_loaded_status(result);
SG_RESET_LOCALE;
return result;
}
Expand Down Expand Up @@ -270,10 +269,10 @@ float64_t CSVM::compute_svm_primal_objective()

if (m_labels && kernel)
{
float64_t C2_tmp=C1;
float64_t C2_tmp=get_C1();
if(C2>0)
{
C2_tmp=C2;
C2_tmp=get_C2();
}

for (int32_t i=0; i<n; i++)
Expand Down
15 changes: 15 additions & 0 deletions src/shogun/classifier/svm/SVM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,21 @@ class CSVM : public CKernelMachine
return objective;
}

/** check if svm been loaded
*
* @return if svm_loaded is true
*/
inline bool get_loaded_status() { return svm_loaded; }

/** set svm loaded status
*
* @loaded if svm been loaded
*/
inline void set_loaded_status(bool loaded)
{
svm_loaded = loaded;
};

/** set callback function svm optimizers may call when they have a new
* (small) set of alphas
*
Expand Down