Merge pull request #7640 from alalek:fix_test_tvl1

This commit is contained in:
Alexander Alekhin 2016-11-23 10:50:30 +00:00
commit 8d662a1a28
2 changed files with 22 additions and 18 deletions

View File

@ -24,7 +24,7 @@ PERF_TEST_P(ImagePair, OpticalFlowDual_TVL1, testing::Values(impair("cv/optflow/
Ptr<DenseOpticalFlow> tvl1 = createOptFlow_DualTVL1();
TEST_CYCLE_N(10) tvl1->calc(frame1, frame2, flow);
TEST_CYCLE() tvl1->calc(frame1, frame2, flow);
SANITY_CHECK(flow, 0.8);
SANITY_CHECK_NOTHING();
}

View File

@ -116,34 +116,39 @@ namespace
return !cvIsNaN(u.x) && !cvIsNaN(u.y) && (fabs(u.x) < 1e9) && (fabs(u.y) < 1e9);
}
double calcRMSE(const Mat_<Point2f>& flow1, const Mat_<Point2f>& flow2)
void check(const Mat_<Point2f>& gold, const Mat_<Point2f>& flow, double threshold = 0.1, double expectedAccuracy = 0.95)
{
double sum = 0.0;
int counter = 0;
threshold = threshold*threshold;
for (int i = 0; i < flow1.rows; ++i)
size_t gold_counter = 0;
size_t valid_counter = 0;
for (int i = 0; i < gold.rows; ++i)
{
for (int j = 0; j < flow1.cols; ++j)
for (int j = 0; j < gold.cols; ++j)
{
const Point2f u1 = flow1(i, j);
const Point2f u2 = flow2(i, j);
const Point2f u1 = gold(i, j);
const Point2f u2 = flow(i, j);
if (isFlowCorrect(u1) && isFlowCorrect(u2))
if (isFlowCorrect(u1))
{
const Point2f diff = u1 - u2;
sum += diff.ddot(diff);
++counter;
gold_counter++;
if (isFlowCorrect(u2))
{
const Point2f diff = u1 - u2;
double err = diff.ddot(diff);
if (err <= threshold)
valid_counter++;
}
}
}
}
return sqrt(sum / (1e-9 + counter));
EXPECT_GE(valid_counter, expectedAccuracy * gold_counter);
}
}
TEST(Video_calcOpticalFlowDual_TVL1, Regression)
{
const double MAX_RMSE = 0.03;
const string frame1_path = TS::ptr()->get_data_path() + "optflow/RubberWhale1.png";
const string frame2_path = TS::ptr()->get_data_path() + "optflow/RubberWhale2.png";
const string gold_flow_path = TS::ptr()->get_data_path() + "optflow/tvl1_flow.flo";
@ -167,7 +172,6 @@ TEST(Video_calcOpticalFlowDual_TVL1, Regression)
ASSERT_EQ(gold.rows, flow.rows);
ASSERT_EQ(gold.cols, flow.cols);
double err = calcRMSE(gold, flow);
EXPECT_LE(err, MAX_RMSE);
check(gold, flow);
#endif
}