Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
26d2857733 | ||
|
|
384c2c31b3 | ||
|
|
ca34ddcea8 |
3 changed files with 5 additions and 21 deletions
|
|
@ -9,12 +9,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
|||
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
|
||||
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
|
||||
|
||||
INCLUDE_DIRECTORIES("~/apps/mpfrc++/")
|
||||
LINK_DIRECTORIES("~/apps/mpfrc++/")
|
||||
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})
|
||||
|
||||
|
|
|
|||
11
cholesky.h
11
cholesky.h
|
|
@ -55,9 +55,6 @@ public:
|
|||
// FIXME check if triangular types behaviour is like having 0
|
||||
typedef ublas::matrix< T > FactorMat;
|
||||
|
||||
//! The type of the scalars
|
||||
typedef T AtomType;
|
||||
|
||||
/** Instanciate without computing anything, you are responsible of
|
||||
* calling the algorithm and getting the result with operator()
|
||||
* */
|
||||
|
|
@ -325,8 +322,8 @@ public:
|
|||
T sum = 0.0;
|
||||
// for( unsigned int k=1; k<i-1; ++k) {
|
||||
// for( unsigned int k=1; 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; ++k) {
|
||||
// for( unsigned int k=0; k<i-1; ++k) {
|
||||
sum += this->_L(i, k) * this->_L(i, k);
|
||||
}
|
||||
this->_L(i,i) = this->_L(i,i) - sum;
|
||||
|
|
@ -341,8 +338,8 @@ public:
|
|||
sum = 0.0;
|
||||
// for( unsigned int k = 1; k < i-1; ++k ) {
|
||||
// for( unsigned int k = 1; 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; ++k ) {
|
||||
// for( unsigned int k = 0; k < i-1; ++k ) {
|
||||
sum += this->_L(j, k) * this->_L(i, k);
|
||||
}
|
||||
this->_L(j,i) = this->_L(j,i) - sum;
|
||||
|
|
|
|||
9
test.cpp
9
test.cpp
|
|
@ -28,9 +28,6 @@ Authors:
|
|||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
#include <mpreal.h>
|
||||
using namespace mpfr;
|
||||
|
||||
#include "cholesky.h"
|
||||
|
||||
|
||||
|
|
@ -241,7 +238,6 @@ 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<float>(M,N,F,R,seed);
|
||||
|
||||
|
|
@ -250,10 +246,5 @@ int main(int argc, char** argv)
|
|||
|
||||
std::cout << std::endl << "LONG DOUBLE" << std::endl;
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue