Commit 96b5ec14 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule…

fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for the patch): http://code.opencv.org/issues/3990.
re-enabled Downhill solver test, let's see how it goes
parent 79ac0d05
...@@ -354,7 +354,7 @@ namespace cv ...@@ -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);
......
...@@ -78,7 +78,7 @@ class RosenbrockF:public cv::MinProblemSolver::Function{ ...@@ -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
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment