diff --git a/test.cpp b/test.cpp index 6e6a019..38a2c8f 100644 --- a/test.cpp +++ b/test.cpp @@ -28,24 +28,28 @@ Authors: #include #include +#include +using namespace mpfr; + #include "cholesky.h" +template void setformat( std::ostream& out ) { out << std::right; out << std::setfill(' '); - out << std::setw( 5 + std::numeric_limits::digits10); - out << std::setprecision(std::numeric_limits::digits10); + out << std::setw( 5 + std::numeric_limits::digits10); + out << std::setprecision(std::numeric_limits::digits10); out << std::setiosflags(std::ios_base::showpoint); } -template +template std::string format(const MT& mat ) { std::ostringstream out; - setformat(out); + setformat(out); for( unsigned int i=0; i -bool equal( const MT& M1, const MT& M2, double prec /* = 1/std::numeric_limits::digits10 ???*/ ) +template +bool equal( const MT& M1, const MT& M2, T prec ) { if( M1.size1() != M2.size1() || M1.size2() != M2.size2() ) { return false; @@ -88,12 +92,12 @@ bool equal( const MT& M1, const MT& M2, double prec /* = 1/std::numeric_limits +template MT error( const MT& M1, const MT& M2 ) { assert( M1.size1() == M2.size1() && M1.size1() == M2.size2() ); - MT Err = ublas::zero_matrix(M1.size1(),M1.size2()); + MT Err = ublas::zero_matrix(M1.size1(),M1.size2()); for( unsigned int i=0; i -double trigsum( const MT& M ) +template +T trigsum( const MT& M ) { - double sum = 0; + T sum = 0; for( unsigned int i=0; i -double sum( const T& c ) +template +T sum( const V& c ) { - return std::accumulate(c.begin(), c.end(), 0); + return std::accumulate(c.begin(), c.end(), static_cast(0) ); } @@ -145,10 +149,10 @@ void test( unsigned int M, unsigned int N, unsigned int F, unsigned int R, unsig // init data structures on the same keys than given algorithms std::map fails; // triangular errors sum - std::map > errors; + std::map > errors; for( typename AlgoMap::iterator ialgo = algos.begin(); ialgo != algos.end(); ++ialgo ) { fails[ialgo->first] = 0; - errors[ialgo->first] = std::vector(); + errors[ialgo->first] = std::vector(); } for( unsigned int n=0; n(V) << std::endl; } #endif for( typename AlgoMap::iterator ialgo = algos.begin(); ialgo != algos.end(); ++ialgo ) { @@ -179,7 +183,7 @@ void test( unsigned int M, unsigned int N, unsigned int F, unsigned int R, unsig try { L = (*ialgo->second)(V); CovarMat Vn = ublas::prod( L, ublas::trans(L) ); - errors[ialgo->first].push_back( trigsum(error(V,Vn)) ); + errors[ialgo->first].push_back( trigsum(error(V,Vn)) ); } catch( cholesky::NotDefinitePositive & error ) { fails[ialgo->first]++; @@ -201,7 +205,7 @@ void test( unsigned int M, unsigned int N, unsigned int F, unsigned int R, unsig std::cout << "NAN"; } else { assert( errors[a].size() == R - fails[a] ); - std::cout << sum(errors[a])/R; + std::cout << sum(errors[a])/R; } std::cout << std::endl; } // for a in algos @@ -237,6 +241,7 @@ int main(int argc, char** argv) std::clog << "Legend:" << std::endl; std::clog << "\tAlgo: (failures/runs)\tAverage error" << std::endl; + /* std::cout << std::endl << "FLOAT" << std::endl; test(M,N,F,R,seed); @@ -245,4 +250,10 @@ int main(int argc, char** argv) std::cout << std::endl << "LONG DOUBLE" << std::endl; test(M,N,F,R,seed); + */ + + std::cout << std::endl << "MPREAL 128" << std::endl; + mpreal::set_default_prec(128); + test(M,N,F,R,seed); } +