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

fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for the patch): http://code.opencv.org/issues/3990.

Browse Source 
re-enabled Downhill solver test, let's see how it goes
This commit is contained in:
Vadim Pisarevsky 2015-05-02 20:59:57 +03:00
parent 79ac0d05ce
commit 96b5ec14d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/downhill_simplex.cpp
View File

@ -354,7 +354,7 @@ namespace cv
int ndim=_step.cols; int ndim=_step.cols;
Mat_<double> simplex=Mat_<double>(ndim+1,ndim,0.0); Mat_<double> simplex=Mat_<double>(ndim+1,ndim,0.0);
simplex.row(0).copyTo(proxy_x); proxy_x.copyTo(simplex.row(0));
createInitialSimplex(simplex,_step); createInitialSimplex(simplex,_step);
double res = innerDownhillSimplex( double res = innerDownhillSimplex(
simplex,_termcrit.epsilon, _termcrit.epsilon, count,_Function,_termcrit.maxCount); simplex,_termcrit.epsilon, _termcrit.epsilon, count,_Function,_termcrit.maxCount);

2
modules/core/test/test_downhill_simplex.cpp
View File

@ -78,7 +78,7 @@ class RosenbrockF:public cv::MinProblemSolver::Function{
} }
}; };
TEST(DISABLED_Core_DownhillSolver, regression_basic){ TEST(Core_DownhillSolver, regression_basic){
cv::Ptr<cv::DownhillSolver> solver=cv::DownhillSolver::create(); cv::Ptr<cv::DownhillSolver> solver=cv::DownhillSolver::create();
#if 1 #if 1
{ {