[mlpack-git] master: Merge branch 'rcurtin-lshopt' (ae6c9e6)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/8d7e5db0bed8fc236407bdc5dee00d716d72a5ab...ae6c9e63b56c1ed1faa9aef9352854bbeb826a2f

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

commit ae6c9e63b56c1ed1faa9aef9352854bbeb826a2f
Merge: 8d7e5db 9f162b6
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Jun 14 19:22:53 2016 -0400

    Merge branch 'rcurtin-lshopt'


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

ae6c9e63b56c1ed1faa9aef9352854bbeb826a2f
 src/mlpack/methods/lsh/lsh_main.cpp        |   3 +-
 src/mlpack/methods/lsh/lsh_search.hpp      |  59 +++++---
 src/mlpack/methods/lsh/lsh_search_impl.hpp | 231 ++++++++++++++++++-----------
 src/mlpack/tests/serialization_test.cpp    |  12 +-
 4 files changed, 196 insertions(+), 109 deletions(-)