Nan max few changes

3 files changed, 95 insertions, 4 deletions

diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmax.h b/2.3-1/src/c/elementaryFunctions/includes/nanmax.h
index bea83f78..83cfa0e9 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/nanmax.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/nanmax.h
@@ -24,12 +24,20 @@ extern "C" {
 #endif
 
 double dnanmaxa (double* , int);
-void   dnanmaxrowa (double*, int , int, double*);
-void   dnanmaxcola (double*, int , int, double*);
+double dnanmax1a (double* , int, int , double*);
+double dnanmax2a (double* , int, double*);
+void   dnanmaxrowa (double*, int , int, double*, double*);
+void   dnanmaxcola (double*, int , int, double*, double*);
+void   dnanmaxrow1a (double*, int , int, double*);
+void   dnanmaxcol1a (double*, int , int, double*);
 
 float snanmaxa (float* , int);
-void   snanmaxrowa (float*, int , int, float*);
-void   snanmaxcola (float*, int , int, float*);
+float snanmax1a (float* , int, int , float*);
+float snanmax2a (float* , int, float*);
+void   snanmaxrowa (float*, int , int, float*, float*);
+void   snanmaxcola (float*, int , int, float*, float*);
+void   snanmaxrow1a (float*, int , int, float*);
+void   snanmaxcol1a (float*, int , int, float*);
 
 
 
diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmean.h b/2.3-1/src/c/elementaryFunctions/includes/nanmean.h
new file mode 100644
index 00000000..097fec4e
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/includes/nanmean.h
@@ -0,0 +1,42 @@
+/* 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: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#ifndef __NANMEAN_H__
+#define __NANMEAN_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "int16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dnanmeana(double* in, int size);
+void dnanmeancola(double *in, int row, int col, double* out);
+void dnanmeanrowa(double *in, int row, int col, double* out);
+
+float snanmeana(float* in, int size);
+void snanmeancola(float *in, int row, int col, float* out);
+void snanmeanrowa(float *in, int row, int col, float* out);
+
+doubleComplex znanmeana(doubleComplex* in, int size);
+void znanmeancola(doubleComplex *in, int row, int col, doubleComplex* out);
+void znanmeanrowa(doubleComplex *in, int row, int col, doubleComplex* out);
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  /*__NANMEAN_H__*/
diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmin.h b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h
new file mode 100644
index 00000000..adeff6b5
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/includes/nanmin.h
@@ -0,0 +1,41 @@
+/* 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: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#ifndef __NANMIN_H__
+#define __NANMIN_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "int16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dnanmina(double* in, int row, int col, double* pos);
+double dnanminnpa(double* in, int row, int col);
+double dnanmins(double in, double* pos);
+double dnanminnps(double in);
+
+void dnanminrownpa(double *in, int row, int col, double* out);
+void dnanmincolnpa(double *in, int row, int col, double* out);
+
+
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  /*__NANMIN_H__*/