summaryrefslogtreecommitdiff
path: root/2.3-1/macros
diff options
context:
space:
mode:
authorAbhinav Dronamraju2017-07-29 00:21:26 +0530
committerAbhinav Dronamraju2017-07-29 00:21:26 +0530
commit78c57c72c7532ea4abba4cb5d06ed34019a30c24 (patch)
tree7d1bdde8a9b590fde4233b8153bdf12d4d16913c /2.3-1/macros
parentcd41972eb98c3c69f74d6788e76e7789a846e53a (diff)
parent8398cac9dceebe7ae065b89dd0d39541acc11d5f (diff)
downloadScilab2C-78c57c72c7532ea4abba4cb5d06ed34019a30c24.tar.gz
Scilab2C-78c57c72c7532ea4abba4cb5d06ed34019a30c24.tar.bz2
Scilab2C-78c57c72c7532ea4abba4cb5d06ed34019a30c24.zip
Nan max few changes
Diffstat (limited to '2.3-1/macros')
-rw-r--r--2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci128
-rw-r--r--2.3-1/macros/findDeps/getAllHeaders.sci2
-rw-r--r--2.3-1/macros/findDeps/getAllInterfaces.sci2
-rw-r--r--2.3-1/macros/findDeps/getAllSources.sci31
4 files changed, 153 insertions, 10 deletions
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 44e36a29..0a738960 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -1015,9 +1015,9 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
// -------------------
-// --- Class Nanmax. ---
+// --- Class Nanmin. ---
// -------------------
-ClassName = 'Nanmax';
+ClassName = 'Nanmin';
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -1033,22 +1033,101 @@ PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y');
+
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+
+//---Function list class. ----
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+//PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+
+
+// --- 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 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= 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)= ''2''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y');
+
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(2).VAL)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName,'file','y');
+
//---Function list class. ----
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0d2',ClassFileName,'file','y');
PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('d2g2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s0s2',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'s0s2',ClassFileName,'file','y');
PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2s2',ClassFileName,'file','y');
+PrintStringInfo('s2g2'+ArgSeparator+'s2s2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -1057,8 +1136,49 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file',
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+// -------------------
+// --- Class Nanmean. ---
+// -------------------
+ClassName = 'Nanmean';
+
+// --- 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= 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');
+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('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');
+PrintStringInfo('z2'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y');
+
+
// --- Annotation Function And Function List Function. ---
-FunctionName = 'nanmin';
+FunctionName = 'nanmean';
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 a8a2e477..22daaade 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -134,6 +134,8 @@ function allHeaders = getAllHeaders(SharedInfo)
"src/c/elementaryFunctions/includes/nthroot.h"
"src/c/elementaryFunctions/includes/pmodulo.h"
"src/c/elementaryFunctions/includes/nanmax.h"
+ "src/c/elementaryFunctions/includes/nanmean.h"
+ "src/c/elementaryFunctions/includes/nanmin.h"
"src/c/elementaryFunctions/includes/issquare.h"
"src/c/elementaryFunctions/includes/isscalar.h"
"src/c/elementaryFunctions/includes/isvector.h"
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index 74acfe40..fe181bc9 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -105,6 +105,8 @@ function allInterfaces = getAllInterfaces(SharedInfo)
"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_nanmean.h"
+ "src/c/elementaryFunctions/interfaces/int_nanmin.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/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 6558f55a..a71031c7 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -812,11 +812,33 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"src/c/elementaryFunctions/pmodulo/i16pmoduloa.c"
"src/c/elementaryFunctions/nanmax/dnanmaxa.c"
"src/c/elementaryFunctions/nanmax/dnanmax1a.c"
+ "src/c/elementaryFunctions/nanmax/dnanmax2a.c"
"src/c/elementaryFunctions/nanmax/dnanmaxcola.c"
"src/c/elementaryFunctions/nanmax/dnanmaxrowa.c"
+ "src/c/elementaryFunctions/nanmax/dnanmaxcol1a.c"
+ "src/c/elementaryFunctions/nanmax/dnanmaxrow1a.c"
"src/c/elementaryFunctions/nanmax/snanmaxa.c"
+ "src/c/elementaryFunctions/nanmax/snanmax1a.c"
+ "src/c/elementaryFunctions/nanmax/snanmax2a.c"
"src/c/elementaryFunctions/nanmax/snanmaxcola.c"
"src/c/elementaryFunctions/nanmax/snanmaxrowa.c"
+ "src/c/elementaryFunctions/nanmax/snanmaxcol1a.c"
+ "src/c/elementaryFunctions/nanmax/snanmaxrow1a.c""
+ "src/c/elementaryFunctions/nanmean/dnanmeana.c"
+ "src/c/elementaryFunctions/nanmean/dnanmeanrowa.c"
+ "src/c/elementaryFunctions/nanmean/dnanmeancola.c"
+ "src/c/elementaryFunctions/nanmean/snanmeana.c"
+ "src/c/elementaryFunctions/nanmean/snanmeanrowa.c"
+ "src/c/elementaryFunctions/nanmean/snanmeancola.c"
+ "src/c/elementaryFunctions/nanmean/znanmeana.c"
+ "src/c/elementaryFunctions/nanmean/znanmeanrowa.c"
+ "src/c/elementaryFunctions/nanmean/znanmeancola.c"
+ "src/c/elementaryFunctions/nanmin/dnanmina.c"
+ "src/c/elementaryFunctions/nanmin/dnanmins.c"
+ "src/c/elementaryFunctions/nanmin/dnanminnpa.c"
+ "src/c/elementaryFunctions/nanmin/dnanmincolnpa.c"
+ "src/c/elementaryFunctions/nanmin/dnanminrownpa.c"
+ "src/c/elementaryFunctions/nanmin/dnanminnps.c"
"src/c/elementaryFunctions/isscalar/disscalara.c"
"src/c/elementaryFunctions/isscalar/disscalars.c"
"src/c/elementaryFunctions/isscalar/gisscalars.c"
@@ -961,12 +983,9 @@ function allSources = getAllSources(SharedInfo,BuildTool)
"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/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 05:05:49 +0000