diff --git a/packages/CLPBN/horus/Util.cpp b/packages/CLPBN/horus/Util.cpp index b0f54baef..a4b6ebf1d 100644 --- a/packages/CLPBN/horus/Util.cpp +++ b/packages/CLPBN/horus/Util.cpp @@ -361,10 +361,10 @@ getL1Distance (const Params& v1, const Params& v2) double dist = 0.0; if (Globals::logDomain) { dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, - std::plus(), func_obj::abs_diff_exp()); + std::plus(), FuncObj::abs_diff_exp()); } else { dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, - std::plus(), func_obj::abs_diff()); + std::plus(), FuncObj::abs_diff()); } return dist; } @@ -378,10 +378,10 @@ getMaxNorm (const Params& v1, const Params& v2) double max = 0.0; if (Globals::logDomain) { max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, - func_obj::max(), func_obj::abs_diff_exp()); + FuncObj::max(), FuncObj::abs_diff_exp()); } else { max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, - func_obj::max(), func_obj::abs_diff()); + FuncObj::max(), FuncObj::abs_diff()); } return max; } diff --git a/packages/CLPBN/horus/Util.h b/packages/CLPBN/horus/Util.h index 542e7320d..51b5c9e4c 100644 --- a/packages/CLPBN/horus/Util.h +++ b/packages/CLPBN/horus/Util.h @@ -398,7 +398,7 @@ operator<< (std::ostream& os, const std::vector& v) } -namespace func_obj { +namespace FuncObj { template struct max : public std::binary_function { @@ -422,7 +422,7 @@ struct abs_diff_exp : public std::binary_function { return std::abs (std::exp (x) - std::exp (y)); }}; -} // namespace func_obj +} // namespace FuncObj } // namespace Horus