[mlpack-git] master: Merge branch 'lsh-computeRecall' into lsh-multiprobe (8264347)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/eaa7182ebed8cce3fd6191dc1f8170546ea297da...812048c7c6bee0b6c8d936677f23bbb5930c6cfc

>---------------------------------------------------------------

commit 8264347c55916b044763a5f23a6af27196a65855
Merge: 8dd409d 4d98deb
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Wed Jun 8 20:11:01 2016 +0300

    Merge branch 'lsh-computeRecall' into lsh-multiprobe
    
    Merges computeRecall with multiprobe


>---------------------------------------------------------------

8264347c55916b044763a5f23a6af27196a65855
 src/mlpack/methods/lsh/lsh_main.cpp        | 20 ++++++++++++++++++++
 src/mlpack/methods/lsh/lsh_search.hpp      |  8 ++++++++
 src/mlpack/methods/lsh/lsh_search_impl.hpp | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --cc src/mlpack/methods/lsh/lsh_search.hpp
index b38dc4f,fbdf6f3..3319e57
--- a/src/mlpack/methods/lsh/lsh_search.hpp
+++ b/src/mlpack/methods/lsh/lsh_search.hpp
@@@ -167,10 -166,17 +167,18 @@@ class LSHSearc
    void Search(const size_t k,
                arma::Mat<size_t>& resultingNeighbors,
                arma::mat& distances,
 -              const size_t numTablesToSearch = 0);
 +              const size_t numTablesToSearch = 0,
 +              size_t T = 0);
  
    /**
+    * Compute the recall (% of neighbors found) given the neighbors returned by
+    * LSHSearch::Search and a "ground truth" file. Recall in [0, 1]
+    */
+   double ComputeRecall(const arma::Mat<size_t>& foundNeighbors,
+                        const arma::Mat<size_t>& realNeighbors);
+ 
+ 
+   /**
     * Serialize the LSH model.
     *
     * @param ar Archive to serialize to.