[mlpack-git] master: Remove BuildHash(); simpler cube default. (b30e697)

gitdub at mlpack.org gitdub at mlpack.org
Thu Jun 2 09:44:03 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/eba4f9924694bc10daec74ff5059dbb8af001416...e3a23c256f017ebb8185b15847c82f51d359cdfd

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

commit b30e6975a22d82f2f82d46d7fa219bdc2eb52870
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Jun 2 09:44:03 2016 -0400

    Remove BuildHash(); simpler cube default.


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

b30e6975a22d82f2f82d46d7fa219bdc2eb52870
 src/mlpack/methods/lsh/lsh_search.hpp      | 19 +------------------
 src/mlpack/methods/lsh/lsh_search_impl.hpp |  5 -----
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/mlpack/methods/lsh/lsh_search.hpp b/src/mlpack/methods/lsh/lsh_search.hpp
index 9c7c1d6..7dd3212 100644
--- a/src/mlpack/methods/lsh/lsh_search.hpp
+++ b/src/mlpack/methods/lsh/lsh_search.hpp
@@ -118,9 +118,7 @@ class LSHSearch
              const double hashWidth = 0.0,
              const size_t secondHashSize = 99901,
              const size_t bucketSize = 500,
-             const arma::cube &projection
-             = arma::zeros<arma::cube>(0,0,0)
-             );
+             const arma::cube& projection = arma::cube());
 
   /**
    * Compute the nearest neighbors of the points in the given query set and
@@ -221,21 +219,6 @@ class LSHSearch
 
  private:
   /**
-   * This function builds a hash table with two levels of hashing as presented
-   * in the paper. This function first hashes the points with 'numProj' random
-   * projections to a single hash table creating (key, point ID) pairs where the
-   * key is a 'numProj'-dimensional integer vector.
-   *
-   * Then each key in this hash table is hashed into a second hash table using a
-   * standard hash.
-   *
-   * This function does not have any parameters and relies on parameters which
-   * are private members of this class, initialized during the class
-   * initialization.
-   */
-  void BuildHash(const arma::cube &projection);
-
-  /**
    * This function takes a query and hashes it into each of the hash tables to
    * get keys for the query and then the key is hashed to a bucket of the second
    * hash table and all the points (if any) in those buckets are collected as
diff --git a/src/mlpack/methods/lsh/lsh_search_impl.hpp b/src/mlpack/methods/lsh/lsh_search_impl.hpp
index c3734aa..74ac4cc 100644
--- a/src/mlpack/methods/lsh/lsh_search_impl.hpp
+++ b/src/mlpack/methods/lsh/lsh_search_impl.hpp
@@ -519,11 +519,6 @@ Search(const size_t k,
 }
 
 template<typename SortPolicy>
-void LSHSearch<SortPolicy>::BuildHash(const arma::cube &projection)
-{
-}
-
-template<typename SortPolicy>
 template<typename Archive>
 void LSHSearch<SortPolicy>::Serialize(Archive& ar,
                                       const unsigned int version)




More information about the mlpack-git mailing list