generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3821 from i-ito:master-flann-lsh-addable-index

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-12 12:14:23 +00:00
commit 362c1a23ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ml/include/opencv2/ml.hpp
View File

@ -1339,7 +1339,7 @@ public:
//! Regularization kinds
enum RegKinds {
REG_NONE = -1, //!< Regularization disabled
REG_DISABLE = -1, //!< Regularization disabled
REG_L1 = 0, //!< %L1 norm
REG_L2 = 1 //!< %L2 norm
};

6
modules/ml/src/lr.cpp
View File

@ -322,7 +322,7 @@ double LogisticRegressionImpl::compute_cost(const Mat& _data, const Mat& _labels
theta_b = _init_theta(Range(1, n), Range::all());
multiply(theta_b, theta_b, theta_c, 1);
if(params.norm != REG_NONE)
if (params.norm != REG_DISABLE)
{
llambda = 1;
}
@ -377,7 +377,7 @@ Mat LogisticRegressionImpl::compute_batch_gradient(const Mat& _data, const Mat&
m = _data.rows;
n = _data.cols;
if(params.norm != REG_NONE)
if (params.norm != REG_DISABLE)
{
llambda = 1;
}
@ -449,7 +449,7 @@ Mat LogisticRegressionImpl::compute_mini_batch_gradient(const Mat& _data, const
Mat data_d;
Mat labels_l;
if(params.norm != REG_NONE)
if (params.norm != REG_DISABLE)
{
lambda_l = 1;
}