Merged
Conversation
Instead of using the current dimension for which we just got a big span, we were computing Min and Max for the previous dimension stored in cutfeat (and using 0 instead of the dimension indice for the very first dimension with "span > (1-eps)max_span")
…it-for-kdtree-single
backported commit 8690575
Added/Fixed testcases for SIFT * merge perf_sift into conventional perf tests * Fix disabled SIFT scale invariance tests allows trainIdx duplication in matching scaled keypoints
* Clean: make the use of the indices array length consistent Either we don't want this method to be used in the future for any other node than the root node, and so we replace indices_length by size_ and remove it as argument, or we want to be able to use it potentially for other nodes, and so using size_ instead of indices_length would have lead to a bug. * Fix: b was not an address * Fix: transpose the Flann repo commit "Fixes in accum_dist methods" from Adil Ibragimov Avoids trying to compute log(ratio) with ratio = 0 * Fix: transpose the Flann repo commit "result_set bugfix" from Jack Rae * Fix Jack Rae commit as the initial i - 1 index was decremented before entering the loop body * Clean: transpose the Flann repo commit "Updated comments in lsh_index" from Richard McPherson * Fix: Transpose the Flann repo commit "Fixing unreachable code in lsh_table.h" from hypevr * Fix warning the same way it was done in flann standalone repo * Change the return value in case of unsupported type
alalek
commented
Jun 29, 2020
| INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DetectorScaleInvariance, | ||
| Value(IMAGE_BIKES, SIFT::create(), 0.69f, 0.98f)); | ||
| INSTANTIATE_TEST_CASE_P(SIFT, DetectorScaleInvariance, | ||
| Value(IMAGE_BIKES, SIFT::create(0, 3, 0.09), 0.65f, 0.98f)); |
Member
Author
There was a problem hiding this comment.
@Yosshi999 I have reduced test threshold on master branch:
[ RUN ] SIFT/DetectorScaleInvariance.scale/0, where GetParam() = ("detectors_descriptors_evaluation/images_datasets/bikes/img1.png", 0.69, 0.98)
scale = 1.5, keyPointMatchesRatio = 0.767554, scaleInliersRatio = 0.996845
scale = 2, keyPointMatchesRatio = 0.812734, scaleInliersRatio = 1
/home/alalek/projects/opencv/dev/modules/features2d/test/test_detectors_invariance.impl.hpp:198: Failure
Expected: (keyPointMatchesRatio) >= (minKeyPointMatchesRatio), actual: 0.678571 vs 0.69
scale = 2.5, keyPointMatchesRatio = 0.678571, scaleInliersRatio = 1
[ FAILED ] SIFT/DetectorScaleInvariance.scale/0, where GetParam() = ("detectors_descriptors_evaluation/images_datasets/bikes/img1.png", 0.69, 0.98) (285 ms)
Member
Author
|
👍 |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#17567 from dev-tronifier:new_branch
#17618 from Yosshi999:gsoc_sift-better-test
#17636 from okamotoR:3.4
#17638 from pemmanuelviel:pev--avoid-branching-in-loop
#17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
#17641 from pemmanuelviel:pev--fix-middleSplit-for-kdtree-single
#17642 from pemmanuelviel:pev--fixes-and-clean
#17648 from alalek:update_libjpeg
#17650 from alalek:update_libjpeg-turbo
#17663 from alalek:backport_17658closes #17613
closes #17628
closes #17607
closes #17612
Previous "Merge 3.4": #17646