Merge pull request #19 from abhinavdronamraju/master

Updated the functions added. Changes are able to merge. 

4 files changed, 102 insertions, 13 deletions

diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 85472a8a..89ffc36f 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1047,6 +1047,39 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

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

 

+

+// -------------------

+// --- Class Isvector. ---

+// -------------------

+ClassName = 'Isvector';

+

+// --- 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');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=   ''g''',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+'g0',ClassFileName,'file','y');

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

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

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

+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');

+

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

+FunctionName = 'isvector';

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

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

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

+

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

 // --- Class Iscolumn. ---

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

@@ -1911,6 +1944,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);

@@ -7213,30 +7251,50 @@ PrintStringInfo('OUT(1).SZ(2)= IN(3).VAL',ClassFileName,'file','y');
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

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

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

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

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

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

-

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

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

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

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

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

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

-

 PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y');

 PrintStringInfo('u162s0s0'+ArgSeparator+'u162',ClassFileName,'file','y');

-PrintStringInfo('u82g2'+ArgSeparator+'u82',ClassFileName,'file','y');

-PrintStringInfo('i82g2'+ArgSeparator+'i82',ClassFileName,'file','y');

-PrintStringInfo('u162g2'+ArgSeparator+'u162',ClassFileName,'file','y');

-PrintStringInfo('i162g2'+ArgSeparator+'i162',ClassFileName,'file','y');

+

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

 FunctionName = 'matrix'; 

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

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

 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('d2'+ArgSeparator+'u160',ClassFileName,'file','y');

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

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

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

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

+PrintStringInfo('s0'+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/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index cf606ab5..95ec1e9f 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -66,6 +66,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/matrixOperations/includes/diag.h"
       "src/c/matrixOperations/includes/cumsum.h"
       "src/c/matrixOperations/includes/matrix.h"
+      "src/c/matrixOperations/includes/nnz.h"
       "src/c/matrixOperations/includes/cumprod.h"
       "src/c/matrixOperations/includes/triu.h"
       "src/c/matrixOperations/includes/tril.h"
@@ -133,6 +134,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/elementaryFunctions/includes/nthroot.h"
       "src/c/elementaryFunctions/includes/issquare.h"
       "src/c/elementaryFunctions/includes/isscalar.h"
+      "src/c/elementaryFunctions/includes/isvector.h"
       "src/c/elementaryFunctions/includes/iscolumn.h"
       "src/c/elementaryFunctions/includes/ismatrix.h"
       "src/c/elementaryFunctions/includes/asind.h"
@@ -141,6 +143,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/statisticsFunctions/includes/variance.h"
       "src/c/statisticsFunctions/includes/sum.h"
       "src/c/statisticsFunctions/includes/mean.h"
+      "src/c/statisticsFunctions/includes/median.h"
       "src/c/statisticsFunctions/includes/meanf.h"
       "src/c/statisticsFunctions/includes/stdevf.h"
       "src/c/statisticsFunctions/includes/prod.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 977ea76e..80043733 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -54,6 +54,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/matrixOperations/interfaces/int_diag.h"
       "src/c/matrixOperations/interfaces/int_cumsum.h"
       "src/c/matrixOperations/interfaces/int_matrix.h"
+      "src/c/matrixOperations/interfaces/int_nnz.h"
       "src/c/matrixOperations/interfaces/int_cumprod.h"
       "src/c/matrixOperations/interfaces/int_triu.h"
       "src/c/matrixOperations/interfaces/int_tril.h"
@@ -104,6 +105,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_nthroot.h"
       "src/c/elementaryFunctions/interfaces/int_issquare.h"
       "src/c/elementaryFunctions/interfaces/int_isscalar.h"
+      "src/c/elementaryFunctions/interfaces/int_isvector.h"
       "src/c/elementaryFunctions/interfaces/int_iscolumn.h"
       "src/c/elementaryFunctions/interfaces/int_ismatrix.h"
       "src/c/elementaryFunctions/interfaces/int_logspace.h"
@@ -130,6 +132,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/elementaryFunctions/interfaces/int_lcm.h"
       "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_meanf.h"
       "src/c/statisticsFunctions/interfaces/int_stdevf.h"
       "src/c/statisticsFunctions/interfaces/int_prod.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 60908c88..13371619 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/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"
@@ -798,7 +804,6 @@ 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/isscalar/disscalara.c"
       "src/c/elementaryFunctions/isscalar/disscalars.c"
       "src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -817,6 +822,14 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/elementaryFunctions/iscolumn/ziscolumns.c"
       "src/c/elementaryFunctions/iscolumn/u16iscolumna.c"
       "src/c/elementaryFunctions/iscolumn/u16iscolumns.c"
+      "src/c/elementaryFunctions/isvector/disvectora.c"
+      "src/c/elementaryFunctions/isvector/disvectors.c"
+      "src/c/elementaryFunctions/isvector/gisvectors.c"
+      "src/c/elementaryFunctions/isvector/gisvectora.c"
+      "src/c/elementaryFunctions/isvector/sisvectors.c" 
+      "src/c/elementaryFunctions/isvector/sisvectora.c"
+      "src/c/elementaryFunctions/isvector/zisvectora.c"
+      "src/c/elementaryFunctions/isvector/zisvectors.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixa.c"
       "src/c/elementaryFunctions/ismatrix/dismatrixs.c"
       //"src/c/elementaryFunctions/ismatrix/gismatrixs.c"
@@ -915,6 +928,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
       "src/c/statisticsFunctions/meanf/zmeanfdz.c"
       "src/c/statisticsFunctions/meanf/cmeanfsc.c"
       "src/c/statisticsFunctions/meanf/zcolumnmeanfa.c"
+"src/c/statisticsFunctions/median/dmediana.c"
+"src/c/statisticsFunctions/median/dmedianrowa.c"
+"src/c/statisticsFunctions/median/dmediancola.c"
+"src/c/statisticsFunctions/median/smediana.c"
+"src/c/statisticsFunctions/median/smedianrowa.c"
+"src/c/statisticsFunctions/median/smediancola.c"
+"src/c/statisticsFunctions/median/u16mediana.c"
+"src/c/statisticsFunctions/median/u16medianrowa.c"
+"src/c/statisticsFunctions/median/u16mediancola.c"
+"src/c/statisticsFunctions/median/zmediana.c"
+"src/c/statisticsFunctions/median/zmediancola.c"
+"src/c/statisticsFunctions/median/zmedianrowa.c"
       "src/c/statisticsFunctions/prod/srowproda.c"
       "src/c/statisticsFunctions/prod/drowproda.c"
       "src/c/statisticsFunctions/prod/dproda.c"