Update

4 files changed, 20 insertions, 28 deletions

diff --git a/scilab2c/Doc/FunctionIntegrationOverview.xls b/scilab2c/Doc/FunctionIntegrationOverview.xls
index 336caef0..2d2406c8 100644
--- a/scilab2c/Doc/FunctionIntegrationOverview.xls
+++ b/scilab2c/Doc/FunctionIntegrationOverview.xls
diff --git a/scilab2c/Doc/SCI2CUserGuidev1.doc b/scilab2c/Doc/SCI2CUserGuidev1.doc
index a00d892b..c0bf4bf1 100644
--- a/scilab2c/Doc/SCI2CUserGuidev1.doc
+++ b/scilab2c/Doc/SCI2CUserGuidev1.doc
diff --git a/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index d0cb7715..3f3822ea 100644
--- a/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/scilab2c/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,37 +1,29 @@
-//SCI2C: DEFAULT_PRECISION= FLOAT
+//SCI2C: DEFAULT_PRECISION= DOUBLE
 
 function mainfunction()

 
-//test zeros
+//test OpApex(transpose&conj) & OpDotApex(transpose)
 
 //reals
 
+disp(3')
 
-//disp(zeros())
+disp(3.')
 
-disp(zeros(1))
+a=[4 2 4 8;3 4 5 1;1 4 5 6; 7 4 5 3]
 
-disp(zeros(4))
+disp(a')
+disp(a.')
 
-disp(zeros(1,1))
+//complexes
 
-disp(zeros(1,4))
+disp((3+%i)')
 
-disp(zeros(4,4))
+disp((3+%i).')
 
-disp(zeros(4,1))
-
-a=[1 2 3; 4 5 6; 7 8 9]
-
-disp(zeros(a))
-
-//complexe
-
-disp(zeros(2+%i))
-
-b=a+%i
-
-disp(zeros(b))
+b=2.5*a+a*%i;
 
+disp(b')
+disp(b.')
 
 endfunction
diff --git a/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 2eaa0a5e..cd44510b 100644
--- a/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/scilab2c/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -2522,16 +2522,16 @@ PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'both','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).TP=    FA_TP_MAX(IN(1).TP)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(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).TP=    FA_TP_MAX(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('OUT(2).TP=    IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).TP=    FA_TP_MAX(IN(1).TP)',ClassFileName,'file','y');
 PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 
@@ -2539,8 +2539,8 @@ PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 //NUT: no mixed data types
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
 PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
 
@@ -2551,8 +2551,8 @@ PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
 PrintStringInfo('d2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
 
-PrintStringInfo('s0'+ArgSeparator+'s0s0',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0d0',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'c0c0',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'z0z0',ClassFileName,'file','y');
 PrintStringInfo('c0'+ArgSeparator+'c0c0',ClassFileName,'file','y');
 PrintStringInfo('z0'+ArgSeparator+'z0z0',ClassFileName,'file','y');