nojhan/cholesky
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: nojhan:mpreal
Branches Tags
nojhan:master
nojhan:gmpxx
nojhan:mpreal
..
compare: nojhan:master
Branches Tags
nojhan:gmpxx
nojhan:master
nojhan:mpreal

3 commits
mpreal ... master

Author SHA1 Message Date
nojhan
26d2857733 pick templatization from mpreal branch, but do not use mpfrc++ in master 2012-01-29 18:31:47 +01:00
nojhan
384c2c31b3 build with cmake 2012-01-29 18:30:03 +01:00
nojhan
ca34ddcea8 templatize everything to work with non-standard types like mpreal (of the mpfrc++ library) 2012-01-29 18:28:36 +01:00
3 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -9,12 +9,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
INCLUDE_DIRECTORIES("~/apps/mpfrc++/")
LINK_DIRECTORIES("~/apps/mpfrc++/")
LINK_DIRECTORIES("/usr/lib/")
ADD_DEFINITIONS( -Wall -W -Wextra ) ADD_DEFINITIONS( -Wall -W -Wextra )
ADD_EXECUTABLE(test test.cpp) ADD_EXECUTABLE(test test.cpp)
TARGET_LINK_LIBRARIES(test ${Boost_LIBRARIES} gmp mpfr mpreal) TARGET_LINK_LIBRARIES(test ${Boost_LIBRARIES})

11
cholesky.h
View file

@ -55,9 +55,6 @@ public:
// FIXME check if triangular types behaviour is like having 0 // FIXME check if triangular types behaviour is like having 0
typedef ublas::matrix< T > FactorMat; typedef ublas::matrix< T > FactorMat;
//! The type of the scalars
typedef T AtomType;
/** Instanciate without computing anything, you are responsible of /** Instanciate without computing anything, you are responsible of
* calling the algorithm and getting the result with operator() * calling the algorithm and getting the result with operator()
* */ * */
@ -325,8 +322,8 @@ public:
T sum = 0.0; T sum = 0.0;
// for( unsigned int k=1; k<i-1; ++k) { // for( unsigned int k=1; k<i-1; ++k) {
// for( unsigned int k=1; k<i; ++k) { // for( unsigned int k=1; k<i; ++k) {
// for( unsigned int k=0; k<i; ++k) { for( unsigned int k=0; k<i; ++k) {
for( unsigned int k=0; k<i-1; ++k) { // for( unsigned int k=0; k<i-1; ++k) {
sum += this->_L(i, k) * this->_L(i, k); sum += this->_L(i, k) * this->_L(i, k);
} }
this->_L(i,i) = this->_L(i,i) - sum; this->_L(i,i) = this->_L(i,i) - sum;
@ -341,8 +338,8 @@ public:
sum = 0.0; sum = 0.0;
// for( unsigned int k = 1; k < i-1; ++k ) { // for( unsigned int k = 1; k < i-1; ++k ) {
// for( unsigned int k = 1; k < i; ++k ) { // for( unsigned int k = 1; k < i; ++k ) {
// for( unsigned int k = 0; k < i; ++k ) { for( unsigned int k = 0; k < i; ++k ) {
for( unsigned int k = 0; k < i-1; ++k ) { // for( unsigned int k = 0; k < i-1; ++k ) {
sum += this->_L(j, k) * this->_L(i, k); sum += this->_L(j, k) * this->_L(i, k);
} }
this->_L(j,i) = this->_L(j,i) - sum; this->_L(j,i) = this->_L(j,i) - sum;

9
test.cpp
View file

@ -28,9 +28,6 @@ Authors:
#include <map> #include <map>
#include <vector> #include <vector>
#include <mpreal.h>
using namespace mpfr;
#include "cholesky.h" #include "cholesky.h"
@ -241,7 +238,6 @@ int main(int argc, char** argv)
std::clog << "Legend:" << std::endl; std::clog << "Legend:" << std::endl;
std::clog << "\tAlgo: (failures/runs)\tAverage error" << std::endl; std::clog << "\tAlgo: (failures/runs)\tAverage error" << std::endl;
/*
std::cout << std::endl << "FLOAT" << std::endl; std::cout << std::endl << "FLOAT" << std::endl;
test<float>(M,N,F,R,seed); test<float>(M,N,F,R,seed);
@ -250,10 +246,5 @@ int main(int argc, char** argv)
std::cout << std::endl << "LONG DOUBLE" << std::endl; std::cout << std::endl << "LONG DOUBLE" << std::endl;
test<long double>(M,N,F,R,seed); 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);
} }