[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into hilbert-r-tree Fix conflicts. (ab890df)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/37fda23945b4f998cd5fa6ec011ae345236c8552...479eca0c625cc4255a3b1a354a4788dae10f1b01

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

commit ab890dff6b4b617b5309af53950c6cac97d994d6
Merge: 72f53d6 e6d2ca7
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date:   Wed Jun 1 21:02:26 2016 +0300

    Merge remote-tracking branch 'upstream/master' into hilbert-r-tree
    Fix conflicts.


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

ab890dff6b4b617b5309af53950c6cac97d994d6
 doc/guide/formats.hpp                              |  43 ++++++-
 doc/guide/iodoc.hpp                                |   2 +-
 doc/tutorials/range_search/range_search.txt        |   8 +-
 src/mlpack/core/data/split_data.hpp                |   5 +-
 src/mlpack/core/tree/ballbound.hpp                 |  20 ++-
 src/mlpack/core/tree/ballbound_impl.hpp            |  94 +++++++--------
 src/mlpack/core/tree/binary_space_tree/typedef.hpp |   4 +-
 .../tree/rectangle_tree/r_star_tree_split_impl.hpp |   2 -
 .../core/tree/rectangle_tree/x_tree_split_impl.hpp |   2 -
 src/mlpack/core/tree/traversal_info.hpp            |   6 +
 src/mlpack/methods/CMakeLists.txt                  |   1 +
 .../ann/activation_functions/logistic_function.hpp |   4 +-
 src/mlpack/methods/ann/layer/constant_layer.hpp    |   4 +-
 src/mlpack/methods/ann/layer/dropconnect_layer.hpp |   4 +-
 src/mlpack/methods/ann/layer/empty_layer.hpp       |   4 +-
 src/mlpack/methods/ann/layer/glimpse_layer.hpp     |   4 +-
 src/mlpack/methods/ann/layer/hard_tanh_layer.hpp   |   4 +-
 src/mlpack/methods/ann/layer/leaky_relu_layer.hpp  |   4 +-
 src/mlpack/methods/ann/layer/log_softmax_layer.hpp |   4 +-
 .../methods/ann/layer/multiply_constant_layer.hpp  |   4 +-
 .../ann/layer/negative_log_likelihood_layer.hpp    |   4 +-
 .../methods/ann/layer/reinforce_normal_layer.hpp   |  11 +-
 .../methods/ann/layer/vr_class_reward_layer.hpp    |   4 +-
 src/mlpack/methods/emst/dtb_rules.hpp              |   4 +-
 src/mlpack/methods/fastmks/fastmks_rules.hpp       |   5 +-
 .../methods/kmeans/dual_tree_kmeans_rules.hpp      |   4 +-
 .../methods/kmeans/pelleg_moore_kmeans_rules.hpp   |   2 -
 src/mlpack/methods/lsh/lsh_search_impl.hpp         |  34 +++---
 src/mlpack/methods/neighbor_search/CMakeLists.txt  |   1 -
 src/mlpack/methods/neighbor_search/kfn_main.cpp    |   2 +-
 src/mlpack/methods/neighbor_search/knn_main.cpp    |   4 +-
 .../neighbor_search/neighbor_search_rules.hpp      |   4 +-
 src/mlpack/methods/neighbor_search/ns_model.hpp    |   8 +-
 .../methods/neighbor_search/ns_model_impl.hpp      |   4 +-
 .../methods/neighbor_search/ns_traversal_info.hpp  |  70 -----------
 .../methods/range_search/range_search_main.cpp     |   2 +-
 .../methods/range_search/range_search_rules.hpp    |   4 +-
 src/mlpack/methods/range_search/rs_model.cpp       |   2 +-
 src/mlpack/methods/range_search/rs_model.hpp       |   8 +-
 src/mlpack/methods/rann/allkrann_main.cpp          |   2 +-
 src/mlpack/methods/rann/ra_model.hpp               |   8 +-
 src/mlpack/methods/rann/ra_model_impl.hpp          |   6 +-
 src/mlpack/methods/rann/ra_search_rules.hpp        |   4 +-
 src/mlpack/methods/{pca => rmva}/CMakeLists.txt    |   6 +-
 src/mlpack/tests/data/vc2_test.csv                 | 134 ++++++++++-----------
 src/mlpack/tests/serialization_test.cpp            |   4 +-
 46 files changed, 266 insertions(+), 298 deletions(-)

diff --cc src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
index e1f2a73,44dbf95..060c2c0
--- a/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_star_tree_split_impl.hpp
@@@ -642,9 -661,9 +642,7 @@@ bool RStarTreeSplit::SplitNonLeafNode(T
    // just in case, we use an assert.
    assert(par->NumChildren() <= par->MaxNumChildren() + 1);
    if (par->NumChildren() == par->MaxNumChildren() + 1)
--  {
 -    par->Split().SplitNonLeafNode(par, relevels);
 -  }
 +    RStarTreeSplit::SplitNonLeafNode(par,relevels);
-   }
  
    // We have to update the children of each of these new nodes so that they
    // record the correct parent.
diff --cc src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
index 1e02901,0b43454..7bb875c
--- a/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/x_tree_split_impl.hpp
@@@ -809,9 -829,9 +809,7 @@@ bool XTreeSplit::SplitNonLeafNode(TreeT
    assert(par->NumChildren() <= par->MaxNumChildren() + 1);
  
    if (par->NumChildren() == par->MaxNumChildren() + 1)
--  {
 -    par->Split().SplitNonLeafNode(par, relevels);
 -  }
 +    XTreeSplit::SplitNonLeafNode(par,relevels);
-   }
  
    // We have to update the children of each of these new nodes so that they
    // record the correct parent.