[mlpack-git] master: Fix -Wreorder and simplify AllkNN type. (823b8d7)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Apr 29 14:43:51 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/ee384655c4462e422e343e9725437fd772ca4449...182d4a629c1b23f683dff7b284844e4e3e9f5cc4

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

commit 823b8d755f2b94b25d81a870ab8fee13438cbcf2
Author: Ryan Curtin <ryan at ratml.org>
Date:   Fri Mar 27 18:40:38 2015 +0000

    Fix -Wreorder and simplify AllkNN type.


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

823b8d755f2b94b25d81a870ab8fee13438cbcf2
 src/mlpack/methods/mean_shift/mean_shift_impl.hpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
index 086961b..5d3efbc 100644
--- a/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
+++ b/src/mlpack/methods/mean_shift/mean_shift_impl.hpp
@@ -26,9 +26,9 @@ template<typename KernelType, typename MatType>
 MeanShift<KernelType, MatType>::MeanShift(const double radius,
                                           const size_t maxIterations,
                                           const KernelType kernel) :
+    radius(radius),
     maxIterations(maxIterations),
-    kernel(kernel),
-    radius(radius)
+    kernel(kernel)
 {
   // Nothing to do.
 }
@@ -43,12 +43,7 @@ void MeanShift<KernelType, MatType>::Radius(double radius)
 template<typename KernelType, typename MatType>
 double MeanShift<KernelType, MatType>::EstimateRadius(const MatType &data)
 {
-  neighbor::NeighborSearch<
-      neighbor::NearestNeighborSort,
-      metric::EuclideanDistance,
-      tree::BinarySpaceTree<bound::HRectBound<2>,
-            neighbor::NeighborSearchStat<neighbor::NearestNeighborSort> >
-  > neighborSearch(data);
+  neighbor::AllkNN neighborSearch(data);
 
   /**
    * For each point in dataset, select nNeighbors nearest points and get



More information about the mlpack-git mailing list