diff options
Diffstat (limited to 'src/c/elementaryFunctions/pmodulo')
-rw-r--r-- | src/c/elementaryFunctions/pmodulo/dpmodulos.c | 16 | ||||
-rw-r--r-- | src/c/elementaryFunctions/pmodulo/i16pmodulos.c | 16 | ||||
-rw-r--r-- | src/c/elementaryFunctions/pmodulo/spmodulos.c | 16 |
3 files changed, 30 insertions, 18 deletions
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); + } } |