guilhem_lavaux/cosmotool
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed decomposition. Add sample matrix.

Browse source
This commit is contained in:
Guilhem Lavaux 2011-12-14 17:40:10 -05:00
parent cf279bbb19
commit 196e17c242
3 changed files with 89 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sample/Hartmann_Matrix.txt Normal file
View file

@ -0,0 +1,7 @@
6
14.8253 -6.4243 7.8746 -1.2498 10.2733 10.2733
-6.4243 15.1024 -1.1155 -0.2761 -8.2117 -8.2117
7.8746 -1.1155 51.8519 -23.3482 12.5902 12.5902
-1.2498 -0.2761 -23.3482 22.7962 -9.8958 -9.8958
10.2733 -8.2117 12.5902 -9.8958 21.0656 21.0656
10.2733 -8.2117 12.5902 -9.8958 21.0656 21.0656

26
sample/testEskow.cpp
View file

@ -1,3 +1,4 @@
#include <fstream>
#include <cstring>
#include <iostream>
#include <iomanip>
@ -26,28 +27,39 @@ struct MatrixOp
}
};
int main()
int main(int argc, char **argv)
{
MatrixOp M;
double norm_E;
ifstream fi(argv[1]);
ofstream f("eskowed.txt");
CholeskyEskow<double,MatrixOp> chol;
M.N = 6;
fi >> M.N;
M.M.resize(M.N*M.N);
memcpy(&M.M[0], &Hartmann_Matrix[0][0], sizeof(double)*36);
for (int i = 0; i < M.N; i++)
{
for (int j = 0; j < M.N; j++)
{
fi >> M(i,j);
if (j > i)
M(i,j) =0;
}
}
CholeskyEskow::cholesky_eskow(M, M.N, norm_E);
chol.cholesky(M, M.N, norm_E);
for (int i = 0; i < M.N; i++)
{
for (int j = 0; j < M.N; j++)
{
if (j > i)
cout << "0 ";
f << "0 ";
else
cout << setprecision(25) << M(i,j) << " ";
f << setprecision(25) << M(i,j) << " ";
}
cout << endl;
f << endl;
}
return 0;
}