[mlpack-git] master: Fix compilation warnings. secondClosest will eventually be removed but is commented for now. (2913684)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 12 16:01:53 EDT 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/eddd7167d69b6c88b271ef2e51d1c20e13f1acd8...70342dd8e5c17e0c164cfb8189748671e9c0dd44

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

commit 29136848aecd3c58088e854f52f1bb94a7444a8a
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Jan 27 17:37:40 2015 -0500

    Fix compilation warnings. secondClosest will eventually be removed but is commented for now.


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

29136848aecd3c58088e854f52f1bb94a7444a8a
 src/mlpack/methods/kmeans/dual_tree_kmeans_impl.hpp       | 6 +++---
 src/mlpack/methods/kmeans/dual_tree_kmeans_rules_impl.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/kmeans/dual_tree_kmeans_impl.hpp b/src/mlpack/methods/kmeans/dual_tree_kmeans_impl.hpp
index 083dcdd..209f2c5 100644
--- a/src/mlpack/methods/kmeans/dual_tree_kmeans_impl.hpp
+++ b/src/mlpack/methods/kmeans/dual_tree_kmeans_impl.hpp
@@ -296,7 +296,7 @@ void DualTreeKMeans<MetricType, MatType, TreeType>::TreeUpdate(
       {
         size_t closest = centroids.n_cols;
         double closestDistance = DBL_MAX;
-        size_t secondClosest = centroids.n_cols;
+//        size_t secondClosest = centroids.n_cols;
         double secondClosestDistance = DBL_MAX;
         for (size_t i = 0; i < cqn->NumDescendants(); ++i)
         {
@@ -308,14 +308,14 @@ void DualTreeKMeans<MetricType, MatType, TreeType>::TreeUpdate(
           ++distanceCalculations;
           if (distance < closestDistance)
           {
-            secondClosest = closest;
+//            secondClosest = closest;
             secondClosestDistance = closestDistance;
             closest = index;
             closestDistance = distance;
           }
           else if (distance < secondClosestDistance)
           {
-            secondClosest = index;
+//            secondClosest = index;
             secondClosestDistance = distance;
           }
         }
diff --git a/src/mlpack/methods/kmeans/dual_tree_kmeans_rules_impl.hpp b/src/mlpack/methods/kmeans/dual_tree_kmeans_rules_impl.hpp
index 1ab28f4..f1f2c53 100644
--- a/src/mlpack/methods/kmeans/dual_tree_kmeans_rules_impl.hpp
+++ b/src/mlpack/methods/kmeans/dual_tree_kmeans_rules_impl.hpp
@@ -389,7 +389,7 @@ double DualTreeKMeansRules<MetricType, TreeType>::ElkanTypeScore(
 
 template<typename MetricType, typename TreeType>
 double DualTreeKMeansRules<MetricType, TreeType>::PellegMooreScore(
-    TreeType& queryNode,
+    TreeType& /* queryNode */,
     TreeType& referenceNode,
     const double minDistance) const
 {



More information about the mlpack-git mailing list