Nan Median Added

24 files changed, 365 insertions, 60 deletions

diff --git a/demos/Abhinav_Demos/Column.sci b/demos/Abhinav_Demos/column.sci
index b9dc55b..8220987 100644
--- a/demos/Abhinav_Demos/Column.sci
+++ b/demos/Abhinav_Demos/column.sci
@@ -3,7 +3,7 @@
 //The function written doesn't work for string or character scalar as of now.
 
 
-function Column()
+function column()
 	a=[1,2,3,4; 5,6,7,8; 98,162,6587,0]
 	disp( iscolumn(a))
 	disp('')
diff --git a/demos/Abhinav_Demos/matrixreshape.sci b/demos/Abhinav_Demos/matrix_reshape.sci
index 38fa0a5..bf7fbbc 100644
--- a/demos/Abhinav_Demos/matrixreshape.sci
+++ b/demos/Abhinav_Demos/matrix_reshape.sci
@@ -1,7 +1,7 @@
 
 // Test file for "matrix" function for the data types double, float, double complex, uint16
 
-function matrixreshape()
+function matrix_reshape()
 	a=[1,2,3,4;5,6,7,8;8,9,1,2]
 	b=float(a)
 	c= uint16(b)
diff --git a/demos/Abhinav_Demos/nan_max.sci b/demos/Abhinav_Demos/nan_max.sci
index 769a92a..ce7e10e 100644
--- a/demos/Abhinav_Demos/nan_max.sci
+++ b/demos/Abhinav_Demos/nan_max.sci
@@ -1,33 +1,9 @@
-function nan_max()
-
-x=[%nan 0.121 %nan 0.5 0.8; 0.12 %nan 9 12 %nan]
-
-disp('Double')
-
-disp(nanmax(x))
-disp('')
-
-disp(nanmax(x , 'r'))
-disp('')
-
-disp(nanmax(x, 'c'))
-disp('')
-
-y= uint16(x)
-
-disp('Float')
-
-disp(nanmax(y))
-disp('')
-
-disp(nanmax(y , 'r'))
-disp('')
-
-disp(nanmax(y, 'c'))
-disp('')
-
-
-
-
+function nan_max 
+    x= double([1 2 1 0.8; 21 1 13 0.1])	
+    [a,b]= nanmin(x)
+    disp(a)
+    disp('')
+    disp(b)
+    disp('')
+    
 endfunction
-
diff --git a/demos/Abhinav_Demos/nan_median.sci b/demos/Abhinav_Demos/nan_median.sci
new file mode 100644
index 0000000..993b2d7
--- /dev/null
+++ b/demos/Abhinav_Demos/nan_median.sci
@@ -0,0 +1,33 @@
+function nan_median()
+
+x=[%nan 0.121 %nan 0.5 0.8; 0.12 %nan 1 0.9812 %nan; 0.4 0.65 1.08 12 0.1621; 12 12 24 1 12]
+
+disp('Double')
+
+disp(nanmedian(x))
+disp('')
+
+disp(nanmedian(x , 'r'))
+disp('')
+
+disp(nanmedian(x, 'c'))
+disp('')
+
+y= float(x)
+
+disp('Float')
+
+disp(nanmedian(y))
+disp('')
+
+disp(nanmedian(y , 'r'))
+disp('')
+
+disp(nanmedian(y, 'c'))
+disp('')
+
+
+
+
+endfunction
+
diff --git a/demos/Abhinav_Demos/non_zero.sci b/demos/Abhinav_Demos/non_zero.sci
new file mode 100644
index 0000000..3e2b3ba
--- /dev/null
+++ b/demos/Abhinav_Demos/non_zero.sci
@@ -0,0 +1,15 @@
+
+// Test file for "nonzero" function for the data types double, float, double complex, uint16
+
+function non_zero()
+	a=[12,4,4; 12,51,6]  // double array  
+	disp(nnz(a))
+      	b=0                  //double scalar
+	disp(nnz(b))
+	f= float(a)          //float array
+	disp(nnz(f))
+	z=%i*2+0             // doubleComplex scalar
+	disp(nnz(z))
+	
+ 	
+endfunction
diff --git a/demos/Abhinav_Demos/nthroot1.sci b/demos/Abhinav_Demos/nth_root.sci
index 201338b..13e4223 100644
--- a/demos/Abhinav_Demos/nthroot1.sci
+++ b/demos/Abhinav_Demos/nth_root.sci
@@ -1,7 +1,7 @@
 // Test file for "nthroot" function for the data types double, float, double complex.
 
 
-function nthroot1()
+function nth_root()
 	b= [1,2,3,4;5,6,7,8]
 	c=[45,12,4,12; 23,34,5,6]
 	d= nthroot(b,c)
diff --git a/demos/Abhinav_Demos/Row.sci b/demos/Abhinav_Demos/row.sci
index 264b174..264b174 100644
--- a/demos/Abhinav_Demos/Row.sci
+++ b/demos/Abhinav_Demos/row.sci
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index caad1f1..a3cb8f5 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -619,6 +619,9 @@ extern "C" {
 /* interfacing median */
 #include "median.h"
 #include "int_median.h"
+/* interfacing nanmedian */
+#include "nanmedian.h"
+#include "int_nanmedian.h"
 /* interfacing mad */
 #include "mad.h"
 #include "int_mad.h"
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index cb24dad..eedd25c 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 436d8bc..44e36a2 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1028,6 +1028,15 @@ PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

 

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         2',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');

+

 PrintStringInfo('NIN=          2',ClassFileName,'file','y');

 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

 PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');

@@ -1036,6 +1045,7 @@ PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,
 //---Function list class. ----

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y');

 PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');

 PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');

@@ -1046,6 +1056,14 @@ FunctionName = 'nanmax';
 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'nanmin';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

 // -------------------

 // --- Class Issquare. ---

 // -------------------

@@ -1982,6 +2000,11 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'nanmedian'; // BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 FunctionName = 'st_deviation'; // BJ : Not implemented

 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index 90b80df..a8a2e47 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -146,6 +146,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/statisticsFunctions/includes/sum.h"
       "src/c/statisticsFunctions/includes/mean.h"
       "src/c/statisticsFunctions/includes/median.h"
+      "src/c/statisticsFunctions/includes/nanmedian.h"
       "src/c/statisticsFunctions/includes/mad.h"
       "src/c/statisticsFunctions/includes/meanf.h"
       "src/c/statisticsFunctions/includes/stdevf.h"
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index 4982900..74acfe4 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -135,6 +135,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_isequal.h"
       "src/c/statisticsFunctions/interfaces/int_mean.h"
       "src/c/statisticsFunctions/interfaces/int_median.h"
+      "src/c/statisticsFunctions/interfaces/int_nanmedian.h"
       "src/c/statisticsFunctions/interfaces/int_mad.h"
       "src/c/statisticsFunctions/interfaces/int_meanf.h"
       "src/c/statisticsFunctions/interfaces/int_stdevf.h"
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index cbb0a1e..6558f55 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -811,6 +811,7 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
       "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
       "src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmax1a.c"
       "src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
       "src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
       "src/c/elementaryFunctions/nanmax/snanmaxa.c"
@@ -954,6 +955,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/median/zmediana.c"
       "src/c/statisticsFunctions/median/zmediancola.c"
       "src/c/statisticsFunctions/median/zmedianrowa.c"
+      "src/c/statisticsFunctions/nanmedian/dnanmediana.c"
+      "src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c"
+      "src/c/statisticsFunctions/nanmedian/dnanmediancola.c"
+      "src/c/statisticsFunctions/nanmedian/snanmediana.c"
+      "src/c/statisticsFunctions/nanmedian/snanmedianrowa.c"
+      "src/c/statisticsFunctions/nanmedian/snanmediancola.c"
+      //"src/c/statisticsFunctions/nanmedian/u16nanmediana.c"
+      //"src/c/statisticsFunctions/nanmedian/u16nanmedianrowa.c"
+      //"src/c/statisticsFunctions/nanmedian/u16nanmediancola.c"
+      //"src/c/statisticsFunctions/nanmedian/znanmediana.c"
+      //"src/c/statisticsFunctions/nanmedian/znanmediancola.c"
+      //"src/c/statisticsFunctions/nanmedian/znanmedianrowa.c"
       "src/c/statisticsFunctions/mad/dmada.c"
       "src/c/statisticsFunctions/mad/dmadrowa.c"
       "src/c/statisticsFunctions/mad/dmadcola.c"
diff --git a/src/c/elementaryFunctions/interfaces/int_nanmax.h b/src/c/elementaryFunctions/interfaces/int_nanmax.h
index dd3df71..45dd55e 100644
--- a/src/c/elementaryFunctions/interfaces/int_nanmax.h
+++ b/src/c/elementaryFunctions/interfaces/int_nanmax.h
@@ -13,8 +13,9 @@
 #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 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)
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxa.c b/src/c/elementaryFunctions/nanmax/dnanmax1a.c
index 6283bf1..a0e7eed 100644
--- a/src/c/elementaryFunctions/nanmax/znanmaxa.c
+++ b/src/c/elementaryFunctions/nanmax/dnanmax1a.c
@@ -15,31 +15,30 @@
 #include <math.h>
 #include "nanmax.h"
 #include "types.h"
-#include "doubleComplex.h"
-#include "abs.h"
-
-doubleComplex znanmaxa(doubleComplex* in, int size)
+double dnanmax1a(double* in, int row, int col, double* out)
 {
-doubleComplex high=0; int k=0;
-for(int i=0; i<size; i++)
+double high;
+int ival=0;
+for(int i=0; i<row*col; i++)
 {
 	if( !(isnan(in[i])) )
 	{
 	high= in[i];
 	 break;
-         k= 1;
+
 	}
 }
 
 
 	
-	for(int i=0; i< size; i++)
+	for(int i=0; i< row*col; i++)
 		{
 			if( !(isnan(in[i])) )
 				{
-					if( zabss(in[i]) > zabss(high))
+					if( in[i] > high)
 						{
 							high= in[i];
+							ival=i;
 	
 						}
 
@@ -48,10 +47,12 @@ for(int i=0; i<size; i++)
 
 
 		}
+
+out[0]= ival%row +1;
+out[1]= ival/row +1;
 		
 
-if(k != 0)
+
 return high;
-else
-return - 0.0/0.0;	
+	
 }
diff --git a/src/c/signalProcessing/interfaces/int_dct.h b/src/c/signalProcessing/interfaces/int_dct.h
index ef58b48..b5cbc28 100644
--- a/src/c/signalProcessing/interfaces/int_dct.h
+++ b/src/c/signalProcessing/interfaces/int_dct.h
@@ -17,7 +17,7 @@
 
 
 
-#define d2dctd2(in,size,out)		ddcta(in,size[0],size[1],-1,out)
+#define d2d2dctd2(in,size,out)		ddcta(in,size[0],size[1],-1,out)
 
 #define d2d0dctd2(in,size,sign,out)	ddcta(in,size[0],size[1],sign,out)
 
diff --git a/src/c/statisticsFunctions/includes/nanmedian.h b/src/c/statisticsFunctions/includes/nanmedian.h
new file mode 100644
index 0000000..85bbcf5
--- /dev/null
+++ b/src/c/statisticsFunctions/includes/nanmedian.h
@@ -0,0 +1,40 @@
+/* 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 __NANMEDIAN_H__
+#define __NANMEDIAN_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "int16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dnanmediana (double* , int);
+void   dnanmedianrowa (double*, int , int, double*);
+void   dnanmediancola (double*, int , int, double*);
+
+float  snanmediana (float* , int);
+void   snanmedianrowa (float*, int , int, float*);
+void   snanmediancola (float*, int , int, float*);
+
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/c/statisticsFunctions/interfaces/int_nanmedian.h b/src/c/statisticsFunctions/interfaces/int_nanmedian.h
new file mode 100644
index 0000000..26b7487
--- /dev/null
+++ b/src/c/statisticsFunctions/interfaces/int_nanmedian.h
@@ -0,0 +1,27 @@
+ /*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_NANMEDIAN_H__
+#define __INT_NANMEDIAN_H__
+
+#define d2nanmediand0(in1, size)                            dnanmediana(in1,size[0]* size[1])
+#define d2g2nanmediand2(in1, size1, in2, size2, out)        (in2[0]=='r') ? dnanmedianrowa(in1, size1[0], size1[1], out) : dnanmediancola(in1, size1[0] , size1[1], out)
+
+#define s2nanmedians0(in1, size)                            snanmediana(in1,size[0]* size[1])
+#define s2g2nanmedians2(in1, size1, in2, size2, out)        (in2[0]=='r') ? snanmedianrowa(in1, size1[0], size1[1], out) : snanmediancola(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)
+
+
+#endif
diff --git a/src/c/statisticsFunctions/nanmedian/dnanmediana.c b/src/c/statisticsFunctions/nanmedian/dnanmediana.c
new file mode 100644
index 0000000..0fb7de1
--- /dev/null
+++ b/src/c/statisticsFunctions/nanmedian/dnanmediana.c
@@ -0,0 +1,51 @@
+/* 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
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmedian.h"
+#include "median.h"
+#include "types.h"
+double dnanmediana(double* in, int size)
+{
+
+double temp[size];
+double out;
+int j=0;
+
+double a= 0.0/0.0;
+
+
+	
+	for(int i=0; i< size; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					temp[j]= in[i];
+					j=j+1;
+					
+		
+				}
+
+
+		}
+
+
+out= dmediana(temp, j);
+
+if(j=0)
+return a;
+else
+return out;
+	
+}
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxcola.c b/src/c/statisticsFunctions/nanmedian/dnanmediancola.c
index ffb96b2..37b3f12 100644
--- a/src/c/elementaryFunctions/nanmax/znanmaxcola.c
+++ b/src/c/statisticsFunctions/nanmedian/dnanmediancola.c
@@ -11,14 +11,13 @@
 */
 
 
-#include "nanmax.h"
+#include "nanmedian.h"
 #include "types.h"
 #include "uint16.h"
-#include "doubleComplex.h"
 
-void znanmaxcola(doubleComplex *in, int row, int col, doubleComplex* out)
+void dnanmediancola(double *in, int row, int col, double* out)
 {
-    doubleComplex inter[col]; 
+    double inter[col]; 
 
 
 for(int i=0; i< row; i++)
@@ -28,7 +27,7 @@ for(int i=0; i< row; i++)
 				inter[j]= in[i+ (j*row)];
 				
 			}
-     out[i]= znanmaxa( inter, col);
+     out[i]= dnanmediana( inter, col);
 	
 	}
 
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxrowa.c b/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c
index e035e77..d24ba82 100644
--- a/src/c/elementaryFunctions/nanmax/znanmaxrowa.c
+++ b/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c
@@ -11,14 +11,13 @@
 */
 
 
-#include "nanmax.h"
+#include "nanmedian.h"
 #include "types.h"
 #include "uint16.h"
-#include "doubleComplex.h"
 
-void znanmaxrowa(doubleComplex *in, int row, int col, doubleComplex* out)
+void dnanmedianrowa(double *in, int row, int col, double* out)
 {
-    doubleComplex inter[row]; 
+    double inter[row]; 
 
 
 
@@ -29,7 +28,7 @@ for(int i=0; i< col; i++)
 				inter[j]= in[j+ (i*row)];
 				
 			}
-     out[i]= znanmaxa( inter, row);
+     out[i]= dnanmediana( inter, row);
 	
 	}
 
diff --git a/src/c/statisticsFunctions/nanmedian/snanmediana.c b/src/c/statisticsFunctions/nanmedian/snanmediana.c
new file mode 100644
index 0000000..cddb990
--- /dev/null
+++ b/src/c/statisticsFunctions/nanmedian/snanmediana.c
@@ -0,0 +1,49 @@
+/* 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
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "nanmedian.h"
+#include "median.h"
+#include "types.h"
+float snanmediana(float* in, int size)
+{
+
+float temp[size];
+float out;
+int j=0;
+
+float a= 0.0/0.0;
+	
+	for(int i=0; i< size; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					temp[j]= in[i];
+					j=j+1;
+					
+		
+				}
+
+
+		}
+
+
+out= smediana(temp, j);
+
+if(j=0)
+return a;
+else
+return out;
+	
+}
diff --git a/src/c/statisticsFunctions/nanmedian/snanmediancola.c b/src/c/statisticsFunctions/nanmedian/snanmediancola.c
new file mode 100644
index 0000000..a8077f1
--- /dev/null
+++ b/src/c/statisticsFunctions/nanmedian/snanmediancola.c
@@ -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
+*/
+
+
+#include "nanmedian.h"
+#include "mean.h"
+#include "types.h"
+#include "uint16.h"
+
+void snanmediancola(float *in, int row, int col, float* out)
+{
+    float inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out[i]= snanmediana( inter, col);
+	
+	}
+
+
+}
diff --git a/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c b/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c
new file mode 100644
index 0000000..47425e0
--- /dev/null
+++ b/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c
@@ -0,0 +1,37 @@
+/* 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
+*/
+
+
+#include "nanmedian.h"
+#include "mean.h"
+#include "types.h"
+#include "uint16.h"
+
+void snanmedianrowa(float *in, int row, int col, float* out)
+{
+    float inter[row]; 
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out[i]= snanmediana( inter, row);
+	
+	}
+
+
+}