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

DLS perf update

Browse Source
This commit is contained in:
edgarriba 2014-08-11 17:09:26 +02:00
parent cc81b4a5cd
commit 2666da892f
1 changed files with 4 additions and 2 deletions

6
modules/calib3d/perf/perf_pnp.cpp

@ -10,7 +10,7 @@ using namespace perf;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
CV_ENUM(pnpAlgo, SOLVEPNP_ITERATIVE, SOLVEPNP_EPNP /*, P3P*/) CV_ENUM(pnpAlgo, SOLVEPNP_ITERATIVE, SOLVEPNP_EPNP, SOLVEPNP_DLS /*, P3P*/)
typedef std::tr1::tuple<int, pnpAlgo> PointsNum_Algo_t; typedef std::tr1::tuple<int, pnpAlgo> PointsNum_Algo_t;
typedef perf::TestBaseWithParam<PointsNum_Algo_t> PointsNum_Algo; typedef perf::TestBaseWithParam<PointsNum_Algo_t> PointsNum_Algo;
@ -20,7 +20,7 @@ typedef perf::TestBaseWithParam<int> PointsNum;
PERF_TEST_P(PointsNum_Algo, solvePnP, PERF_TEST_P(PointsNum_Algo, solvePnP,
testing::Combine( testing::Combine(
testing::Values(/*4,*/ 3*9, 7*13), //TODO: find why results on 4 points are too unstable testing::Values(/*4,*/ 3*9, 7*13), //TODO: find why results on 4 points are too unstable
testing::Values((int)SOLVEPNP_ITERATIVE, (int)SOLVEPNP_EPNP) testing::Values((int)SOLVEPNP_ITERATIVE, (int)SOLVEPNP_EPNP, (int)SOLVEPNP_DLS)
) )
) )
{ {
@ -117,8 +117,10 @@ PERF_TEST_P(PointsNum, DISABLED_SolvePnPRansac, testing::Values(4, 3*9, 7*13))
Mat dist_coef(1, 8, CV_32F, cv::Scalar::all(0)); Mat dist_coef(1, 8, CV_32F, cv::Scalar::all(0));
vector<cv::Point2f> image_vec; vector<cv::Point2f> image_vec;
Mat rvec_gold(1, 3, CV_32FC1); Mat rvec_gold(1, 3, CV_32FC1);
randu(rvec_gold, 0, 1); randu(rvec_gold, 0, 1);
Mat tvec_gold(1, 3, CV_32FC1); Mat tvec_gold(1, 3, CV_32FC1);
randu(tvec_gold, 0, 1); randu(tvec_gold, 0, 1);
projectPoints(object, rvec_gold, tvec_gold, camera_mat, dist_coef, image_vec); projectPoints(object, rvec_gold, tvec_gold, camera_mat, dist_coef, image_vec);