From 35ff505ddd9b1f269f2b6bfb4e7ed8e4ee20bf41 Mon Sep 17 00:00:00 2001
From: Abhinav Dronamraju
Date: Thu, 20 Jul 2017 21:38:57 +0530
Subject: Pmodulo and nanmax started

---
 includes/sci2clib.h                                |   6 ++
 jar/scilab_en_US_help.jar                          | Bin 11210 -> 11210 bytes
 .../ToolInitialization/INIT_FillSCI2LibCDirs.sci   |  66 +++++++++++++++++++++
 macros/findDeps/getAllHeaders.sci                  |   2 +
 macros/findDeps/getAllInterfaces.sci               |   2 +
 macros/findDeps/getAllSources.sci                  |  26 ++++++--
 src/c/elementaryFunctions/includes/ismatrix.h      |   3 +
 src/c/elementaryFunctions/includes/isvector.h      |   8 +--
 src/c/elementaryFunctions/includes/nanmax.h        |  40 +++++++++++++
 src/c/elementaryFunctions/includes/pmodulo.h       |  40 +++++++++++++
 .../elementaryFunctions/interfaces/int_ismatrix.h  |   2 +
 .../elementaryFunctions/interfaces/int_isvector.h  |   8 +--
 src/c/elementaryFunctions/interfaces/int_nanmax.h  |  27 +++++++++
 src/c/elementaryFunctions/interfaces/int_pmodulo.h |  26 ++++++++
 src/c/elementaryFunctions/ismatrix/dismatrixs.c    |   2 +-
 src/c/elementaryFunctions/ismatrix/gismatrixa.c    |  22 +++++++
 src/c/elementaryFunctions/ismatrix/gismatrixs.c    |  22 +++++++
 src/c/elementaryFunctions/ismatrix/sismatrixa.c    |  22 +++++++
 src/c/elementaryFunctions/ismatrix/sismatrixs.c    |  22 +++++++
 src/c/elementaryFunctions/ismatrix/u16ismatrixa.c  |  23 +++++++
 src/c/elementaryFunctions/ismatrix/u16ismatrixs.c  |  23 +++++++
 src/c/elementaryFunctions/ismatrix/zismatrixa.c    |  24 ++++++++
 src/c/elementaryFunctions/ismatrix/zismatrixs.c    |  24 ++++++++
 src/c/elementaryFunctions/isvector/disvectora.c    |   4 +-
 src/c/elementaryFunctions/isvector/gisvectora.c    |   4 +-
 src/c/elementaryFunctions/isvector/sisvectora.c    |   4 +-
 src/c/elementaryFunctions/isvector/zisvectora.c    |   4 +-
 src/c/elementaryFunctions/nanmax/dnanmaxa.c        |  53 +++++++++++++++++
 src/c/elementaryFunctions/nanmax/dnanmaxcola.c     |  35 +++++++++++
 src/c/elementaryFunctions/nanmax/dnanmaxrowa.c     |  36 +++++++++++
 src/c/elementaryFunctions/nanmax/snanmaxa.c        |  53 +++++++++++++++++
 src/c/elementaryFunctions/nanmax/snanmaxcola.c     |  35 +++++++++++
 src/c/elementaryFunctions/nanmax/snanmaxrowa.c     |  36 +++++++++++
 src/c/elementaryFunctions/nanmax/znanmaxa.c        |  57 ++++++++++++++++++
 src/c/elementaryFunctions/nanmax/znanmaxcola.c     |  36 +++++++++++
 src/c/elementaryFunctions/nanmax/znanmaxrowa.c     |  37 ++++++++++++
 src/c/elementaryFunctions/pmodulo/dpmoduloa.c      |  32 ++++++++++
 src/c/elementaryFunctions/pmodulo/dpmodulos.c      |  54 +++++++++++++++++
 src/c/elementaryFunctions/pmodulo/i16pmoduloa.c    |  33 +++++++++++
 src/c/elementaryFunctions/pmodulo/i16pmodulos.c    |  55 +++++++++++++++++
 src/c/elementaryFunctions/pmodulo/spmoduloa.c      |  32 ++++++++++
 src/c/elementaryFunctions/pmodulo/spmodulos.c      |  54 +++++++++++++++++
 42 files changed, 1071 insertions(+), 23 deletions(-)
 create mode 100644 src/c/elementaryFunctions/includes/nanmax.h
 create mode 100644 src/c/elementaryFunctions/includes/pmodulo.h
 create mode 100644 src/c/elementaryFunctions/interfaces/int_nanmax.h
 create mode 100644 src/c/elementaryFunctions/interfaces/int_pmodulo.h
 create mode 100644 src/c/elementaryFunctions/ismatrix/gismatrixa.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/gismatrixs.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/sismatrixa.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/sismatrixs.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/u16ismatrixa.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/u16ismatrixs.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/zismatrixa.c
 create mode 100644 src/c/elementaryFunctions/ismatrix/zismatrixs.c
 create mode 100644 src/c/elementaryFunctions/nanmax/dnanmaxa.c
 create mode 100644 src/c/elementaryFunctions/nanmax/dnanmaxcola.c
 create mode 100644 src/c/elementaryFunctions/nanmax/dnanmaxrowa.c
 create mode 100644 src/c/elementaryFunctions/nanmax/snanmaxa.c
 create mode 100644 src/c/elementaryFunctions/nanmax/snanmaxcola.c
 create mode 100644 src/c/elementaryFunctions/nanmax/snanmaxrowa.c
 create mode 100644 src/c/elementaryFunctions/nanmax/znanmaxa.c
 create mode 100644 src/c/elementaryFunctions/nanmax/znanmaxcola.c
 create mode 100644 src/c/elementaryFunctions/nanmax/znanmaxrowa.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/dpmoduloa.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/dpmodulos.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/i16pmoduloa.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/i16pmodulos.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/spmoduloa.c
 create mode 100644 src/c/elementaryFunctions/pmodulo/spmodulos.c

diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 5fecac8..11c3f23 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -176,6 +176,12 @@ extern "C" {
 /*interfacing nthroot*/
 #include "nthroot.h"
 #include "int_nthroot.h"
+/*interfacing pmodulo*/
+#include "pmodulo.h"
+#include "int_pmodulo.h"
+/*interfacing nanmax*/
+#include "nanmax.h"
+#include "int_nanmax.h"
 /*interfacing issquare*/
 #include "issquare.h"
 #include "int_issquare.h"
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index be66237..33a02e6 100644
Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index aacc909..2c5740c 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -982,6 +982,70 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
+
+// -------------------
+// --- Class Pmodulo. ---
+// -------------------
+ClassName = 'Pmodulo';
+
+// --- Class Annotation. ---
+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN=          2',ClassFileName,'file','y');
+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');
+//Was FA_TP_USER
+//Cause some trouble if user specify some precision and if input(and also output) is complex.
+PrintStringInfo('OUT(1).TP=   IN(1).TP',ClassFileName,'file','y'); 
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');
+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'pmodulo';
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+// -------------------
+// --- Class Nanmax. ---
+// -------------------
+ClassName = 'Nanmax';
+
+// --- Class Annotation. ---
+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN=          1',ClassFileName,'file','y');
+PrintStringInfo('NOUT=         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)= ''1''',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');
+//---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');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nanmax';
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 // -------------------
 // --- Class Issquare. ---
 // -------------------
@@ -1139,6 +1203,8 @@ PrintStringInfo('g2'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'g0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('u162'+ArgSeparator+'g0',ClassFileName,'file','y');
+PrintStringInfo('u160'+ArgSeparator+'g0',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'ismatrix';
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index 6f9a272..82f07fd 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -132,6 +132,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/asech.h"
       "src/c/elementaryFunctions/includes/isrow.h"
       "src/c/elementaryFunctions/includes/nthroot.h"
+      "src/c/elementaryFunctions/includes/pmodulo.h"
+      "src/c/elementaryFunctions/includes/nanmax.h"
       "src/c/elementaryFunctions/includes/issquare.h"
       "src/c/elementaryFunctions/includes/isscalar.h"
       "src/c/elementaryFunctions/includes/isvector.h"
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index b826bb0..8bc347d 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -103,6 +103,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_linspace.h"
       "src/c/elementaryFunctions/interfaces/int_isrow.h" 
       "src/c/elementaryFunctions/interfaces/int_nthroot.h"
+      "src/c/elementaryFunctions/interfaces/int_pmodulo.h"
+      "src/c/elementaryFunctions/interfaces/int_nanmax.h"
       "src/c/elementaryFunctions/interfaces/int_issquare.h"
       "src/c/elementaryFunctions/interfaces/int_isscalar.h"
       "src/c/elementaryFunctions/interfaces/int_isvector.h"
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 79bfd2b..bdd6400 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -804,6 +804,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/nthroot/snthroota.c"
       "src/c/elementaryFunctions/nthroot/snthroot1a.c"
       "src/c/elementaryFunctions/nthroot/snthroots.c"
+      "src/c/elementaryFunctions/pmodulo/dpmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/dpmoduloa.c"
+      "src/c/elementaryFunctions/pmodulo/spmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/spmoduloa.c"
+      "src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
+      "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
+"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+"src/c/elementaryFunctions/nanmax/snanmaxa.c"
+"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
+"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
       "src/c/elementaryFunctions/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -832,12 +844,14 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/isvector/zisvectors.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixa.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixs.c"
-      //"src/c/elementaryFunctions/ismatrix/gismatrixs.c"
-      //"src/c/elementaryFunctions/ismatrix/gismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/sismatrixs.c" 
-      //"src/c/elementaryFunctions/ismatrix/sismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/zismatrixa.c"
-      //"src/c/elementaryFunctions/ismatrix/zismatrixs.c"  
+      "src/c/elementaryFunctions/ismatrix/gismatrixs.c"
+      "src/c/elementaryFunctions/ismatrix/gismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/sismatrixs.c" 
+      "src/c/elementaryFunctions/ismatrix/sismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/zismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/zismatrixs.c"  
+      "src/c/elementaryFunctions/ismatrix/u16ismatrixa.c"
+      "src/c/elementaryFunctions/ismatrix/u16ismatrixs.c" 
       "src/c/elementaryFunctions/acscd/dacscda.c"
       "src/c/elementaryFunctions/acscd/dacscds.c"
       "src/c/elementaryFunctions/acscd/sacscda.c"
diff --git a/src/c/elementaryFunctions/includes/ismatrix.h b/src/c/elementaryFunctions/includes/ismatrix.h
index 072bfdc..0dd8b4a 100644
--- a/src/c/elementaryFunctions/includes/ismatrix.h
+++ b/src/c/elementaryFunctions/includes/ismatrix.h
@@ -17,6 +17,7 @@
 #include "types.h"
 #include "doubleComplex.h"
 #include "floatComplex.h"
+#include "uint16.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -30,6 +31,8 @@ char gismatrixa(char*);
 char gismatrixs(char);
 char zismatrixa(doubleComplex*);
 char zismatrixs(doubleComplex);
+char u16ismatrixa(uint16*);
+char u16ismatrixs(uint16);
 
 #ifdef  __cplusplus
 } /* extern "C" */
diff --git a/src/c/elementaryFunctions/includes/isvector.h b/src/c/elementaryFunctions/includes/isvector.h
index 5f45abb..75599cd 100644
--- a/src/c/elementaryFunctions/includes/isvector.h
+++ b/src/c/elementaryFunctions/includes/isvector.h
@@ -22,13 +22,13 @@
 extern "C" {
 #endif
 
-char disvectora(double* , int);
+char disvectora(double* , int, int);
 char disvectors(double);
-char sisvectora( float* , int);
+char sisvectora( float* , int, int);
 char sisvectors( float);
-char gisvectora(char* , int);
+char gisvectora(char* , int, int );
 char gisvectors(char);
-char zisvectora(doubleComplex*, int);
+char zisvectora(doubleComplex*, int, int);
 char zisvectors(doubleComplex);
 
 #ifdef  __cplusplus
diff --git a/src/c/elementaryFunctions/includes/nanmax.h b/src/c/elementaryFunctions/includes/nanmax.h
new file mode 100644
index 0000000..bea83f7
--- /dev/null
+++ b/src/c/elementaryFunctions/includes/nanmax.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 __NANMAX_H__
+#define __NANMAX_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "int16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+double dnanmaxa (double* , int);
+void   dnanmaxrowa (double*, int , int, double*);
+void   dnanmaxcola (double*, int , int, double*);
+
+float snanmaxa (float* , int);
+void   snanmaxrowa (float*, int , int, float*);
+void   snanmaxcola (float*, int , int, float*);
+
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/c/elementaryFunctions/includes/pmodulo.h b/src/c/elementaryFunctions/includes/pmodulo.h
new file mode 100644
index 0000000..d46febc
--- /dev/null
+++ b/src/c/elementaryFunctions/includes/pmodulo.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 __PMODULO_H__
+#define __PMODULO_H__
+
+
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+#include "int16.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+void dpmoduloa(double*, int ,double*, double*);
+double dpmodulos(double, double);
+
+void spmoduloa(float*, int ,float*, float*);
+float spmodulos(float, float);
+
+void i16pmoduloa(int16*, int ,int16*, int16*);
+int16 i16pmodulos(int16, int16);
+
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif
diff --git a/src/c/elementaryFunctions/interfaces/int_ismatrix.h b/src/c/elementaryFunctions/interfaces/int_ismatrix.h
index 56dfc85..96352d1 100644
--- a/src/c/elementaryFunctions/interfaces/int_ismatrix.h
+++ b/src/c/elementaryFunctions/interfaces/int_ismatrix.h
@@ -21,6 +21,8 @@
 #define g0ismatrixg0(in)               gismatrixs(in)
 #define z2ismatrixg0(in, size)         zismatrixa(in)
 #define z0ismatrixg0(in)               zismatrixs(in)
+#define u162ismatrixg0(in, size)         u16ismatrixa(in)
+#define u160ismatrixg0(in)               u16ismatrixs(in)
 
 
 #endif
diff --git a/src/c/elementaryFunctions/interfaces/int_isvector.h b/src/c/elementaryFunctions/interfaces/int_isvector.h
index 6d943bd..a4edaea 100644
--- a/src/c/elementaryFunctions/interfaces/int_isvector.h
+++ b/src/c/elementaryFunctions/interfaces/int_isvector.h
@@ -13,13 +13,13 @@
 #ifndef __INT_ISVECTOR_H__
 #define __INT_ISVECTOR_H__
 
-#define d2isvectorg0(in, size )        disvectora(in, size[0])
+#define d2isvectorg0(in, size )        disvectora(in, size[0], size[1])
 #define d0isvectorg0(in)               disvectors(in)
-#define s2isvectorg0(in , size)        sisvectora(in, size[0])
+#define s2isvectorg0(in , size)        sisvectora(in, size[0], size[1])
 #define s0isvectorg0(in)               sisvectors(in)
-#define g2isvectorg0(in, size)         gisvectora(in, size[0])
+#define g2isvectorg0(in, size)         gisvectora(in, size[0], size[1])
 #define g0isvectorg0(in)               gisvectors(in)
-#define z2isvectorg0(in, size)         zisvectora(in , size[0])
+#define z2isvectorg0(in, size)         zisvectora(in , size[0], size[1])
 #define z0isvectorg0(in)               zisvectors(in)
 
 
diff --git a/src/c/elementaryFunctions/interfaces/int_nanmax.h b/src/c/elementaryFunctions/interfaces/int_nanmax.h
new file mode 100644
index 0000000..dd3df71
--- /dev/null
+++ b/src/c/elementaryFunctions/interfaces/int_nanmax.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_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)
+
+
+#endif
diff --git a/src/c/elementaryFunctions/interfaces/int_pmodulo.h b/src/c/elementaryFunctions/interfaces/int_pmodulo.h
new file mode 100644
index 0000000..72b1277
--- /dev/null
+++ b/src/c/elementaryFunctions/interfaces/int_pmodulo.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_PMODULO_H__
+#define __INT_PMODULO_H__
+
+#define d0d0pmodulod0(in1, in2)        dpmodulos(in1,in2)
+#define d2d2pmodulod2(in1, size1, in2, size2, out)        dpmoduloa(in1,size1[0]*size1[1],in2, out)
+
+#define s0s0pmodulos0(in1, in2)        spmodulos(in1,in2)
+#define s2s2pmodulos2(in1, size1, in2, size2, out)        spmoduloa(in1,size1[0]*size1[1],in2, 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/elementaryFunctions/ismatrix/dismatrixs.c b/src/c/elementaryFunctions/ismatrix/dismatrixs.c
index f1c99dc..15edcf2 100644
--- a/src/c/elementaryFunctions/ismatrix/dismatrixs.c
+++ b/src/c/elementaryFunctions/ismatrix/dismatrixs.c
@@ -17,6 +17,6 @@
 #include "types.h"
 char dismatrixs(double in)
 {
-   char out= 'F' ;
+   char out= 'T' ;
     return out;
 }
diff --git a/src/c/elementaryFunctions/ismatrix/gismatrixa.c b/src/c/elementaryFunctions/ismatrix/gismatrixa.c
new file mode 100644
index 0000000..f728814
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/gismatrixa.c
@@ -0,0 +1,22 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+char gismatrixa(char* in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/gismatrixs.c b/src/c/elementaryFunctions/ismatrix/gismatrixs.c
new file mode 100644
index 0000000..61a3062
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/gismatrixs.c
@@ -0,0 +1,22 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+char gismatrixs(char in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/sismatrixa.c b/src/c/elementaryFunctions/ismatrix/sismatrixa.c
new file mode 100644
index 0000000..44335b8
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/sismatrixa.c
@@ -0,0 +1,22 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+char sismatrixa(float* in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/sismatrixs.c b/src/c/elementaryFunctions/ismatrix/sismatrixs.c
new file mode 100644
index 0000000..d6c6f23
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/sismatrixs.c
@@ -0,0 +1,22 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+char sismatrixs(float in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/u16ismatrixa.c b/src/c/elementaryFunctions/ismatrix/u16ismatrixa.c
new file mode 100644
index 0000000..c16d54c
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/u16ismatrixa.c
@@ -0,0 +1,23 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+#include "uint16.h"
+char u16ismatrixa(uint16* in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/u16ismatrixs.c b/src/c/elementaryFunctions/ismatrix/u16ismatrixs.c
new file mode 100644
index 0000000..6431357
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/u16ismatrixs.c
@@ -0,0 +1,23 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+#include "uint16.h"
+char u16ismatrixs(uint16 in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/zismatrixa.c b/src/c/elementaryFunctions/ismatrix/zismatrixa.c
new file mode 100644
index 0000000..32d7260
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/zismatrixa.c
@@ -0,0 +1,24 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+#include "uint16.h"
+#include "doubleComplex.h"
+char zismatrixa(doubleComplex* in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/ismatrix/zismatrixs.c b/src/c/elementaryFunctions/ismatrix/zismatrixs.c
new file mode 100644
index 0000000..d38592c
--- /dev/null
+++ b/src/c/elementaryFunctions/ismatrix/zismatrixs.c
@@ -0,0 +1,24 @@
+/* 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 "ismatrix.h"
+#include "types.h"
+#include "uint16.h"
+#include "doubleComplex.h"
+char zismatrixs(doubleComplex in)
+{
+   char out= 'T' ;
+    return out;
+}
diff --git a/src/c/elementaryFunctions/isvector/disvectora.c b/src/c/elementaryFunctions/isvector/disvectora.c
index 3c41027..a96485b 100644
--- a/src/c/elementaryFunctions/isvector/disvectora.c
+++ b/src/c/elementaryFunctions/isvector/disvectora.c
@@ -15,9 +15,9 @@
 #include <math.h>
 #include "isvector.h"
 #include "types.h"
-char disvectora(double* inp, int size1)
+char disvectora(double* inp, int row, int col)
 {
-   if(size1 ==1)
+   if(row ==1 || col==1)
    return 'T';
    return 'F';
 }
diff --git a/src/c/elementaryFunctions/isvector/gisvectora.c b/src/c/elementaryFunctions/isvector/gisvectora.c
index d2e261e..758fa87 100644
--- a/src/c/elementaryFunctions/isvector/gisvectora.c
+++ b/src/c/elementaryFunctions/isvector/gisvectora.c
@@ -16,9 +16,9 @@
 #include "isvector.h"
 #include "types.h"
 #include "string.h"
-char gisvectora(char *inp, int size1)
+char gisvectora(char *inp, int row, int col)
 {
-   if(size1 ==1)
+   if(row ==1 || col==1)
    return 'T';
    return 'F';
 }
diff --git a/src/c/elementaryFunctions/isvector/sisvectora.c b/src/c/elementaryFunctions/isvector/sisvectora.c
index 09ad651..d6a4821 100644
--- a/src/c/elementaryFunctions/isvector/sisvectora.c
+++ b/src/c/elementaryFunctions/isvector/sisvectora.c
@@ -15,9 +15,9 @@
 #include <math.h>
 #include "isvector.h"
 #include "types.h"
-char sisvectora(float* inp, int size1)
+char sisvectora(float* inp, int row, int col)
 {
-    if(size1 ==1)
+    if(row ==1 || col==1)
    return 'T';
    return 'F';
 }
diff --git a/src/c/elementaryFunctions/isvector/zisvectora.c b/src/c/elementaryFunctions/isvector/zisvectora.c
index fba7812..0ed64a6 100644
--- a/src/c/elementaryFunctions/isvector/zisvectora.c
+++ b/src/c/elementaryFunctions/isvector/zisvectora.c
@@ -17,9 +17,9 @@
 #include "isvector.h"
 #include "types.h"
 
-char zisvectora(doubleComplex *inp, int size1)
+char zisvectora(doubleComplex *inp, int row, int col)
 {
-     if(size1 ==1)
+     if(row ==1 || col==1)
    return 'T';
    return 'F';
 }
diff --git a/src/c/elementaryFunctions/nanmax/dnanmaxa.c b/src/c/elementaryFunctions/nanmax/dnanmaxa.c
new file mode 100644
index 0000000..4ff4a1a
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/dnanmaxa.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"
+double dnanmaxa(double* in, int size)
+{
+double 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];
+	
+						}
+
+		
+				}
+
+
+		}
+		
+
+
+return high;
+	
+}
diff --git a/src/c/elementaryFunctions/nanmax/dnanmaxcola.c b/src/c/elementaryFunctions/nanmax/dnanmaxcola.c
new file mode 100644
index 0000000..9db0742
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/dnanmaxcola.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 dnanmaxcola(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]= dnanmaxa( inter, col);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c b/src/c/elementaryFunctions/nanmax/dnanmaxrowa.c
new file mode 100644
index 0000000..191fa01
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/dnanmaxrowa.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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void dnanmaxrowa(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]= dnanmaxa( inter, row);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/nanmax/snanmaxa.c b/src/c/elementaryFunctions/nanmax/snanmaxa.c
new file mode 100644
index 0000000..1eab1ac
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/snanmaxa.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 snanmaxa(float* in, int size)
+{
+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];
+	
+						}
+
+		
+				}
+
+
+		}
+		
+
+
+return high;
+	
+}
diff --git a/src/c/elementaryFunctions/nanmax/snanmaxcola.c b/src/c/elementaryFunctions/nanmax/snanmaxcola.c
new file mode 100644
index 0000000..b408052
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/snanmaxcola.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 snanmaxcola(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]= snanmaxa( inter, col);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/nanmax/snanmaxrowa.c b/src/c/elementaryFunctions/nanmax/snanmaxrowa.c
new file mode 100644
index 0000000..ab1ce0c
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/snanmaxrowa.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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+
+void snanmaxrowa(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]= snanmaxa( inter, row);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxa.c b/src/c/elementaryFunctions/nanmax/znanmaxa.c
new file mode 100644
index 0000000..6283bf1
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/znanmaxa.c
@@ -0,0 +1,57 @@
+/* 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"
+#include "doubleComplex.h"
+#include "abs.h"
+
+doubleComplex znanmaxa(doubleComplex* in, int size)
+{
+doubleComplex high=0; int k=0;
+for(int i=0; i<size; i++)
+{
+	if( !(isnan(in[i])) )
+	{
+	high= in[i];
+	 break;
+         k= 1;
+	}
+}
+
+
+	
+	for(int i=0; i< size; i++)
+		{
+			if( !(isnan(in[i])) )
+				{
+					if( zabss(in[i]) > zabss(high))
+						{
+							high= in[i];
+	
+						}
+
+		
+				}
+
+
+		}
+		
+
+if(k != 0)
+return high;
+else
+return - 0.0/0.0;	
+}
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxcola.c b/src/c/elementaryFunctions/nanmax/znanmaxcola.c
new file mode 100644
index 0000000..ffb96b2
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/znanmaxcola.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 "nanmax.h"
+#include "types.h"
+#include "uint16.h"
+#include "doubleComplex.h"
+
+void znanmaxcola(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]= znanmaxa( inter, col);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/nanmax/znanmaxrowa.c b/src/c/elementaryFunctions/nanmax/znanmaxrowa.c
new file mode 100644
index 0000000..e035e77
--- /dev/null
+++ b/src/c/elementaryFunctions/nanmax/znanmaxrowa.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"
+#include "doubleComplex.h"
+
+void znanmaxrowa(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]= znanmaxa( inter, row);
+	
+	}
+
+
+}
diff --git a/src/c/elementaryFunctions/pmodulo/dpmoduloa.c b/src/c/elementaryFunctions/pmodulo/dpmoduloa.c
new file mode 100644
index 0000000..0817987
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/dpmoduloa.c
@@ -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
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "pmodulo.h"
+#include "types.h"
+void dpmoduloa(double* inp1, int size, double* inp2, double* out)
+{
+ 
+		
+				for(int i=0; i< size; i++)
+					{
+
+					out[i]= dpmodulos(inp1[i], inp2[i]);
+														
+					}
+
+
+
+	
+}
diff --git a/src/c/elementaryFunctions/pmodulo/dpmodulos.c b/src/c/elementaryFunctions/pmodulo/dpmodulos.c
new file mode 100644
index 0000000..6144177
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/dpmodulos.c
@@ -0,0 +1,54 @@
+/* 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 "pmodulo.h"
+#include "types.h"
+
+double dpmodulos(double inp1, double inp2)
+{ 
+    if( inp1>0 && inp2>0)
+
+		{
+			return fmod(inp1,inp2);
+
+         	}
+
+
+    if( inp1>0 && inp2<0)
+
+		{
+
+			return fmod(inp1,inp2);
+
+		}
+
+
+    if(inp1<0 && inp2>0)
+
+    		{
+
+			return ((fmod(inp1,inp2))+(inp2));
+
+	
+		}
+
+    if(inp1<0 && inp2<0)
+		{
+
+			return ((fmod(inp1,inp2))-(inp2));
+
+		}
+
+}
diff --git a/src/c/elementaryFunctions/pmodulo/i16pmoduloa.c b/src/c/elementaryFunctions/pmodulo/i16pmoduloa.c
new file mode 100644
index 0000000..bb76d7f
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/i16pmoduloa.c
@@ -0,0 +1,33 @@
+/* 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 "int16.h"
+#include "pmodulo.h"
+#include "types.h"
+void i16pmoduloa(int16* inp1, int size, int16* inp2, int16* out)
+{
+ 
+		
+				for(int i=0; i< size; i++)
+					{
+
+					out[i]= i16pmodulos(inp1[i], inp2[i]);
+														
+					}
+
+
+
+	
+}
diff --git a/src/c/elementaryFunctions/pmodulo/i16pmodulos.c b/src/c/elementaryFunctions/pmodulo/i16pmodulos.c
new file mode 100644
index 0000000..f7f86c5
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/i16pmodulos.c
@@ -0,0 +1,55 @@
+/* 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 "int16.h"
+#include "pmodulo.h"
+#include "types.h"
+
+int16 i16pmodulos(int16 inp1, int16 inp2)
+{ 
+    if( inp1>0 && inp2>0)
+
+		{
+			return inp1%inp2;
+
+         	}
+
+
+    if( inp1>0 && inp2<0)
+
+		{
+
+			return inp1%inp2;
+
+		}
+
+
+    if(inp1<0 && inp2>0)
+
+    		{
+
+			return ((inp1%inp2)+(inp2));
+
+	
+		}
+
+    if(inp1<0 && inp2<0)
+		{
+
+			return ((inp1%inp2)-(inp2));
+
+		}
+
+}
diff --git a/src/c/elementaryFunctions/pmodulo/spmoduloa.c b/src/c/elementaryFunctions/pmodulo/spmoduloa.c
new file mode 100644
index 0000000..87b2a2f
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/spmoduloa.c
@@ -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
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include "pmodulo.h"
+#include "types.h"
+void spmoduloa(float* inp1, int size, float* inp2, float* out)
+{
+ 
+		
+				for(int i=0; i< size; i++)
+					{
+
+					out[i]= spmodulos(inp1[i], inp2[i]);
+														
+					}
+
+
+
+	
+}
diff --git a/src/c/elementaryFunctions/pmodulo/spmodulos.c b/src/c/elementaryFunctions/pmodulo/spmodulos.c
new file mode 100644
index 0000000..9ab6bc4
--- /dev/null
+++ b/src/c/elementaryFunctions/pmodulo/spmodulos.c
@@ -0,0 +1,54 @@
+/* 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 "pmodulo.h"
+#include "types.h"
+
+float spmodulos(float inp1, float inp2)
+{ 
+    if( inp1>0 && inp2>0)
+
+		{
+			return fmod(inp1,inp2);
+
+         	}
+
+
+    if( inp1>0 && inp2<0)
+
+		{
+
+			return fmod(inp1,inp2);
+
+		}
+
+
+    if(inp1<0 && inp2>0)
+
+    		{
+
+			return ((fmod(inp1,inp2))+(inp2));
+
+	
+		}
+
+    if(inp1<0 && inp2<0)
+		{
+
+			return ((fmod(inp1,inp2))-(inp2));
+
+		}
+
+}
-- 
cgit 


From b58911a949248b09a0597309feb35fbcc25556fd Mon Sep 17 00:00:00 2001
From: Abhinav Dronamraju
Date: Thu, 20 Jul 2017 22:17:24 +0530
Subject: Solved error of nnz

---
 jar/scilab_en_US_help.jar                          | Bin 18123 -> 11210 bytes
 macros/ASTManagement/lib                           | Bin 2008 -> 0 bytes
 macros/CCodeGeneration/lib                         | Bin 1056 -> 0 bytes
 macros/ErrorMessages/lib                           | Bin 520 -> 0 bytes
 macros/FunctionAnnotation/lib                      | Bin 2412 -> 0 bytes
 macros/FunctionList/lib                            | Bin 588 -> 0 bytes
 macros/GeneralFunctions/lib                        | Bin 1132 -> 0 bytes
 macros/Hardware/AVR/lib                            | Bin 972 -> 0 bytes
 macros/Hardware/RasberryPi/Digital/lib             | Bin 600 -> 0 bytes
 macros/Hardware/RasberryPi/I2C/lib                 | Bin 704 -> 0 bytes
 macros/Hardware/RasberryPi/Interrupt/lib           | Bin 536 -> 0 bytes
 macros/Hardware/RasberryPi/Misc/lib                | Bin 564 -> 0 bytes
 macros/Hardware/RasberryPi/SPI/lib                 | Bin 584 -> 0 bytes
 macros/Hardware/RasberryPi/Serial/lib              | Bin 692 -> 0 bytes
 macros/Hardware/RasberryPi/Setup/lib               | Bin 616 -> 0 bytes
 macros/Hardware/RasberryPi/Shift/lib               | Bin 568 -> 0 bytes
 macros/Hardware/RasberryPi/Soft/lib                | Bin 636 -> 0 bytes
 macros/Hardware/RasberryPi/Timing/lib              | Bin 596 -> 0 bytes
 macros/Hardware/RasberryPi/gertBoard/lib           | Bin 656 -> 0 bytes
 macros/Hardware/RasberryPi/lcd/lib                 | Bin 776 -> 0 bytes
 macros/Hardware/RasberryPi/lcd128x64/lib           | Bin 800 -> 0 bytes
 macros/Hardware/RasberryPi/lib                     | Bin 592 -> 0 bytes
 macros/Hardware/RasberryPi/mcp/lib                 | Bin 608 -> 0 bytes
 macros/Hardware/RasberryPi/pcf/lib                 | Bin 536 -> 0 bytes
 macros/Hardware/RasberryPi/piGlow/lib              | Bin 596 -> 0 bytes
 macros/Hardware/RasberryPi/pinMap/lib              | Bin 548 -> 0 bytes
 macros/Hardware/RasberryPi/pwm/lib                 | Bin 608 -> 0 bytes
 macros/ImageProcessing/core/lib                    | Bin 524 -> 0 bytes
 macros/ImageProcessing/highgui/lib                 | Bin 584 -> 0 bytes
 macros/ImageProcessing/imgproc/lib                 | Bin 752 -> 0 bytes
 macros/Scilab-Arduino/lib                          | Bin 716 -> 0 bytes
 macros/SymbolTable/lib                             | Bin 752 -> 0 bytes
 .../ToolInitialization/INIT_FillSCI2LibCDirs.sci   |  32 ++++++++++++++++++
 macros/ToolInitialization/lib                      | Bin 804 -> 0 bytes
 macros/findDeps/getAllSources.sci                  |  36 ++++++++++++---------
 macros/findDeps/lib                                | Bin 620 -> 0 bytes
 macros/lib                                         | Bin 536 -> 0 bytes
 37 files changed, 53 insertions(+), 15 deletions(-)
 delete mode 100644 macros/ASTManagement/lib
 delete mode 100644 macros/CCodeGeneration/lib
 delete mode 100644 macros/ErrorMessages/lib
 delete mode 100644 macros/FunctionAnnotation/lib
 delete mode 100644 macros/FunctionList/lib
 delete mode 100644 macros/GeneralFunctions/lib
 delete mode 100644 macros/Hardware/AVR/lib
 delete mode 100644 macros/Hardware/RasberryPi/Digital/lib
 delete mode 100644 macros/Hardware/RasberryPi/I2C/lib
 delete mode 100644 macros/Hardware/RasberryPi/Interrupt/lib
 delete mode 100644 macros/Hardware/RasberryPi/Misc/lib
 delete mode 100644 macros/Hardware/RasberryPi/SPI/lib
 delete mode 100644 macros/Hardware/RasberryPi/Serial/lib
 delete mode 100644 macros/Hardware/RasberryPi/Setup/lib
 delete mode 100644 macros/Hardware/RasberryPi/Shift/lib
 delete mode 100644 macros/Hardware/RasberryPi/Soft/lib
 delete mode 100644 macros/Hardware/RasberryPi/Timing/lib
 delete mode 100644 macros/Hardware/RasberryPi/gertBoard/lib
 delete mode 100644 macros/Hardware/RasberryPi/lcd/lib
 delete mode 100644 macros/Hardware/RasberryPi/lcd128x64/lib
 delete mode 100644 macros/Hardware/RasberryPi/lib
 delete mode 100644 macros/Hardware/RasberryPi/mcp/lib
 delete mode 100644 macros/Hardware/RasberryPi/pcf/lib
 delete mode 100644 macros/Hardware/RasberryPi/piGlow/lib
 delete mode 100644 macros/Hardware/RasberryPi/pinMap/lib
 delete mode 100644 macros/Hardware/RasberryPi/pwm/lib
 delete mode 100644 macros/ImageProcessing/core/lib
 delete mode 100644 macros/ImageProcessing/highgui/lib
 delete mode 100644 macros/ImageProcessing/imgproc/lib
 delete mode 100644 macros/Scilab-Arduino/lib
 delete mode 100644 macros/SymbolTable/lib
 delete mode 100644 macros/ToolInitialization/lib
 delete mode 100644 macros/findDeps/lib
 delete mode 100644 macros/lib

diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 0bffe90..5693d3f 100644
Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ
diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib
deleted file mode 100644
index dee4362..0000000
Binary files a/macros/ASTManagement/lib and /dev/null differ
diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib
deleted file mode 100644
index 3d4fed1..0000000
Binary files a/macros/CCodeGeneration/lib and /dev/null differ
diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib
deleted file mode 100644
index ba3b9a5..0000000
Binary files a/macros/ErrorMessages/lib and /dev/null differ
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
deleted file mode 100644
index 239105c..0000000
Binary files a/macros/FunctionAnnotation/lib and /dev/null differ
diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib
deleted file mode 100644
index 1c722dd..0000000
Binary files a/macros/FunctionList/lib and /dev/null differ
diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib
deleted file mode 100644
index 7586a91..0000000
Binary files a/macros/GeneralFunctions/lib and /dev/null differ
diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib
deleted file mode 100644
index ed4c52b..0000000
Binary files a/macros/Hardware/AVR/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Digital/lib b/macros/Hardware/RasberryPi/Digital/lib
deleted file mode 100644
index ba42ba7..0000000
Binary files a/macros/Hardware/RasberryPi/Digital/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/I2C/lib b/macros/Hardware/RasberryPi/I2C/lib
deleted file mode 100644
index 561476c..0000000
Binary files a/macros/Hardware/RasberryPi/I2C/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Interrupt/lib b/macros/Hardware/RasberryPi/Interrupt/lib
deleted file mode 100644
index 97a61ac..0000000
Binary files a/macros/Hardware/RasberryPi/Interrupt/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Misc/lib b/macros/Hardware/RasberryPi/Misc/lib
deleted file mode 100644
index c718615..0000000
Binary files a/macros/Hardware/RasberryPi/Misc/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/SPI/lib b/macros/Hardware/RasberryPi/SPI/lib
deleted file mode 100644
index a16d474..0000000
Binary files a/macros/Hardware/RasberryPi/SPI/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Serial/lib b/macros/Hardware/RasberryPi/Serial/lib
deleted file mode 100644
index a007f00..0000000
Binary files a/macros/Hardware/RasberryPi/Serial/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Setup/lib b/macros/Hardware/RasberryPi/Setup/lib
deleted file mode 100644
index 83655c9..0000000
Binary files a/macros/Hardware/RasberryPi/Setup/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Shift/lib b/macros/Hardware/RasberryPi/Shift/lib
deleted file mode 100644
index 2b12025..0000000
Binary files a/macros/Hardware/RasberryPi/Shift/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Soft/lib b/macros/Hardware/RasberryPi/Soft/lib
deleted file mode 100644
index 09ecede..0000000
Binary files a/macros/Hardware/RasberryPi/Soft/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/Timing/lib b/macros/Hardware/RasberryPi/Timing/lib
deleted file mode 100644
index d271c90..0000000
Binary files a/macros/Hardware/RasberryPi/Timing/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/gertBoard/lib b/macros/Hardware/RasberryPi/gertBoard/lib
deleted file mode 100644
index e8db080..0000000
Binary files a/macros/Hardware/RasberryPi/gertBoard/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/lcd/lib b/macros/Hardware/RasberryPi/lcd/lib
deleted file mode 100644
index c2b693f..0000000
Binary files a/macros/Hardware/RasberryPi/lcd/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/lcd128x64/lib b/macros/Hardware/RasberryPi/lcd128x64/lib
deleted file mode 100644
index 94dfda8..0000000
Binary files a/macros/Hardware/RasberryPi/lcd128x64/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index 49ed811..0000000
Binary files a/macros/Hardware/RasberryPi/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/mcp/lib b/macros/Hardware/RasberryPi/mcp/lib
deleted file mode 100644
index d411aad..0000000
Binary files a/macros/Hardware/RasberryPi/mcp/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/pcf/lib b/macros/Hardware/RasberryPi/pcf/lib
deleted file mode 100644
index da6a8da..0000000
Binary files a/macros/Hardware/RasberryPi/pcf/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/piGlow/lib b/macros/Hardware/RasberryPi/piGlow/lib
deleted file mode 100644
index 3f30f85..0000000
Binary files a/macros/Hardware/RasberryPi/piGlow/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/pinMap/lib b/macros/Hardware/RasberryPi/pinMap/lib
deleted file mode 100644
index 133363e..0000000
Binary files a/macros/Hardware/RasberryPi/pinMap/lib and /dev/null differ
diff --git a/macros/Hardware/RasberryPi/pwm/lib b/macros/Hardware/RasberryPi/pwm/lib
deleted file mode 100644
index 8711baf..0000000
Binary files a/macros/Hardware/RasberryPi/pwm/lib and /dev/null differ
diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib
deleted file mode 100644
index 40b7b0a..0000000
Binary files a/macros/ImageProcessing/core/lib and /dev/null differ
diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index 0d7f88a..0000000
Binary files a/macros/ImageProcessing/highgui/lib and /dev/null differ
diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index 63b5e7e..0000000
Binary files a/macros/ImageProcessing/imgproc/lib and /dev/null differ
diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib
deleted file mode 100644
index a62fd4e..0000000
Binary files a/macros/Scilab-Arduino/lib and /dev/null differ
diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib
deleted file mode 100644
index 4379c83..0000000
Binary files a/macros/SymbolTable/lib and /dev/null differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index e0e63d4..aa80514 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -7363,6 +7363,38 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
 
+//------------------------------------
+//---- Class NNZ---------------------
+//------------------------------------
+ClassName = 'NNZ';
+
+// --- Class Annotation. ---
+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+//Arguements specified: initial value, start time, time vector, ode function
+PrintStringInfo('NIN=         1',ClassFileName,'file','y');
+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''u16''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('z0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'u160',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nnz'; 
+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
 //------------------------------------
 //---- Class TRIU ---------------------
 //------------------------------------
diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib
deleted file mode 100644
index 670a52e..0000000
Binary files a/macros/ToolInitialization/lib and /dev/null differ
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index fde9eb7..cbb0a1e 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -308,6 +308,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/matrixOperations/matrix/smatrixa.c"
       "src/c/matrixOperations/matrix/u16matrixa.c"
       "src/c/matrixOperations/matrix/zmatrixa.c"
+      "src/c/matrixOperations/nnz/dnnza.c"
+      "src/c/matrixOperations/nnz/dnnzs.c"
+      "src/c/matrixOperations/nnz/snnza.c"
+      "src/c/matrixOperations/nnz/snnzs.c"
+      "src/c/matrixOperations/nnz/znnza.c"
+      "src/c/matrixOperations/nnz/znnzs.c"
       "src/c/matrixOperations/triu/dtriua.c"
       "src/c/matrixOperations/triu/striua.c"
       "src/c/matrixOperations/triu/u8triua.c"
@@ -804,12 +810,12 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/pmodulo/spmoduloa.c"
       "src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
       "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
-"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
-"src/c/elementaryFunctions/nanmax/snanmaxa.c"
-"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
-"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
+      "src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxa.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxcola.c"
+      "src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
       "src/c/elementaryFunctions/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -948,15 +954,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/mad/dmada.c"
-"src/c/statisticsFunctions/mad/dmadrowa.c"
-"src/c/statisticsFunctions/mad/dmadcola.c"
-"src/c/statisticsFunctions/mad/smada.c"
-"src/c/statisticsFunctions/mad/smadrowa.c"
-"src/c/statisticsFunctions/mad/smadcola.c"
-"src/c/statisticsFunctions/mad/zmada.c"
-"src/c/statisticsFunctions/mad/zmadrowa.c"
-"src/c/statisticsFunctions/mad/zmadcola.c"
+      "src/c/statisticsFunctions/mad/dmada.c"
+      "src/c/statisticsFunctions/mad/dmadrowa.c"
+      "src/c/statisticsFunctions/mad/dmadcola.c"
+      "src/c/statisticsFunctions/mad/smada.c"
+      "src/c/statisticsFunctions/mad/smadrowa.c"
+      "src/c/statisticsFunctions/mad/smadcola.c"
+      "src/c/statisticsFunctions/mad/zmada.c"
+      "src/c/statisticsFunctions/mad/zmadrowa.c"
+      "src/c/statisticsFunctions/mad/zmadcola.c"
       "src/c/statisticsFunctions/prod/srowproda.c"
       "src/c/statisticsFunctions/prod/drowproda.c"
       "src/c/statisticsFunctions/prod/dproda.c"
diff --git a/macros/findDeps/lib b/macros/findDeps/lib
deleted file mode 100644
index afcd3ca..0000000
Binary files a/macros/findDeps/lib and /dev/null differ
diff --git a/macros/lib b/macros/lib
deleted file mode 100644
index 551263e..0000000
Binary files a/macros/lib and /dev/null differ
-- 
cgit 


From 388b2e5e833667609f9ddca5f86f5859c8819399 Mon Sep 17 00:00:00 2001
From: Abhinav Dronamraju
Date: Fri, 21 Jul 2017 11:47:28 +0530
Subject: Changes to median

---
 jar/scilab_en_US_help.jar                           | Bin 11210 -> 11210 bytes
 macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 5693d3f..cb24dad 100644
Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index aa80514..436d8bc 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1977,6 +1977,11 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
+FunctionName = 'median'; // 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);
-- 
cgit