diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix namespace name

Browse Source
This commit is contained in:
Tiago Gomes 2013-02-13 19:09:11 +00:00
parent ef4ebb4d7f
commit ab7f4c8113
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/CLPBN/horus/Util.cpp
View File

@ -361,10 +361,10 @@ getL1Distance (const Params& v1, const Params& v2)
double dist = 0.0; double dist = 0.0;
if (Globals::logDomain) { if (Globals::logDomain) {
dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0,
std::plus<double>(), func_obj::abs_diff_exp<double>()); std::plus<double>(), FuncObj::abs_diff_exp<double>());
} else { } else {
dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, dist = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0,
std::plus<double>(), func_obj::abs_diff<double>()); std::plus<double>(), FuncObj::abs_diff<double>());
} }
return dist; return dist;
} }
@ -378,10 +378,10 @@ getMaxNorm (const Params& v1, const Params& v2)
double max = 0.0; double max = 0.0;
if (Globals::logDomain) { if (Globals::logDomain) {
max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0,
func_obj::max<double>(), func_obj::abs_diff_exp<double>()); FuncObj::max<double>(), FuncObj::abs_diff_exp<double>());
} else { } else {
max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0, max = std::inner_product (v1.begin(), v1.end(), v2.begin(), 0.0,
func_obj::max<double>(), func_obj::abs_diff<double>()); FuncObj::max<double>(), FuncObj::abs_diff<double>());
} }
return max; return max;
} }

4
packages/CLPBN/horus/Util.h
View File

@ -398,7 +398,7 @@ operator<< (std::ostream& os, const std::vector<T>& v)
} }
namespace func_obj { namespace FuncObj {
template<typename T> template<typename T>
struct max : public std::binary_function<T, T, T> { struct max : public std::binary_function<T, T, T> {
@ -422,7 +422,7 @@ struct abs_diff_exp : public std::binary_function<T, T, T> {
return std::abs (std::exp (x) - std::exp (y)); return std::abs (std::exp (x) - std::exp (y));
}}; }};
} // namespace func_obj } // namespace FuncObj
} // namespace Horus } // namespace Horus