[mlpack-git] master: Merge branch 'master' into lsh-parallelization (4cbd43e)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/34cf8d94f79c9a72ff4199676033b060cd039fcd...425324bf7fb7c86c85d10a909d8a59d4f69b7164

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

commit 4cbd43e3b5c9e234377473845b703dbb06530bec
Merge: abef504 a9f5622
Author: Yannis Mentekidis <mentekid at gmail.com>
Date:   Fri Jun 24 14:36:09 2016 +0100

    Merge branch 'master' into lsh-parallelization
    
    Merges all changes to master


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

4cbd43e3b5c9e234377473845b703dbb06530bec
 LICENSE.txt                                        |  12 +-
 src/mlpack/core/arma_extend/CMakeLists.txt         |   4 -
 src/mlpack/core/arma_extend/Mat_extra_bones.hpp    |  10 +
 src/mlpack/core/arma_extend/Mat_extra_meat.hpp     |  10 +
 src/mlpack/core/arma_extend/README.md              |  23 +
 src/mlpack/core/arma_extend/SpMat_extra_bones.hpp  |  40 +-
 src/mlpack/core/arma_extend/SpMat_extra_meat.hpp   | 323 +------------
 src/mlpack/core/arma_extend/arma_extend.hpp        |   4 -
 src/mlpack/core/arma_extend/fn_ind2sub.hpp         |   8 +
 src/mlpack/core/arma_extend/hdf5_misc.hpp          |  11 +
 src/mlpack/core/arma_extend/operator_minus.hpp     |  10 +
 src/mlpack/core/arma_extend/promote_type.hpp       |  50 --
 src/mlpack/core/arma_extend/restrictors.hpp        |  22 -
 src/mlpack/core/arma_extend/traits.hpp             |  49 --
 src/mlpack/core/arma_extend/typedef.hpp            |  30 --
 src/mlpack/core/boost_backport/LICENSE.txt         |  23 +
 src/mlpack/core/boost_backport/README.md           |  11 +-
 .../unordered_collections_load_imp.hpp             |   3 +
 .../unordered_collections_save_imp.hpp             |   3 +
 src/mlpack/core/boost_backport/unordered_map.hpp   |   5 +-
 src/mlpack/core/data/CMakeLists.txt                |   1 +
 src/mlpack/core/data/binarize.hpp                  |  99 ++++
 src/mlpack/core/optimizers/lbfgs/lbfgs.hpp         |   4 +-
 .../core/tree/rectangle_tree/rectangle_tree.hpp    |   2 +-
 src/mlpack/methods/lsh/lsh_main.cpp                |  20 +
 src/mlpack/methods/lsh/lsh_search.hpp              |  12 +
 src/mlpack/methods/lsh/lsh_search_impl.hpp         |  27 ++
 .../methods/neighbor_search/neighbor_search.hpp    |   4 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp    | 210 +++++++-
 .../methods/neighbor_search/ns_model_impl.hpp      | 532 +++++++++------------
 src/mlpack/methods/preprocess/CMakeLists.txt       |   1 +
 .../preprocess/preprocess_binarize_main.cpp        |  85 ++++
 .../methods/preprocess/preprocess_split_main.cpp   |   2 +-
 src/mlpack/tests/CMakeLists.txt                    |   1 +
 src/mlpack/tests/binarize_test.cpp                 |  66 +++
 src/mlpack/tests/lsh_test.cpp                      | 120 ++++-
 36 files changed, 991 insertions(+), 846 deletions(-)

diff --cc src/mlpack/methods/lsh/lsh_search.hpp
index 9898d84,a4e6ca9..e1767cb
--- a/src/mlpack/methods/lsh/lsh_search.hpp
+++ b/src/mlpack/methods/lsh/lsh_search.hpp
@@@ -189,8 -189,19 +189,20 @@@ class LSHSearc
                arma::mat& distances,
                const size_t numTablesToSearch = 0);
  
 +
    /**
+    * Compute the recall (% of neighbors found) given the neighbors returned by
+    * LSHSearch::Search and a "ground truth" set of neighbors.  The recall
+    * returned will be in the range [0, 1].
+    *
+    * @param foundNeighbors Set of neighbors to compute recall of.
+    * @param realNeighbors Set of "ground truth" neighbors to compute recall
+    *     against.
+    */
+   static double ComputeRecall(const arma::Mat<size_t>& foundNeighbors,
+                               const arma::Mat<size_t>& realNeighbors);
+ 
+   /**
     * Serialize the LSH model.
     *
     * @param ar Archive to serialize to.