diff options
| author | Abhinav Dronamraju | 2017-08-01 20:22:53 +0530 |
|---|---|---|
| committer | Abhinav Dronamraju | 2017-08-01 20:22:53 +0530 |
| commit | e837bc137eb35bd77e31530436d7727a500d45e0 (patch) | |
| tree | e39bf9d85039ac33be87b8ad8661944e9a7327fa /2.3-1/macros | |
| parent | 81419aa6b4f55ae75192f704d2e52dbad3f34033 (diff) | |
| download | Scilab2C-e837bc137eb35bd77e31530436d7727a500d45e0.tar.gz Scilab2C-e837bc137eb35bd77e31530436d7727a500d45e0.tar.bz2 Scilab2C-e837bc137eb35bd77e31530436d7727a500d45e0.zip | |
Nanstdev, stdev, nancumsum added
Diffstat (limited to '2.3-1/macros')
| -rw-r--r-- | 2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci | 48 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllHeaders.sci | 5 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllInterfaces.sci | 3 | ||||
| -rw-r--r-- | 2.3-1/macros/findDeps/getAllSources.sci | 21 |
4 files changed, 76 insertions, 1 deletions
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 2ca622fe..71d918c2 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1138,6 +1138,44 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // -------------------
+// --- Class Nancumsum. ---
+// -------------------
+ClassName = 'Nancumsum';
+
+// --- 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)= IN(1).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(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)= 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('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nancumsum';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+// -------------------
// --- Class Nanmean. ---
// -------------------
ClassName = 'Nanmean';
@@ -2129,6 +2167,16 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+FunctionName = 'stdev'; // 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 = 'nanstdev'; // 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);
+
// --------------------
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 1a455232..5869aba1 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -137,6 +137,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/elementaryFunctions/includes/nanmean.h" "src/c/elementaryFunctions/includes/nanmin.h" "src/c/elementaryFunctions/includes/nansum.h" + "src/c/elementaryFunctions/includes/nancumsum.h" "src/c/elementaryFunctions/includes/issquare.h" "src/c/elementaryFunctions/includes/isscalar.h" "src/c/elementaryFunctions/includes/isvector.h" @@ -150,9 +151,11 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/statisticsFunctions/includes/mean.h" "src/c/statisticsFunctions/includes/median.h" "src/c/statisticsFunctions/includes/nanmedian.h" + "src/c/statisticsFunctions/includes/nanstdev.h" "src/c/statisticsFunctions/includes/mad.h" "src/c/statisticsFunctions/includes/meanf.h" - "src/c/statisticsFunctions/includes/stdevf.h" + "src/c/statisticsFunctions/includes/stdevf.h" + "src/c/statisticsFunctions/includes/stdev.h" "src/c/statisticsFunctions/includes/prod.h" "src/c/statisticsFunctions/includes/dynlib_statisticsfunctions.h" "src/c/statisticsFunctions/includes/statMax.h" diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 12f5b3d4..b31fb92e 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -108,6 +108,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "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_nancumsum.h" "src/c/elementaryFunctions/interfaces/int_issquare.h" "src/c/elementaryFunctions/interfaces/int_isscalar.h" "src/c/elementaryFunctions/interfaces/int_isvector.h" @@ -139,9 +140,11 @@ function allInterfaces = getAllInterfaces(SharedInfo) "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_nanstdev.h" "src/c/statisticsFunctions/interfaces/int_mad.h" "src/c/statisticsFunctions/interfaces/int_meanf.h" "src/c/statisticsFunctions/interfaces/int_stdevf.h" + "src/c/statisticsFunctions/interfaces/int_stdev.h" "src/c/statisticsFunctions/interfaces/int_prod.h" "src/c/statisticsFunctions/interfaces/int_variance.h" "src/c/statisticsFunctions/interfaces/int_sum.h" diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index 7e0a806c..fbc71eb6 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -914,6 +914,15 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/nansum/znansuma.c" "src/c/elementaryFunctions/nansum/znansumcola.c" "src/c/elementaryFunctions/nansum/znansumrowa.c" + "src/c/elementaryFunctions/nancumsum/dnancumsuma.c" + "src/c/elementaryFunctions/nancumsum/dnancumsumrowa.c" + "src/c/elementaryFunctions/nancumsum/dnancumsumcola.c" + "src/c/elementaryFunctions/nancumsum/snancumsuma.c" + "src/c/elementaryFunctions/nancumsum/snancumsumrowa.c" + "src/c/elementaryFunctions/nancumsum/snancumsumcola.c" + "src/c/elementaryFunctions/nancumsum/znancumsuma.c" + "src/c/elementaryFunctions/nancumsum/znancumsumcola.c" + "src/c/elementaryFunctions/nancumsum/znancumsumrowa.c" "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c" "src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c" "src/c/elementaryFunctions/isequal/disequals.c" @@ -988,6 +997,12 @@ 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/stdev/dstdeva.c" + "src/c/statisticsFunctions/stdev/dstdevrowa.c" + "src/c/statisticsFunctions/stdev/dstdevcola.c" + "src/c/statisticsFunctions/stdev/sstdeva.c" + "src/c/statisticsFunctions/stdev/sstdevrowa.c" + "src/c/statisticsFunctions/stdev/sstdevcola.c" "src/c/statisticsFunctions/nanmedian/dnanmediana.c" "src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c" "src/c/statisticsFunctions/nanmedian/dnanmediancola.c" @@ -997,6 +1012,12 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/statisticsFunctions/nanmedian/znanmediana.c" "src/c/statisticsFunctions/nanmedian/znanmediancola.c" "src/c/statisticsFunctions/nanmedian/znanmedianrowa.c" + "src/c/statisticsFunctions/nanstdev/dnanstdeva.c" + "src/c/statisticsFunctions/nanstdev/dnanstdevrowa.c" + "src/c/statisticsFunctions/nanstdev/dnanstdevcola.c" + "src/c/statisticsFunctions/nanstdev/snanstdeva.c" + "src/c/statisticsFunctions/nanstdev/snanstdevrowa.c" + "src/c/statisticsFunctions/nanstdev/snanstdevcola.c" "src/c/statisticsFunctions/mad/dmada.c" "src/c/statisticsFunctions/mad/dmadrowa.c" "src/c/statisticsFunctions/mad/dmadcola.c" |