diff options
author | torset | 2009-02-10 14:06:53 +0000 |
---|---|---|
committer | torset | 2009-02-10 14:06:53 +0000 |
commit | db8e453cc7a696d6461afdfc83faa86fad5ab7be (patch) | |
tree | 82fb6a8d2b7e00fa58e420c2568cdcfdc9ac2258 /src | |
parent | 9cea656d20e16294356b99e360d93ab64e3e1e54 (diff) | |
download | scilab2c-db8e453cc7a696d6461afdfc83faa86fad5ab7be.tar.gz scilab2c-db8e453cc7a696d6461afdfc83faa86fad5ab7be.tar.bz2 scilab2c-db8e453cc7a696d6461afdfc83faa86fad5ab7be.zip |
Some modif in Lev functions
Diffstat (limited to 'src')
-rw-r--r-- | src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionLev.sci | 38 | ||||
-rw-r--r-- | src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci | 20 | ||||
-rw-r--r-- | src/signalProcessing/interfaces/int_lev.h | 4 | ||||
-rw-r--r-- | src/signalProcessing/lev/cleva2.c | 2 | ||||
-rw-r--r-- | src/signalProcessing/lev/sleva2.c | 2 | ||||
-rw-r--r-- | src/signalProcessing/lev/zleva2.c | 2 |
6 files changed, 62 insertions, 6 deletions
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionLev.sci b/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionLev.sci new file mode 100644 index 00000000..274567db --- /dev/null +++ b/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionLev.sci @@ -0,0 +1,38 @@ +//SCI2C: DEFAULT_PRECISION= DOUBLE + +function mainfunction()
+ +//test lev + +//reals + +b=[1 2 3 4] + +disp(lev(b)) + +[u,v]=lev(b) +disp(u) +disp(v) + +[x,y,z]=lev(b) +disp(x) +disp(y) +disp(z) + +//complexes + +c=[1+2*%i 2 3-3*%i 4+%i] + +disp(lev(c)) + +[uc,vc]=lev(c) +disp(uc) +disp(vc) + +[xc,yc,zc]=lev(c) +disp(xc) +disp(yc) +disp(zc) + + +endfunction diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index cdca2826..378ded91 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -1,8 +1,11 @@ -//SCI2C: DEFAULT_PRECISION= DOUBLE +//SCI2C: DEFAULT_PRECISION= FLOAT function mainfunction()
//test lev + +//reals + b=[1 2 3 4] disp(lev(b)) @@ -16,5 +19,20 @@ disp(x) disp(y) disp(z) +//complexes + +c=[1+2*%i 2 3-3*%i 4+%i] + +disp(lev(c)) + +[uc,vc]=lev(c) +disp(uc) +disp(vc) + +[xc,yc,zc]=lev(c) +disp(xc) +disp(yc) +disp(zc) + endfunction diff --git a/src/signalProcessing/interfaces/int_lev.h b/src/signalProcessing/interfaces/int_lev.h index 72642951..f15f9ea0 100644 --- a/src/signalProcessing/interfaces/int_lev.h +++ b/src/signalProcessing/interfaces/int_lev.h @@ -43,10 +43,10 @@ #define z2levz2(in,size,out) {doubleComplex sigma2;\ - sigma2=zleva2(in,size[0]*size[1],out,out2);\ + sigma2=zleva2(in,size[0]*size[1],out);\ } -#define z2levz2z0(in,size,out) zleva2(in,size[0]*size[1],out,out2); +#define z2levz2z0(in,size,out) zleva2(in,size[0]*size[1],out); #define z2levz2z0z2(in,size,out1,out2) zleva(in,size[0]*size[1],out1,out2); diff --git a/src/signalProcessing/lev/cleva2.c b/src/signalProcessing/lev/cleva2.c index f3467b42..e5eb57cf 100644 --- a/src/signalProcessing/lev/cleva2.c +++ b/src/signalProcessing/lev/cleva2.c @@ -37,7 +37,7 @@ #include "subtraction.h" -floatComplex cleva(floatComplex* in,int size, floatComplex* ar){ +floatComplex cleva2(floatComplex* in,int size, floatComplex* ar){ int i=0, j=0; floatComplex accu=FloatComplex(0,0); floatComplex* ak1; diff --git a/src/signalProcessing/lev/sleva2.c b/src/signalProcessing/lev/sleva2.c index 5f084639..ee70c68e 100644 --- a/src/signalProcessing/lev/sleva2.c +++ b/src/signalProcessing/lev/sleva2.c @@ -32,7 +32,7 @@ #include "stdlib.h" -float sleva(float* in,int size, float* ar, float* rc){ +float sleva2(float* in,int size, float* ar){ int i=0, j=0; float accu=0; float* ak1; diff --git a/src/signalProcessing/lev/zleva2.c b/src/signalProcessing/lev/zleva2.c index bbab11ed..4145a9e8 100644 --- a/src/signalProcessing/lev/zleva2.c +++ b/src/signalProcessing/lev/zleva2.c @@ -36,7 +36,7 @@ #include "division.h" #include "subtraction.h" -doubleComplex zleva(doubleComplex* in,int size, doubleComplex* ar, doubleComplex* rc){ +doubleComplex zleva2(doubleComplex* in,int size, doubleComplex* ar){ int i=0, j=0; doubleComplex accu=DoubleComplex(0,0); doubleComplex* ak1; |