mirror of
https://github.com/boostorg/ublas.git
synced 2026-02-22 03:42:19 +00:00
merge [61880],[75560],[80267],[80268],[80269],[80270],[80399],[80403],[80483],[80485],[80507],[80563] into release branch
* fix #6511, fix #6514, fix #7296, fix #7297, * see #4024 [SVN r80588]
This commit is contained in:
@@ -26,7 +26,7 @@ typename AE::value_type mean_square(const matrix_expression<AE> &me) {
|
||||
typename AE::size_type i, j;
|
||||
for (i=0; i!= me().size1(); i++) {
|
||||
for (j=0; j!= me().size2(); j++) {
|
||||
s+=std::fabs(me()(i,j));
|
||||
s+= scalar_traits<typename AE::value_type>::type_abs(me()(i,j));
|
||||
}
|
||||
}
|
||||
return s/me().size1()*me().size2();
|
||||
@@ -39,7 +39,7 @@ typename AE::value_type mean_square(const vector_expression<AE> &ve) {
|
||||
typename AE::value_type s(0);
|
||||
typename AE::size_type i;
|
||||
for (i=0; i!= ve().size(); i++) {
|
||||
s+=std::fabs(ve()(i));
|
||||
s+=scalar_traits<typename AE::value_type>::type_abs(ve()(i));
|
||||
}
|
||||
return s/ve().size();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user