From 81ee383e58289e1feffcb2559cd269a32eb49972 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@9d5b8971-822b-0410-80eb-d18c1038ef23> Date: Fri, 28 Jan 2011 20:33:09 +0000 Subject: [PATCH] Removed math::Pow from bounds_aux.h --- .../fastlib-stl/mlpack/series_expansion/bounds_aux.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fastlib/branches/fastlib-stl/mlpack/series_expansion/bounds_aux.h b/fastlib/branches/fastlib-stl/mlpack/series_expansion/bounds_aux.h index 67a0850bc2..d7128e6558 100644 --- a/fastlib/branches/fastlib-stl/mlpack/series_expansion/bounds_aux.h +++ b/fastlib/branches/fastlib-stl/mlpack/series_expansion/bounds_aux.h @@ -32,9 +32,9 @@ class bounds_aux { furthest_point_in_bound1[d] = bound1_range.hi; v = v2; } - furthest_dsqd += math::PowAbs(v); // v is non-negative + furthest_dsqd += std::pow(v,t_pow); // v is non-negative } - furthest_dsqd = math::Pow<2, t_pow>(furthest_dsqd); + furthest_dsqd = std::pow(furthest_dsqd, 2.0/t_pow); } template @@ -62,9 +62,9 @@ class bounds_aux { furthest_point_in_bound1[d] = bound1_range.hi; v = v2; } - furthest_dsqd += math::PowAbs(v); // v is non-negative + furthest_dsqd += std::pow(v,t_pow); // v is non-negative } - furthest_dsqd = math::Pow<2, t_pow>(furthest_dsqd); + furthest_dsqd = std::pow(furthest_dsqd, 2.0/t_pow); } template @@ -90,10 +90,10 @@ class bounds_aux { furthest_point_in_bound1.CopyValues(bound1.center()); la::AddExpert(bound1.radius(), unit_vector, &furthest_point_in_bound1); - furthest_dsqd = math::Pow<2, t_pow> + furthest_dsqd = std::pow( (la::RawLMetric(bound2_centroid.length(), furthest_point_in_bound1.ptr(), - bound2_centroid.ptr())); + bound2_centroid.ptr())), 2.0/t_pow); } /** @brief Returns the maximum side length of the bounding box that