[mlpack-svn] r11601 - mlpack/trunk/src/mlpack/core/tree

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: jcline3
Date: 2012-02-27 13:40:25 -0500 (Mon, 27 Feb 2012)
New Revision: 11601

Modified:
   mlpack/trunk/src/mlpack/core/tree/hrectbound_impl.hpp
   mlpack/trunk/src/mlpack/core/tree/periodichrectbound_impl.hpp
Log:
fabs(max(,)) -> max(fabs(),fabs())


Modified: mlpack/trunk/src/mlpack/core/tree/hrectbound_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/hrectbound_impl.hpp	2012-02-27 15:51:52 UTC (rev 11600)
+++ mlpack/trunk/src/mlpack/core/tree/hrectbound_impl.hpp	2012-02-27 18:40:25 UTC (rev 11601)
@@ -196,8 +196,8 @@
 
   for (size_t d = 0; d < dim; d++)
   {
-    double v = fabs(std::max(point[d] - bounds[d].Lo(),
-                             bounds[d].Hi() - point[d]));
+		double v = std::max(fabs(point[d] - bounds[d].Lo()),
+					       fabs(bounds[d].Hi() - point[d]));
     sum += pow(v, (double) t_pow);
   }
 
@@ -217,8 +217,8 @@
   double v;
   for (size_t d = 0; d < dim; d++)
   {
-    v = fabs(std::max(other.bounds[d].Hi() - bounds[d].Lo(),
-                      bounds[d].Hi() - other.bounds[d].Lo()));
+		v = std::max(fabs(other.bounds[d].Hi() - bounds[d].Lo()),
+					       fabs(bounds[d].Hi() - other.bounds[d].Lo()));
     sum += pow(v, (double) t_pow); // v is non-negative.
   }
 

Modified: mlpack/trunk/src/mlpack/core/tree/periodichrectbound_impl.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/tree/periodichrectbound_impl.hpp	2012-02-27 15:51:52 UTC (rev 11600)
+++ mlpack/trunk/src/mlpack/core/tree/periodichrectbound_impl.hpp	2012-02-27 18:40:25 UTC (rev 11601)
@@ -329,8 +329,8 @@
       double tempMax;
       double sum = 0;
 
-      double v = fabs(std::max(point3[i] - bounds[i].Lo(),
-          bounds[i].Hi() - point3[i]));
+      double v = std::max(fabs(point3[i] - bounds[i].Lo()),
+          fabs(bounds[i].Hi() - point3[i]));
       sum += pow(v, (double) t_pow);
 
       tempMax = pow(sum, 2.0 / (double) t_pow) / 4.0;
@@ -417,11 +417,11 @@
         d[i].Hi() = b[i].Hi();
         c[i].Lo() = b[i].Lo();
 
-        double vLower = fabs(std::max(d.bounds[i].Hi() - bounds[i].Lo(),
-            bounds[i].Hi() - d.bounds[i].Lo()));
+        double vLower = std::max(fabs(d.bounds[i].Hi() - bounds[i].Lo()),
+            fabs(bounds[i].Hi() - d.bounds[i].Lo()));
 
-        double vHigher = fabs(std::max(c.bounds[i].Hi() - bounds[i].Lo(),
-            bounds[i].Hi() - c.bounds[i].Lo()));
+        double vHigher = std::max(fabs(c.bounds[i].Hi() - bounds[i].Lo()),
+            fabs(bounds[i].Hi() - c.bounds[i].Lo()));
 
         sumLower += pow(vLower, (double) t_pow);
         sumHigher += pow(vHigher, (double) t_pow);
@@ -433,8 +433,8 @@
       }
       else
       {
-        double v = fabs(std::max(b.bounds[i].Hi() - bounds[i].Lo(),
-            bounds[i].Hi() - b.bounds[i].Lo()));
+        double v = std::max(fabs(b.bounds[i].Hi() - bounds[i].Lo()),
+            fabs(bounds[i].Hi() - b.bounds[i].Lo()));
         sum += pow(v, (double) t_pow); // v is non-negative.
         tempMax = pow(sum, 2.0 / (double) t_pow);
       }