summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorsimon2009-08-04 11:52:49 +0000
committersimon2009-08-04 11:52:49 +0000
commitbe8c66b26fa69a8078ee369f0af5fb9372f95293 (patch)
treed3574f2f85042a199d5455221f58b23f05d5e394 /macros
parentac2f79dabb674e9cf79e611c19b3acd2d98a9831 (diff)
downloadscilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.tar.gz
scilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.tar.bz2
scilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.zip
added case where second input of meanf is complex
updated the header and interface added functiosn for the new cases update INIT_FillSCI2LibCDirs changing the unit test in order to test the new cases
Diffstat (limited to 'macros')
-rw-r--r--macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci42
-rw-r--r--macros/findDeps/getAllHeaders.sci1
-rw-r--r--macros/findDeps/getAllInterfaces.sci1
-rw-r--r--macros/findDeps/getAllSources.sci22
4 files changed, 63 insertions, 3 deletions
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 88cf1358..0de6a107 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -2466,7 +2466,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= FA_TP_MAX(IN(1).TP, IN(2).TP)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= FA_SZ_SEL1(IN(1).SZ(1),IN(3).VAL)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(3).VAL)',ClassFileName,'file','y');
@@ -2492,6 +2492,46 @@ PrintStringInfo('s2s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('c2s2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
PrintStringInfo('z2d2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+//
+PrintStringInfo('s0c0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d0z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('c0c0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('z0z0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+PrintStringInfo('s2c2'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d2z2'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('c2c2'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('z2z2'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+PrintStringInfo('s0c0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d0z0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
+PrintStringInfo('c0c0s0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('z0z0d0'+ArgSeparator+'z0',ClassFileName,'file','y');
+
+PrintStringInfo('s2c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('d2z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('c2c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
+PrintStringInfo('z2z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+//
+PrintStringInfo('s0c0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0z0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('c0c0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('z0z0'+ArgSeparator+'d0',ClassFileName,'file','y');
+
+PrintStringInfo('s2c2'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d2z2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('c2c2'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('z2z2'+ArgSeparator+'d0',ClassFileName,'file','y');
+
+PrintStringInfo('s0c0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('d0z0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('c0c0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('z0z0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+
+PrintStringInfo('s2c2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2z2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('c2c2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('z2z2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'meanf'; // AS : Done
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index a08266df..d7998ffd 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -91,6 +91,7 @@ function allHeaders = getAllHeaders()
"src/c/statisticsFunctions/includes/sum.h"
"src/c/statisticsFunctions/includes/mean.h"
"src/c/statisticsFunctions/includes/meanf.h"
+ "src/c/statisticsFunctions/includes/stdevf.h"
"src/c/statisticsFunctions/includes/prod.h"
"src/c/statisticsFunctions/includes/dynlib_statisticsfunctions.h"
"src/c/statisticsFunctions/includes/statMax.h"
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index 45c46155..314b99dc 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -78,6 +78,7 @@ function allInterfaces = getAllInterfaces()
"src/c/elementaryFunctions/interfaces/int_cosh.h"
"src/c/statisticsFunctions/interfaces/int_mean.h"
"src/c/statisticsFunctions/interfaces/int_meanf.h"
+ "src/c/statisticsFunctions/interfaces/int_stdevf.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/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index d6af0cef..a4e85131 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -418,8 +418,10 @@ function allSources = getAllSources()
"src/c/statisticsFunctions/meanf/crowmeanfa.c"
"src/c/statisticsFunctions/meanf/dcolumnmeanfa.c"
"src/c/statisticsFunctions/meanf/zmeanfa.c"
- "src/c/statisticsFunctions/meanf/zmeanfv.c"
- "src/c/statisticsFunctions/meanf/cmeanfv.c"
+ "src/c/statisticsFunctions/meanf/zmeanfzd.c"
+ "src/c/statisticsFunctions/meanf/cmeanfcs.c"
+ "src/c/statisticsFunctions/meanf/zmeanfdz.c"
+ "src/c/statisticsFunctions/meanf/cmeanfsc.c"
"src/c/statisticsFunctions/meanf/zcolumnmeanfa.c"
"src/c/statisticsFunctions/prod/srowproda.c"
"src/c/statisticsFunctions/prod/drowproda.c"
@@ -445,6 +447,22 @@ function allSources = getAllSources()
"src/c/statisticsFunctions/variance/zrowvariancea.c"
"src/c/statisticsFunctions/variance/ccolumnvariancea.c"
"src/c/statisticsFunctions/variance/scolumnvariancea.c"
+ "src/c/statisticsFunctions/stdevf/cstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/zstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/cstdevfcs.c"
+ "src/c/statisticsFunctions/stdevf/zstdevfzd.c"
+ "src/c/statisticsFunctions/stdevf/cstdevfsc.c"
+ "src/c/statisticsFunctions/stdevf/zstdevfdz.c"
+ "src/c/statisticsFunctions/stdevf/dcolumnstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/dstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/crowstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/sstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/drowstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/srowstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/zcolumnstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/zrowstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/ccolumnstdevfa.c"
+ "src/c/statisticsFunctions/stdevf/scolumnstdevfa.c"
"src/c/operations/multiplication/cmula.c"
"src/c/operations/multiplication/cmuls.c"
"src/c/operations/multiplication/cmulv.c"