COMPMID-556: Allow missing keypoint tolerance HarrisCorners
Change-Id: Ic38489023e2da2344d7d654b7a29357bb2362bfa
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/112766
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h
index 4a96dd3..1f81d38 100644
--- a/tests/validation/Validation.h
+++ b/tests/validation/Validation.h
@@ -231,7 +231,8 @@
/** Validate key points. */
template <typename T, typename U, typename V = AbsoluteTolerance<float>>
-void validate_keypoints(T target_first, T target_last, U reference_first, U reference_last, V tolerance = AbsoluteTolerance<float>());
+void validate_keypoints(T target_first, T target_last, U reference_first, U reference_last, V tolerance = AbsoluteTolerance<float>(),
+ float allowed_missing_percentage = 5.f, float allowed_mismatch_percentage = 5.f);
template <typename T>
struct compare_base
@@ -483,16 +484,16 @@
if(point == last2)
{
++num_missing;
+ ARM_COMPUTE_TEST_INFO("Key point not found" << *first1)
ARM_COMPUTE_TEST_INFO("keypoint1 = " << *first1)
- ARM_COMPUTE_EXPECT_FAIL("Key point not found", framework::LogLevel::DEBUG);
}
else if(!validate(point->tracking_status, first1->tracking_status) || !validate(point->strength, first1->strength, tolerance) || !validate(point->scale, first1->scale)
|| !validate(point->orientation, first1->orientation) || !validate(point->error, first1->error))
{
++num_mismatches;
+ ARM_COMPUTE_TEST_INFO("Mismatching keypoint")
ARM_COMPUTE_TEST_INFO("keypoint1 = " << *first1)
ARM_COMPUTE_TEST_INFO("keypoint2 = " << *point)
- ARM_COMPUTE_EXPECT_FAIL("Mismatching keypoint", framework::LogLevel::DEBUG);
}
++first1;
@@ -502,13 +503,12 @@
}
template <typename T, typename U, typename V>
-void validate_keypoints(T target_first, T target_last, U reference_first, U reference_last, V tolerance)
+void validate_keypoints(T target_first, T target_last, U reference_first, U reference_last, V tolerance,
+ float allowed_missing_percentage, float allowed_mismatch_percentage)
{
const int64_t num_elements_target = std::distance(target_first, target_last);
const int64_t num_elements_reference = std::distance(reference_first, reference_last);
- ARM_COMPUTE_EXPECT_EQUAL(num_elements_target, num_elements_reference, framework::LogLevel::ERRORS);
-
int64_t num_missing = 0;
int64_t num_mismatches = 0;
@@ -520,10 +520,10 @@
const float percent_mismatches = static_cast<float>(num_mismatches) / num_elements_reference * 100.f;
ARM_COMPUTE_TEST_INFO(num_missing << " keypoints (" << std::fixed << std::setprecision(2) << percent_missing << "%) are missing in target");
- ARM_COMPUTE_EXPECT_EQUAL(num_missing, 0, framework::LogLevel::ERRORS);
+ ARM_COMPUTE_EXPECT(percent_missing <= allowed_missing_percentage, framework::LogLevel::ERRORS);
ARM_COMPUTE_TEST_INFO(num_mismatches << " keypoints (" << std::fixed << std::setprecision(2) << percent_mismatches << "%) mismatched");
- ARM_COMPUTE_EXPECT_EQUAL(num_mismatches, 0, framework::LogLevel::ERRORS);
+ ARM_COMPUTE_EXPECT(percent_mismatches <= allowed_mismatch_percentage, framework::LogLevel::ERRORS);
}
if(num_elements_target > 0)
@@ -533,7 +533,7 @@
const float percent_missing = static_cast<float>(num_missing) / num_elements_target * 100.f;
ARM_COMPUTE_TEST_INFO(num_missing << " keypoints (" << std::fixed << std::setprecision(2) << percent_missing << "%) are not part of target");
- ARM_COMPUTE_EXPECT_EQUAL(num_missing, 0, framework::LogLevel::ERRORS);
+ ARM_COMPUTE_EXPECT(percent_missing <= allowed_missing_percentage, framework::LogLevel::ERRORS);
}
}