projects
/
valse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix arrays reading in C, add type Real for double or float
[valse.git]
/
src
/
test
/
test.EMGLLF.c
diff --git
a/src/test/test.EMGLLF.c
b/src/test/test.EMGLLF.c
index
e938b3a
..
db38f14
100644
(file)
--- a/
src/test/test.EMGLLF.c
+++ b/
src/test/test.EMGLLF.c
@@
-1,13
+1,11
@@
#include "EMGLLF.h"
#include "EMGLLF.h"
-#include "utils.h"
+#include "
test_
utils.h"
#include <stdlib.h>
#include <stdlib.h>
+#include <stdio.h>
+
int main(int argc, char** argv)
{
int main(int argc, char** argv)
{
- ////////////
- // INPUTS //
- ////////////
-
int* dimensions = readArray_int("dimensions");
int n = dimensions[0];
int p = dimensions[1];
int* dimensions = readArray_int("dimensions");
int n = dimensions[0];
int p = dimensions[1];
@@
-15,6
+13,10
@@
int main(int argc, char** argv)
int k = dimensions[3];
free(dimensions);
int k = dimensions[3];
free(dimensions);
+ ////////////
+ // INPUTS //
+ ////////////
+
float* phiInit = readArray_real("phiInit");
float* rhoInit = readArray_real("rhoInit");
float* piInit = readArray_real("piInit");
float* phiInit = readArray_real("phiInit");
float* rhoInit = readArray_real("rhoInit");
float* piInit = readArray_real("piInit");
@@
-40,7
+42,6
@@
int main(int argc, char** argv)
////////////////////
// Call to EMGLLF //
////////////////////
////////////////////
// Call to EMGLLF //
////////////////////
-
EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
phi,rho,pi,LLF,S,
n,p,m,k);
EMGLLF_core(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,
phi,rho,pi,LLF,S,
n,p,m,k);
@@
-68,8
+69,8
@@
int main(int argc, char** argv)
free(pi);
free(ref_pi);
free(pi);
free(ref_pi);
- float* ref_LLF = readArray_real("LLF"
, maxi
);
- compareArray_real("LLF", LLF, ref_LLF);
+ float* ref_LLF = readArray_real("LLF");
+ compareArray_real("LLF", LLF, ref_LLF
, maxi
);
free(LLF);
free(ref_LLF);
free(LLF);
free(ref_LLF);