Merge branch 'master' of https://github.com/kmyid/TILDE

vcg-uvic · Jun 16, 2015 · 199ab0b · 199ab0b
2 parents 3de27f2 + bf02582
commit 199ab0b
Show file tree

Hide file tree

Showing 42 changed files with 1,418 additions and 41 deletions.
diff --git a/c++/3rdParties/license_dollarToolBox.txt 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+end
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getKeypoints_FAST.m ends here
diff --git 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
@@ -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
+end
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getKeypoints_MSER.m ends here
diff --git 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
+end
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getKeypoints_RANDOM.m ends here
diff --git 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
+end
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% getKeypoints_SFOP.m ends here