diff options
Diffstat (limited to 'src/c/signalProcessing/ell1mag')
-rw-r--r-- | src/c/signalProcessing/ell1mag/dell1maga.c | 4 | ||||
-rw-r--r-- | src/c/signalProcessing/ell1mag/zell1maga.c | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/c/signalProcessing/ell1mag/dell1maga.c b/src/c/signalProcessing/ell1mag/dell1maga.c index 4cc80ef6..58ef3035 100644 --- a/src/c/signalProcessing/ell1mag/dell1maga.c +++ b/src/c/signalProcessing/ell1mag/dell1maga.c @@ -19,11 +19,9 @@ void dell1maga(double eps,double m1,double* z,int size,double* oup ) { double s[size]; int i; - doubleComplex tp; for(i=0;i<size;i++) { - tp=DoubleComplex(z[i],0); - s[i]=zmodsns(tp,m1); + s[i]=dmodsns(z[i],m1); } double un[size]; int j; diff --git a/src/c/signalProcessing/ell1mag/zell1maga.c b/src/c/signalProcessing/ell1mag/zell1maga.c index 529cecb5..35b49281 100644 --- a/src/c/signalProcessing/ell1mag/zell1maga.c +++ b/src/c/signalProcessing/ell1mag/zell1maga.c @@ -36,14 +36,13 @@ void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup ) int k; double ml; ml=eps*eps; - doubleComplex t1,t2,t3; - t2=DoubleComplex(ml,0); + doubleComplex tp1,tp2,tp3; for(k=0;k<size;k++) { - t1=zmuls(s[k],s[k]); - t2=zmuls(t2,t1); - t3=DoubleComplex(un[k],0); - v=zrdivs(t3,(zadds(t3,t2))); + tp1=zmuls(s[k],s[k]); + tp2=DoubleComplex(ml,0); + tp3=DoubleComplex(un[k],0); + v=zrdivs(tp3,zadds(tp3,(zmuls(tp2,tp1)))); oup[k]=zreals(v); } } |