aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2011-08-19 15:08:29 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2011-08-19 15:08:29 +0200
commitea4a1960f0cfd64ecccda5f52a6c43ede1e6c271 (patch)
tree7d1ee46d4e522b15156cf0826604ed4328a47414
parent79ad55a901434066e31523fcb47ce80cbc6897d5 (diff)
mv the mpreal copy in its own folder
-rw-r--r--unsupported/Eigen/MPRealSupport4
-rw-r--r--unsupported/test/CMakeLists.txt2
-rwxr-xr-xunsupported/test/mpreal/dlmalloc.c (renamed from unsupported/test/dlmalloc.c)0
-rwxr-xr-xunsupported/test/mpreal/dlmalloc.h (renamed from unsupported/test/dlmalloc.h)0
-rw-r--r--unsupported/test/mpreal/mpreal.cpp (renamed from unsupported/test/mpreal.cpp)0
-rw-r--r--unsupported/test/mpreal/mpreal.h (renamed from unsupported/test/mpreal.h)0
-rw-r--r--unsupported/test/mpreal_support.cpp4
7 files changed, 6 insertions, 4 deletions
diff --git a/unsupported/Eigen/MPRealSupport b/unsupported/Eigen/MPRealSupport
index 974137a4c..30e8d66e4 100644
--- a/unsupported/Eigen/MPRealSupport
+++ b/unsupported/Eigen/MPRealSupport
@@ -45,6 +45,8 @@ namespace Eigen {
* via the <a href="http://www.holoborodko.com/pavel/mpfr">MPFR C++</a>
* library which itself is built upon <a href="http://www.mpfr.org/">MPFR</a>/<a href="http://gmplib.org/">GMP</a>.
*
+ * You can find a copy of MPFR C++ that is known to be compatible in the unsupported/test/mpreal folder.
+ *
* Here is an example:
*
\code
@@ -148,7 +150,7 @@ int main()
inline bool isApprox(const mpfr::mpreal& a, const mpfr::mpreal& b, const mpfr::mpreal& prec)
{
- return mpfr::abs(a - b) <= (mpfr::min)(mpfr::abs(a), mpfr::abs(b)) * prec;
+ return mpfr::abs(a - b) <= (mpfr::min)(mpfr::abs(a), mpfr::abs(b)) * prec;
}
inline bool isApproxOrLessThan(const mpfr::mpreal& a, const mpfr::mpreal& b, const mpfr::mpreal& prec)
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index a14b57cb9..cd50c48e1 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -82,7 +82,7 @@ ei_add_test(FFT)
find_package(MPFR 2.3.0)
find_package(GMP)
if(MPFR_FOUND)
- include_directories(${MPFR_INCLUDES})
+ include_directories(${MPFR_INCLUDES} ./mpreal)
ei_add_property(EIGEN_TESTED_BACKENDS "MPFR C++, ")
set(EIGEN_MPFR_TEST_LIBRARIES ${MPFR_LIBRARIES} ${GMP_LIBRARIES})
ei_add_test(mpreal_support "" "${EIGEN_MPFR_TEST_LIBRARIES}" )
diff --git a/unsupported/test/dlmalloc.c b/unsupported/test/mpreal/dlmalloc.c
index a2c03b533..a2c03b533 100755
--- a/unsupported/test/dlmalloc.c
+++ b/unsupported/test/mpreal/dlmalloc.c
diff --git a/unsupported/test/dlmalloc.h b/unsupported/test/mpreal/dlmalloc.h
index a90dcb6f5..a90dcb6f5 100755
--- a/unsupported/test/dlmalloc.h
+++ b/unsupported/test/mpreal/dlmalloc.h
diff --git a/unsupported/test/mpreal.cpp b/unsupported/test/mpreal/mpreal.cpp
index 373f23b12..373f23b12 100644
--- a/unsupported/test/mpreal.cpp
+++ b/unsupported/test/mpreal/mpreal.cpp
diff --git a/unsupported/test/mpreal.h b/unsupported/test/mpreal/mpreal.h
index 96f474640..96f474640 100644
--- a/unsupported/test/mpreal.h
+++ b/unsupported/test/mpreal/mpreal.h
diff --git a/unsupported/test/mpreal_support.cpp b/unsupported/test/mpreal_support.cpp
index 080510a58..53d388821 100644
--- a/unsupported/test/mpreal_support.cpp
+++ b/unsupported/test/mpreal_support.cpp
@@ -42,6 +42,6 @@ void test_mpreal_support()
}
extern "C" {
-#include "dlmalloc.c"
+#include "mpreal/dlmalloc.c"
}
-#include "mpreal.cpp"
+#include "mpreal/mpreal.cpp"