[mlpack-git] master: Merge branch 'master' into serialize (3063668)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/4a97187bbba7ce8a6191b714949dd818ef0f37d2...e5905e62c15d1bcff21e6359b11efcd7ab6d7ca0

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

commit 30636685f24eccc9a6697a621ea3db4ab3a5b128
Merge: 9690b45 9763c57
Author: ryan <ryan at ratml.org>
Date:   Thu Apr 23 14:52:39 2015 -0400

    Merge branch 'master' into serialize


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

30636685f24eccc9a6697a621ea3db4ab3a5b128
 HISTORY.md                                         |   5 +-
 src/mlpack/methods/fastmks/fastmks.hpp             | 150 +++----
 src/mlpack/methods/fastmks/fastmks_impl.hpp        | 490 ++++++--------------
 src/mlpack/methods/fastmks/fastmks_main.cpp        | 111 +++--
 .../methods/neighbor_search/neighbor_search.hpp    |  10 +
 src/mlpack/methods/rann/allkrann_main.cpp          | 195 +++-----
 src/mlpack/methods/rann/ra_search.hpp              | 326 ++++++++------
 src/mlpack/methods/rann/ra_search_impl.hpp         | 493 ++++++++++++---------
 src/mlpack/methods/rann/ra_search_rules.hpp        |   8 +-
 src/mlpack/methods/rann/ra_search_rules_impl.hpp   |  22 +-
 src/mlpack/tests/allkrann_search_test.cpp          |  35 +-
 11 files changed, 850 insertions(+), 995 deletions(-)

diff --cc src/mlpack/methods/neighbor_search/neighbor_search.hpp
index 6621b72,80306e1..71f1c50
--- a/src/mlpack/methods/neighbor_search/neighbor_search.hpp
+++ b/src/mlpack/methods/neighbor_search/neighbor_search.hpp
@@@ -173,13 -178,21 +178,18 @@@ class NeighborSearc
    //! Modify the number of node combination scores.
    size_t& Scores() { return scores; }
  
+   //! Access whether or not search is done in single-tree mode.
+   bool SingleMode() const { return singleMode; }
+   //! Modify whether or not search is done in single-tree mode.
+   bool& SingleMode() { return singleMode; }
+ 
   private:
 -  //! Copy of reference dataset (if we need it, because tree building modifies
 -  //! it).
 -  typename TreeType::Mat referenceCopy;
 -  //! Reference dataset.
 -  const typename TreeType::Mat& referenceSet;
 -  //! Pointer to the root of the reference tree.
 -  TreeType* referenceTree;
    //! Permutations of reference points during tree building.
    std::vector<size_t> oldFromNewReferences;
 +  //! Pointer to the root of the reference tree.
 +  TreeType* referenceTree;
 +  //! Reference to reference dataset.
 +  const typename TreeType::Mat& referenceSet;
  
    //! If true, this object created the trees and is responsible for them.
    bool treeOwner;