Skip to content

Commit

Permalink
fix buildbot warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
OXPHOS committed Mar 15, 2017
1 parent 4657e0f commit 15db575
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/shogun/mathematics/linalg/LinalgBackendEigen.h
Expand Up @@ -530,11 +530,11 @@ class LinalgBackendEigen : public LinalgBackendBase
T sum_impl(const SGMatrix<T>& mat, bool no_diag=false) const
{
typename SGMatrix<T>::EigenMatrixXtMap m = mat;
T sum = m.sum();
T result = m.sum();
if (no_diag)
sum -= m.diagonal().sum();
result -= m.diagonal().sum();

return sum;
return result;
}

/** Eigen3 matrix block sum method */
Expand All @@ -545,11 +545,11 @@ class LinalgBackendEigen : public LinalgBackendBase
Eigen::Block<typename SGMatrix<T>::EigenMatrixXtMap> m_block = m.block(
mat.m_row_begin, mat.m_col_begin, mat.m_row_size, mat.m_col_size);

T sum = m_block.sum();
T result = m_block.sum();
if (no_diag)
sum -= m_block.diagonal().sum();
result -= m_block.diagonal().sum();

return sum;
return result;
}

/** Eigen3 symmetric matrix sum method */
Expand All @@ -562,12 +562,12 @@ class LinalgBackendEigen : public LinalgBackendBase
// the computation with using only the upper triangular part.
typename SGMatrix<T>::EigenMatrixXt m_upper =
m.template triangularView<Eigen::StrictlyUpper>();
T sum = m_upper.sum();
sum += sum;
T result = m_upper.sum();
result += result;

if (!no_diag)
sum += m.diagonal().sum();
return sum;
result += m.diagonal().sum();
return result;
}

/** Eigen3 symmetric matrix block sum method */
Expand All @@ -582,12 +582,12 @@ class LinalgBackendEigen : public LinalgBackendBase
// the computation with using only the upper triangular part.
typename SGMatrix<T>::EigenMatrixXt m_upper =
m_block.template triangularView<Eigen::StrictlyUpper>();
T sum = m_upper.sum();
sum += sum;
T result = m_upper.sum();
result += result;

if (!no_diag)
sum += m_block.diagonal().sum();
return sum;
result += m_block.diagonal().sum();
return result;
}

/** Eigen3 matrix colwise sum method */
Expand Down

0 comments on commit 15db575

Please sign in to comment.