diff options
Diffstat (limited to 'src/c')
115 files changed, 198 insertions, 195 deletions
diff --git a/src/c/CACSD/lqr/dlqra.c b/src/c/CACSD/lqr/dlqra.c index 1440c3a8..f977ffac 100644 --- a/src/c/CACSD/lqr/dlqra.c +++ b/src/c/CACSD/lqr/dlqra.c @@ -38,7 +38,6 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ double *BRi, *StRi, *S_t; double *buf1, *buf2, *buf3, *buf4, *buf5, *buf6; - int ks; double *wsmall, *X12, *phi12; A = (double*) malloc (no_of_states*no_of_states*sizeof(double)); @@ -196,7 +195,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ /*Find schur decomposition of LA*/ wsmall = (double*) malloc(4*no_of_states*no_of_states*sizeof(double)); - ks = (int)dschura(LA,2*no_of_states,1,2,wsmall,NULL); + dschura(LA,2*no_of_states,1,2,wsmall,NULL); X12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); phi12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); @@ -295,7 +294,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ /*Find schur decomposition of LA*/ wsmall = (double*) malloc(4*no_of_states*no_of_states*sizeof(double)); - ks = (int)dgschura(LA,2*no_of_states,LE,2,2,wsmall,NULL,NULL,NULL); + dgschura(LA,2*no_of_states,LE,2,2,wsmall,NULL,NULL,NULL); X12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); phi12 = (double*) malloc(no_of_states*no_of_states*sizeof(double)); @@ -359,4 +358,4 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ free(buf3); free(buf4); -}
\ No newline at end of file +} diff --git a/src/c/elementaryFunctions/Trigonometry/coth/scotha.c b/src/c/elementaryFunctions/Trigonometry/coth/scotha.c index 53351621..df438b18 100644 --- a/src/c/elementaryFunctions/Trigonometry/coth/scotha.c +++ b/src/c/elementaryFunctions/Trigonometry/coth/scotha.c @@ -15,7 +15,6 @@ void scotha(float* in,int size,float* out) { - float val; int i=0; for(i=0;i<size;i++) { diff --git a/src/c/elementaryFunctions/isequal/zisequala.c b/src/c/elementaryFunctions/isequal/zisequala.c index 13d241fe..fbd906c6 100644 --- a/src/c/elementaryFunctions/isequal/zisequala.c +++ b/src/c/elementaryFunctions/isequal/zisequala.c @@ -14,6 +14,7 @@ #include <stdlib.h> #include <isreal.h> #include "doubleComplex.h" +#include "isequal.h" char zisequala(doubleComplex* inp1, int size1r, int size1c, doubleComplex* inp2, int size2r, int size2c) { diff --git a/src/c/elementaryFunctions/nancumsum/dnancumsuma.c b/src/c/elementaryFunctions/nancumsum/dnancumsuma.c index 135ab4bb..144f8762 100644 --- a/src/c/elementaryFunctions/nancumsum/dnancumsuma.c +++ b/src/c/elementaryFunctions/nancumsum/dnancumsuma.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void dnancumsuma(double *in, int size, double* out) { diff --git a/src/c/elementaryFunctions/nancumsum/dnancumsumcola.c b/src/c/elementaryFunctions/nancumsum/dnancumsumcola.c index a49b394d..a50415b3 100644 --- a/src/c/elementaryFunctions/nancumsum/dnancumsumcola.c +++ b/src/c/elementaryFunctions/nancumsum/dnancumsumcola.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void dnancumsumcola(double *in, int row, int col, double* out) { diff --git a/src/c/elementaryFunctions/nancumsum/dnancumsumrowa.c b/src/c/elementaryFunctions/nancumsum/dnancumsumrowa.c index 45ce1ca2..fb6c136d 100644 --- a/src/c/elementaryFunctions/nancumsum/dnancumsumrowa.c +++ b/src/c/elementaryFunctions/nancumsum/dnancumsumrowa.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void dnancumsumrowa(double *in, int row, int col, double* out) { diff --git a/src/c/elementaryFunctions/nancumsum/snancumsuma.c b/src/c/elementaryFunctions/nancumsum/snancumsuma.c index 56d16335..77183443 100644 --- a/src/c/elementaryFunctions/nancumsum/snancumsuma.c +++ b/src/c/elementaryFunctions/nancumsum/snancumsuma.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void snancumsuma(float *in, int size, float* out) { diff --git a/src/c/elementaryFunctions/nancumsum/snancumsumcola.c b/src/c/elementaryFunctions/nancumsum/snancumsumcola.c index 3b96ef01..1ac77e04 100644 --- a/src/c/elementaryFunctions/nancumsum/snancumsumcola.c +++ b/src/c/elementaryFunctions/nancumsum/snancumsumcola.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void snancumsumcola(float *in, int row, int col, float* out) { diff --git a/src/c/elementaryFunctions/nancumsum/snancumsumrowa.c b/src/c/elementaryFunctions/nancumsum/snancumsumrowa.c index 7eef3869..65594eff 100644 --- a/src/c/elementaryFunctions/nancumsum/snancumsumrowa.c +++ b/src/c/elementaryFunctions/nancumsum/snancumsumrowa.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void snancumsumrowa(float *in, int row, int col, float* out) { diff --git a/src/c/elementaryFunctions/nancumsum/znancumsuma.c b/src/c/elementaryFunctions/nancumsum/znancumsuma.c index fd0a1e3e..0d2129b6 100644 --- a/src/c/elementaryFunctions/nancumsum/znancumsuma.c +++ b/src/c/elementaryFunctions/nancumsum/znancumsuma.c @@ -16,6 +16,7 @@ #include "uint16.h" #include "doubleComplex.h" #include "addition.h" +#include "isnan.h" void znancumsuma(doubleComplex *in, int size, doubleComplex* out) { diff --git a/src/c/elementaryFunctions/nancumsum/znancumsumcola.c b/src/c/elementaryFunctions/nancumsum/znancumsumcola.c index c1ca16b6..343b0ff0 100644 --- a/src/c/elementaryFunctions/nancumsum/znancumsumcola.c +++ b/src/c/elementaryFunctions/nancumsum/znancumsumcola.c @@ -16,6 +16,7 @@ #include "uint16.h" #include "addition.h" #include "doubleComplex.h" +#include "isnan.h" void znancumsumcola(doubleComplex* in, int row, int col, doubleComplex* out) { diff --git a/src/c/elementaryFunctions/nancumsum/znancumsumrowa.c b/src/c/elementaryFunctions/nancumsum/znancumsumrowa.c index be04a4a7..e37c7bd2 100644 --- a/src/c/elementaryFunctions/nancumsum/znancumsumrowa.c +++ b/src/c/elementaryFunctions/nancumsum/znancumsumrowa.c @@ -16,6 +16,7 @@ #include "doubleComplex.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" void znancumsumrowa(doubleComplex *in, int row, int col, doubleComplex* out) { diff --git a/src/c/elementaryFunctions/nanmin/dnanminrowa.c b/src/c/elementaryFunctions/nanmin/dnanminrowa.c index 0909fc2c..288dc5a1 100644 --- a/src/c/elementaryFunctions/nanmin/dnanminrowa.c +++ b/src/c/elementaryFunctions/nanmin/dnanminrowa.c @@ -17,7 +17,7 @@ void dnanminrowa(double *in, int row, int col, double *out, double *p) { - double inter[row], *position; + double inter[row], position[2]; diff --git a/src/c/elementaryFunctions/nansum/dnansuma.c b/src/c/elementaryFunctions/nansum/dnansuma.c index adc4a02b..2944d635 100644 --- a/src/c/elementaryFunctions/nansum/dnansuma.c +++ b/src/c/elementaryFunctions/nansum/dnansuma.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" double dnansuma(double *in, int size) { diff --git a/src/c/elementaryFunctions/nansum/snansuma.c b/src/c/elementaryFunctions/nansum/snansuma.c index 8c1cebbb..0b8c9c37 100644 --- a/src/c/elementaryFunctions/nansum/snansuma.c +++ b/src/c/elementaryFunctions/nansum/snansuma.c @@ -15,6 +15,7 @@ #include "types.h" #include "uint16.h" #include "addition.h" +#include "isnan.h" float snansuma(float *in, int size) { diff --git a/src/c/elementaryFunctions/nansum/znansuma.c b/src/c/elementaryFunctions/nansum/znansuma.c index cb839f02..7f679e47 100644 --- a/src/c/elementaryFunctions/nansum/znansuma.c +++ b/src/c/elementaryFunctions/nansum/znansuma.c @@ -15,6 +15,7 @@ #include "types.h" #include "doubleComplex.h" #include "addition.h" +#include "isnan.h" doubleComplex znansuma(doubleComplex *in, int size) { diff --git a/src/c/elementaryFunctions/pmodulo/dpmodulos.c b/src/c/elementaryFunctions/pmodulo/dpmodulos.c index 61441777..1b03849a 100644 --- a/src/c/elementaryFunctions/pmodulo/dpmodulos.c +++ b/src/c/elementaryFunctions/pmodulo/dpmodulos.c @@ -18,7 +18,7 @@ double dpmodulos(double inp1, double inp2) { - if( inp1>0 && inp2>0) + if(inp1>=0 && inp2>0) { return fmod(inp1,inp2); @@ -26,7 +26,7 @@ double dpmodulos(double inp1, double inp2) } - if( inp1>0 && inp2<0) + else if(inp1>=0 && inp2<0) { @@ -35,20 +35,24 @@ double dpmodulos(double inp1, double inp2) } - if(inp1<0 && inp2>0) + else if(inp1<0 && inp2>0) { - return ((fmod(inp1,inp2))+(inp2)); + return fmod(inp1,inp2)+inp2; } - if(inp1<0 && inp2<0) + else if(inp1<0 && inp2<0) { - return ((fmod(inp1,inp2))-(inp2)); + return fmod(inp1,inp2)-inp2; } + else + { + return fmod(inp1,inp2); + } } diff --git a/src/c/elementaryFunctions/pmodulo/i16pmodulos.c b/src/c/elementaryFunctions/pmodulo/i16pmodulos.c index f7f86c5b..e7e066ca 100644 --- a/src/c/elementaryFunctions/pmodulo/i16pmodulos.c +++ b/src/c/elementaryFunctions/pmodulo/i16pmodulos.c @@ -19,7 +19,7 @@ int16 i16pmodulos(int16 inp1, int16 inp2) { - if( inp1>0 && inp2>0) + if(inp1>=0 && inp2>0) { return inp1%inp2; @@ -27,7 +27,7 @@ int16 i16pmodulos(int16 inp1, int16 inp2) } - if( inp1>0 && inp2<0) + else if(inp1>=0 && inp2<0) { @@ -36,20 +36,24 @@ int16 i16pmodulos(int16 inp1, int16 inp2) } - if(inp1<0 && inp2>0) + else if(inp1<0 && inp2>0) { - return ((inp1%inp2)+(inp2)); + return inp1%inp2+inp2; } - if(inp1<0 && inp2<0) + else if(inp1<0 && inp2<0) { - return ((inp1%inp2)-(inp2)); + return inp1%inp2-inp2; } + else + { + return inp1%inp2; + } } diff --git a/src/c/elementaryFunctions/pmodulo/spmodulos.c b/src/c/elementaryFunctions/pmodulo/spmodulos.c index 9ab6bc49..4e43129d 100644 --- a/src/c/elementaryFunctions/pmodulo/spmodulos.c +++ b/src/c/elementaryFunctions/pmodulo/spmodulos.c @@ -18,7 +18,7 @@ float spmodulos(float inp1, float inp2) { - if( inp1>0 && inp2>0) + if(inp1>=0 && inp2>0) { return fmod(inp1,inp2); @@ -26,7 +26,7 @@ float spmodulos(float inp1, float inp2) } - if( inp1>0 && inp2<0) + else if(inp1>=0 && inp2<0) { @@ -35,20 +35,24 @@ float spmodulos(float inp1, float inp2) } - if(inp1<0 && inp2>0) + else if(inp1<0 && inp2>0) { - return ((fmod(inp1,inp2))+(inp2)); + return fmod(inp1,inp2)+inp2; } - if(inp1<0 && inp2<0) + else if(inp1<0 && inp2<0) { - return ((fmod(inp1,inp2))-(inp2)); + return fmod(inp1,inp2)-inp2; } + else + { + return fmod(inp1,inp2); + } } diff --git a/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c b/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c index 811a4116..61a87588 100644 --- a/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c +++ b/src/c/elementaryFunctions/radix_conversions/base2dec/gbase2decs.c @@ -17,7 +17,7 @@ double gbase2decs(char* in,int size,int base) { size-=2; - int i=0,val=0,j=0; + int i=0,val=0; double o=0.0; for(i=0; in[i]!='\0'; i++) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2base/ddec2bases.c b/src/c/elementaryFunctions/radix_conversions/dec2base/ddec2bases.c index dae7bdcc..e89d3861 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2base/ddec2bases.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2base/ddec2bases.c @@ -18,7 +18,7 @@ void ddec2bases(double in,int base,int n,char* out) { int quot; //printf("%d\n",n); - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; //printf("%d",quot); while(quot!=0) diff --git a/src/c/elementaryFunctions/radix_conversions/dec2base/sdec2bases.c b/src/c/elementaryFunctions/radix_conversions/dec2base/sdec2bases.c index a627c052..2f7fca76 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2base/sdec2bases.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2base/sdec2bases.c @@ -17,7 +17,7 @@ void sdec2bases(float in,int base,int n,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c b/src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c index f5db16c8..eddf0838 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2bin/ddec2bins.c @@ -36,7 +36,7 @@ void ddec2bins(double in,int n,double* out) else j=n-1; - i=0; + i=0; while(i<j) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c b/src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c index 5df0fe8d..38eb4667 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2bin/i16dec2bins.c @@ -30,7 +30,7 @@ void i16dec2bins(int16 in,int n,int16* out) j=i-1; else j=n-1; - i=0; + i=0; while(i<j) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c b/src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c index ea689857..a477101e 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2bin/i8dec2bins.c @@ -30,7 +30,7 @@ void i8dec2bins(int8 in,int n,int8* out) j=i-1; else j=n-1; - i=0; + i=0; while(i<j) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bins.c b/src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bins.c index ea998897..653aa7ed 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bins.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2bin/u16dec2bins.c @@ -30,7 +30,7 @@ void u16dec2bins(uint16 in,int n,uint16* out) j=i-1; else j=n-1; - i=0; + i=0; while(i<j) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bins.c b/src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bins.c index af56d92f..ead5a050 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bins.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2bin/u8dec2bins.c @@ -30,7 +30,7 @@ void u8dec2bins(uint8 in,int n,uint8* out) j=i-1; else j=n-1; - i=0; + i=0; while(i<j) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexs.c b/src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexs.c index bcbb2667..3f2e380c 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexs.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2hex/ddec2hexs.c @@ -17,7 +17,7 @@ void ddec2hexs(double in,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { diff --git a/src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexs.c b/src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexs.c index f4a15ee2..ab348a03 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexs.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2hex/i16dec2hexs.c @@ -17,7 +17,7 @@ void i16dec2hexs(int16 in,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { @@ -44,6 +44,5 @@ void i16dec2hexs(int16 in,char* out) i++; j--; } - out[i+1]=' '; } diff --git a/src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexs.c b/src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexs.c index 290335f9..d1ec9ead 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexs.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2hex/i8dec2hexs.c @@ -17,7 +17,7 @@ void i8dec2hexs(int8 in,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { @@ -44,7 +44,6 @@ void i8dec2hexs(int8 in,char* out) i++; j--; } - out[i+1]=' '; } diff --git a/src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexs.c b/src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexs.c index b7c3c98a..8f61739f 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexs.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2hex/u16dec2hexs.c @@ -17,7 +17,7 @@ void u16dec2hexs(uint16 in,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { @@ -44,6 +44,5 @@ void u16dec2hexs(uint16 in,char* out) i++; j--; } - out[i+1]=' '; } diff --git a/src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexs.c b/src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexs.c index acf236e6..25223e3e 100644 --- a/src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexs.c +++ b/src/c/elementaryFunctions/radix_conversions/dec2hex/u8dec2hexs.c @@ -17,7 +17,7 @@ void u8dec2hexs(uint8 in,char* out) { int quot; - int i=0,j=0,k=0,tmp,temp; + int i=0,j=0,tmp,temp; quot=(int)in; while(quot!=0) { @@ -44,6 +44,5 @@ void u8dec2hexs(uint8 in,char* out) i++; j--; } - out[i+1]=' '; } diff --git a/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c b/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c index eb42a7a7..b5dc03cc 100644 --- a/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c +++ b/src/c/elementaryFunctions/radix_conversions/hex2dec/ghex2decs.c @@ -17,7 +17,7 @@ double ghex2decs(char* in,int size) { size-=2; - int i=0,val=0,j=0; + int i=0,val=0; double o=0.0; for(i=0; in[i]!='\0'; i++) { diff --git a/src/c/graphics/transforms/scaling/dscalinga.c b/src/c/graphics/transforms/scaling/dscalinga.c index 24d45733..078571f8 100644 --- a/src/c/graphics/transforms/scaling/dscalinga.c +++ b/src/c/graphics/transforms/scaling/dscalinga.c @@ -17,10 +17,7 @@ void dscalinga (double* inp1, int row, int col, double inp2, double* inp3, int size3, double* out) { - double temp[row*col], one[col], prod[row*col], diff[row*col]; - - for(int i = 0; i < row*col; i++) - temp[i] = inp1[i]; + double one[col], prod[row*col], diff[row*col]; donesa(one, 1, col); diff --git a/src/c/graphics/transforms/scaling/sscalinga.c b/src/c/graphics/transforms/scaling/sscalinga.c index 1adfcf3e..eb3b27f1 100644 --- a/src/c/graphics/transforms/scaling/sscalinga.c +++ b/src/c/graphics/transforms/scaling/sscalinga.c @@ -17,10 +17,7 @@ void sscalinga (float* inp1, int row, int col, double inp2, float* inp3, int size3, float* out) { - float temp[row*col], one[col], prod[row*col], diff[row*col]; - - for(int i = 0; i < row*col; i++) - temp[i] = inp1[i]; + float one[col], prod[row*col], diff[row*col]; sonesa(one, 1, col); diff --git a/src/c/graphics/transforms/scaling/zscalinga.c b/src/c/graphics/transforms/scaling/zscalinga.c index fb71a77e..6cf9d698 100644 --- a/src/c/graphics/transforms/scaling/zscalinga.c +++ b/src/c/graphics/transforms/scaling/zscalinga.c @@ -21,10 +21,7 @@ void zscalinga (doubleComplex* inp1, int row, int col, doubleComplex inp2, doubleComplex* inp3, int size3, doubleComplex* out) { - doubleComplex temp[row*col], one[col], prod[row*col], diff[row*col]; - - for(int i = 0; i < row*col; i++) - temp[i] = inp1[i]; + doubleComplex one[col], prod[row*col], diff[row*col]; zonesa(one, 1, col); diff --git a/src/c/interpolation/interp1/dinterp13a.c b/src/c/interpolation/interp1/dinterp13a.c index 7b755e1c..336c7e51 100644 --- a/src/c/interpolation/interp1/dinterp13a.c +++ b/src/c/interpolation/interp1/dinterp13a.c @@ -16,7 +16,7 @@ void dinterp13a(double *x,int size1,double *fx,int size2,double *q,int size3,char *ch,int size4,double *out) { - int i,j,k,f; + int i,j,f; double a,b; if(strcmp(ch,"linear")==0) { diff --git a/src/c/interpolation/interp1/sinterp13a.c b/src/c/interpolation/interp1/sinterp13a.c index b8cb0851..3c661ab9 100644 --- a/src/c/interpolation/interp1/sinterp13a.c +++ b/src/c/interpolation/interp1/sinterp13a.c @@ -16,7 +16,7 @@ void sinterp13a(float *x,int size1,float *fx,int size2,float *q,int size3,char *ch,int size4,float *out) { - int i,j,k,f; + int i,j,f; float a,b; if(strcmp(ch,"linear")==0) { diff --git a/src/c/linearAlgebra/givens/dgivensa.c b/src/c/linearAlgebra/givens/dgivensa.c index 9bf0637b..dbdbf7b5 100644 --- a/src/c/linearAlgebra/givens/dgivensa.c +++ b/src/c/linearAlgebra/givens/dgivensa.c @@ -19,6 +19,7 @@ givens(x,y)=givens([x;y]) */ +#include <stdlib.h> #include "givens.h" #include <stdio.h> #include <math.h> diff --git a/src/c/linearAlgebra/hess/dhessa.c b/src/c/linearAlgebra/hess/dhessa.c index e1f2e2d1..5c881d9d 100644 --- a/src/c/linearAlgebra/hess/dhessa.c +++ b/src/c/linearAlgebra/hess/dhessa.c @@ -27,7 +27,7 @@ extern int dorghr_(int *, int *,int *,double *,int *,double *,double *,int *,int /* All the vairbale names are given exactly the same name as scilab source code */ void dhessa(double *in1,int size,int nout,double *out1, double *out2){ /* Variables names are done through, Lapack library. */ - int i,j,k; + int i,j; int N = size; int ILO=1; int IHI=N; diff --git a/src/c/linearAlgebra/householder/dhouseholdera.c b/src/c/linearAlgebra/householder/dhouseholdera.c index 5a98bfae..d1bf8465 100644 --- a/src/c/linearAlgebra/householder/dhouseholdera.c +++ b/src/c/linearAlgebra/householder/dhouseholdera.c @@ -34,7 +34,7 @@ Syntax :- void dhouseholdera(int ninp,double *inp1,int row,double *inp2,double *out1){ - int i,j; + int i; double *x; x = (double *)malloc(row*sizeof(double)); diff --git a/src/c/linearAlgebra/lu/dlua.c b/src/c/linearAlgebra/lu/dlua.c index d3cf6d11..a5c4f5ff 100644 --- a/src/c/linearAlgebra/lu/dlua.c +++ b/src/c/linearAlgebra/lu/dlua.c @@ -21,12 +21,9 @@ extern double dgetrf_ (int* , int* , double* , int* , int* , int* ); void dlua(double*inp1, int size, double* out1, double* out2) { - char TRANS = 'N'; int INFO=3; int LDA = 3; - int LDB = 3; int N = 3; - int NRHS = 1; int IPIV[2] ; /*double A[9] = @@ -37,15 +34,13 @@ void dlua(double*inp1, int size, double* out1, double* out2) };*/ //void LAPACK_dgetrf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda, lapack_int* ipiv, lapack_int *info ); -// dgetrf_(&N,&N,inp1,&LDA,IPIV,&INFO); + dgetrf_(&N,&N,inp1,&LDA,IPIV,&INFO); - dgetrf_(6,2,inp1,6,IPIV,&INFO); - // checks INFO, if INFO != 0 something goes wrong, for more information see the MAN page of dgetrf. for(int i = 0; i < 3*3; i++) printf("%lf \n ", inp1[i]); - printf("PIVOTTTTTT \n "); + printf("PIVOTTTTTT \n "); for(int i = 0; i < 2; i++) printf("%d \n ", IPIV[i]); diff --git a/src/c/linearAlgebra/qr/dqra.c b/src/c/linearAlgebra/qr/dqra.c index bae4bc27..42912a90 100644 --- a/src/c/linearAlgebra/qr/dqra.c +++ b/src/c/linearAlgebra/qr/dqra.c @@ -19,6 +19,8 @@ #include "lapack.h" #include "string.h" #include "matrixTranspose.h" +#include "max.h" +#include "min.h" /*For reference check Scilab source code & lapack library websites Names of variable are almost same for convience. @@ -153,8 +155,6 @@ double dqra(int ninp,int nout,double *inp1,int M,int N,double tol,double *out1,d [Q,R]=qr(A) [Q,R,E]=qr(A) */ - int LDA = M; - double *TAU; TAU = (double *)malloc(min(M,N)*sizeof(double)); diff --git a/src/c/linearAlgebra/rank/zranka.c b/src/c/linearAlgebra/rank/zranka.c index 0efad251..3f04bb1d 100644 --- a/src/c/linearAlgebra/rank/zranka.c +++ b/src/c/linearAlgebra/rank/zranka.c @@ -20,6 +20,7 @@ #include "svd.h" #include "doubleComplex.h" #include "addition.h" +#include "max.h" #define eps 2.22044604925e-16 diff --git a/src/c/linearAlgebra/rowcomp/drowcompa.c b/src/c/linearAlgebra/rowcomp/drowcompa.c index 3161a2d6..f622849d 100644 --- a/src/c/linearAlgebra/rowcomp/drowcompa.c +++ b/src/c/linearAlgebra/rowcomp/drowcompa.c @@ -16,11 +16,13 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> +#include <string.h> #include "svd.h" #include "norm.h" #include "eye.h" #include "matrixTranspose.h" #include "qr.h" +#include "min.h" /* All variable names, are in consideration of scilab documentation. for reference please check the scilab code.*/ diff --git a/src/c/linearAlgebra/sqroot/dsqroota.c b/src/c/linearAlgebra/sqroot/dsqroota.c index 1ba97268..d31d7cf2 100644 --- a/src/c/linearAlgebra/sqroot/dsqroota.c +++ b/src/c/linearAlgebra/sqroot/dsqroota.c @@ -19,6 +19,7 @@ #include "matrixTranspose.h" #include "svd.h" #include "matrixMultiplication.h" +#include "min.h" #define eps 2.22044604925e-16 @@ -33,14 +34,11 @@ void dsqroota(double *inp,int row,int col, double *out){ } int i,j; double *U,*S,*V; - double *A,*B; int rk; U = (double *)malloc((double)row*row*sizeof(double)); - S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); + S = (double *)malloc((double)min(row,col)*min(row,col)*sizeof(double)); V = (double *)malloc((double)col*col*sizeof(double)); - A = (double *)malloc(rk*rk*sizeof(double)); - B = (double *)malloc(rk*row*sizeof(double)); double *Q1; Q1 = (double *)malloc(row*col*sizeof(double)); @@ -88,6 +86,10 @@ void dsqroota(double *inp,int row,int col, double *out){ } else{ rk = dsvda(0,inp,row,col,0,4,U,S,V); + + double *A,*B; + A = (double *)malloc(rk*rk*sizeof(double)); + B = (double *)malloc(rk*row*sizeof(double)); /*Will be used in complex numbers*/ //C = (double *)malloc(rk*row*sizeof(double)); diff --git a/src/c/linearAlgebra/sva/dsvaa.c b/src/c/linearAlgebra/sva/dsvaa.c index 691694e4..6c9d95e1 100644 --- a/src/c/linearAlgebra/sva/dsvaa.c +++ b/src/c/linearAlgebra/sva/dsvaa.c @@ -17,6 +17,8 @@ #include <stdlib.h> #include "string.h" #include "matrixTranspose.h" +#include "max.h" +#include "min.h" #define eps 2.22044604925e-16 @@ -30,18 +32,17 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ if(row == 0 && col == 0) return; int i,j; int arow; /*Actual row of given matrix*/ - int acol; /*Actual col of given matrix*/ /* Calculation of svd of a given matrix */ double *U,*S,*V; - U = (double *)malloc((double)row*Min(row,col)*sizeof(double)); - S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); - V = (double *)malloc((double)col*Min(row,col)*sizeof(double)); + U = (double *)malloc((double)row*min(row,col)*sizeof(double)); + S = (double *)malloc((double)min(row,col)*min(row,col)*sizeof(double)); + V = (double *)malloc((double)col*min(row,col)*sizeof(double)); dsvda(0,in1,M,N,1,3,U,S,V); if (ninp == 1){ /* [u,s,v] = sva(A) when input is only matrix */ - tol = Max(row,col)*S[0]*eps; + tol = max(row,col)*S[0]*eps; rk = 0; for(i=0;i<col;i++){ if(S[i+i*row] > tol){ @@ -53,7 +54,7 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ tol = in2; if(tol > 1){ rk = tol; - if(rk > Min(row,col)){ + if(rk > min(row,col)){ printf("ERROR: Wrong value for input argument !"); out1 = NULL; out2 = NULL; @@ -71,20 +72,18 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ } } arow = M; - acol = Min(M,N); /* Copying, the output in required format */ for(i=0;i<arow;i++){ for(j=0;j<rk;j++){ out1[i+j*row]=U[i+j*arow]; } } - arow = Min(M,N); + arow = min(M,N); for(i=0;i<rk;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out2[i+j*(int)rk] = S[i+j*arow]; } } arow = N; - acol = Min(M,N); for(i=0;i<arow;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out3[i+j*arow] = V[i+j*arow]; diff --git a/src/c/matrixOperations/cross/ccrossa.c b/src/c/matrixOperations/cross/ccrossa.c index 5f74bb36..6563d374 100644 --- a/src/c/matrixOperations/cross/ccrossa.c +++ b/src/c/matrixOperations/cross/ccrossa.c @@ -15,9 +15,9 @@ void ccrossa (floatComplex* inp1, int size1_r, int size1_c, floatComplex* inp2, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%f %f ", crealf(oup[0]), cimagf(oup[0])); + printf("%f %f ", crealf(oup[1]), cimagf(oup[1])); + printf("%f %f \n", crealf(oup[2]), cimagf(oup[2])); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/i16crossa.c b/src/c/matrixOperations/cross/i16crossa.c index 91cdb7f0..77a3ca36 100644 --- a/src/c/matrixOperations/cross/i16crossa.c +++ b/src/c/matrixOperations/cross/i16crossa.c @@ -12,9 +12,9 @@ void i16crossa (int16* inp1, int size1_r, int size1_c, int16* inp2, int size2_r, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%d ", oup[0]); + printf("%d ", oup[1]); + printf("%d \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/i8crossa.c b/src/c/matrixOperations/cross/i8crossa.c index adfbd534..f485ebb7 100644 --- a/src/c/matrixOperations/cross/i8crossa.c +++ b/src/c/matrixOperations/cross/i8crossa.c @@ -12,9 +12,9 @@ void i8crossa (int8* inp1, int size1_r, int size1_c, int8* inp2, int size2_r, in oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%d ", oup[0]); + printf("%d ", oup[1]); + printf("%d \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/u16crossa.c b/src/c/matrixOperations/cross/u16crossa.c index e0a32bcc..3cf813c9 100644 --- a/src/c/matrixOperations/cross/u16crossa.c +++ b/src/c/matrixOperations/cross/u16crossa.c @@ -12,9 +12,9 @@ void u16crossa (uint16* inp1, int size1_r, int size1_c, uint16* inp2, int size2_ oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%u ", oup[0]); + printf("%u ", oup[1]); + printf("%u \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/u8crossa.c b/src/c/matrixOperations/cross/u8crossa.c index 7a8b857f..7c2d7c1a 100644 --- a/src/c/matrixOperations/cross/u8crossa.c +++ b/src/c/matrixOperations/cross/u8crossa.c @@ -12,9 +12,9 @@ void u8crossa (uint8* inp1, int size1_r, int size1_c, uint8* inp2, int size2_r, oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%u ", oup[0]); + printf("%u ", oup[1]); + printf("%u \n", oup[2]); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/cross/zcrossa.c b/src/c/matrixOperations/cross/zcrossa.c index 85a19607..591c1087 100644 --- a/src/c/matrixOperations/cross/zcrossa.c +++ b/src/c/matrixOperations/cross/zcrossa.c @@ -15,9 +15,9 @@ void zcrossa (doubleComplex* inp1, int size1_r, int size1_c, doubleComplex* inp2 oup[0] = inp1[1]*inp2[2] - inp1[2]*inp2[1]; oup[1] = inp1[2]*inp2[0] - inp1[0]*inp2[2]; oup[2] = inp1[0]*inp2[1] - inp1[1]*inp2[0]; - printf("%lf ", oup[0]); - printf("%lf ", oup[1]); - printf("%lf \n", oup[2]); + printf("%lf %lf ", creal(oup[0]), cimag(oup[0])); + printf("%lf %lf ", creal(oup[1]), cimag(oup[1])); + printf("%lf %lf \n", creal(oup[2]), cimag(oup[2])); } else // Calculating the cross product for a 3XN Matrix { diff --git a/src/c/matrixOperations/expm/cexpma.c b/src/c/matrixOperations/expm/cexpma.c index 7da0fc70..e7c9f0b2 100644 --- a/src/c/matrixOperations/expm/cexpma.c +++ b/src/c/matrixOperations/expm/cexpma.c @@ -69,7 +69,7 @@ void cexpma(floatComplex * in, floatComplex * out, int _iLeadDim) pfltMatrixX[iIndex1] = pfltMatrixA[iIndex1] ; - ceyea(pfltMatrixEye, _iLeadDim, _iLeadDim); + ceyea(pfltMatrixEye, _iLeadDim, _iLeadDim); /*cmulma ( & cfltCst , 1 ,1, pfltMatrixA , _iLeadDim, _iLeadDim, diff --git a/src/c/matrixOperations/expm/dexpma.c b/src/c/matrixOperations/expm/dexpma.c index d9b42327..8939813d 100644 --- a/src/c/matrixOperations/expm/dexpma.c +++ b/src/c/matrixOperations/expm/dexpma.c @@ -67,7 +67,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) pdblMatrixX[iIndex1] = pdblMatrixA[iIndex1] ; - deyea(pdblMatrixEye, _iLeadDim, _iLeadDim); + deyea(pdblMatrixEye, _iLeadDim, _iLeadDim); /*cA = A * c*/ @@ -106,7 +106,7 @@ void dexpma (double* in, double* out, int _iLeadDim){ pdblMatrixcX[iIndex1] = pdblMatrixX[iIndex1] * dblCst ; /*E = E + cX*/ - dadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; + dadda ( out, iSquare , pdblMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { diff --git a/src/c/matrixOperations/expm/sexpma.c b/src/c/matrixOperations/expm/sexpma.c index cd969981..b265a212 100644 --- a/src/c/matrixOperations/expm/sexpma.c +++ b/src/c/matrixOperations/expm/sexpma.c @@ -68,7 +68,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ for ( iIndex1 = 0 ; iIndex1 < iSquare ; iIndex1++ ) pfltMatrixX[iIndex1] = pfltMatrixA[iIndex1] ; - seyea(pfltMatrixEye, _iLeadDim, _iLeadDim); + seyea(pfltMatrixEye, _iLeadDim, _iLeadDim); /*cA = A * c*/ @@ -110,7 +110,7 @@ void sexpma (float* in, float* out, int _iLeadDim){ pfltMatrixcX[iIndex1] = pfltMatrixX[iIndex1] * (float) dblCst ; /*E = E + cX*/ - sadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; + sadda ( out, iSquare , pfltMatrixcX , iSquare , out ) ; if(iFlag == 1) /*D = D + cX*/ { diff --git a/src/c/matrixOperations/expm/zexpma.c b/src/c/matrixOperations/expm/zexpma.c index 3de35e02..680f68ab 100644 --- a/src/c/matrixOperations/expm/zexpma.c +++ b/src/c/matrixOperations/expm/zexpma.c @@ -71,7 +71,7 @@ void zexpma(doubleComplex * in, doubleComplex * out, int _iLeadDim) pdblMatrixX[iIndex1] = pdblMatrixA[iIndex1] ; - zeyea(pdblMatrixEye, _iLeadDim, _iLeadDim); + zeyea(pdblMatrixEye, _iLeadDim, _iLeadDim); /* zmulma ( & zdblCst , 1 ,1, pdblMatrixA , _iLeadDim, _iLeadDim, diff --git a/src/c/matrixOperations/matrix/dmatrixa.c b/src/c/matrixOperations/matrix/dmatrixa.c index 649dbc34..9bbc2154 100644 --- a/src/c/matrixOperations/matrix/dmatrixa.c +++ b/src/c/matrixOperations/matrix/dmatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/smatrixa.c b/src/c/matrixOperations/matrix/smatrixa.c index f432023a..6c00f980 100644 --- a/src/c/matrixOperations/matrix/smatrixa.c +++ b/src/c/matrixOperations/matrix/smatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/u16matrixa.c b/src/c/matrixOperations/matrix/u16matrixa.c index e60d880d..ff0965ba 100644 --- a/src/c/matrixOperations/matrix/u16matrixa.c +++ b/src/c/matrixOperations/matrix/u16matrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "uint16.h" diff --git a/src/c/matrixOperations/matrix/zmatrixa.c b/src/c/matrixOperations/matrix/zmatrixa.c index 5e5651b1..3f0e6b9b 100644 --- a/src/c/matrixOperations/matrix/zmatrixa.c +++ b/src/c/matrixOperations/matrix/zmatrixa.c @@ -12,6 +12,7 @@ /*Function returns cumulative sum of members of array/matrix*/ +#include <stdio.h> #include "matrix.h" #include "types.h" #include "doubleComplex.h" diff --git a/src/c/matrixOperations/norm/dnorma.c b/src/c/matrixOperations/norm/dnorma.c index 2bb9b8b7..4d016de0 100644 --- a/src/c/matrixOperations/norm/dnorma.c +++ b/src/c/matrixOperations/norm/dnorma.c @@ -20,6 +20,7 @@ #include <math.h> #include <stdio.h> #include<stdlib.h> +#include "min.h" double dnorma (double *in, int row, int col, int norm) { diff --git a/src/c/signalProcessing/%k/dmodka.c b/src/c/signalProcessing/%k/dmodka.c index 8368cb6b..d9dab00b 100644 --- a/src/c/signalProcessing/%k/dmodka.c +++ b/src/c/signalProcessing/%k/dmodka.c @@ -41,9 +41,9 @@ void dmodka(double* inp,int size,double* oup) { ones[i]=1; } - double a[size],b[size],c[size],an[size],bn[size],cn[size],kans[size]; + double a[size],b[size],c[size],an[size],bn[size],cn[size]; - int j,kk,l,m; + int j,kk,l; for(j=0;j<size;j++) { a[j]=1; @@ -57,7 +57,6 @@ void dmodka(double* inp,int size,double* oup) c[l]=sqrt(inp[l]); } - int x=0; while(max_calc(c,size)>eps) { @@ -88,7 +87,7 @@ void dmodka(double* inp,int size,double* oup) c[z]=cn[z]; } } - int q,w; + int q; for(q=0;q<size;q++) { oup[q]=PI*(ones[q]/(2*a[q])); diff --git a/src/c/signalProcessing/%sn/zmodsna.c b/src/c/signalProcessing/%sn/zmodsna.c index 85bc0c16..a84b9ecb 100644 --- a/src/c/signalProcessing/%sn/zmodsna.c +++ b/src/c/signalProcessing/%sn/zmodsna.c @@ -16,9 +16,8 @@ #define CA 0.0003 -doubleComplex zmodsnsproto(doubleComplex uu,double emmc,doubleComplex* sni) +void zmodsnsproto(doubleComplex uu,double emmc,doubleComplex* sni) { - doubleComplex ans; double uur,uui; uur=zreals(uu); uui=zimags(uu); diff --git a/src/c/signalProcessing/cheb2mag/dcheb2mags.c b/src/c/signalProcessing/cheb2mag/dcheb2mags.c index 006c5917..b63d3efe 100644 --- a/src/c/signalProcessing/cheb2mag/dcheb2mags.c +++ b/src/c/signalProcessing/cheb2mag/dcheb2mags.c @@ -17,7 +17,7 @@ void dcheb2mags(double n,double omegar, double A, double* sample,int size,double double e; //e=sqrt(A*A-1); e=1/(pow(10,A/10)-1); - double x,k,cn,h,tp; + double x,cn,h,tp; int i; for(i=0;i<size;i++) { diff --git a/src/c/signalProcessing/ffilt/gffilts.c b/src/c/signalProcessing/ffilt/gffilts.c index 09876d00..d4bdd75e 100644 --- a/src/c/signalProcessing/ffilt/gffilts.c +++ b/src/c/signalProcessing/ffilt/gffilts.c @@ -18,7 +18,6 @@ void gffilts(char* ft,int size,double N,double fc,double fh,double* oup) int sz=N; double X[sz]; double no22=(N-1)/2; - int ino22=(int)no22; if(ft[0]=='l') { dfilt_sincs(N,fc,X); diff --git a/src/c/signalProcessing/fft/fft842.c b/src/c/signalProcessing/fft/fft842.c index 162490fe..e3737f86 100644 --- a/src/c/signalProcessing/fft/fft842.c +++ b/src/c/signalProcessing/fft/fft842.c @@ -29,7 +29,6 @@ static int fastlog2( int n) void fft842 (doubleComplex* b, int size , int in) { - double fn; doubleComplex temp ; int L[16],L1,L2,L3,L4,L5,L6,L7,L8,L9,L10,L11,L12,L13,L14,L15; @@ -39,7 +38,6 @@ void fft842 (doubleComplex* b, int size , int in) n2pow = fastlog2( size ); nthpo = size ; - fn = 1.0 / (double)nthpo; if(in==FORWARD) diff --git a/src/c/signalProcessing/filt_sinc/dfilt_sincs.c b/src/c/signalProcessing/filt_sinc/dfilt_sincs.c index 1b7d1b18..384f372a 100644 --- a/src/c/signalProcessing/filt_sinc/dfilt_sincs.c +++ b/src/c/signalProcessing/filt_sinc/dfilt_sincs.c @@ -39,7 +39,6 @@ void dfilt_sincs(double N,double fc,double* oup) xn[(int)no2]=2*fc; xd[(int)no2]=1; } - double x[sz]; int k; for(k=0;k<N;k++) { diff --git a/src/c/signalProcessing/fsfirlin/dfsfirlina.c b/src/c/signalProcessing/fsfirlin/dfsfirlina.c index e44f464e..8d4a6d70 100644 --- a/src/c/signalProcessing/fsfirlin/dfsfirlina.c +++ b/src/c/signalProcessing/fsfirlin/dfsfirlina.c @@ -41,7 +41,6 @@ void dfsfirlina(double* hd,int size,double flag,double* hst) double eps=pow(-1,(n-1)); double s1[sz+1],s2[sz+1]; double s[2*(sz)+1]; - double sr[2*(sz)+1]; if(flag==1) { int j,k; diff --git a/src/c/signalProcessing/sincd/dsincds.c b/src/c/signalProcessing/sincd/dsincds.c index c9f2f815..f1744b69 100644 --- a/src/c/signalProcessing/sincd/dsincds.c +++ b/src/c/signalProcessing/sincd/dsincds.c @@ -28,7 +28,6 @@ void dsincds(double n,double flg,double* oup) double eps=pow(-1,(n-1)); double s1[sz+1],s2[sz+1]; double s[2*(sz)+1]; - double sr[2*(sz)+1]; if(flg==1) { int j,k; diff --git a/src/c/signalProcessing/sincd/u8sincds.c b/src/c/signalProcessing/sincd/u8sincds.c index ff0a2acc..0c2584f2 100644 --- a/src/c/signalProcessing/sincd/u8sincds.c +++ b/src/c/signalProcessing/sincd/u8sincds.c @@ -28,7 +28,6 @@ void u8sincds(int n,int flg,double* oup) double eps=pow(-1,(n-1)); double s1[sz+1],s2[sz+1]; double s[2*(sz)+1]; - double sr[2*(sz)+1]; if(flg==1) { int j,k; diff --git a/src/c/signalProcessing/transforms/dct/cdcta.c b/src/c/signalProcessing/transforms/dct/cdcta.c index 7ff83645..3bd58bf5 100644 --- a/src/c/signalProcessing/transforms/dct/cdcta.c +++ b/src/c/signalProcessing/transforms/dct/cdcta.c @@ -22,13 +22,12 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out) { - int i,j,k,u,v; + int i,j,u,v; int n; int x,y; float res,ress,vv,ff; - float re,z,q,m; - floatComplex accu = FloatComplex(0, 0); - floatComplex temp,mm,aa,bb,cc; + float z,q; + floatComplex temp,mm,aa,bb; if(sign==-1) { if(row==1) @@ -183,7 +182,6 @@ void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out) out[x]=FloatComplex(0,0); for(i=0;i<row;i++) { - re=0; mm=FloatComplex(0,0); temp=FloatComplex(0,0); for(j=0;j<col;j++) diff --git a/src/c/signalProcessing/transforms/dct/ddcta.c b/src/c/signalProcessing/transforms/dct/ddcta.c index 3802c816..87159af6 100644 --- a/src/c/signalProcessing/transforms/dct/ddcta.c +++ b/src/c/signalProcessing/transforms/dct/ddcta.c @@ -17,7 +17,7 @@ void ddcta(double *in,int row,int col,int sign,double *out) { - int i,j,k,u,v; + int i,j,u,v; int n; int x,y; double res,ress; diff --git a/src/c/signalProcessing/transforms/dct/sdcta.c b/src/c/signalProcessing/transforms/dct/sdcta.c index 9f380e8b..ff09e5d6 100644 --- a/src/c/signalProcessing/transforms/dct/sdcta.c +++ b/src/c/signalProcessing/transforms/dct/sdcta.c @@ -17,7 +17,7 @@ void sdcta(float *in,int row,int col,int sign,float *out) { - int i,j,k,u,v; + int i,j,u,v; int n; int x,y; float res,ress; diff --git a/src/c/signalProcessing/transforms/dct/zdcta.c b/src/c/signalProcessing/transforms/dct/zdcta.c index 3ae2e333..bf71200b 100644 --- a/src/c/signalProcessing/transforms/dct/zdcta.c +++ b/src/c/signalProcessing/transforms/dct/zdcta.c @@ -22,13 +22,12 @@ void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out) { - int i,j,k,u,v; + int i,j,u,v; int n; int x,y; double res,ress,vv,ff; - double re,z,q,m; - doubleComplex accu = DoubleComplex(0, 0); - doubleComplex temp,mm,aa,bb,cc; + double z,q; + doubleComplex temp,mm,aa,bb; if(sign==-1) { if(row==1) @@ -183,7 +182,6 @@ void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out) out[x]=DoubleComplex(0,0); for(i=0;i<row;i++) { - re=0; mm=DoubleComplex(0,0); temp=DoubleComplex(0,0); for(j=0;j<col;j++) diff --git a/src/c/signalProcessing/transforms/idct/cidcta.c b/src/c/signalProcessing/transforms/idct/cidcta.c index ae98ba19..dad49504 100644 --- a/src/c/signalProcessing/transforms/idct/cidcta.c +++ b/src/c/signalProcessing/transforms/idct/cidcta.c @@ -22,13 +22,12 @@ void cidcta(floatComplex *in,int row,int col,floatComplex *out) { - int i,j,k,u,v; + int i,j,u,v; int n=col; int x,y; - float res,ress,vv,ff; - float re,z,q,m; - floatComplex accu = FloatComplex(0, 0); - floatComplex temp,mm,aa,bb; + float res,ress,vv; + float z,q; + floatComplex temp,mm,aa; if(row==1) { res=1./sqrt(n); @@ -72,7 +71,6 @@ void cidcta(floatComplex *in,int row,int col,floatComplex *out) out[x]=FloatComplex(0,0); for(i=0;i<row;i++) { - re=0; mm=FloatComplex(0,0); temp=FloatComplex(0,0); for(j=0;j<col;j++) diff --git a/src/c/signalProcessing/transforms/idct/didcta.c b/src/c/signalProcessing/transforms/idct/didcta.c index 5f475160..671c5105 100644 --- a/src/c/signalProcessing/transforms/idct/didcta.c +++ b/src/c/signalProcessing/transforms/idct/didcta.c @@ -17,7 +17,7 @@ void didcta(double *in,int row,int col,double *out) { - int i,j,k,u,v; + int i,j,u,v; int n=col; int x,y; double res,ress; diff --git a/src/c/signalProcessing/transforms/idct/sidcta.c b/src/c/signalProcessing/transforms/idct/sidcta.c index 62f85da0..54dffeef 100644 --- a/src/c/signalProcessing/transforms/idct/sidcta.c +++ b/src/c/signalProcessing/transforms/idct/sidcta.c @@ -17,7 +17,7 @@ void sidcta(float *in,int row,int col,float *out) { - int i,j,k,u,v; + int i,j,u,v; int n=col; int x,y; float res,ress; diff --git a/src/c/signalProcessing/transforms/idct/zidcta.c b/src/c/signalProcessing/transforms/idct/zidcta.c index cc01c966..10c035cd 100644 --- a/src/c/signalProcessing/transforms/idct/zidcta.c +++ b/src/c/signalProcessing/transforms/idct/zidcta.c @@ -22,13 +22,12 @@ void zidcta(doubleComplex *in,int row,int col,doubleComplex *out) { - int i,j,k,u,v; + int i,j,u,v; int n=col; int x,y; - double res,ress,vv,ff; - double re,z,q,m; - doubleComplex accu = DoubleComplex(0, 0); - doubleComplex temp,mm,aa,bb; + double res,ress,vv; + double z,q; + doubleComplex temp,mm,aa; if(row==1) { res=1./sqrt(n); @@ -72,7 +71,6 @@ void zidcta(doubleComplex *in,int row,int col,doubleComplex *out) out[x]=DoubleComplex(0,0); for(i=0;i<row;i++) { - re=0; mm=DoubleComplex(0,0); temp=DoubleComplex(0,0); for(j=0;j<col;j++) diff --git a/src/c/signalProcessing/zpch2/dzpch2s.c b/src/c/signalProcessing/zpch2/dzpch2s.c index 22a46a64..73ca0212 100644 --- a/src/c/signalProcessing/zpch2/dzpch2s.c +++ b/src/c/signalProcessing/zpch2/dzpch2s.c @@ -19,7 +19,7 @@ double dzpch2s(double N, double A, double omegar,doubleComplex* zeros,doubleComplex* poles) { int k,j; - double e,xk,realVal,gain; + double xk,gain; doubleComplex accumulate1,accumulate2,tp1,tp2; accumulate1=DoubleComplex(1,0); accumulate2=DoubleComplex(1,0); diff --git a/src/c/specialFunctions/besseli/dbesselia.c b/src/c/specialFunctions/besseli/dbesselia.c index 14ac1ed3..46cedf80 100644 --- a/src/c/specialFunctions/besseli/dbesselia.c +++ b/src/c/specialFunctions/besseli/dbesselia.c @@ -26,8 +26,7 @@ double onebessi( double inp1, double inp2) if (inp1 < 0) { - double dblank; - return( dblank ); + return 0.0/0.0; } if (inp1 == 0) { diff --git a/src/c/specialFunctions/besseli/sbesselia.c b/src/c/specialFunctions/besseli/sbesselia.c index 6e185e0b..55ec43b6 100644 --- a/src/c/specialFunctions/besseli/sbesselia.c +++ b/src/c/specialFunctions/besseli/sbesselia.c @@ -26,8 +26,7 @@ float fonebessi( float inp1, float inp2) if (inp1 < 0) { - float dblank; - return( dblank ); + return 0.0/0.0; } if (inp1 == 0) { diff --git a/src/c/specialFunctions/besselj/dbesselja.c b/src/c/specialFunctions/besselj/dbesselja.c index 23a355f5..8054bd53 100644 --- a/src/c/specialFunctions/besselj/dbesselja.c +++ b/src/c/specialFunctions/besselj/dbesselja.c @@ -81,9 +81,7 @@ double bessj( int n, double x ) if (n < 0) { - double dblank; - //setdblack_c( &dblank ); - return( dblank ); + return 0.0/0.0; } ax=fabs(x); if (n == 0) diff --git a/src/c/specialFunctions/besselj/sbesselja.c b/src/c/specialFunctions/besselj/sbesselja.c index 68d2ea4f..57e3d63c 100644 --- a/src/c/specialFunctions/besselj/sbesselja.c +++ b/src/c/specialFunctions/besselj/sbesselja.c @@ -81,8 +81,7 @@ float fbessj( int n, float x ) if (n < 0) { - float dblank; - return( dblank ); + return 0.0/0.0; } ax=fabs(x); if (n == 0) diff --git a/src/c/specialFunctions/besselk/dbesselka.c b/src/c/specialFunctions/besselk/dbesselka.c index df6c0708..1f01ee63 100644 --- a/src/c/specialFunctions/besselk/dbesselka.c +++ b/src/c/specialFunctions/besselk/dbesselka.c @@ -109,8 +109,7 @@ double bessk( int n, double x ) if (n < 0 || x == 0.0) { - double dblank; - return( dblank ); + return 0.0/0.0; } if (n == 0) return( bessk0(x) ); diff --git a/src/c/specialFunctions/besselk/sbesselka.c b/src/c/specialFunctions/besselk/sbesselka.c index bfb35eb1..56d3207b 100644 --- a/src/c/specialFunctions/besselk/sbesselka.c +++ b/src/c/specialFunctions/besselk/sbesselka.c @@ -109,8 +109,7 @@ float fbessk( int n, float x ) if (n < 0 || x == 0.0) { - float dblank; - return( dblank ); + return 0.0/0.0; } if (n == 0) return( fbessk0(x) ); diff --git a/src/c/specialFunctions/bessely/dbesselya.c b/src/c/specialFunctions/bessely/dbesselya.c index 76678629..14ea8583 100644 --- a/src/c/specialFunctions/bessely/dbesselya.c +++ b/src/c/specialFunctions/bessely/dbesselya.c @@ -135,8 +135,7 @@ double bessy( int n, double x ) if (n < 0 || x == 0.0) { - double dblank; - return( dblank ); + return 0.0/0.0; } if (n == 0) return( bessy0(x) ); diff --git a/src/c/specialFunctions/bessely/sbesselya.c b/src/c/specialFunctions/bessely/sbesselya.c index 1b42736c..2e8b08d8 100644 --- a/src/c/specialFunctions/bessely/sbesselya.c +++ b/src/c/specialFunctions/bessely/sbesselya.c @@ -136,8 +136,7 @@ float fbessy( int n, float x ) if (n < 0 || x == 0.0) { - float dblank; - return( dblank ); + return 0.0/0.0; } if (n == 0) return( fbessy0(x) ); diff --git a/src/c/specialFunctions/calerf/dcalerfs.c b/src/c/specialFunctions/calerf/dcalerfs.c index c3608653..3b2bfd7a 100644 --- a/src/c/specialFunctions/calerf/dcalerfs.c +++ b/src/c/specialFunctions/calerf/dcalerfs.c @@ -25,5 +25,6 @@ double dcalerfs (double inp1, double inp2) return derfcs(inp1); if (inp2 == 2) return derfcxs(inp1); + return 0.0/0.0; } diff --git a/src/c/specialFunctions/calerf/scalerfs.c b/src/c/specialFunctions/calerf/scalerfs.c index ffc48c37..20de0c34 100644 --- a/src/c/specialFunctions/calerf/scalerfs.c +++ b/src/c/specialFunctions/calerf/scalerfs.c @@ -25,5 +25,6 @@ float scalerfs (float inp1, double inp2) return derfcs(inp1); if (inp2 == 2) return derfcxs(inp1); + return 0.0/0.0; } diff --git a/src/c/specialFunctions/erfinv/derfinvs.c b/src/c/specialFunctions/erfinv/derfinvs.c index 3f7fe761..2dce2051 100644 --- a/src/c/specialFunctions/erfinv/derfinvs.c +++ b/src/c/specialFunctions/erfinv/derfinvs.c @@ -28,7 +28,8 @@ double derfinvs (double inp1) { return 0.0/0.0; // returns Nan } - if ((inp1 >= -0.7) && (inp1 <= 0.7)) + + else if ((inp1 >= -0.7) && (inp1 <= 0.7)) { double sq = inp1 * inp1; return (inp1 * (((a[3]*sq+a[2]) * sq+a[1]) * sq+a[0]) / ((((b[3]*sq+b[2]) * sq+b[1]) * sq+b[0]) * sq+1)); //Inverse error formula @@ -45,5 +46,10 @@ double derfinvs (double inp1) double z = sqrt(-log((1+inp1)/2)); return (-(((c[3]*z+c[2]) * z+c[1]) * z+c[0]) / ((d[1]*z+d[0]) * z+1)); //Inverse error formula } + + else + { + return 0.0/0.0; // returns Nan + } } diff --git a/src/c/specialFunctions/erfinv/serfinvs.c b/src/c/specialFunctions/erfinv/serfinvs.c index 5436fe39..55ba532f 100644 --- a/src/c/specialFunctions/erfinv/serfinvs.c +++ b/src/c/specialFunctions/erfinv/serfinvs.c @@ -29,7 +29,8 @@ float serfinvs (float inp1) double na = 0.0/0.0; return (float)na; } - if ((inp1 >= -0.7) && (inp1 <= 0.7)) + + else if ((inp1 >= -0.7) && (inp1 <= 0.7)) { float sq = inp1 * inp1; return (inp1 * (((a[3]*sq+a[2]) * sq+a[1]) * sq+a[0]) / ((((b[3]*sq+b[2]) * sq+b[1]) * sq+b[0]) * sq+1)); //Inverse error formula @@ -46,5 +47,10 @@ float serfinvs (float inp1) float z = sqrt(-log((1+inp1)/2)); return (-(((c[3]*z+c[2]) * z+c[1]) * z+c[0]) / ((d[1]*z+d[0]) * z+1)); //Inverse error formula } + + else + { + return 0.0/0.0; + } } diff --git a/src/c/statisticsFunctions/center/dcentera.c b/src/c/statisticsFunctions/center/dcentera.c index 87480386..17b95c0c 100644 --- a/src/c/statisticsFunctions/center/dcentera.c +++ b/src/c/statisticsFunctions/center/dcentera.c @@ -8,7 +8,7 @@ void dcentera (double* inp, int row, int col, double* out) { - double sum = 0, xbar = 0, sigma = 0; + double sum = 0, xbar = 0; for(int i = 0; i < row*col; i++) // Findinag the maen of all the elements of the matrix sum += inp[i]; xbar = sum/(row*col); diff --git a/src/c/statisticsFunctions/center/scentera.c b/src/c/statisticsFunctions/center/scentera.c index 2b165be1..3f9c7930 100644 --- a/src/c/statisticsFunctions/center/scentera.c +++ b/src/c/statisticsFunctions/center/scentera.c @@ -8,7 +8,7 @@ void scentera (float* inp, int row, int col, float* out) { - float sum = 0, xbar = 0, sigma = 0; + float sum = 0, xbar = 0; for(int i = 0; i < row*col; i++) // Findinag the maen of all the elements of the matrix sum += inp[i]; xbar = sum/(row*col); diff --git a/src/c/statisticsFunctions/center/zcentera.c b/src/c/statisticsFunctions/center/zcentera.c index 22ce70d7..8f18c996 100644 --- a/src/c/statisticsFunctions/center/zcentera.c +++ b/src/c/statisticsFunctions/center/zcentera.c @@ -12,7 +12,7 @@ void zcentera (doubleComplex* inp, int row, int col, doubleComplex* out) { - doubleComplex sum = 0, xbar = 0, sigma = 0; + doubleComplex sum = 0, xbar = 0; for(int i = 0; i < row*col; i++) // Findinag the maen of all the elements of the matrix sum = zadds(sum,inp[i]); xbar = zrdivs(sum,(row*col)); diff --git a/src/c/statisticsFunctions/center/zcentercola.c b/src/c/statisticsFunctions/center/zcentercola.c index 8a838bc5..43921ac4 100644 --- a/src/c/statisticsFunctions/center/zcentercola.c +++ b/src/c/statisticsFunctions/center/zcentercola.c @@ -9,6 +9,7 @@ #include "center.h" #include "doubleComplex.h" #include "sqrt.h" +#include "matrixMultiplication.h" void zcentercola (doubleComplex* inp, int row, int col, doubleComplex* out) { diff --git a/src/c/statisticsFunctions/center/zcenterrowa.c b/src/c/statisticsFunctions/center/zcenterrowa.c index cddd3403..cd69e0c1 100644 --- a/src/c/statisticsFunctions/center/zcenterrowa.c +++ b/src/c/statisticsFunctions/center/zcenterrowa.c @@ -9,6 +9,7 @@ #include "center.h" #include "doubleComplex.h" #include "sqrt.h" +#include "matrixMultiplication.h" void zcenterrowa (doubleComplex* inp, int row, int col, doubleComplex* out) { diff --git a/src/c/statisticsFunctions/correl/dcorrelfres.c b/src/c/statisticsFunctions/correl/dcorrelfres.c index 7d4c718a..34389353 100644 --- a/src/c/statisticsFunctions/correl/dcorrelfres.c +++ b/src/c/statisticsFunctions/correl/dcorrelfres.c @@ -11,10 +11,11 @@ #include "correl.h" #include "matrix.h" #include "mean.h" +#include "matrixMultiplication.h" double dcorrelfres (double* inp1, int sr1, int sc1, double* inp2, int sr2, int sc2, double* inp3, int sr3, int sc3) { - double p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], sum = 0, prod[sr3]; + double p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], prod[sr3]; double fr[sr3*sc3]; diff --git a/src/c/statisticsFunctions/correl/scorrelfres.c b/src/c/statisticsFunctions/correl/scorrelfres.c index 2d056a5b..066063cd 100644 --- a/src/c/statisticsFunctions/correl/scorrelfres.c +++ b/src/c/statisticsFunctions/correl/scorrelfres.c @@ -11,10 +11,11 @@ #include "correl.h" #include "matrix.h" #include "mean.h" +#include "matrixMultiplication.h" float scorrelfres (float* inp1, int sr1, int sc1, float* inp2, int sr2, int sc2, float* inp3, int sr3, int sc3) { - float p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], sum = 0, prod[sr3]; + float p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], prod[sr3]; float fr[sr3*sc3]; diff --git a/src/c/statisticsFunctions/correl/zcorrelfres.c b/src/c/statisticsFunctions/correl/zcorrelfres.c index b026c58a..a183ec77 100644 --- a/src/c/statisticsFunctions/correl/zcorrelfres.c +++ b/src/c/statisticsFunctions/correl/zcorrelfres.c @@ -13,10 +13,11 @@ #include "matrix.h" #include "mean.h" #include "doubleComplex.h" +#include "matrixMultiplication.h" doubleComplex zcorrelfres (doubleComplex* inp1, int sr1, int sc1, doubleComplex* inp2, int sr2, int sc2, doubleComplex* inp3, int sr3, int sc3) { - doubleComplex p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], sum = 0, prod[sr3]; + doubleComplex p1[sr3], p2[sc3], m1 = 0, m2 = 0, s1 = 0, s2 = 0, s3 = 0, diff1[sr1*sc1], diff2[sr2*sc2], prod[sr3]; doubleComplex fr[sr3*sc3]; diff --git a/src/c/statisticsFunctions/covar/dcovars.c b/src/c/statisticsFunctions/covar/dcovars.c index f67905ee..f4bff05c 100644 --- a/src/c/statisticsFunctions/covar/dcovars.c +++ b/src/c/statisticsFunctions/covar/dcovars.c @@ -11,6 +11,7 @@ #include "correl.h" #include "matrix.h" #include "mean.h" +#include "matrixMultiplication.h" double dcovars (double* inp1, int sr1, int sc1, double* inp2, int sr2, int sc2, double* fre, int sr3, int sc3) { diff --git a/src/c/statisticsFunctions/covar/scovars.c b/src/c/statisticsFunctions/covar/scovars.c index daff6b94..2f1c9ecb 100644 --- a/src/c/statisticsFunctions/covar/scovars.c +++ b/src/c/statisticsFunctions/covar/scovars.c @@ -11,6 +11,7 @@ #include "correl.h" #include "matrix.h" #include "mean.h" +#include "matrixMultiplication.h" float scovars (float* inp1, int sr1, int sc1, float* inp2, int sr2, int sc2, float* fre, int sr3, int sc3) { diff --git a/src/c/statisticsFunctions/covar/zcovars.c b/src/c/statisticsFunctions/covar/zcovars.c index 6adbd3c9..3a395fb5 100644 --- a/src/c/statisticsFunctions/covar/zcovars.c +++ b/src/c/statisticsFunctions/covar/zcovars.c @@ -12,6 +12,7 @@ #include "matrix.h" #include "mean.h" #include "doubleComplex.h" +#include "matrixMultiplication.h" doubleComplex zcovars (doubleComplex* inp1, int sr1, int sc1, doubleComplex* inp2, int sr2, int sc2, doubleComplex* fre, int sr3, int sc3) { diff --git a/src/c/statisticsFunctions/gsort/dgsorta.c b/src/c/statisticsFunctions/gsort/dgsorta.c index 8585b54e..30dd3fe8 100644 --- a/src/c/statisticsFunctions/gsort/dgsorta.c +++ b/src/c/statisticsFunctions/gsort/dgsorta.c @@ -17,7 +17,7 @@ void dgsorta(double *in, int size, char check, double* out) { - double a; double fin; double in_copy[size]; + double a; double in_copy[size]; for(int i=0; i< size; i++) diff --git a/src/c/statisticsFunctions/gsort/sgsorta.c b/src/c/statisticsFunctions/gsort/sgsorta.c index 35bbc93e..a463ddb3 100644 --- a/src/c/statisticsFunctions/gsort/sgsorta.c +++ b/src/c/statisticsFunctions/gsort/sgsorta.c @@ -17,7 +17,7 @@ void sgsorta(float *in, int size, char check, float* out) { - float a; float fin; float in_copy[size]; + float a; float in_copy[size]; for(int i=0; i< size; i++) diff --git a/src/c/statisticsFunctions/gsort/u16gsorta.c b/src/c/statisticsFunctions/gsort/u16gsorta.c index bca7b025..4d281262 100644 --- a/src/c/statisticsFunctions/gsort/u16gsorta.c +++ b/src/c/statisticsFunctions/gsort/u16gsorta.c @@ -17,7 +17,7 @@ void u16gsorta(uint16 *in, int size, char check, uint16* out) { - uint16 a; uint16 fin; uint16 in_copy[size]; + uint16 a; uint16 in_copy[size]; for(int i=0; i< size; i++) diff --git a/src/c/statisticsFunctions/gsort/zgsorta.c b/src/c/statisticsFunctions/gsort/zgsorta.c index 0620a8cb..45d17973 100644 --- a/src/c/statisticsFunctions/gsort/zgsorta.c +++ b/src/c/statisticsFunctions/gsort/zgsorta.c @@ -19,7 +19,7 @@ void zgsorta(doubleComplex *in, int size, char check, doubleComplex* out) { - doubleComplex a; doubleComplex fin; doubleComplex in_copy[size]; + doubleComplex a; doubleComplex in_copy[size]; for(int i=0; i< size; i++) diff --git a/src/c/statisticsFunctions/moment/zmomentcola.c b/src/c/statisticsFunctions/moment/zmomentcola.c index 2b3cebb1..bae76295 100644 --- a/src/c/statisticsFunctions/moment/zmomentcola.c +++ b/src/c/statisticsFunctions/moment/zmomentcola.c @@ -7,7 +7,7 @@ void zmomentcola (doubleComplex* inp, int row, int col, double ord, doubleComplex* out) { - double vect[col]; + doubleComplex vect[col]; for(int i = 0; i < row ; i++) { for(int j = 0; j < col ; j++) diff --git a/src/c/statisticsFunctions/nanmedian/dnanmediana.c b/src/c/statisticsFunctions/nanmedian/dnanmediana.c index 0fb7de12..91aa85cf 100644 --- a/src/c/statisticsFunctions/nanmedian/dnanmediana.c +++ b/src/c/statisticsFunctions/nanmedian/dnanmediana.c @@ -40,12 +40,10 @@ double a= 0.0/0.0; } +if(j==0) + return a; out= dmediana(temp, j); - -if(j=0) -return a; -else return out; } diff --git a/src/c/statisticsFunctions/nanmedian/snanmediana.c b/src/c/statisticsFunctions/nanmedian/snanmediana.c index cddb990e..50557fa4 100644 --- a/src/c/statisticsFunctions/nanmedian/snanmediana.c +++ b/src/c/statisticsFunctions/nanmedian/snanmediana.c @@ -38,12 +38,10 @@ float a= 0.0/0.0; } +if(j==0) + return a; out= smediana(temp, j); - -if(j=0) -return a; -else return out; } diff --git a/src/c/statisticsFunctions/nanmedian/znanmediana.c b/src/c/statisticsFunctions/nanmedian/znanmediana.c index bfc1fe46..7f46093b 100644 --- a/src/c/statisticsFunctions/nanmedian/znanmediana.c +++ b/src/c/statisticsFunctions/nanmedian/znanmediana.c @@ -40,12 +40,10 @@ float a= 0.0/0.0; } +if(j==0) + return a; out= zmediana(temp, j); - -if(j=0) -return a; -else return out; } diff --git a/src/c/statisticsFunctions/nanstdev/dnanstdeva.c b/src/c/statisticsFunctions/nanstdev/dnanstdeva.c index 05b54339..f9fe7ff6 100644 --- a/src/c/statisticsFunctions/nanstdev/dnanstdeva.c +++ b/src/c/statisticsFunctions/nanstdev/dnanstdeva.c @@ -40,12 +40,10 @@ double a= 0.0/0.0; } +if(j==0) + return a; out= dstdeva(temp, j); - -if(j=0) -return a; -else return out; } diff --git a/src/c/statisticsFunctions/nanstdev/snanstdeva.c b/src/c/statisticsFunctions/nanstdev/snanstdeva.c index 3e6ab154..3079061f 100644 --- a/src/c/statisticsFunctions/nanstdev/snanstdeva.c +++ b/src/c/statisticsFunctions/nanstdev/snanstdeva.c @@ -40,12 +40,10 @@ double a= 0.0/0.0; } +if(j==0) + return a; out= sstdeva(temp, j); - -if(j=0) -return a; -else return out; } diff --git a/src/c/statisticsFunctions/wcenter/zwcentercola.c b/src/c/statisticsFunctions/wcenter/zwcentercola.c index 5e4e2bdd..fa166ab9 100644 --- a/src/c/statisticsFunctions/wcenter/zwcentercola.c +++ b/src/c/statisticsFunctions/wcenter/zwcentercola.c @@ -9,6 +9,7 @@ #include "wcenter.h" #include "doubleComplex.h" #include "sqrt.h" +#include "matrixMultiplication.h" void zwcentercola (doubleComplex* inp, int row, int col, doubleComplex* out) { diff --git a/src/c/statisticsFunctions/wcenter/zwcenterrowa.c b/src/c/statisticsFunctions/wcenter/zwcenterrowa.c index f68835d8..2d35c417 100644 --- a/src/c/statisticsFunctions/wcenter/zwcenterrowa.c +++ b/src/c/statisticsFunctions/wcenter/zwcenterrowa.c @@ -9,6 +9,7 @@ #include "wcenter.h" #include "doubleComplex.h" #include "sqrt.h" +#include "matrixMultiplication.h" void zwcenterrowa (doubleComplex* inp, int row, int col, doubleComplex* out) { |