-
Notifications
You must be signed in to change notification settings - Fork 5.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add LOGOS features matching strategy #2383
Conversation
5a044be
to
04aa240
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for contribution!
|
||
void CV_LogosMatcherTest::run( int ) | ||
{ | ||
const std::string vP1_path = ts->get_data_path() + "detectors_descriptors_evaluation/matching/LOGOS/vP1.txt"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please avoid using of legacy "cvtest::BaseTest". It is not needed after migration on GoogleTest. Just write:
TEST(XFeatures2d_LogosMatcher, logos_matcher_regression)
{
const std::string vP1_path ...
...
}
ts->get_data_path() + "..."
Please use cvtest::findDataFile(...)
instead.
|
||
std::cout << "groundTruth: " << groundTruth.size() << " ; matchesLogos: " << matchesLogos.size() | ||
<< " ; correctMatches: " << correctMatches << std::endl; | ||
ASSERT_TRUE(correctMatches == static_cast<int>(groundTruth.size())); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ASSERT_EQ(static_cast<int>(groundTruth.size()), correctMatches)
<< "groundTruth: " << groundTruth.size()
<< " ; matchesLogos: " << matchesLogos.size()
<< " ; correctMatches: " << correctMatches
;
@@ -1,89 +1,119 @@ | |||
@incollection{Agrawal08, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please backport sorting onto 3.4 branch too?
With some note which order should be preserved (like "cite id" string)
modules/xfeatures2d/src/logos.cpp
Outdated
/* | ||
* MIT License | ||
* | ||
* Copyright (c) 2018 Stephanie Lowry |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this file code covered by 3rdparty license too? Is where some adopted code or it has been written from scratch ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have removed the license.
f5973b7
to
d54b041
Compare
…ion) features matching strategy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well done! Thank you 👍
Merge with extra: opencv/opencv_extra#690
This pullrequest changes
Original code: LOGOS
Regression tests consist in comparing the output of the current implementation w.r.t. the original Matlab code, see opencv/opencv_extra#690
Note:
cv::Ptr
successfully (got some memory leak issues)This method requires to build a BoW for a considered image dataset. Something like:
Cosine distance can be used to get the nearest BoW cluster for each descriptor.