summaryrefslogtreecommitdiff
path: root/2.3-1/macros
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros')
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci23
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci1
-rw-r--r--2.3-1/macros/findDeps/getAllInterfaces.sci1
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci13
4 files changed, 38 insertions, 0 deletions
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 436d8bc1..44e36a29 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1028,6 +1028,15 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
+
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -1036,6 +1045,7 @@ PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,
//---Function list class. ----
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y');
PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
@@ -1046,6 +1056,14 @@ FunctionName = 'nanmax';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'nanmin';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
// -------------------
// --- Class Issquare. ---
// -------------------
@@ -1982,6 +2000,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+FunctionName = 'nanmedian'; // BJ : Done AS : Float_Done
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
FunctionName = 'st_deviation'; // BJ : Not implemented
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 90b80dfc..a8a2e477 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -146,6 +146,7 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/statisticsFunctions/includes/sum.h"
"src/c/statisticsFunctions/includes/mean.h"
"src/c/statisticsFunctions/includes/median.h"
+ "src/c/statisticsFunctions/includes/nanmedian.h"
"src/c/statisticsFunctions/includes/mad.h"
"src/c/statisticsFunctions/includes/meanf.h"
"src/c/statisticsFunctions/includes/stdevf.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 49829000..74acfe40 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -135,6 +135,7 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"src/c/elementaryFunctions/interfaces/int_isequal.h"
"src/c/statisticsFunctions/interfaces/int_mean.h"
"src/c/statisticsFunctions/interfaces/int_median.h"
+ "src/c/statisticsFunctions/interfaces/int_nanmedian.h"
"src/c/statisticsFunctions/interfaces/int_mad.h"
"src/c/statisticsFunctions/interfaces/int_meanf.h"
"src/c/statisticsFunctions/interfaces/int_stdevf.h"
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index cbb0a1ec..6558f55a 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -811,6 +811,7 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/elementaryFunctions/pmodulo/i16pmodulos.c"
"src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
+ "src/c/elementaryFunctions/nanmax/dnanmax1a.c"
"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
"src/c/elementaryFunctions/nanmax/snanmaxa.c"
@@ -954,6 +955,18 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/statisticsFunctions/median/zmediana.c"
"src/c/statisticsFunctions/median/zmediancola.c"
"src/c/statisticsFunctions/median/zmedianrowa.c"
+ "src/c/statisticsFunctions/nanmedian/dnanmediana.c"
+ "src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c"
+ "src/c/statisticsFunctions/nanmedian/dnanmediancola.c"
+ "src/c/statisticsFunctions/nanmedian/snanmediana.c"
+ "src/c/statisticsFunctions/nanmedian/snanmedianrowa.c"
+ "src/c/statisticsFunctions/nanmedian/snanmediancola.c"
+ //"src/c/statisticsFunctions/nanmedian/u16nanmediana.c"
+ //"src/c/statisticsFunctions/nanmedian/u16nanmedianrowa.c"
+ //"src/c/statisticsFunctions/nanmedian/u16nanmediancola.c"
+ //"src/c/statisticsFunctions/nanmedian/znanmediana.c"
+ //"src/c/statisticsFunctions/nanmedian/znanmediancola.c"
+ //"src/c/statisticsFunctions/nanmedian/znanmedianrowa.c"
"src/c/statisticsFunctions/mad/dmada.c"
"src/c/statisticsFunctions/mad/dmadrowa.c"
"src/c/statisticsFunctions/mad/dmadcola.c"
generated by cgit (git 2.34.1) at 2024-12-20 11:45:14 +0000