Merge pull request #26 from abhinavdronamraju/master

Added functions and merged FOSSEE master

3 files changed, 56 insertions, 19 deletions

diff --git a/2.3-1/src/c/statisticsFunctions/interfaces/int_median.h b/2.3-1/src/c/statisticsFunctions/interfaces/int_median.h
index 2a219870..e9f3578b 100644
--- a/2.3-1/src/c/statisticsFunctions/interfaces/int_median.h
+++ b/2.3-1/src/c/statisticsFunctions/interfaces/int_median.h
@@ -31,27 +31,9 @@ extern "C" {
 #define z2g2medianz2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? zmedianrowa(in1, size1[0], size1[1], out) :zmediancola(in1, size1[0], size1[1], out)
 
 
-#define s2d0d0matrixs2(in1, size, in2, in3, out )         smatrixa(in1, size[0], size[1], in2, in3, out)
-#define s2s0s0matrixs2(in1, size, in2, in3, out )         smatrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u160u160matrixs2(in1, size, in2, in3, out )     smatrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u80u80matrixs2(in1, size, in2, in3, out )       smatrixa(in1, size[0], size[1], in2, in3, out)
-
-#define u162d0d0matrixu162(in1, size, in2, in3, out )         u16matrixa(in1, size[0], size[1], in2, in3, out)
-#define u162s0s0matrixu162(in1, size, in2, in3, out )         u16matrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u160u160matrixs2(in1, size, in2, in3, out )     smatrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u80u80matrixs2(in1, size, in2, in3, out )       smatrixa(in1, size[0], size[1], in2, in3, out)
-
-#define z2d0d0matrixz2(in1, size, in2, in3, out )         zmatrixa(in1, size[0], size[1], in2, in3, out)
-#define z2s0s0matrixz2(in1, size, in2, in3, out )         zmatrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u160u160matrixs2(in1, size, in2, in3, out )     smatrixa(in1, size[0], size[1], in2, in3, out)
-//#define s2u80u80matrixs2(in1, size, in2, in3, out )       smatrixa(in1, size[0], size[1], in2, in3, out)
-
-
-
-
 
 #ifdef  __cplusplus
 } /* extern "C" */
 #endif
 
-#endif /*__INT_MATRIX_H__*/
+#endif /*__INT_MEDIAN_H__*/
diff --git a/2.3-1/src/c/statisticsFunctions/interfaces/int_nanstdev.h b/2.3-1/src/c/statisticsFunctions/interfaces/int_nanstdev.h
new file mode 100644
index 00000000..1d652ee1
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/interfaces/int_nanstdev.h
@@ -0,0 +1,23 @@
+ /*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_NANSTDEV_H__
+#define __INT_NANSTDEV_H__
+
+#define d2nanstdevd0(in1, size)                            dnanstdeva(in1,size[0]* size[1])
+#define d2g2nanstdevd2(in1, size1, in2, size2, out)        (in2[0]=='r') ? dnanstdevrowa(in1, size1[0], size1[1], out) : dnanstdevcola(in1, size1[0] , size1[1], out)
+
+#define s2nanstdevs0(in1, size)                            snanstdeva(in1,size[0]* size[1])
+#define s2g2nanstdevs2(in1, size1, in2, size2, out)        (in2[0]=='r') ? snanstdevrowa(in1, size1[0], size1[1], out) : snanstdevcola(in1, size1[0] , size1[1], out)
+
+
+#endif
diff --git a/2.3-1/src/c/statisticsFunctions/interfaces/int_stdev.h b/2.3-1/src/c/statisticsFunctions/interfaces/int_stdev.h
new file mode 100644
index 00000000..1e0b6a36
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/interfaces/int_stdev.h
@@ -0,0 +1,32 @@
+/* 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_STDEV_H__
+#define __INT_STDEV_H__
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define d2stdevd0(in1, size)                             dstdeva(in1, size[0]* size[1])
+#define d2g2stdevd2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? dstdevrowa(in1, size1[0], size1[1], out) :dstdevcola(in1, size1[0], size1[1], out)
+
+#define s2stdevs0(in1, size)                             sstdeva(in1, size[0]* size[1])
+#define s2g2stdevs2(in1, size1, in2, size2, out)         (in2[0]== 'r') ? sstdevrowa(in1, size1[0], size1[1], out) :sstdevcola(in1, size1[0], size1[1], out)
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*__INT_STDEV_H__*/