apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed math::Pow from bounds_aux.h

Browse Source
This commit is contained in:
(no author)
2011-01-28 20:33:09 +00:00
parent f206588c32
commit 81ee383e58
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib/branches/fastlib-stl/mlpack/series_expansion/bounds_aux.h
+6 -6
View File
@@ -32,9 +32,9 @@ class bounds_aux {
furthest_point_in_bound1[d] = bound1_range.hi;
v = v2;
}
furthest_dsqd += math::PowAbs<t_pow, 1>(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<int t_pow>
@@ -62,9 +62,9 @@ class bounds_aux {
furthest_point_in_bound1[d] = bound1_range.hi;
v = v2;
}
furthest_dsqd += math::PowAbs<t_pow, 1>(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<int t_pow, typename TVector>
@@ -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<t_pow>(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