From afae3013c86d26dc1b233228431be208705acff0 Mon Sep 17 00:00:00 2001 From: Ankitr19 Date: Tue, 4 Jul 2017 15:26:35 +0530 Subject: New function and rpi issues resolved --- RUN_TESTS/run_tests.bat | 0 includes/sci2clib.h | 10 +- macros/FunctionAnnotation/FA_SZ_AMELL.sci | 9 ++ macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci | 2 +- macros/FunctionAnnotation/lib | Bin 2308 -> 2304 bytes macros/FunctionAnnotation/names | 1 + .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 58 +++++++++ macros/ToolInitialization/lib | Bin 772 -> 744 bytes macros/findDeps/getAllHeaders.sci | 2 + macros/findDeps/getAllInterfaces.sci | 2 + macros/findDeps/getAllSources.sci | 4 + macros/findDeps/lib | Bin 564 -> 536 bytes .../elementaryFunctions/Trigonometry/sinc/zsinca.c | 10 +- src/c/signalProcessing/%sn/zmodsna.c | 143 ++++++++++++++++++++- src/c/signalProcessing/amell/amell.h | 27 ++++ src/c/signalProcessing/amell/damella.c | 23 ++++ src/c/signalProcessing/amell/damells.c | 57 ++++++++ src/c/signalProcessing/amell/int_amell.h | 18 +++ src/c/signalProcessing/ell1mag/dell1maga.c | 40 ++++++ src/c/signalProcessing/ell1mag/ell1mag.h | 28 ++++ src/c/signalProcessing/ell1mag/int_ell1mag.h | 18 +++ src/c/signalProcessing/ell1mag/zell1maga.c | 40 ++++++ src/c/signalProcessing/filt_sinc/dfilt_sincs.c | 11 +- src/c/signalProcessing/includes/amell.h | 28 ++++ src/c/signalProcessing/includes/ell1mag.h | 29 +++++ src/c/signalProcessing/interfaces/int_amell.h | 19 +++ src/c/signalProcessing/interfaces/int_ell1mag.h | 19 +++ src/c/signalProcessing/interfaces/int_modsn.h | 2 +- src/c/string/ascii/gasciia.c | 4 +- src/c/string/strcspn/gstrcspna.c | 6 +- 30 files changed, 588 insertions(+), 22 deletions(-) mode change 100644 => 100755 RUN_TESTS/run_tests.bat create mode 100644 macros/FunctionAnnotation/FA_SZ_AMELL.sci create mode 100644 src/c/signalProcessing/amell/amell.h create mode 100644 src/c/signalProcessing/amell/damella.c create mode 100644 src/c/signalProcessing/amell/damells.c create mode 100644 src/c/signalProcessing/amell/int_amell.h create mode 100644 src/c/signalProcessing/ell1mag/dell1maga.c create mode 100644 src/c/signalProcessing/ell1mag/ell1mag.h create mode 100644 src/c/signalProcessing/ell1mag/int_ell1mag.h create mode 100644 src/c/signalProcessing/ell1mag/zell1maga.c create mode 100644 src/c/signalProcessing/includes/amell.h create mode 100644 src/c/signalProcessing/includes/ell1mag.h create mode 100644 src/c/signalProcessing/interfaces/int_amell.h create mode 100644 src/c/signalProcessing/interfaces/int_ell1mag.h diff --git a/RUN_TESTS/run_tests.bat b/RUN_TESTS/run_tests.bat old mode 100644 new mode 100755 diff --git a/includes/sci2clib.h b/includes/sci2clib.h index 2a4ffad2..5bbd8ba8 100644 --- a/includes/sci2clib.h +++ b/includes/sci2clib.h @@ -488,10 +488,18 @@ extern "C" { #include "ffilt.h" #include "int_ffilt.h" -/*interfacing modsn */ +/*interfacing %sn */ #include "modsn.h" #include "int_modsn.h" +/*interfacing ell1mag */ +#include "ell1mag.h" +#include "int_ell1mag.h" + +/* interfacing amell */ +#include "amell.h" +#include "int_amell.h" + /* STATISTICS FUNCTIONS */ /* interfacing max */ diff --git a/macros/FunctionAnnotation/FA_SZ_AMELL.sci b/macros/FunctionAnnotation/FA_SZ_AMELL.sci new file mode 100644 index 00000000..6cf27b0d --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_AMELL.sci @@ -0,0 +1,9 @@ +function outp=FA_SZ_AMELL(in1sz) + in1sz=string(in1sz); + insz=eval(in1sz); + if(insz>1) then + outp=string(insz); + else + outp="1"; + end +endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci index 50b897e0..527217a5 100644 --- a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci +++ b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.sci @@ -27,7 +27,7 @@ function outsize = FA_SZ_ROW_COLUMN_CAT(inval,in1size,in2size) // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(1),3,3); +SCI2CNInArgCheck(argn(2),3,3); in1size = string(in1size); diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index fe171a59..62d9138a 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names index 1d83afa1..097ba5cc 100644 --- a/macros/FunctionAnnotation/names +++ b/macros/FunctionAnnotation/names @@ -15,6 +15,7 @@ FA_SCHUR_TP FA_SUB FA_SZ_1 FA_SZ_2 +FA_SZ_AMELL FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX FA_SZ_DEC2BASE diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 52bc10c2..c874416e 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -8200,6 +8200,64 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + +//------------------------------------ +//---- Class ELL1MAG -------------------- +//------------------------------------ +ClassName = 'ell1mag'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 3',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(3).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0d0z2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'ell1mag'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + +//------------------------------------ +//---- Class AMELL -------------------- +//------------------------------------ +ClassName = 'amell'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_AMELL(IN(1).SZ(2))',ClassFileName,'file','y'); + +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'amell'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + + + + + // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA // ///////////////////////////////////////////// diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib index 8fc6062d..dd481d10 100644 Binary files a/macros/ToolInitialization/lib and b/macros/ToolInitialization/lib differ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 872e24cd..d144f896 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -166,6 +166,8 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/signalProcessing/includes/filt_sinc.h" "src/c/signalProcessing/includes/ffilt.h" "src/c/signalProcessing/includes/modsn.h" + "src/c/signalProcessing/includes/ell1mag.h" + "src/c/signalProcessing/includes/amell.h" "src/c/implicitList/dynlib_implicitlist.h" "src/c/implicitList/implicitList.h" "src/c/differential_calculus/includes/ode.h" diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 3befda80..86f1bf56 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -164,6 +164,8 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/signalProcessing/interfaces/int_filt_sinc.h" "src/c/signalProcessing/interfaces/int_ffilt.h" "src/c/signalProcessing/interfaces/int_modsn.h" + "src/c/signalProcessing/interfaces/int_ell1mag.h" + "src/c/signalProcessing/interfaces/int_amell.h" "src/c/implicitList/int_OpColon.h" "src/c/differential_calculus/interfaces/int_ode.h" "src/c/differential_calculus/interfaces/int_diffc.h" diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 90dc0143..c8fa7ae6 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -1047,6 +1047,10 @@ function allSources = getAllSources(SharedInfo) "src/c/signalProcessing/%sn/zmodsns.c" "src/c/signalProcessing/%sn/dmodsna.c" "src/c/signalProcessing/%sn/zmodsna.c" + "src/c/signalProcessing/ell1mag/zell1maga.c" + "src/c/signalProcessing/ell1mag/dell1maga.c" + "src/c/signalProcessing/amell/damells.c" + "src/c/signalProcessing/amell/damella.c" "src/c/implicitList/zimplicitLists.c" "src/c/implicitList/dimplicitLists.c" "src/c/implicitList/cimplicitLists.c" diff --git a/macros/findDeps/lib b/macros/findDeps/lib index 4f7fa99b..12d73687 100644 Binary files a/macros/findDeps/lib and b/macros/findDeps/lib differ diff --git a/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c b/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c index ad7d095b..1f6cf9ba 100644 --- a/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c +++ b/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c @@ -14,18 +14,22 @@ #include "sinc.h" #include "sin.h" #include "doubleComplex.h" +#include "division.h" void zsinca(doubleComplex* sample,int size,doubleComplex* oup) { int j; + double r,i; for(j=0;j #include "modsn.h" #include "doubleComplex.h" +#define CA 0.0003 + + +doubleComplex zmodsnsproto(doubleComplex uu,double emmc,doubleComplex* sni) +{ + doubleComplex ans; + double uur,uui; + uur=zreals(uu); + uui=zimags(uu); + double sr,cr,dr; + //Performing Elliptic Function operation for the real values + double a1,b1,c1,d1,emc1,u1; + double em1[14],en1[14]; + int i1,ii1,l1,bo1; + emc1=1-emmc; + u1=uur; + if(emc1) + { + bo1=(emc1<0.0); + if(bo1) + { + d1=1.0-emc1; + emc1/=-1.0/d1; + u1*=(d1=sqrt(d1)); + } + a1=1.0; + dr=1.0; + for(i1=1;i1<=13;i1++) + { + l1=i1; + em1[i1]=a1; + en1[i1]=(emc1=sqrt(emc1)); + c1=0.5*(a1+emc1); + if(fabs(a1-emc1)<=CA*a1)break; + emc1*=a1; + a1=c1; + } + u1*=c1; + sr=sin(u1); + cr=cos(u1); + if(sr) + { + a1=cr/sr; + c1*=a1; + for(ii1=l1;ii1>=1;ii1--) + { + b1=em1[ii1]; + a1*=c1; + c1*=dr; + dr=(en1[ii1]+a1)/(b1+a1); + a1=c1/b1; + } + a1=1.0/sqrt(c1*c1+1.0); + sr=(sr>=0.0?a1:-a1); + cr=c1*(sr); + } + if(bo1) + { + a1=dr; + dr=cr; + cr=a1; + sr/=d1; + } + } + else + { + cr=1.0/cosh(u1); + dr=cr; + sr=tanh(u1); + } + //////////////////////////////////////////////////////////////// + double si,ci,di; + //Performing Elleptic Function operation for the imaginary values + double a,b,c,d,emc,u; + double em[14],en[14]; + int i,ii,l,bo; + //double s1,c1,d1; + emc=emmc; + u=uui; + if(emc) + { + bo=(emc<0.0); + if(bo) + { + d=1.0-emc; + emc/=-1.0/d; + u*=(d=sqrt(d)); + } + a=1.0; + di=1.0; + for(i=1;i<=13;i++) + { + l=i; + em[i]=a; + en[i]=(emc=sqrt(emc)); + c=0.5*(a+emc); + if(fabs(a-emc)<=CA*a)break; + emc*=a; + a=c; + } + u*=c; + si=sin(u); + ci=cos(u); + if(si) + { + a=ci/si; + c*=a; + for(ii=l;ii>=1;ii--) + { + b=em[ii]; + a*=c; + c*=di; + di=(en[ii]+a)/(b+a); + a=c/b; + } + a=1.0/sqrt(c*c+1.0); + si=(si>=0.0?a:-a); + ci=c*(si); + } + if(bo) + { + a=di; + di=ci; + ci=a; + si/=d; + } + } + else + { + ci=1.0/cosh(u); + di=ci; + si=tanh(u); + } + ///////////////////////////////////////////////////////// + double delta; + delta=ci*ci + emmc*sr*sr*si*si; + double snir,snii; + snir=(sr*di)/delta; + snii=(cr*dr*si*ci)/delta; + *sni=DoubleComplex(snir,snii); +} void zmodsna(doubleComplex* uu,int size,double emmc,doubleComplex* sn) { int i; for(i=0;i +#include +#include "amell.h" + +void damella(double* u,int size,double x,double* oup) +{ + int i; + for(i=0;i +#include +#include "amell.h" +#define N 30 +#define DBL_EPSILON 2.2204460492503131E-16 + + +double damells(double u,double x) +{ + double a[N+1]; + double g[N+1]; + double c[N+1]; + double two_n; + double phi; + double k; + int n; + k=(long double)fabs(x); + if(k==1.0) + return 0; + if(k>1.0) + printf("Wrong type of input argument type #2"); + + a[0]=1.0; + g[0]=sqrt(1.0-k*k); + c[0]=k; + two_n=1.0; + for(n=0;n0;n--) + { + phi=0.5*(phi+asin(c[n]*sin(phi)/a[n])); + } + return (double)phi; +} + diff --git a/src/c/signalProcessing/amell/int_amell.h b/src/c/signalProcessing/amell/int_amell.h new file mode 100644 index 00000000..5d0c86f6 --- /dev/null +++ b/src/c/signalProcessing/amell/int_amell.h @@ -0,0 +1,18 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_AMELL_H__ +#define __INT_AMELL_H__ + +#define d0d0amelld0(u,x) damells(u,x) + +#endif /* !__INT_AMELL_H__! */ diff --git a/src/c/signalProcessing/ell1mag/dell1maga.c b/src/c/signalProcessing/ell1mag/dell1maga.c new file mode 100644 index 00000000..9af0c8e8 --- /dev/null +++ b/src/c/signalProcessing/ell1mag/dell1maga.c @@ -0,0 +1,40 @@ +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Ankit Raj + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#include +#include "modsn.h" +#include "ell1mag.h" +#include "doubleComplex.h" + +void dell1maga(double eps,double m1,double* z,int size,double* oup ) +{ + double s[size]; + int i; + for(i=0;i +#include "modsn.h" +#include "ell1mag.h" +#include "doubleComplex.h" + +void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup ) +{ + doubleComplex s[size]; + int i; + for(i=0;i