diff options
Diffstat (limited to 'src/c/elementaryFunctions')
32 files changed, 58 insertions, 38 deletions
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++) { |