[mlpack-git] master: Fix even more warnings that I've introduced. (51c7496)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:00:19 EST 2015


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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

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

commit 51c74961af3e890d52366ccbd82d9cf1a0956fd1
Author: Ryan Curtin <ryan at ratml.org>
Date:   Mon Sep 15 15:26:03 2014 +0000

    Fix even more warnings that I've introduced.


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

51c74961af3e890d52366ccbd82d9cf1a0956fd1
 .../core/tree/rectangle_tree/r_tree_split_impl.hpp       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp b/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
index 417b5ff..5d8a4e0 100644
--- a/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
+++ b/src/mlpack/core/tree/rectangle_tree/r_tree_split_impl.hpp
@@ -360,12 +360,12 @@ void RTreeSplit<DescentType, StatisticType, MatType>::AssignPointDestNode(
   {
     if (numAssignedOne < numAssignedTwo)
     {
-      for (int i = 0; i < end; i++)
+      for (size_t i = 0; i < end; i++)
         treeOne->InsertPoint(oldTree->Points()[i]);
     }
     else
     {
-      for (int i = 0; i < end; i++)
+      for (size_t i = 0; i < end; i++)
         treeTwo->InsertPoint(oldTree->Points()[i]);
     }
   }
@@ -410,14 +410,14 @@ void RTreeSplit<DescentType, StatisticType, MatType>::AssignNodeDestNode(
   assert(treeOne->NumChildren() == 1);
   assert(treeTwo->NumChildren() == 1);
 
-  for (int i = 0; i < end; i++)
-    for (int j = i + 1; j < end; j++)
+  for (size_t i = 0; i < end; i++)
+    for (size_t j = i + 1; j < end; j++)
       assert(oldTree->Children()[i] != oldTree->Children()[j]);
 
-  for (int i = 0; i < end; i++)
+  for (size_t i = 0; i < end; i++)
     assert(oldTree->Children()[i] != treeOne->Children()[0]);
 
-  for (int i = 0; i < end; i++)
+  for (size_t i = 0; i < end; i++)
     assert(oldTree->Children()[i] != treeTwo->Children()[0]);
 
   size_t numAssignTreeOne = 1;
@@ -507,7 +507,7 @@ void RTreeSplit<DescentType, StatisticType, MatType>::AssignNodeDestNode(
   {
     if (numAssignTreeOne < numAssignTreeTwo)
     {
-      for (int i = 0; i < end; i++)
+      for (size_t i = 0; i < end; i++)
       {
         InsertNodeIntoTree(treeOne, oldTree->Children()[i]);
         numAssignTreeOne++;
@@ -515,7 +515,7 @@ void RTreeSplit<DescentType, StatisticType, MatType>::AssignNodeDestNode(
     }
     else
     {
-      for (int i = 0; i < end; i++)
+      for (size_t i = 0; i < end; i++)
       {
         InsertNodeIntoTree(treeTwo, oldTree->Children()[i]);
         numAssignTreeTwo++;



More information about the mlpack-git mailing list