Merge pull request #25 from abhinavdronamraju/master

Added Nansum and merged

2 files changed, 45 insertions, 10 deletions

diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h
index dd3df71d..6096290f 100644
--- a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h
@@ -13,15 +13,14 @@
 #ifndef __INT_NANMAX_H__
 #define __INT_NANMAX_H__
 
-#define d2nanmaxd0(in1, size)                            dnanmaxa(in1,size[0]* size[1])
-#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 d2nanmaxd0(in1, size)                                   dnanmaxa(in1,size[0]* size[1])
+#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
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nansum.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nansum.h
new file mode 100644
index 00000000..149d69b8
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nansum.h
@@ -0,0 +1,36 @@
+/* Copyright (C) 2016 - 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: Abhinav Dronamraju
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#ifndef __INT_NANSUM_H__
+#define __INT_NANSUM_H__
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define d2nansumd0(in1, size)                             dnansuma(in1, size[0]* size[1])
+#define d2g2nansumd2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? dnansumrowa(in1, size1[0], size1[1], out) :dnansumcola(in1, size1[0], size1[1], out)
+
+#define s2nansums0(in1, size)                             snansuma(in1, size[0]* size[1])
+#define s2g2nansums2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? snansumrowa(in1, size1[0], size1[1], out) :snansumcola(in1, size1[0], size1[1], out)
+
+#define z2nansumz0(in1, size)                             znansuma(in1, size[0]* size[1])
+#define z2g2nansumz2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? znansumrowa(in1, size1[0], size1[1], out) :znansumcola(in1, size1[0], size1[1], out)
+
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*__INT_MATRIX_H__*/