From bf02582de308209c7a80e10b2edb97029771ef1c Mon Sep 17 00:00:00 2001 From: Kwang Moo Yi Date: Tue, 16 Jun 2015 17:26:10 +0200 Subject: [PATCH] Re-added dollar Toolbox license and added headers --- c++/3rdParties/license_dollarToolBox.txt | 26 ++++++++++++ c++/demo.cpp | 6 +-- c++/src/NonMaxSup.cpp | 6 +-- c++/src/NonMaxSup.hpp | 6 +-- c++/src/libTILDE.cpp | 9 ++-- .../EdgeFoci/getKeypoints_EdgeFoci.m | 36 ++++++++++++++++ .../FAST/getKeypoints_FAST.m | 37 +++++++++++++++- .../getKeypoints_LearnedConvolutional.m | 41 ++++++++++++++++++ .../MSER/getKeypoints_MSER.m | 37 +++++++++++++++- .../RANDOM/getKeypoints_RANDOM.m | 41 +++++++++++++++++- .../SFOP/getKeypoints_SFOP.m | 38 ++++++++++++++++- .../SIFER/getKeypoints_SIFER.m | 37 +++++++++++++++- .../SIFT/getKeypoints_SIFT.m | 37 +++++++++++++++- .../SURF/getKeypoints_SURF.m | 36 ++++++++++++++++ .../TILDEP/getKeypoints_TILDEP.m | 41 +++++++++++++++++- .../TILDEP24/getKeypoints_TILDEP24.m | 41 +++++++++++++++++- .../WADE/getKeypoints_WADE.m | 37 +++++++++++++++- matlab/src/Utils/ApplyLearnedELLFilter.m | 42 +++++++++++++++++++ ...rnedELLFilterWithPreProcImage_NoLoadFile.m | 40 ++++++++++++++++++ .../ApplyLearnedFilterWithSVM_NoLoadFile.m | 40 ++++++++++++++++++ matlab/src/Utils/PreProcessTrainImage.m | 41 +++++++++++++++++- matlab/src/Utils/computeKP.m | 41 +++++++++++++++++- .../evaluateKeyPointsCompWithDir_ratio.m | 41 +++++++++++++++++- matlab/src/Utils/setup_path.m | 40 ++++++++++++++++++ matlab/src/Utils/tools_evaluate/evaluate.m | 40 ++++++++++++++++++ .../src/Utils/tools_evaluate/growAndScore.m | 41 +++++++++++++++++- .../tools_evaluate/mergeScoreImg2Keypoints.m | 41 +++++++++++++++++- .../src/Utils/tools_evaluate/sortFeaturesSS.m | 41 +++++++++++++++++- .../tools_evaluate/sortFeaturesSS_noAbs.m | 41 +++++++++++++++++- .../Utils/tools_filtering/fastELLFiltering.m | 41 +++++++++++++++++- .../tools_filtering/fastELLFiltering_approx.m | 41 +++++++++++++++++- .../Utils/tools_nonmax/ApplyAdaptiveNonMax.m | 40 ++++++++++++++++++ .../Utils/tools_nonmax/ApplyNonMax2Score.m | 41 +++++++++++++++++- .../tools_nonmax/adaptiveNMSWithPoints.m | 40 ++++++++++++++++++ matlab/src/Utils/tools_nonmax/binary2pts.m | 40 ++++++++++++++++++ matlab/src/Utils/tools_nonmax/pts2binary.m | 40 ++++++++++++++++++ matlab/src/demo.m | 40 ++++++++++++++++++ matlab/src/evaluate_OxfordEFDataset_1000.m | 41 +++++++++++++++++- .../src/evaluate_OxfordEFDataset_2percents.m | 41 +++++++++++++++++- matlab/src/evaluate_WebcamDataset_2percents.m | 41 +++++++++++++++++- matlab/src/link.m | 6 +-- matlab/src/make.m | 6 +-- 42 files changed, 1418 insertions(+), 41 deletions(-) create mode 100644 c++/3rdParties/license_dollarToolBox.txt diff --git a/c++/3rdParties/license_dollarToolBox.txt b/c++/3rdParties/license_dollarToolBox.txt new file mode 100644 index 0000000..5aba728 --- /dev/null +++ b/c++/3rdParties/license_dollarToolBox.txt @@ -0,0 +1,26 @@ +Copyright (c) 2012, Piotr Dollar +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are those +of the authors and should not be interpreted as representing official policies, +either expressed or implied, of the FreeBSD Project. diff --git a/c++/demo.cpp b/c++/demo.cpp index 17d1064..c1493bf 100644 --- a/c++/demo.cpp +++ b/c++/demo.cpp @@ -2,14 +2,14 @@ // // Filename: test.cpp // Description: -// Author: Yannick Verdie, Kwang Moo Yi, Alberto Crivella +// Author: Yannick Verdie, Kwang Moo Yi // Maintainer: Yannick Verdie // Created: Tue Mar 3 17:47:28 2015 (+0100) // Version: 0.5a // Package-Requires: () -// Last-Updated: Thu May 28 13:04:33 2015 (+0200) +// Last-Updated: Tue Jun 16 17:09:04 2015 (+0200) // By: Kwang -// Update #: 25 +// Update #: 26 // URL: // Doc URL: // Keywords: diff --git a/c++/src/NonMaxSup.cpp b/c++/src/NonMaxSup.cpp index ca195e7..a1b8883 100644 --- a/c++/src/NonMaxSup.cpp +++ b/c++/src/NonMaxSup.cpp @@ -2,14 +2,14 @@ // // Filename: NonMaxSup.cpp // Description: -// Author: Yannick Verdie, Kwang Moo Yi, Alberto Crivella +// Author: Yannick Verdie, Kwang Moo Yi // Maintainer: Yannick Verdie, Kwang Moo Yi // Created: Tue Mar 3 17:48:14 2015 (+0100) // Version: 0.5a // Package-Requires: () -// Last-Updated: Thu May 28 12:53:40 2015 (+0200) +// Last-Updated: Tue Jun 16 17:09:37 2015 (+0200) // By: Kwang -// Update #: 5 +// Update #: 6 // URL: // Doc URL: // Keywords: diff --git a/c++/src/NonMaxSup.hpp b/c++/src/NonMaxSup.hpp index 237ecf4..710ff3d 100644 --- a/c++/src/NonMaxSup.hpp +++ b/c++/src/NonMaxSup.hpp @@ -2,14 +2,14 @@ // // Filename: NonMaxSup.hpp // Description: -// Author: Yannick Verdie, Kwang Moo Yi, Alberto Crivella +// Author: Yannick Verdie, Kwang Moo Yi // Maintainer: Yannick Verdie, Kwang Moo Yi // Created: Tue Mar 3 17:51:23 2015 (+0100) // Version: 0.5a // Package-Requires: () -// Last-Updated: Thu May 28 12:53:23 2015 (+0200) +// Last-Updated: Tue Jun 16 17:09:29 2015 (+0200) // By: Kwang -// Update #: 8 +// Update #: 9 // URL: // Doc URL: // Keywords: diff --git a/c++/src/libTILDE.cpp b/c++/src/libTILDE.cpp index 9c1ef69..88c50dd 100644 --- a/c++/src/libTILDE.cpp +++ b/c++/src/libTILDE.cpp @@ -7,9 +7,9 @@ // Created: Tue Mar 3 17:53:46 2015 (+0100) // Version: 0.5a // Package-Requires: () -// Last-Updated: Thu May 28 13:18:32 2015 (+0200) +// Last-Updated: Tue Jun 16 17:25:55 2015 (+0200) // By: Kwang -// Update #: 40 +// Update #: 41 // URL: // Doc URL: // Keywords: @@ -67,8 +67,9 @@ vector < Mat > getLuv_fast(const Mat & input_color_image) const double Lt = 0.008856; - //addapted from Dollar toolbox - //http://vision.ucsd.edu/~pdollar/toolbox/doc/ + // adapted from Dollar toolbox + // http://vision.ucsd.edu/~pdollar/toolbox/doc/ + // See c++/src/3rdParties/license_dollarToolBox.txt static float lTable[1064]; for(int i=0; i<1025; i++) { diff --git a/matlab/src/KeypointDetectors/EdgeFoci/getKeypoints_EdgeFoci.m b/matlab/src/KeypointDetectors/EdgeFoci/getKeypoints_EdgeFoci.m index 68ca5fc..dec997d 100755 --- a/matlab/src/KeypointDetectors/EdgeFoci/getKeypoints_EdgeFoci.m +++ b/matlab/src/KeypointDetectors/EdgeFoci/getKeypoints_EdgeFoci.m @@ -1,3 +1,36 @@ +%% getKeypoints_EdgeFoci.m --- +% +% Filename: getKeypoints_EdgeFoci.m +% Description: Wrapper Function for EdgeFoci +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:16:41 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:19:23 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_EdgeFoci(img_info, p) edgefoci_name = [img_info.full_feature_prefix '_EdgeFoci_keypoints.mat']; @@ -40,3 +73,6 @@ keypts = loadkey.keypts; end end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_EdgeFoci.m ends here diff --git a/matlab/src/KeypointDetectors/FAST/getKeypoints_FAST.m b/matlab/src/KeypointDetectors/FAST/getKeypoints_FAST.m index b78c37f..29aba22 100755 --- a/matlab/src/KeypointDetectors/FAST/getKeypoints_FAST.m +++ b/matlab/src/KeypointDetectors/FAST/getKeypoints_FAST.m @@ -1,3 +1,36 @@ +%% getKeypoints_FAST.m --- +% +% Filename: getKeypoints_FAST.m +% Description: Wrapper Function for FAST +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:16:52 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:19:36 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + % function [keypts] = getKeypoints_FAST(img_info, p) % fast_name = [img_info.full_feature_prefix '_FAST_keypoints.mat']; @@ -47,4 +80,6 @@ loadkey = load(fast_name); keypts = loadkey.keypts; end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_FAST.m ends here diff --git a/matlab/src/KeypointDetectors/LearnedConvolutional/getKeypoints_LearnedConvolutional.m b/matlab/src/KeypointDetectors/LearnedConvolutional/getKeypoints_LearnedConvolutional.m index 8ea17ef..2e0e780 100755 --- a/matlab/src/KeypointDetectors/LearnedConvolutional/getKeypoints_LearnedConvolutional.m +++ b/matlab/src/KeypointDetectors/LearnedConvolutional/getKeypoints_LearnedConvolutional.m @@ -1,3 +1,41 @@ +%% getKeypoints_LearnedConvolutional.m --- +% +% Filename: getKeypoints_LearnedConvolutional.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:17:08 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:18:04 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Learned Convolutial Filters code using the coeeficients from the +% authors' website. See related copyright issues. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_LearnedConvolutional(img_info, p) fixed_scale = 4;%half of the filter size @@ -41,3 +79,6 @@ end end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_LearnedConvolutional.m ends here diff --git a/matlab/src/KeypointDetectors/MSER/getKeypoints_MSER.m b/matlab/src/KeypointDetectors/MSER/getKeypoints_MSER.m index b6a7ca1..e0ae3d5 100755 --- a/matlab/src/KeypointDetectors/MSER/getKeypoints_MSER.m +++ b/matlab/src/KeypointDetectors/MSER/getKeypoints_MSER.m @@ -1,3 +1,36 @@ +%% getKeypoints_MSER.m --- +% +% Filename: getKeypoints_MSER.m +% Description: Wrapper function for MSER +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:18:09 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:19:52 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_MSER(img_info, p) mser_name = [img_info.full_feature_prefix '_MSER_keypoints.mat']; @@ -52,4 +85,6 @@ loadkey = load(mser_name); keypts = loadkey.keypts; end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_MSER.m ends here diff --git a/matlab/src/KeypointDetectors/RANDOM/getKeypoints_RANDOM.m b/matlab/src/KeypointDetectors/RANDOM/getKeypoints_RANDOM.m index 38b8941..b3c3239 100755 --- a/matlab/src/KeypointDetectors/RANDOM/getKeypoints_RANDOM.m +++ b/matlab/src/KeypointDetectors/RANDOM/getKeypoints_RANDOM.m @@ -1,3 +1,40 @@ +%% getKeypoints_RANDOM.m --- +% +% Filename: getKeypoints_RANDOM.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:18:28 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:18:33 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_RANDOM(img_info, p) fixed_scale = 1;%half of the filter size @@ -16,4 +53,6 @@ keypts = [J I zeros(size(I,1),3) repmat(fixed_scale,size(I,1),1)]'; keypts = mergeScoreImg2Keypoints(keypts, score_res); -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_RANDOM.m ends here diff --git a/matlab/src/KeypointDetectors/SFOP/getKeypoints_SFOP.m b/matlab/src/KeypointDetectors/SFOP/getKeypoints_SFOP.m index 0dbda2f..1622169 100755 --- a/matlab/src/KeypointDetectors/SFOP/getKeypoints_SFOP.m +++ b/matlab/src/KeypointDetectors/SFOP/getKeypoints_SFOP.m @@ -1,3 +1,37 @@ +%% getKeypoints_SFOP.m --- +% +% Filename: getKeypoints_SFOP.m +% Description: Wrapper Function for SFOP +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:18:38 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:19:04 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% +%% Code: + + function [keypts] = getKeypoints_SFOP(img_info, p) sfop_name = [img_info.full_feature_prefix '_SFOP_keypoints.mat']; @@ -28,4 +62,6 @@ loadkey = load(sfop_name); keypts = loadkey.keypts; end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_SFOP.m ends here diff --git a/matlab/src/KeypointDetectors/SIFER/getKeypoints_SIFER.m b/matlab/src/KeypointDetectors/SIFER/getKeypoints_SIFER.m index db9dc10..8347725 100755 --- a/matlab/src/KeypointDetectors/SIFER/getKeypoints_SIFER.m +++ b/matlab/src/KeypointDetectors/SIFER/getKeypoints_SIFER.m @@ -1,3 +1,36 @@ +%% getKeypoints_SIFER.m --- +% +% Filename: getKeypoints_SIFER.m +% Description: Wrapper Function for SIFER +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:20:14 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:20:29 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_SIFER(img_info, p) sifer_name = [img_info.full_feature_prefix '_SIFER_keypoints.mat']; @@ -48,4 +81,6 @@ loadkey = load(sifer_name); keypts = loadkey.keypts; end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_SIFER.m ends here diff --git a/matlab/src/KeypointDetectors/SIFT/getKeypoints_SIFT.m b/matlab/src/KeypointDetectors/SIFT/getKeypoints_SIFT.m index 44eafbb..96c9e5b 100755 --- a/matlab/src/KeypointDetectors/SIFT/getKeypoints_SIFT.m +++ b/matlab/src/KeypointDetectors/SIFT/getKeypoints_SIFT.m @@ -1,3 +1,36 @@ +%% getKeypoints_SIFT.m --- +% +% Filename: getKeypoints_SIFT.m +% Description: Wrapper Function for SIFT +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:20:35 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:20:49 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_SIFT(img_info, p) sift_name = [img_info.full_feature_prefix '_SIFT_keypoints.mat']; @@ -43,4 +76,6 @@ % keypts = loadkey.keypts; % end -% end \ No newline at end of file +% end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_SIFT.m ends here diff --git a/matlab/src/KeypointDetectors/SURF/getKeypoints_SURF.m b/matlab/src/KeypointDetectors/SURF/getKeypoints_SURF.m index bb9b202..81ceb16 100755 --- a/matlab/src/KeypointDetectors/SURF/getKeypoints_SURF.m +++ b/matlab/src/KeypointDetectors/SURF/getKeypoints_SURF.m @@ -1,3 +1,36 @@ +%% getKeypoints_SURF.m --- +% +% Filename: getKeypoints_SURF.m +% Description: Wrapper Function for SURF +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:20:54 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:21:08 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_SURF(img_info, p) surf_name = [img_info.full_feature_prefix '_SURF_keypoints.mat']; @@ -48,3 +81,6 @@ % keypts = loadkey.keypts; % end % end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_SURF.m ends here diff --git a/matlab/src/KeypointDetectors/TILDEP/getKeypoints_TILDEP.m b/matlab/src/KeypointDetectors/TILDEP/getKeypoints_TILDEP.m index a447643..40f2e94 100755 --- a/matlab/src/KeypointDetectors/TILDEP/getKeypoints_TILDEP.m +++ b/matlab/src/KeypointDetectors/TILDEP/getKeypoints_TILDEP.m @@ -1,3 +1,40 @@ +%% getKeypoints_TILDEP.m --- +% +% Filename: getKeypoints_TILDEP.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:21:16 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:21:22 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts, score_res] = getKeypoints_TILDEP(img_info, p) suffix = ''; @@ -39,4 +76,6 @@ function [] = parsavefilter(fname, score_res, binary_res) save(fname, 'score_res', 'binary_res'); -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_TILDEP.m ends here diff --git a/matlab/src/KeypointDetectors/TILDEP24/getKeypoints_TILDEP24.m b/matlab/src/KeypointDetectors/TILDEP24/getKeypoints_TILDEP24.m index 21a19b1..d90321f 100755 --- a/matlab/src/KeypointDetectors/TILDEP24/getKeypoints_TILDEP24.m +++ b/matlab/src/KeypointDetectors/TILDEP24/getKeypoints_TILDEP24.m @@ -1,3 +1,40 @@ +%% getKeypoints_TILDEP24.m --- +% +% Filename: getKeypoints_TILDEP24.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:21:28 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:21:34 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts, score_res] = getKeypoints_TILDEP24(img_info, p) global sRoot; @@ -69,4 +106,6 @@ function [] = parsavefilter(fname, score_res, binary_res) save(fname, 'score_res', 'binary_res'); -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_TILDEP24.m ends here diff --git a/matlab/src/KeypointDetectors/WADE/getKeypoints_WADE.m b/matlab/src/KeypointDetectors/WADE/getKeypoints_WADE.m index 2d2e7b3..657625b 100755 --- a/matlab/src/KeypointDetectors/WADE/getKeypoints_WADE.m +++ b/matlab/src/KeypointDetectors/WADE/getKeypoints_WADE.m @@ -1,3 +1,36 @@ +%% getKeypoints_WADE.m --- +% +% Filename: getKeypoints_WADE.m +% Description: Wrapper Function for WADE +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:21:38 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:21:50 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = getKeypoints_WADE(img_info, p) wade_name = [img_info.full_feature_prefix '_wade_keypoints.mat']; @@ -26,4 +59,6 @@ loadkey = load(wade_name); keypts = loadkey.keypts; end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% getKeypoints_WADE.m ends here diff --git a/matlab/src/Utils/ApplyLearnedELLFilter.m b/matlab/src/Utils/ApplyLearnedELLFilter.m index 010d528..ebe641b 100755 --- a/matlab/src/Utils/ApplyLearnedELLFilter.m +++ b/matlab/src/Utils/ApplyLearnedELLFilter.m @@ -1,3 +1,42 @@ +%% ApplyLearnedELLFilter.m --- +% +% Filename: ApplyLearnedELLFilter.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Author: Kwang +% Maintainer: +% Created: Tue Jun 16 17:12:09 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:12:25 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ binary_res, score_res_final ] = ApplyLearnedELLFilter( input_color_image, threshold, nameELLFilter, bDisp ) %% Load Filter param = 0; @@ -12,3 +51,6 @@ [ binary_res, score_res_final ] = ApplyLearnedELLFilterWithPreProcImage_NoLoadFile( input_preproc_image, threshold, res, bDisp ); + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% ApplyLearnedELLFilter.m ends here diff --git a/matlab/src/Utils/ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m b/matlab/src/Utils/ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m index a7554e0..a143f40 100755 --- a/matlab/src/Utils/ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m +++ b/matlab/src/Utils/ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m @@ -1,3 +1,40 @@ +%% ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m --- +% +% Filename: ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:12:31 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:12:35 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ binary_res, score_res_final ] = ApplyLearnedELLFilterWithPreProcImage_NoLoadFile( input_preproc_image, threshold, res, bDisp ) % %% Load Filter % param = 0; @@ -64,3 +101,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% ApplyLearnedELLFilterWithPreProcImage_NoLoadFile.m ends here diff --git a/matlab/src/Utils/ApplyLearnedFilterWithSVM_NoLoadFile.m b/matlab/src/Utils/ApplyLearnedFilterWithSVM_NoLoadFile.m index ffa782a..dacfcbf 100755 --- a/matlab/src/Utils/ApplyLearnedFilterWithSVM_NoLoadFile.m +++ b/matlab/src/Utils/ApplyLearnedFilterWithSVM_NoLoadFile.m @@ -1,3 +1,40 @@ +%% ApplyLearnedFilterWithSVM_NoLoadFile.m --- +% +% Filename: ApplyLearnedFilterWithSVM_NoLoadFile.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:12:41 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:12:46 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ binary_res, score_res ] = ApplyLearnedFilterWithSVM_NoLoadFile( input_color_image, threshold, trained_svmWeights, param, input_preproc_image ) if (~exist('param','var')) @@ -119,3 +156,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% ApplyLearnedFilterWithSVM_NoLoadFile.m ends here diff --git a/matlab/src/Utils/PreProcessTrainImage.m b/matlab/src/Utils/PreProcessTrainImage.m index 3cd662c..db59fd8 100755 --- a/matlab/src/Utils/PreProcessTrainImage.m +++ b/matlab/src/Utils/PreProcessTrainImage.m @@ -1,3 +1,40 @@ +%% PreProcessTrainImage.m --- +% +% Filename: PreProcessTrainImage.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:12:53 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:12:58 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ output_img ] = PreProcessTrainImage( input_img, param ) %UNTITLED Summary of this function goes here % Detailed explanation goes here @@ -40,4 +77,6 @@ output_img(:,:, end) = ACImg; end end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% PreProcessTrainImage.m ends here diff --git a/matlab/src/Utils/computeKP.m b/matlab/src/Utils/computeKP.m index 41c0266..8d0dc1b 100755 --- a/matlab/src/Utils/computeKP.m +++ b/matlab/src/Utils/computeKP.m @@ -1,3 +1,40 @@ +%% computeKP.m --- +% +% Filename: computeKP.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:13:09 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:13:36 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function Allrepeatability = computeKP(parameters) nameDataset = parameters.nameDataset;%for saving at the end @@ -75,4 +112,6 @@ AllrepeatabilityCross = cell2mat(AllrepeatabilityCross); save(['results_' nameDataset '_' num2str(numberOfKeypoints{1})]); -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% computeKP.m ends here diff --git a/matlab/src/Utils/evaluateKeyPointsCompWithDir_ratio.m b/matlab/src/Utils/evaluateKeyPointsCompWithDir_ratio.m index 179cded..549f492 100755 --- a/matlab/src/Utils/evaluateKeyPointsCompWithDir_ratio.m +++ b/matlab/src/Utils/evaluateKeyPointsCompWithDir_ratio.m @@ -1,3 +1,40 @@ +%% evaluateKeyPointsCompWithDir_ratio.m --- +% +% Filename: evaluateKeyPointsCompWithDir_ratio.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:13:51 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:13:57 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [eval_result] = evaluateKeyPointsCompWithDir_ratio( trainset_name, testset_name, num_key, parameters) global sRoot; @@ -188,4 +225,6 @@ di = dirData(3:end); di(~dirIndex(3:end)) = ''; -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% evaluateKeyPointsCompWithDir_ratio.m ends here diff --git a/matlab/src/Utils/setup_path.m b/matlab/src/Utils/setup_path.m index 3560a24..cbe72d2 100755 --- a/matlab/src/Utils/setup_path.m +++ b/matlab/src/Utils/setup_path.m @@ -1,3 +1,40 @@ +%% setup_path.m --- +% +% Filename: setup_path.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:14:08 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:14:13 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + global bSetupPathFin global sRoot; @@ -24,3 +61,6 @@ %mkdir(sRoot,'resultAUCs'); end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% setup_path.m ends here diff --git a/matlab/src/Utils/tools_evaluate/evaluate.m b/matlab/src/Utils/tools_evaluate/evaluate.m index 759e3ca..006dcf3 100755 --- a/matlab/src/Utils/tools_evaluate/evaluate.m +++ b/matlab/src/Utils/tools_evaluate/evaluate.m @@ -1,3 +1,40 @@ +%% evaluate.m --- +% +% Filename: evaluate.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:14:18 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:14:23 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [AUC] = evaluate(features, pb, imgs,Hs) if ~exist('Hs', 'var') @@ -37,3 +74,6 @@ end AUC = mean(cell2mat(score),2); end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% evaluate.m ends here diff --git a/matlab/src/Utils/tools_evaluate/growAndScore.m b/matlab/src/Utils/tools_evaluate/growAndScore.m index 5c2d87d..86f0334 100755 --- a/matlab/src/Utils/tools_evaluate/growAndScore.m +++ b/matlab/src/Utils/tools_evaluate/growAndScore.m @@ -1,3 +1,40 @@ +%% growAndScore.m --- +% +% Filename: growAndScore.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:14:27 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:14:32 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [score] = growAndScore(feat1,feat2,img, H, range, repeatabilityType) if ~exist('H', 'var') @@ -41,4 +78,6 @@ % warning(['The current Evaluation does FAST-Like evaluation with ' ... % 'fixed ratio of 5!']); -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% growAndScore.m ends here diff --git a/matlab/src/Utils/tools_evaluate/mergeScoreImg2Keypoints.m b/matlab/src/Utils/tools_evaluate/mergeScoreImg2Keypoints.m index 8865798..08bc511 100755 --- a/matlab/src/Utils/tools_evaluate/mergeScoreImg2Keypoints.m +++ b/matlab/src/Utils/tools_evaluate/mergeScoreImg2Keypoints.m @@ -1,7 +1,46 @@ +%% mergeScoreImg2Keypoints.m --- +% +% Filename: mergeScoreImg2Keypoints.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:14:35 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:14:42 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [keypts] = mergeScoreImg2Keypoints(keypts, scoreImg) idx = sub2ind(size(scoreImg),round(keypts(2,:)),round(keypts(1,:))); scores = scoreImg(idx); keypts(5,:) = scores; -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% mergeScoreImg2Keypoints.m ends here diff --git a/matlab/src/Utils/tools_evaluate/sortFeaturesSS.m b/matlab/src/Utils/tools_evaluate/sortFeaturesSS.m index 0754371..4d9bad4 100755 --- a/matlab/src/Utils/tools_evaluate/sortFeaturesSS.m +++ b/matlab/src/Utils/tools_evaluate/sortFeaturesSS.m @@ -1,3 +1,40 @@ +%% sortFeaturesSS.m --- +% +% Filename: sortFeaturesSS.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:14:46 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:14:50 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [feat] = sortFeaturesSS(features, p, sortOnScale) if ~exist('sortOnScale','var') @@ -43,4 +80,6 @@ end end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% sortFeaturesSS.m ends here diff --git a/matlab/src/Utils/tools_evaluate/sortFeaturesSS_noAbs.m b/matlab/src/Utils/tools_evaluate/sortFeaturesSS_noAbs.m index 20351dc..9a8782e 100755 --- a/matlab/src/Utils/tools_evaluate/sortFeaturesSS_noAbs.m +++ b/matlab/src/Utils/tools_evaluate/sortFeaturesSS_noAbs.m @@ -1,3 +1,40 @@ +%% sortFeaturesSS_noAbs.m --- +% +% Filename: sortFeaturesSS_noAbs.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:14:58 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:15:02 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [feat] = sortFeaturesSS_noAbs(features, p, sortOnScale) if ~exist('sortOnScale','var') @@ -43,4 +80,6 @@ end end -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% sortFeaturesSS_noAbs.m ends here diff --git a/matlab/src/Utils/tools_filtering/fastELLFiltering.m b/matlab/src/Utils/tools_filtering/fastELLFiltering.m index bc1870c..cf36d21 100755 --- a/matlab/src/Utils/tools_filtering/fastELLFiltering.m +++ b/matlab/src/Utils/tools_filtering/fastELLFiltering.m @@ -1,3 +1,40 @@ +%% fastELLFiltering.m --- +% +% Filename: fastELLFiltering.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:15:18 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:15:22 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ score_res, computation_time, debug, b_spatial ] = fastELLFiltering(input_preproc_image, threshold, res) param = res.param; @@ -43,4 +80,6 @@ computation_time.gathering_time = toc; -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% fastELLFiltering.m ends here diff --git a/matlab/src/Utils/tools_filtering/fastELLFiltering_approx.m b/matlab/src/Utils/tools_filtering/fastELLFiltering_approx.m index 47e46c6..c7f2ab8 100755 --- a/matlab/src/Utils/tools_filtering/fastELLFiltering_approx.m +++ b/matlab/src/Utils/tools_filtering/fastELLFiltering_approx.m @@ -1,3 +1,40 @@ +%% fastELLFiltering_approx.m --- +% +% Filename: fastELLFiltering_approx.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:15:26 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:15:30 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ score_res, computation_time ] = fastELLFiltering_approx(input_preproc_image, threshold, res) param = res.param; @@ -101,4 +138,6 @@ computation_time.gathering_time = toc; -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% fastELLFiltering_approx.m ends here diff --git a/matlab/src/Utils/tools_nonmax/ApplyAdaptiveNonMax.m b/matlab/src/Utils/tools_nonmax/ApplyAdaptiveNonMax.m index 9d3a982..3f05797 100755 --- a/matlab/src/Utils/tools_nonmax/ApplyAdaptiveNonMax.m +++ b/matlab/src/Utils/tools_nonmax/ApplyAdaptiveNonMax.m @@ -1,3 +1,40 @@ +%% ApplyAdaptiveNonMax.m --- +% +% Filename: ApplyAdaptiveNonMax.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:15:42 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:15:46 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ binary_img ] = ApplyAdaptiveNonMax( score_img, binary_img, nbPoints ) %ApplyAdaptiveNonMax Apply Adaptive Nonmax % Detailed explanation goes here @@ -15,3 +52,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% ApplyAdaptiveNonMax.m ends here diff --git a/matlab/src/Utils/tools_nonmax/ApplyNonMax2Score.m b/matlab/src/Utils/tools_nonmax/ApplyNonMax2Score.m index f8c95d9..b808275 100755 --- a/matlab/src/Utils/tools_nonmax/ApplyNonMax2Score.m +++ b/matlab/src/Utils/tools_nonmax/ApplyNonMax2Score.m @@ -1,3 +1,40 @@ +%% ApplyNonMax2Score.m --- +% +% Filename: ApplyNonMax2Score.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:15:56 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:16:02 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [score_img, binary_img] = ApplyNonMax2Score(score_img, param, bDoSimpleNonMax) if ~exist('param','var') @@ -100,4 +137,6 @@ % smooth and do the stuff here -end \ No newline at end of file +end +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% ApplyNonMax2Score.m ends here diff --git a/matlab/src/Utils/tools_nonmax/adaptiveNMSWithPoints.m b/matlab/src/Utils/tools_nonmax/adaptiveNMSWithPoints.m index fb301a8..98ac7df 100755 --- a/matlab/src/Utils/tools_nonmax/adaptiveNMSWithPoints.m +++ b/matlab/src/Utils/tools_nonmax/adaptiveNMSWithPoints.m @@ -1,3 +1,40 @@ +%% adaptiveNMSWithPoints.m --- +% +% Filename: adaptiveNMSWithPoints.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:16:07 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:16:11 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ I2,J2,S2 ] = adaptiveNMSWithPoints( I,J,S,nbPoints, thr_r ) %UNTITLED4 Summary of this function goes here % Detailed explanation goes here @@ -75,3 +112,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% adaptiveNMSWithPoints.m ends here diff --git a/matlab/src/Utils/tools_nonmax/binary2pts.m b/matlab/src/Utils/tools_nonmax/binary2pts.m index 91ddaa8..24d0e24 100755 --- a/matlab/src/Utils/tools_nonmax/binary2pts.m +++ b/matlab/src/Utils/tools_nonmax/binary2pts.m @@ -1,3 +1,40 @@ +%% binary2pts.m --- +% +% Filename: binary2pts.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:16:18 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:16:23 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ I,J,S ] = binary2pts( binary,score ) %turns binary image with score image into x,y,s combo @@ -6,3 +43,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% binary2pts.m ends here diff --git a/matlab/src/Utils/tools_nonmax/pts2binary.m b/matlab/src/Utils/tools_nonmax/pts2binary.m index 2592b58..f395d7f 100755 --- a/matlab/src/Utils/tools_nonmax/pts2binary.m +++ b/matlab/src/Utils/tools_nonmax/pts2binary.m @@ -1,3 +1,40 @@ +%% pts2binary.m --- +% +% Filename: pts2binary.m +% Description: +% Author: Kwang Moo Yi, Yannick Verdie +% Maintainer: Kwang Moo Yi, Yannick Verdie +% Created: Tue Jun 16 17:16:27 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:16:33 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + function [ binary,score ] = pts2binary( I,J, score ) %turns binary image with score image into x,y,s combo @@ -6,3 +43,6 @@ end + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% pts2binary.m ends here diff --git a/matlab/src/demo.m b/matlab/src/demo.m index f3ffb1d..37d2124 100644 --- a/matlab/src/demo.m +++ b/matlab/src/demo.m @@ -1,3 +1,40 @@ +%% demo.m --- +% +% Filename: demo.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:10:23 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:11:22 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + %%parameters..., no need to edit other than these 3 values%% fullPathFilter = '../filters/BestFilters_2percents/Original/MexicoMed.mat'; fixed_scale = 10; @@ -36,3 +73,6 @@ fprintf('Program terminated normally.\n'); + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% demo.m ends here diff --git a/matlab/src/evaluate_OxfordEFDataset_1000.m b/matlab/src/evaluate_OxfordEFDataset_1000.m index f8840f3..c94f320 100644 --- a/matlab/src/evaluate_OxfordEFDataset_1000.m +++ b/matlab/src/evaluate_OxfordEFDataset_1000.m @@ -1,3 +1,40 @@ +%% evaluate_OxfordEFDataset_1000.m --- +% +% Filename: evaluate_OxfordEFDataset_1000.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:10:45 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:11:09 2015 (+0200) +% By: Kwang +% Update #: 2 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + warning off backtrace addpath('Utils'); @@ -12,4 +49,6 @@ parameters.testsets = {'bark','bikes','boat','graf','leuven','trees','ubc', 'wall', 'notredame', 'obama', 'yosemite', 'paintedladies', 'rushmore'}; parameters.numberOfKeypoints = {1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000}; -computeKP(parameters); \ No newline at end of file +computeKP(parameters); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% evaluate_OxfordEFDataset_1000.m ends here diff --git a/matlab/src/evaluate_OxfordEFDataset_2percents.m b/matlab/src/evaluate_OxfordEFDataset_2percents.m index d7a110e..c85de4a 100644 --- a/matlab/src/evaluate_OxfordEFDataset_2percents.m +++ b/matlab/src/evaluate_OxfordEFDataset_2percents.m @@ -1,3 +1,40 @@ +%% evaluate_OxfordEFDataset_2percents.m --- +% +% Filename: evaluate_OxfordEFDataset_2percents.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:11:26 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:11:31 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + warning off backtrace addpath('Utils'); @@ -12,4 +49,6 @@ parameters.testsets = {'bark','bikes','boat','graf','leuven','trees','ubc', 'wall', 'notredame', 'obama', 'yosemite', 'paintedladies', 'rushmore'}; parameters.numberOfKeypoints = {50, 174, 65, 101, 141, 175, 150, 175, 65, 39, 105, 65, 74}; -computeKP(parameters); \ No newline at end of file +computeKP(parameters); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% evaluate_OxfordEFDataset_2percents.m ends here diff --git a/matlab/src/evaluate_WebcamDataset_2percents.m b/matlab/src/evaluate_WebcamDataset_2percents.m index 6ac648e..82e3501 100644 --- a/matlab/src/evaluate_WebcamDataset_2percents.m +++ b/matlab/src/evaluate_WebcamDataset_2percents.m @@ -1,3 +1,40 @@ +%% evaluate_WebcamDataset_2percents.m --- +% +% Filename: evaluate_WebcamDataset_2percents.m +% Description: +% Author: Yannick Verdie, Kwang Moo Yi +% Maintainer: Yannick Verdie, Kwang Moo Yi +% Created: Tue Jun 16 17:11:36 2015 (+0200) +% Version: +% Package-Requires: () +% Last-Updated: Tue Jun 16 17:11:41 2015 (+0200) +% By: Kwang +% Update #: 1 +% URL: +% Doc URL: +% Keywords: +% Compatibility: +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Commentary: +% +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Change Log: +% +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C), EPFL Computer Vision Lab. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +%% Code: + + warning off backtrace addpath('Utils'); @@ -12,4 +49,6 @@ parameters.optionalTildeSuffix = '2percents'; parameters.numberOfKeypoints = {85,161,123,0.02,0.02,0.02}; -Allrepeatability = computeKP(parameters); \ No newline at end of file +Allrepeatability = computeKP(parameters); +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% evaluate_WebcamDataset_2percents.m ends here diff --git a/matlab/src/link.m b/matlab/src/link.m index 5a7d643..1be14c2 100644 --- a/matlab/src/link.m +++ b/matlab/src/link.m @@ -3,13 +3,13 @@ % Filename: link.m % Description: Script to create soft links % Author: Kwang Moo Yi, Yannick Verdie -% Maintainer: +% Maintainer: Kwang Moo Yi % Created: Fri Jun 5 15:22:44 2015 (+0200) % Version: % Package-Requires: () -% Last-Updated: Fri Jun 5 17:30:04 2015 (+0200) +% Last-Updated: Tue Jun 16 17:11:49 2015 (+0200) % By: Kwang -% Update #: 5 +% Update #: 6 % URL: % Doc URL: % Keywords: diff --git a/matlab/src/make.m b/matlab/src/make.m index e782953..3ab8446 100644 --- a/matlab/src/make.m +++ b/matlab/src/make.m @@ -3,13 +3,13 @@ % Filename: make.m % Description: Automatic compile script for external methods % Author: Yannick Verdie, Kwang Moo Yi -% Maintainer: +% Maintainer: Kwang Moo Yi % Created: Fri Jun 5 15:21:41 2015 (+0200) % Version: % Package-Requires: () -% Last-Updated: Fri Jun 5 17:30:16 2015 (+0200) +% Last-Updated: Tue Jun 16 17:12:00 2015 (+0200) % By: Kwang -% Update #: 3 +% Update #: 4 % URL: % Doc URL: % Keywords: