Merge pull request #25 from abhinavdronamraju/master

Added Nansum and merged

85 files changed, 1348 insertions, 88 deletions

diff --git a/2.3-1/demos/Abhinav_Demos/Column.sci b/2.3-1/demos/Abhinav_Demos/column.sci
index b9dc55bd..82209876 100644
--- a/2.3-1/demos/Abhinav_Demos/Column.sci
+++ b/2.3-1/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/2.3-1/demos/Abhinav_Demos/matrixreshape.sci b/2.3-1/demos/Abhinav_Demos/matrix_reshape.sci
index 38fa0a53..bf7fbbc8 100644
--- a/2.3-1/demos/Abhinav_Demos/matrixreshape.sci
+++ b/2.3-1/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/2.3-1/demos/Abhinav_Demos/nan_max.sci b/2.3-1/demos/Abhinav_Demos/nan_max.sci
index 769a92a7..c840e069 100644
--- a/2.3-1/demos/Abhinav_Demos/nan_max.sci
+++ b/2.3-1/demos/Abhinav_Demos/nan_max.sci
@@ -1,33 +1,43 @@
-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= [1 %nan 1 0.8; 21 1 13 %nan]	
+	disp('Double')
+	a= nanmax(x)
+	disp(a)
+	disp('')
+	[b,c]= nanmax(x)
+        disp(b)
+	disp('')
+        disp(c)
+	disp('')
+	d= nanmax(x)
+        disp(d)
+	disp('')
+	e=nanmax(x,'r')
+	f=nanmax(x,'c')
+        disp(e)
+	disp('')
+        disp(f)
+	disp('')
+
+	y= float(x)
+	disp('Float')
+	g= nanmax(y)
+	disp(g)
+	disp('')
+	[h,i]= nanmax(y)
+        disp(h)
+	disp('')
+        disp(i)
+	disp('')
+	j= nanmax(y)
+        disp(j)
+	disp('')
+	k=nanmax(y,'r')
+	l=nanmax(y,'c')
+        disp(k)
+	disp('')
+        disp(l)
+	disp('')
+		
+    
 endfunction
-
diff --git a/2.3-1/demos/Abhinav_Demos/nan_median.sci b/2.3-1/demos/Abhinav_Demos/nan_median.sci
new file mode 100644
index 00000000..f2b350c0
--- /dev/null
+++ b/2.3-1/demos/Abhinav_Demos/nan_median.sci
@@ -0,0 +1,31 @@
+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/2.3-1/demos/Abhinav_Demos/nan_sum.sci b/2.3-1/demos/Abhinav_Demos/nan_sum.sci
new file mode 100644
index 00000000..b6d10173
--- /dev/null
+++ b/2.3-1/demos/Abhinav_Demos/nan_sum.sci
@@ -0,0 +1,35 @@
+function nan_sum ()
+    x= [1 %nan 1 0.8; 21 1 13 %nan]	
+	disp('Double')
+	a= nansum(x)
+	disp(a)
+	disp('')
+	b= nansum(x, 'r')
+	disp(b)
+	disp('')
+	c= nansum(x,'c')
+	disp(c)
+	disp('')
+    y= float(x)
+	disp('Float')
+	d= nansum(y)
+	disp(d)
+	disp('')
+	e= nansum(y, 'r')
+	disp(e)
+	disp('')
+	f= nansum(y,'c')
+	disp(f)
+	disp('')
+    z= [%nan , 12, 1219, %nan + %i*121; 121 %nan 90 12]
+	disp('DoubleComplex')
+	g= nansum(z)
+	disp(g)
+	disp('')
+	h= nansum(z, 'r')
+	disp(h)
+	disp('')
+	i= nansum(z,'c')
+	disp(i)
+	disp('')
+endfunction
diff --git a/2.3-1/demos/Abhinav_Demos/non_zero.sci b/2.3-1/demos/Abhinav_Demos/non_zero.sci
new file mode 100644
index 00000000..3e2b3ba9
--- /dev/null
+++ b/2.3-1/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/2.3-1/demos/Abhinav_Demos/nthroot1.sci b/2.3-1/demos/Abhinav_Demos/nth_root.sci
index 201338b3..13e4223e 100644
--- a/2.3-1/demos/Abhinav_Demos/nthroot1.sci
+++ b/2.3-1/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/2.3-1/demos/Abhinav_Demos/Row.sci b/2.3-1/demos/Abhinav_Demos/row.sci
index 264b174a..264b174a 100644
--- a/2.3-1/demos/Abhinav_Demos/Row.sci
+++ b/2.3-1/demos/Abhinav_Demos/row.sci
diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index 34ec11b7..5f94371e 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -201,6 +201,9 @@ extern "C" {
 /*interfacing nanmin*/
 #include "nanmin.h"
 #include "int_nanmin.h"
+/*interfacing nanmin*/
+#include "nansum.h"
+#include "int_nansum.h"
 /*interfacing issquare*/
 #include "issquare.h"
 #include "int_issquare.h"
@@ -629,6 +632,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/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index 5e1cb051..3e0f09b1 100644
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ b/2.3-1/jar/scilab_en_US_help.jar
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
deleted file mode 100644
index dee4362f..00000000
--- a/2.3-1/macros/ASTManagement/lib
+++ /dev/null
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
deleted file mode 100644
index 3d4fed1d..00000000
--- a/2.3-1/macros/CCodeGeneration/lib
+++ /dev/null
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
deleted file mode 100644
index ba3b9a5a..00000000
--- a/2.3-1/macros/ErrorMessages/lib
+++ /dev/null
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
deleted file mode 100644
index 239105c8..00000000
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ /dev/null
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
deleted file mode 100644
index 1c722dd0..00000000
--- a/2.3-1/macros/FunctionList/lib
+++ /dev/null
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
deleted file mode 100644
index 7586a91b..00000000
--- a/2.3-1/macros/GeneralFunctions/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
deleted file mode 100644
index ed4c52b8..00000000
--- a/2.3-1/macros/Hardware/AVR/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Digital/lib b/2.3-1/macros/Hardware/RasberryPi/Digital/lib
deleted file mode 100644
index ba42ba7c..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Digital/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/I2C/lib b/2.3-1/macros/Hardware/RasberryPi/I2C/lib
deleted file mode 100644
index 561476c1..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/I2C/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib b/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib
deleted file mode 100644
index 97a61acb..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Interrupt/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Misc/lib b/2.3-1/macros/Hardware/RasberryPi/Misc/lib
deleted file mode 100644
index c718615f..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Misc/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/SPI/lib b/2.3-1/macros/Hardware/RasberryPi/SPI/lib
deleted file mode 100644
index a16d474e..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/SPI/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Serial/lib b/2.3-1/macros/Hardware/RasberryPi/Serial/lib
deleted file mode 100644
index a007f001..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Serial/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Setup/lib b/2.3-1/macros/Hardware/RasberryPi/Setup/lib
deleted file mode 100644
index 83655c94..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Setup/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Shift/lib b/2.3-1/macros/Hardware/RasberryPi/Shift/lib
deleted file mode 100644
index 2b12025f..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Shift/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Soft/lib b/2.3-1/macros/Hardware/RasberryPi/Soft/lib
deleted file mode 100644
index 09ecede9..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Soft/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/Timing/lib b/2.3-1/macros/Hardware/RasberryPi/Timing/lib
deleted file mode 100644
index d271c900..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/Timing/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib b/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib
deleted file mode 100644
index e8db080c..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/gertBoard/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd/lib b/2.3-1/macros/Hardware/RasberryPi/lcd/lib
deleted file mode 100644
index c2b693fa..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lcd/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib b/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib
deleted file mode 100644
index 94dfda86..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lcd128x64/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index 49ed8116..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/mcp/lib b/2.3-1/macros/Hardware/RasberryPi/mcp/lib
deleted file mode 100644
index d411aad8..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/mcp/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pcf/lib b/2.3-1/macros/Hardware/RasberryPi/pcf/lib
deleted file mode 100644
index da6a8dad..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pcf/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/piGlow/lib b/2.3-1/macros/Hardware/RasberryPi/piGlow/lib
deleted file mode 100644
index 3f30f859..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/piGlow/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pinMap/lib b/2.3-1/macros/Hardware/RasberryPi/pinMap/lib
deleted file mode 100644
index 133363e6..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pinMap/lib
+++ /dev/null
diff --git a/2.3-1/macros/Hardware/RasberryPi/pwm/lib b/2.3-1/macros/Hardware/RasberryPi/pwm/lib
deleted file mode 100644
index 8711baf0..00000000
--- a/2.3-1/macros/Hardware/RasberryPi/pwm/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
deleted file mode 100644
index 40b7b0a1..00000000
--- a/2.3-1/macros/ImageProcessing/core/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index 0d7f88a9..00000000
--- a/2.3-1/macros/ImageProcessing/highgui/lib
+++ /dev/null
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index 63b5e7e9..00000000
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ /dev/null
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
deleted file mode 100644
index a62fd4e4..00000000
--- a/2.3-1/macros/Scilab-Arduino/lib
+++ /dev/null
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
deleted file mode 100644
index 4379c83d..00000000
--- a/2.3-1/macros/SymbolTable/lib
+++ /dev/null
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ac542428..2ca622fe 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1050,8 +1050,8 @@ PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');

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

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

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

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

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

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

 

 //---Function list class. ----

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

@@ -1070,10 +1070,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 

+

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

-// --- Class Nanmean. ---

+// --- Class Nanmax. ---

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

-ClassName = 'Nanmean';

+ClassName = 'Nanmax';

 

 // --- Class Annotation. ---

 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

@@ -1084,32 +1085,62 @@ 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(2).TP=    IN(1).TP',ClassFileName,'file','y');

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

+PrintStringInfo('OUT(2).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');

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

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

+

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

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

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

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

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

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

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

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

+

 //---Function list class. ----

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

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

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

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

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

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

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

+

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

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

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

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

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

-PrintStringInfo('z2'+ArgSeparator+'z0',ClassFileName,'file','y');

-PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');

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

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

 

 

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

-FunctionName = 'nanmean';

+FunctionName = 'nanmax';

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

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

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

 

 

+

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

-// --- Class Nanmax. ---

+// --- Class Nanmean. ---

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

-ClassName = 'Nanmax';

+ClassName = 'Nanmean';

 

 // --- Class Annotation. ---

 PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

@@ -1128,17 +1159,20 @@ 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('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');

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

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

+PrintStringInfo('z2'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');

 

 

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

-FunctionName = 'nanmax';

+FunctionName = 'nanmean';

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

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

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

 

 

-

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

 // --- Class Issquare. ---

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

@@ -2075,6 +2109,16 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

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

 

+FunctionName = 'nansum'; // 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 = '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/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
deleted file mode 100644
index 670a52e0..00000000
--- a/2.3-1/macros/ToolInitialization/lib
+++ /dev/null
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 9a7b5c58..1a455232 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -136,6 +136,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/nanmax.h"
       "src/c/elementaryFunctions/includes/nanmean.h"
       "src/c/elementaryFunctions/includes/nanmin.h"
+      "src/c/elementaryFunctions/includes/nansum.h"
       "src/c/elementaryFunctions/includes/issquare.h"
       "src/c/elementaryFunctions/includes/isscalar.h"
       "src/c/elementaryFunctions/includes/isvector.h"
@@ -148,6 +149,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/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 0fa8d307..12f5b3d4 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -107,6 +107,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_nanmax.h"
       "src/c/elementaryFunctions/interfaces/int_nanmean.h"
       "src/c/elementaryFunctions/interfaces/int_nanmin.h"
+      "src/c/elementaryFunctions/interfaces/int_nansum.h"
       "src/c/elementaryFunctions/interfaces/int_issquare.h"
       "src/c/elementaryFunctions/interfaces/int_isscalar.h"
       "src/c/elementaryFunctions/interfaces/int_isvector.h"
@@ -137,6 +138,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/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index f11d8ea6..7e0a806c 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -811,11 +811,19 @@ 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/dnanmax2a.c"
       "src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
       "src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxrow1a.c"
       "src/c/elementaryFunctions/nanmax/snanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/snanmax1a.c"
+      "src/c/elementaryFunctions/nanmax/snanmax2a.c"
       "src/c/elementaryFunctions/nanmax/snanmaxcola.c"
       "src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxcol1a.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxrow1a.c"
       "src/c/elementaryFunctions/nanmean/dnanmeana.c"
       "src/c/elementaryFunctions/nanmean/dnanmeanrowa.c"
       "src/c/elementaryFunctions/nanmean/dnanmeancola.c"
@@ -897,6 +905,15 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/atand/datands.c"
       "src/c/elementaryFunctions/atand/satanda.c"
       "src/c/elementaryFunctions/atand/satands.c"
+      "src/c/elementaryFunctions/nansum/dnansuma.c"
+      "src/c/elementaryFunctions/nansum/dnansumrowa.c"
+      "src/c/elementaryFunctions/nansum/dnansumcola.c"
+      "src/c/elementaryFunctions/nansum/snansuma.c"
+      "src/c/elementaryFunctions/nansum/snansumrowa.c"
+      "src/c/elementaryFunctions/nansum/snansumcola.c"
+      "src/c/elementaryFunctions/nansum/znansuma.c"
+      "src/c/elementaryFunctions/nansum/znansumcola.c"
+      "src/c/elementaryFunctions/nansum/znansumrowa.c"
       "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c"
       "src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c"
       "src/c/elementaryFunctions/isequal/disequals.c"
@@ -971,6 +988,15 @@ 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/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/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
deleted file mode 100644
index afcd3cab..00000000
--- a/2.3-1/macros/findDeps/lib
+++ /dev/null
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
deleted file mode 100644
index 551263ea..00000000
--- a/2.3-1/macros/lib
+++ /dev/null
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/nansum.h b/2.3-1/src/c/elementaryFunctions/includes/nansum.h
new file mode 100644
index 00000000..5a366631
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/includes/nansum.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: Abhinav Dronamraju
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+ 
+
+#ifndef __NANSUM_H__
+#define __NANSUM_H__
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "uint16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dnansuma(double* , int );
+void   dnansumrowa(double*, int, int, double*);
+void   dnansumcola(double*, int, int, double*);
+
+float  snansuma(float* , int );
+void   snansumrowa(float*, int, int, float*);
+void   snansumcola(float*, int, int, float*);
+
+doubleComplex  znansuma(doubleComplex* , int );
+void   znansumrowa(doubleComplex*, int, int, doubleComplex*);
+void   znansumcola(doubleComplex*, int, int, doubleComplex*);
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*__MATRIX_H__*/
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__*/
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmax1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmax1a.c
new file mode 100644
index 00000000..a0e7eede
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmax1a.c
@@ -0,0 +1,58 @@
+/* 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 "nanmax.h"
+#include "types.h"
+double dnanmax1a(double* in, int row, int col, double* out)
+{
+double high;
+int ival=0;
+for(int i=0; i<row*col; i++)
+{
+	if( !(isnan(in[i])) )
+	{
+	high= in[i];
+	 break;
+
+	}
+}
+
+
+	
+	for(int i=0; i< row*col; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					if( in[i] > high)
+						{
+							high= in[i];
+							ival=i;
+	
+						}
+
+		
+				}
+
+
+		}
+
+out[0]= ival%row +1;
+out[1]= ival/row +1;
+		
+
+
+return high;
+	
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxa.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmax2a.c
index 6283bf16..82ddda6b 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxa.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmax2a.c
@@ -15,19 +15,16 @@
 #include <math.h>
 #include "nanmax.h"
 #include "types.h"
-#include "doubleComplex.h"
-#include "abs.h"
-
-doubleComplex znanmaxa(doubleComplex* in, int size)
+double dnanmax2a(double* in, int size, double* out)
 {
-doubleComplex high=0; int k=0;
+double high;
 for(int i=0; i<size; i++)
 {
 	if( !(isnan(in[i])) )
 	{
 	high= in[i];
 	 break;
-         k= 1;
+
 	}
 }
 
@@ -37,9 +34,10 @@ for(int i=0; i<size; i++)
 		{
 			if( !(isnan(in[i])) )
 				{
-					if( zabss(in[i]) > zabss(high))
+					if( in[i] > high)
 						{
 							high= in[i];
+							*out= i+1;
 	
 						}
 
@@ -50,8 +48,6 @@ for(int i=0; i<size; i++)
 		}
 		
 
-if(k != 0)
 return high;
-else
-return - 0.0/0.0;	
+	
 }
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c
new file mode 100644
index 00000000..1198dcea
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c
@@ -0,0 +1,35 @@
+/* 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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void dnanmaxcol1a(double *in, int row, int col, double* out1)
+{
+    double inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out1[i]= dnanmaxa( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcola.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcola.c
index 9db07423..388337e7 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcola.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxcola.c
@@ -15,7 +15,7 @@
 #include "types.h"
 #include "uint16.h"
 
-void dnanmaxcola(double *in, int row, int col, double* out)
+void dnanmaxcola(double *in, int row, int col, double* out1, double* out2)
 {
     double inter[col]; 
 
@@ -27,7 +27,7 @@ for(int i=0; i< row; i++)
 				inter[j]= in[i+ (j*row)];
 				
 			}
-     out[i]= dnanmaxa( inter, col);
+     out1[i]= dnanmax2a( inter, col, &out2[i]);
 	
 	}
 
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrow1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrow1a.c
new file mode 100644
index 00000000..c4a7a4d1
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrow1a.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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void dnanmaxrow1a(double *in, int row, int col, double* out1)
+{
+    double inter[row];  
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out1[i]= dnanmaxa( inter, row);
+	
+	}
+
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c
index 191fa012..47d4d386 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c
@@ -15,9 +15,9 @@
 #include "types.h"
 #include "uint16.h"
 
-void dnanmaxrowa(double *in, int row, int col, double* out)
+void dnanmaxrowa(double *in, int row, int col, double* out1, double* out2)
 {
-    double inter[row]; 
+    double inter[row];  
 
 
 
@@ -28,9 +28,10 @@ for(int i=0; i< col; i++)
 				inter[j]= in[j+ (i*row)];
 				
 			}
-     out[i]= dnanmaxa( inter, row);
+     out1[i]= dnanmax2a( inter, row, &out2[i]);
 	
 	}
 
 
+
 }
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmax1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmax1a.c
new file mode 100644
index 00000000..7420c3a3
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmax1a.c
@@ -0,0 +1,58 @@
+/* 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 "nanmax.h"
+#include "types.h"
+float snanmax1a(float* in, int row, int col, float* out)
+{
+float high;
+int ival=0;
+for(int i=0; i<row*col; i++)
+{
+	if( !(isnan(in[i])) )
+	{
+	high= in[i];
+	 break;
+
+	}
+}
+
+
+	
+	for(int i=0; i< row*col; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					if( in[i] > high)
+						{
+							high= in[i];
+							ival=i;
+	
+						}
+
+		
+				}
+
+
+		}
+
+out[0]= ival%row +1;
+out[1]= ival/row +1;
+		
+
+
+return high;
+	
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmax2a.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmax2a.c
new file mode 100644
index 00000000..59c282d8
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmax2a.c
@@ -0,0 +1,53 @@
+/* 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 "nanmax.h"
+#include "types.h"
+float snanmax2a(float* in, int size, float* out)
+{
+float high;
+for(int i=0; i<size; i++)
+{
+	if( !(isnan(in[i])) )
+	{
+	high= in[i];
+	 break;
+
+	}
+}
+
+
+	
+	for(int i=0; i< size; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					if( in[i] > high)
+						{
+							high= in[i];
+							*out= i+1;
+	
+						}
+
+		
+				}
+
+
+		}
+		
+
+return high;
+	
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcol1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcol1a.c
new file mode 100644
index 00000000..a737033b
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcol1a.c
@@ -0,0 +1,35 @@
+/* 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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void snanmaxcol1a(float *in, int row, int col, float* out1)
+{
+    float inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out1[i]= snanmaxa( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcola.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcola.c
index b4080525..2703319a 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcola.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxcola.c
@@ -15,7 +15,7 @@
 #include "types.h"
 #include "uint16.h"
 
-void snanmaxcola(float *in, int row, int col, float* out)
+void snanmaxcola(float *in, int row, int col, float* out1, float* out2)
 {
     float inter[col]; 
 
@@ -27,7 +27,7 @@ for(int i=0; i< row; i++)
 				inter[j]= in[i+ (j*row)];
 				
 			}
-     out[i]= snanmaxa( inter, col);
+     out1[i]= snanmax2a( inter, col, &out2[i]);
 	
 	}
 
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrow1a.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrow1a.c
new file mode 100644
index 00000000..09d062c7
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrow1a.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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void snanmaxrow1a(float *in, int row, int col, float* out1)
+{
+    float inter[row];  
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out1[i]= snanmaxa( inter, row);
+	
+	}
+
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrowa.c b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrowa.c
index ab1ce0cb..c438ae0f 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrowa.c
+++ b/2.3-1/src/c/elementaryFunctions/nanmax/snanmaxrowa.c
@@ -15,9 +15,9 @@
 #include "types.h"
 #include "uint16.h"
 
-void snanmaxrowa(float *in, int row, int col, float* out)
+void snanmaxrowa(float *in, int row, int col, float* out1, float* out2)
 {
-    float inter[row]; 
+    float inter[row];  
 
 
 
@@ -28,9 +28,10 @@ for(int i=0; i< col; i++)
 				inter[j]= in[j+ (i*row)];
 				
 			}
-     out[i]= snanmaxa( inter, row);
+     out1[i]= snanmax2a( inter, row, &out2[i]);
 	
 	}
 
 
+
 }
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/dnansuma.c b/2.3-1/src/c/elementaryFunctions/nansum/dnansuma.c
new file mode 100644
index 00000000..adc4a02b
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/dnansuma.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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+#include "addition.h"
+
+double dnansuma(double *in, int size)
+{
+   double fin=0;
+
+
+    for (int i = 0; i < size; ++i)
+
+    {
+	if(!(isnan(in[i])))
+		{
+			fin= dadds(fin, in[i]);
+
+		}	
+
+
+    }
+
+    return fin;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/dnansumcola.c b/2.3-1/src/c/elementaryFunctions/nansum/dnansumcola.c
new file mode 100644
index 00000000..eb406387
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/dnansumcola.c
@@ -0,0 +1,35 @@
+/* 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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+
+void dnansumcola(double *in, int row, int col, double* out)
+{
+    double inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out[i]= dnansuma( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/dnansumrowa.c b/2.3-1/src/c/elementaryFunctions/nansum/dnansumrowa.c
new file mode 100644
index 00000000..e8a7cfb3
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/dnansumrowa.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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+
+void dnansumrowa(double *in, int row, int col, double* out)
+{
+    double inter[row]; 
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out[i]= dnansuma( inter, row);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/snansuma.c b/2.3-1/src/c/elementaryFunctions/nansum/snansuma.c
new file mode 100644
index 00000000..8c1cebbb
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/snansuma.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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+#include "addition.h"
+
+float snansuma(float *in, int size)
+{
+   float fin=0;
+
+
+    for (int i = 0; i < size; ++i)
+
+    {
+	if(!(isnan(in[i])))
+		{
+			fin= sadds(fin, in[i]);
+
+		}	
+
+
+    }
+
+    return fin;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/snansumcola.c b/2.3-1/src/c/elementaryFunctions/nansum/snansumcola.c
new file mode 100644
index 00000000..d83e6f0d
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/snansumcola.c
@@ -0,0 +1,35 @@
+/* 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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+
+void snansumcola(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]= snansuma( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/snansumrowa.c b/2.3-1/src/c/elementaryFunctions/nansum/snansumrowa.c
new file mode 100644
index 00000000..5442694d
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/snansumrowa.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 "nansum.h"
+#include "types.h"
+#include "uint16.h"
+
+void snansumrowa(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]= snansuma( inter, row);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nansum/znansuma.c b/2.3-1/src/c/elementaryFunctions/nansum/znansuma.c
new file mode 100644
index 00000000..cb839f02
--- /dev/null
+++ b/2.3-1/src/c/elementaryFunctions/nansum/znansuma.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 "nansum.h"
+#include "types.h"
+#include "doubleComplex.h"
+#include "addition.h"
+
+doubleComplex znansuma(doubleComplex *in, int size)
+{
+   doubleComplex fin=0;
+
+
+    for (int i = 0; i < size; ++i)
+
+    {
+	if(!(isnan(zreals(in[i]))) && !(isnan(zimags(in[i]))))
+		{
+			fin= zadds(fin, in[i]);
+
+		}	
+
+
+    }
+
+    return fin;
+}
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxcola.c b/2.3-1/src/c/elementaryFunctions/nansum/znansumcola.c
index ffb96b20..2543c49e 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxcola.c
+++ b/2.3-1/src/c/elementaryFunctions/nansum/znansumcola.c
@@ -11,12 +11,12 @@
 */
 
 
-#include "nanmax.h"
+#include "nansum.h"
 #include "types.h"
 #include "uint16.h"
 #include "doubleComplex.h"
 
-void znanmaxcola(doubleComplex *in, int row, int col, doubleComplex* out)
+void znansumcola(doubleComplex *in, int row, int col, doubleComplex * out)
 {
     doubleComplex inter[col]; 
 
@@ -28,7 +28,7 @@ for(int i=0; i< row; i++)
 				inter[j]= in[i+ (j*row)];
 				
 			}
-     out[i]= znanmaxa( inter, col);
+     out[i]= znansuma( inter, col);
 	
 	}
 
diff --git a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxrowa.c b/2.3-1/src/c/elementaryFunctions/nansum/znansumrowa.c
index e035e778..39535c9f 100644
--- a/2.3-1/src/c/elementaryFunctions/nanmax/znanmaxrowa.c
+++ b/2.3-1/src/c/elementaryFunctions/nansum/znansumrowa.c
@@ -11,12 +11,12 @@
 */
 
 
-#include "nanmax.h"
+#include "nansum.h"
 #include "types.h"
 #include "uint16.h"
 #include "doubleComplex.h"
 
-void znanmaxrowa(doubleComplex *in, int row, int col, doubleComplex* out)
+void znansumrowa(doubleComplex *in, int row, int col, doubleComplex* out)
 {
     doubleComplex inter[row]; 
 
@@ -29,7 +29,7 @@ for(int i=0; i< col; i++)
 				inter[j]= in[j+ (i*row)];
 				
 			}
-     out[i]= znanmaxa( inter, row);
+     out[i]= znansuma( inter, row);
 	
 	}
 
diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h
index 3481c4d5..ba8f42fd 100644
--- a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h
+++ b/2.3-1/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/2.3-1/src/c/statisticsFunctions/includes/nanmedian.h b/2.3-1/src/c/statisticsFunctions/includes/nanmedian.h
new file mode 100644
index 00000000..767dbc90
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/includes/nanmedian.h
@@ -0,0 +1,44 @@
+/* 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*);
+
+doubleComplex  znanmediana (doubleComplex* , int);
+void   znanmedianrowa (doubleComplex*, int , int, doubleComplex*);
+void   znanmediancola (doubleComplex*, int , int, doubleComplex*);
+
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/2.3-1/src/c/statisticsFunctions/interfaces/int_nanmedian.h b/2.3-1/src/c/statisticsFunctions/interfaces/int_nanmedian.h
new file mode 100644
index 00000000..6fd08b46
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/interfaces/int_nanmedian.h
@@ -0,0 +1,26 @@
+ /*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 z2nanmedianz0(in1, size)                            znanmediana(in1,size[0]* size[1])
+#define z2g2nanmedianz2(in1, size1, in2, size2, out)        (in2[0]=='r') ? znanmedianrowa(in1, size1[0], size1[1], out) : znanmediancola(in1, size1[0] , size1[1], out)
+
+
+#endif
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmediana.c b/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmediana.c
new file mode 100644
index 00000000..0fb7de12
--- /dev/null
+++ b/2.3-1/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/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmediancola.c b/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmediancola.c
new file mode 100644
index 00000000..37b3f128
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmediancola.c
@@ -0,0 +1,35 @@
+/* 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 "types.h"
+#include "uint16.h"
+
+void dnanmediancola(double *in, int row, int col, double* out)
+{
+    double inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out[i]= dnanmediana( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c b/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c
new file mode 100644
index 00000000..d24ba828
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.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 "types.h"
+#include "uint16.h"
+
+void dnanmedianrowa(double *in, int row, int col, double* out)
+{
+    double inter[row]; 
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out[i]= dnanmediana( inter, row);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/snanmediana.c b/2.3-1/src/c/statisticsFunctions/nanmedian/snanmediana.c
new file mode 100644
index 00000000..cddb990e
--- /dev/null
+++ b/2.3-1/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/2.3-1/src/c/statisticsFunctions/nanmedian/snanmediancola.c b/2.3-1/src/c/statisticsFunctions/nanmedian/snanmediancola.c
new file mode 100644
index 00000000..a8077f19
--- /dev/null
+++ b/2.3-1/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/2.3-1/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c b/2.3-1/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c
new file mode 100644
index 00000000..47425e0f
--- /dev/null
+++ b/2.3-1/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);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediana.c b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediana.c
new file mode 100644
index 00000000..bfc1fe46
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediana.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"
+#include "doubleComplex.h"
+
+doubleComplex znanmediana(doubleComplex* in, int size)
+{
+
+doubleComplex temp[size];
+doubleComplex out;
+int j=0;
+
+float a= 0.0/0.0;
+	
+	for(int i=0; i< size; i++)
+		{
+			if( !(zreals(in[i])) && !(zimags(in[i])) ) 
+				{
+					temp[j]= in[i];
+					j=j+1;
+					
+		
+				}
+
+
+		}
+
+
+out= zmediana(temp, j);
+
+if(j=0)
+return a;
+else
+return out;
+	
+}
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediancola.c b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediancola.c
new file mode 100644
index 00000000..0aaeba02
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmediancola.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"
+#include "doubleComplex.h"
+
+void znanmediancola(doubleComplex *in, int row, int col, doubleComplex* out)
+{
+    doubleComplex inter[col]; 
+
+
+for(int i=0; i< row; i++)
+	{
+		for(int j=0 ; j< col; j++)
+			{
+				inter[j]= in[i+ (j*row)];
+				
+			}
+     out[i]= znanmediana( inter, col);
+	
+	}
+
+
+}
diff --git a/2.3-1/src/c/statisticsFunctions/nanmedian/znanmedianrowa.c b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmedianrowa.c
new file mode 100644
index 00000000..d0e470fa
--- /dev/null
+++ b/2.3-1/src/c/statisticsFunctions/nanmedian/znanmedianrowa.c
@@ -0,0 +1,38 @@
+/* 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"
+#include "doubleComplex.h"
+
+void znanmedianrowa(doubleComplex* in, int row, int col, doubleComplex* out)
+{
+    doubleComplex inter[row]; 
+
+
+
+for(int i=0; i< col; i++)
+	{
+		for(int j=0 ; j< row; j++)
+			{
+				inter[j]= in[j+ (i*row)];
+				
+			}
+     out[i]= znanmediana( inter, row);
+	
+	}
+
+
+}