1 files changed, 5 insertions, 17 deletions
diff --git a/libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp b/libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp
index 9a2f8a11f..75d1f708a 100644
--- a/libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp
+++ b/libs/numeric/ublas/test/test_coordinate_matrix_inplace_merge.cpp
@@ -13,26 +13,14 @@
 #include <boost/numeric/ublas/matrix_sparse.hpp>
 #include <boost/numeric/ublas/matrix_expression.hpp>
 #include <boost/numeric/ublas/io.hpp>
-
-#include "libs/numeric/ublas/test/utils.hpp"
+#include "common/testhelper.hpp"
+#include "utils.hpp"
 
 using std::cout;
 using std::endl;
 
 const double TOL = 1e-15;
 
-template <class AE>
-typename AE::value_type mean_square(const boost::numeric::ublas::matrix_expression<AE> &me) {
-    typename AE::value_type s(0);
-    typename AE::size_type i, j;
-    for (i=0; i!= me().size1(); i++) {
-        for (j=0; j!= me().size2(); j++) {
-          s += boost::numeric::ublas::scalar_traits<typename AE::value_type>::type_abs(me()(i,j));
-        }
-    }
-    return s/me().size1()*me().size2();
-}
-
 template<typename T>
 bool check_sortedness(const boost::numeric::ublas::coordinate_matrix<T>& matrix) {
   bool result = true;
@@ -90,12 +78,12 @@ BOOST_UBLAS_TEST_DEF( test_coordinate_matrix_inplace_merge_random )
 
       {
         bool sorted = check_sortedness(matrix_coord);
-        bool identical = mean_square(matrix_coord - matrix_dense) < TOL;
+        bool identical = compare_to(matrix_coord, matrix_dense, TOL);
         if (!(sorted && identical)) {
           print_entries(size_x, size_y, entries);
         }
         BOOST_UBLAS_TEST_CHECK( check_sortedness(matrix_coord) );
-        BOOST_UBLAS_TEST_CHECK( mean_square(matrix_coord - matrix_dense) < TOL);
+        BOOST_UBLAS_TEST_CHECK( compare_to(matrix_coord, matrix_dense, TOL) );
       }
 
       for (size_t entry = 0; entry < nr_entries; ++ entry) {
@@ -109,7 +97,7 @@ BOOST_UBLAS_TEST_DEF( test_coordinate_matrix_inplace_merge_random )
 
       {
         bool sorted = check_sortedness(matrix_coord);
-        bool identical = mean_square(matrix_coord - matrix_dense) < TOL;
+        bool identical = compare_to(matrix_coord, matrix_dense, TOL);
         if (!(sorted && identical)) {
           print_entries(size_x, size_y, entries);
         }