summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/matrixOperations/chol/cchola.c2
-rw-r--r--src/matrixOperations/chol/dchola.c1
-rw-r--r--src/matrixOperations/chol/schola.c2
-rw-r--r--src/matrixOperations/chol/testDoubleChol.c12
-rw-r--r--src/matrixOperations/chol/zchola.c2
-rw-r--r--src/matrixOperations/interfaces/int_trace.h8
6 files changed, 14 insertions, 13 deletions
diff --git a/src/matrixOperations/chol/cchola.c b/src/matrixOperations/chol/cchola.c
index 6a456188..a00718c1 100644
--- a/src/matrixOperations/chol/cchola.c
+++ b/src/matrixOperations/chol/cchola.c
@@ -60,8 +60,6 @@ void cchola(floatComplex * in, int size, floatComplex *out){
int i=0, j=0, k=0;
floatComplex tmp,transposee;
float accu;
-
- for (i=0;i<size*size;i++) out[i]=FloatComplex(0,0); /* Voir si on peut l'enlever */
for (i=0;i<size;i++){
accu=0.0f;
diff --git a/src/matrixOperations/chol/dchola.c b/src/matrixOperations/chol/dchola.c
index 918c790a..a35f90b2 100644
--- a/src/matrixOperations/chol/dchola.c
+++ b/src/matrixOperations/chol/dchola.c
@@ -44,7 +44,6 @@ void dchola(double * in, int size, double *out){
int i=0, j=0, k=0;
double tmp=0, accu=0;
- for (i=0;i<size*size;i++) out[i]=0; /* Voir si on peut l'enlever */
for (i=0;i<size;i++){
accu=0;
diff --git a/src/matrixOperations/chol/schola.c b/src/matrixOperations/chol/schola.c
index 4a2121d8..1c9e9a6e 100644
--- a/src/matrixOperations/chol/schola.c
+++ b/src/matrixOperations/chol/schola.c
@@ -52,8 +52,6 @@ void schola(float * in, int size, float *out){
int i=0, j=0, k=0;
float tmp=0, accu=0;
- for (i=0;i<size*size;i++) out[i]=0; /* Voir si on peut l'enlever */
-
for (i=0;i<size;i++){
accu=0;
for (j=0;j<i;j++){
diff --git a/src/matrixOperations/chol/testDoubleChol.c b/src/matrixOperations/chol/testDoubleChol.c
index 4a89ba05..41138b1c 100644
--- a/src/matrixOperations/chol/testDoubleChol.c
+++ b/src/matrixOperations/chol/testDoubleChol.c
@@ -28,18 +28,26 @@ static void dcholsTest(void){
}
static void dcholaTest(void){
+ double in2[49]={0.2113249,0.7560439,0.0002211,0.3303271, 0.6653811,0.6283918,0.8497452 ,\
+ 0.6857310,0.8782165,0.0683740,0.5608486,0.6623569,0.7263507,0.1985144 ,\
+ 0.5442573, 0.2320748 , 0.2312237, 0.2164633, 0.8833888, 0.6525135, 0.3076091 ,\
+ 0.9329616, 0.2146008 , 0.312642 , 0.3616361 , 0.2922267 , 0.5664249 , 0.4826472 ,\
+ 0.3321719, 0.5935095, 0.5015342 , 0.4368588 , 0.2693125 , 0.6325745 , 0.4051954 ,\
+ 0.9184708, 0.0437334, 0.4818509 , 0.2639556 , 0.4148104 , 0.2806498 , 0.1280058 ,\
+ 0.7783129, 0.2119030, 0.1121355 ,0.6856896 ,0.1531217 ,0.6970851 ,0.8415518 };
double in[9]= {0.722725308034569025040,0.8976796260103583335877,0.2427821881137788295746,\
0.4337721113115549087524,0.9677053210325539112091,0.5068534435704350471497,\
0.523297640960663557053,0.5596947595477104187012,0.5617307000793516635895};
double res[9]={0.8501325238070644996213,0,0,\
0.5102405791617476982225,0.8410468907315681308390,0,\
0.6155483131232661886401,0.2920372626834314977451,0.3123222878611475739064};
- double out[9];
+ double out[9]={0}, out2[49]={0};
int size=3;
int i;
printf("\n >>> DCholA <<<\n");
-
+ dchola(in2,7,out2);
+ for (i=0;i<49;i++)printf("out2[i]= %f\n",out2[i]);
dchola(in,size,out);
for (i=0;i<9;i++){
if (out[i]>1e-16) assert( (fabs(out[i]-res[i]) / fabs(out[i])) <1e-15);
diff --git a/src/matrixOperations/chol/zchola.c b/src/matrixOperations/chol/zchola.c
index 724ff646..ce6543ff 100644
--- a/src/matrixOperations/chol/zchola.c
+++ b/src/matrixOperations/chol/zchola.c
@@ -50,8 +50,6 @@ void zchola(doubleComplex * in, int size, doubleComplex *out){
doubleComplex tmp,transposee;
double accu;
- for (i=0;i<size*size;i++) out[i]=DoubleComplex(0,0); /* Voir si on peut l'enlever */
-
for (i=0;i<size;i++){
accu=0.0f;
for (j=0;j<i;j++){
diff --git a/src/matrixOperations/interfaces/int_trace.h b/src/matrixOperations/interfaces/int_trace.h
index 2b9a5d4e..8bfea860 100644
--- a/src/matrixOperations/interfaces/int_trace.h
+++ b/src/matrixOperations/interfaces/int_trace.h
@@ -23,12 +23,12 @@
#define z0tracez0(in) in
-#define s2traces0(in,size,out) stracea(in, size[0])
+#define s2traces0(in,size) stracea(in, size[0])
-#define d2traced0(in,size,out) dtracea(in, size[0])
+#define d2traced0(in,size) dtracea(in, size[0])
-#define c2tracec0(in,size,out) ctracea(in, size[0])
+#define c2tracec0(in,size) ctracea(in, size[0])
-#define z2tracez0(in,size,out) ztracea(in, size[0])
+#define z2tracez0(in,size) ztracea(in, size[0])
#endif /* !__INT_TRACE_H__ */