From e31c1e72fbf744558a79103dd1f41f0df60be9e5 Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@gmail.com>
Date: Sun, 29 Jan 2012 19:21:10 +0100
Subject: [PATCH] use gmpxx instead of mpfr++

---
 CMakeLists.txt |  5 ++---
 cholesky.h     |  3 ++-
 test.cpp       | 16 +++++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40bdbb3..cc7e58e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,11 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-INCLUDE_DIRECTORIES("~/apps/mpfrc++/")
-LINK_DIRECTORIES("~/apps/mpfrc++/")
+INCLUDE_DIRECTORIES("/usr/include/")
 LINK_DIRECTORIES("/usr/lib/")
 
 ADD_DEFINITIONS( -Wall -W -Wextra )
 
 ADD_EXECUTABLE(test test.cpp)
-TARGET_LINK_LIBRARIES(test ${Boost_LIBRARIES} gmp mpfr mpreal)
+TARGET_LINK_LIBRARIES(test ${Boost_LIBRARIES} gmpxx)
 
diff --git a/cholesky.h b/cholesky.h
index 2391c18..8a19602 100644
--- a/cholesky.h
+++ b/cholesky.h
@@ -208,7 +208,8 @@ public:
     inline virtual T L_i_i( const typename Cholesky<T>::CovarMat& V, const unsigned int& i, const T& sum ) const
     {
         /***** ugly hack *****/
-        return sqrt( fabs( V(i,i) - sum) );
+        //return sqrt( fabs( V(i,i) - sum) );
+        return sqrt( abs( V(i,i) - sum) );
     }
 };
 
diff --git a/test.cpp b/test.cpp
index 38a2c8f..98b4388 100644
--- a/test.cpp
+++ b/test.cpp
@@ -28,8 +28,7 @@ Authors:
 #include <map>
 #include <vector>
 
-#include <mpreal.h>
-using namespace mpfr;
+#include <gmpxx.h>
 
 #include "cholesky.h"
 
@@ -115,7 +114,8 @@ T trigsum( const MT& M )
     T sum = 0;
     for( unsigned int i=0; i<M.size1(); ++i ) {
         for( unsigned int j=i; j<M.size2(); ++j ) { // triangular browsing
-            sum += fabs( M(i,j) ); // absolute deviation
+            //sum += fabs( M(i,j) ); // absolute deviation
+            sum += abs( M(i,j) ); // absolute deviation
         }
     }
     return sum;
@@ -168,7 +168,9 @@ void test( unsigned int M, unsigned int N, unsigned int F, unsigned int R, unsig
         // a variance-covariance matrix of size N*N
         // Note: a covariance matrix is necessarily semi-positive definite
         //       thus, any failure in the Cholesky factorization is due to round-off errors
-        CovarMat V = ublas::prod( ublas::trans(S), S );
+        //CovarMat V = ublas::prod( ublas::trans(S), S );
+        CovarMat ST = ublas::trans(S);
+        CovarMat V = ublas::prod( ST, S );
         assert( V.size1() == N && V.size2() == N );
 #ifndef NDEBUG
         if( R == 1 ) {
@@ -252,8 +254,8 @@ int main(int argc, char** argv)
     test<long double>(M,N,F,R,seed);
     */
 
-    std::cout << std::endl << "MPREAL 128" << std::endl;
-    mpreal::set_default_prec(128);
-    test<mpreal>(M,N,F,R,seed);
+    std::cout << std::endl << "MPF 128" << std::endl;
+    mpf_set_default_prec(128);
+    test<mpf_class>(M,N,F,R,seed);
 }