modify solver_type in train.c predict.c

L2_LR => L2R_LR
L2_L2LOSS_SVC_DUAL => L2R_L2LOSS_SVC_DUAL
L2_L2LOSS_SVC => L2R_L2LOSS_SVC
L2_L1LOSS_SVC_DUAL => L2R_L1LOSS_SVC_DUAL
L1_L2LOSS_SVC => L1R_L2LOSS_SVC
L1_LR => L1R_LR

diff --git a/matlab/predict.c b/matlab/predict.c
index 7bd90278c5ec48b1220602e052fdd557ba8dee2e..0d79afaa02662cf2d16c14118e1d62577e6e1e9c 100644 (file)
--- a/matlab/predict.c
+++ b/matlab/predict.c
@@ -272,7 +272,7 @@ void mexFunction( int nlhs, mxArray *plhs[],
 
                if(prob_estimate_flag)
                {
-                       if(model_->param.solver_type!=L2_LR)
+                       if(model_->param.solver_type!=L2R_LR)
                        {
                                mexPrintf("probability output is only supported for logistic regression\n");
                                prob_estimate_flag=0;

diff --git a/matlab/train.c b/matlab/train.c
index f8ad784787f7f289d5a1ffe920a6cd37882c6633..56e325bb8d4f505fce7d1766e47f00b834aebbde 100644 (file)
--- a/matlab/train.c
+++ b/matlab/train.c
@@ -89,7 +89,7 @@ int parse_command_line(int nrhs, const mxArray *prhs[], char *model_file_name)
        char *argv[CMD_LEN/2];
 
        // default values
-       param.solver_type = L2_L2LOSS_SVC_DUAL;
+       param.solver_type = L2R_L2LOSS_SVC_DUAL;
        param.C = 1;
        param.eps = INF; // see setting below
        param.nr_weight = 0;
@@ -173,11 +173,11 @@ int parse_command_line(int nrhs, const mxArray *prhs[], char *model_file_name)
 
        if(param.eps == INF)
        {
-               if(param.solver_type == L2_LR || param.solver_type == L2_L2LOSS_SVC)
+               if(param.solver_type == L2R_LR || param.solver_type == L2R_L2LOSS_SVC)
                        param.eps = 0.01;
-               else if(param.solver_type == L2_L2LOSS_SVC_DUAL || param.solver_type == L2_L1LOSS_SVC_DUAL || param.solver_type == MCSVM_CS)
+               else if(param.solver_type == L2R_L2LOSS_SVC_DUAL || param.solver_type == L2R_L1LOSS_SVC_DUAL || param.solver_type == MCSVM_CS)
                        param.eps = 0.1;
-               else if(param.solver_type == L1_L2LOSS_SVC || param.solver_type == L1_LR)
+               else if(param.solver_type == L1R_L2LOSS_SVC || param.solver_type == L1R_LR)
                        param.eps = 0.01;
        }
        return 0;