diff options
| author | Abhinav Dronamraju | 2017-07-29 00:21:26 +0530 |
|---|---|---|
| committer | Abhinav Dronamraju | 2017-07-29 00:21:26 +0530 |
| commit | ddd322c2eca9f67013a6bc67a798f7a9978cd1d0 (patch) | |
| tree | 1944ac0880df918c92def266f1f7496d5b182ce4 /src/c/elementaryFunctions/interfaces/int_nanmax.h | |
| parent | 9b3788e3f1b061bee62ad14c0bfbd7dfd64fbd01 (diff) | |
| parent | ac3b1715d28643d9c8ba79a409adaf4196509ea7 (diff) | |
| download | scilab2c-ddd322c2eca9f67013a6bc67a798f7a9978cd1d0.tar.gz scilab2c-ddd322c2eca9f67013a6bc67a798f7a9978cd1d0.tar.bz2 scilab2c-ddd322c2eca9f67013a6bc67a798f7a9978cd1d0.zip | |
Nan max few changes
Diffstat (limited to 'src/c/elementaryFunctions/interfaces/int_nanmax.h')
| -rw-r--r-- | src/c/elementaryFunctions/interfaces/int_nanmax.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/c/elementaryFunctions/interfaces/int_nanmax.h b/src/c/elementaryFunctions/interfaces/int_nanmax.h index 45dd55e5..6096290f 100644 --- a/src/c/elementaryFunctions/interfaces/int_nanmax.h +++ b/src/c/elementaryFunctions/interfaces/int_nanmax.h @@ -14,15 +14,13 @@ #define __INT_NANMAX_H__ #define d2nanmaxd0(in1, size) dnanmaxa(in1,size[0]* size[1]) -//#define d2nanmaxd0d2(in1, size, out) dnanmaxa(in1,size[0], size[1], out) -#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out) : dnanmaxcola(in1, size1[0] , size1[1], out) - -#define s2nanmaxs0(in1, size) snanmaxa(in1,size[0]* size[1]) -#define s2g2nanmaxs2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmaxrowa(in1, size1[0], size1[1], out) : snanmaxcola(in1, size1[0] , size1[1], out) - - -//#define i160i160pmoduloi160(in1, in2) i16pmodulos(in1,in2) -//#define i162i162pmoduloi162(in1, size1, in2, size2, out) i16pmoduloa(in1,size1[0]*size1[1],in2, out) - +#define d2nanmaxd0d2(in1, size, out) dnanmax1a(in1,size[0], size[1], out) +#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrow1a(in1, size1[0], size1[1], out) : dnanmaxcol1a(in1, size1[0] , size1[1], out) +#define d2g2nanmaxd2d2(in1, size1, in2, size2, out1, out2) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out1, out2) : dnanmaxcola(in1, size1[0] , size1[1], out1, out2) + +#define s2nanmaxs0(in1, size) snanmaxa(in1,size[0]* size[1]) +#define s2nanmaxs0s2(in1, size, out) snanmax1a(in1,size[0], size[1], out) +#define s2g2nanmaxs2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmaxrow1a(in1, size1[0], size1[1], out) : snanmaxcol1a(in1, size1[0] , size1[1], out) +#define s2g2nanmaxs2s2(in1, size1, in2, size2, out1, out2) (in2[0]=='r') ? snanmaxrowa(in1, size1[0], size1[1], out1, out2) : snanmaxcola(in1, size1[0] , size1[1], out1, out2) #endif |