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

CvLevMarq: add solve method to interface

Browse Source
This commit is contained in:
Pavel Rojtberg 2015-12-10 23:01:55 +01:00
parent 22b64e2c28
commit 4c251bd260
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/calib3d/include/opencv2/calib3d/calib3d_c.h
View File

@ -415,6 +415,7 @@ public:
int state; int state;
int iters; int iters;
bool completeSymmFlag; bool completeSymmFlag;
int solveMethod;
}; };
#endif #endif

4
modules/calib3d/src/compat_ptsetreg.cpp
View File

@ -58,6 +58,7 @@ CvLevMarq::CvLevMarq()
iters = 0; iters = 0;
completeSymmFlag = false; completeSymmFlag = false;
errNorm = prevErrNorm = DBL_MAX; errNorm = prevErrNorm = DBL_MAX;
solveMethod = cv::DECOMP_SVD;
} }
CvLevMarq::CvLevMarq( int nparams, int nerrs, CvTermCriteria criteria0, bool _completeSymmFlag ) CvLevMarq::CvLevMarq( int nparams, int nerrs, CvTermCriteria criteria0, bool _completeSymmFlag )
@ -113,6 +114,7 @@ void CvLevMarq::init( int nparams, int nerrs, CvTermCriteria criteria0, bool _co
state = STARTED; state = STARTED;
iters = 0; iters = 0;
completeSymmFlag = _completeSymmFlag; completeSymmFlag = _completeSymmFlag;
solveMethod = cv::DECOMP_SVD;
} }
bool CvLevMarq::update( const CvMat*& _param, CvMat*& matJ, CvMat*& _err ) bool CvLevMarq::update( const CvMat*& _param, CvMat*& matJ, CvMat*& _err )
@ -314,7 +316,7 @@ void CvLevMarq::step()
#else #else
_JtJN.diag() += lambda; _JtJN.diag() += lambda;
#endif #endif
solve(_JtJN, _JtErr, nonzero_param); solve(_JtJN, _JtErr, nonzero_param, solveMethod);
int j = 0; int j = 0;
for( int i = 0; i < nparams; i++ ) for( int i = 0; i < nparams; i++ )