Commit 63ae5f00 authored by Alexander Alekhin's avatar Alexander Alekhin

features2d(test): enable debug messages

parent 43e09125
...@@ -11,7 +11,7 @@ using std::tr1::make_tuple; ...@@ -11,7 +11,7 @@ using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
using namespace testing; using namespace testing;
#define SHOW_DEBUG_LOG 0 #define SHOW_DEBUG_LOG 1
typedef std::tr1::tuple<std::string, Ptr<FeatureDetector>, Ptr<DescriptorExtractor>, float> typedef std::tr1::tuple<std::string, Ptr<FeatureDetector>, Ptr<DescriptorExtractor>, float>
String_FeatureDetector_DescriptorExtractor_Float_t; String_FeatureDetector_DescriptorExtractor_Float_t;
...@@ -72,7 +72,7 @@ TEST_P(DescriptorRotationInvariance, rotation) ...@@ -72,7 +72,7 @@ TEST_P(DescriptorRotationInvariance, rotation)
vector<KeyPoint> keypoints0; vector<KeyPoint> keypoints0;
Mat descriptors0; Mat descriptors0;
featureDetector->detect(image0, keypoints0, mask0); featureDetector->detect(image0, keypoints0, mask0);
std::cout << "Intial keypoints: " << keypoints0.size() << std::endl; std::cout << "Keypoints: " << keypoints0.size() << std::endl;
EXPECT_GE(keypoints0.size(), 15u); EXPECT_GE(keypoints0.size(), 15u);
descriptorExtractor->compute(image0, keypoints0, descriptors0); descriptorExtractor->compute(image0, keypoints0, descriptors0);
...@@ -109,7 +109,7 @@ TEST_P(DescriptorRotationInvariance, rotation) ...@@ -109,7 +109,7 @@ TEST_P(DescriptorRotationInvariance, rotation)
#if SHOW_DEBUG_LOG #if SHOW_DEBUG_LOG
std::cout std::cout
<< "angle = " << angle << "angle = " << angle
<< ", keypoints = " << keypoints1.size() << ", inliers = " << descInliersCount
<< ", descInliersRatio = " << static_cast<float>(descInliersCount) / keypoints0.size() << ", descInliersRatio = " << static_cast<float>(descInliersCount) / keypoints0.size()
<< std::endl; << std::endl;
#endif #endif
...@@ -121,6 +121,7 @@ TEST_P(DescriptorScaleInvariance, scale) ...@@ -121,6 +121,7 @@ TEST_P(DescriptorScaleInvariance, scale)
{ {
vector<KeyPoint> keypoints0; vector<KeyPoint> keypoints0;
featureDetector->detect(image0, keypoints0); featureDetector->detect(image0, keypoints0);
std::cout << "Keypoints: " << keypoints0.size() << std::endl;
EXPECT_GE(keypoints0.size(), 15u); EXPECT_GE(keypoints0.size(), 15u);
Mat descriptors0; Mat descriptors0;
descriptorExtractor->compute(image0, keypoints0, descriptors0); descriptorExtractor->compute(image0, keypoints0, descriptors0);
...@@ -159,6 +160,7 @@ TEST_P(DescriptorScaleInvariance, scale) ...@@ -159,6 +160,7 @@ TEST_P(DescriptorScaleInvariance, scale)
#if SHOW_DEBUG_LOG #if SHOW_DEBUG_LOG
std::cout std::cout
<< "scale = " << scale << "scale = " << scale
<< ", inliers = " << descInliersCount
<< ", descInliersRatio = " << static_cast<float>(descInliersCount) / keypoints0.size() << ", descInliersRatio = " << static_cast<float>(descInliersCount) / keypoints0.size()
<< std::endl; << std::endl;
#endif #endif
......
...@@ -11,7 +11,7 @@ using std::tr1::make_tuple; ...@@ -11,7 +11,7 @@ using std::tr1::make_tuple;
using std::tr1::get; using std::tr1::get;
using namespace testing; using namespace testing;
#define SHOW_DEBUG_LOG 0 #define SHOW_DEBUG_LOG 1
typedef std::tr1::tuple<std::string, Ptr<FeatureDetector>, float, float> String_FeatureDetector_Float_Float_t; typedef std::tr1::tuple<std::string, Ptr<FeatureDetector>, float, float> String_FeatureDetector_Float_Float_t;
const static std::string IMAGE_TSUKUBA = "features2d/tsukuba.png"; const static std::string IMAGE_TSUKUBA = "features2d/tsukuba.png";
......
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