From 96b5ec14d45a7e7d7b0d9acdf1dd9a473514ee95 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Sat, 2 May 2015 20:59:57 +0300
Subject: [PATCH] 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

---
 modules/core/src/downhill_simplex.cpp       | 2 +-
 modules/core/test/test_downhill_simplex.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/downhill_simplex.cpp b/modules/core/src/downhill_simplex.cpp
index 261bf33c3f..01712be22e 100644
--- a/modules/core/src/downhill_simplex.cpp
+++ b/modules/core/src/downhill_simplex.cpp
@@ -354,7 +354,7 @@ namespace cv
         int ndim=_step.cols;
         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);
         double res = innerDownhillSimplex(
                 simplex,_termcrit.epsilon, _termcrit.epsilon, count,_Function,_termcrit.maxCount);
diff --git a/modules/core/test/test_downhill_simplex.cpp b/modules/core/test/test_downhill_simplex.cpp
index aa6d746121..9370f3172d 100644
--- a/modules/core/test/test_downhill_simplex.cpp
+++ b/modules/core/test/test_downhill_simplex.cpp
@@ -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();
 #if 1
     {