summaryrefslogtreecommitdiff
path: root/src/Scilab2C
diff options
context:
space:
mode:
authortorset2009-02-20 13:51:43 +0000
committertorset2009-02-20 13:51:43 +0000
commita054e9271f711824788bb14d49ed9d0966cc7bb9 (patch)
tree6a25129e121d6d50d2b73101c62db70f1a6935f9 /src/Scilab2C
parent2e2f500f9a66fa5fe57fdc24866e536f3a33ac81 (diff)
downloadscilab2c-a054e9271f711824788bb14d49ed9d0966cc7bb9.tar.gz
scilab2c-a054e9271f711824788bb14d49ed9d0966cc7bb9.tar.bz2
scilab2c-a054e9271f711824788bb14d49ed9d0966cc7bb9.zip
Update
Diffstat (limited to 'src/Scilab2C')
-rw-r--r--src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci48
-rw-r--r--src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci8
2 files changed, 5 insertions, 51 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 57a21ec9..6a30b4c5 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -3,55 +3,9 @@
//test pow
function mainfunction()
-//scalar^scalar
-disp(3.2^5.1)
-disp(3.2^(5.1+%i*1.4))
-disp((2.1+%i*0.3)^6.4)
-disp((2.1+%i*0.3)^(5.1+%i*1.4))
-
-//scalar.^scalar
-disp(3.2.^5.1)
-disp(3.2.^(5.1+%i*1.4))
-disp((2.1+%i*0.3).^6.4)
-disp((2.1+%i*0.3).^(5.1+%i*1.4))
-
-//scalar^matrice
a=[1.2 6.1 3.6; 1.7 4.9 7.1];
-b=a+%i*[1.8 2.9 3.6; 5.5 7.3 4.1];
-
-disp(2.1^a)
-disp(2.3^b)
-disp((3.5+%i*2.5)^a)
-disp((3.5+%i*2.5)^b)
-
-//scalar.^matrice
-disp(2.1.^a)
-disp(2.3.^b)
-disp((3.5+%i*2.5).^a)
-disp((3.5+%i*2.5).^b)
-
-//matrix^scalar
-//matrice carrée attendue ici
-c=[1.2 6.1 ; 4.9 7.1];
-d=c+%i*[1.8 2.9 ; 5.5 7.3];
-disp(c^3.2)
-disp(c^(3.2+%i*5.4))
-disp(d^3.2)
-disp(d^(3.2+%i*5.4))
-
-//matrix.^scalar
-disp(a.^3.2)
-disp(a.^(3.2+%i*5.4))
-disp(b.^3.2)
-disp(b.^(3.2+%i*5.4))
-
-
-//matrix.^matrix
-disp(a.^a)
-disp(a.^b)
-disp(b.^a)
-disp(b.^b)
+disp(a(1,2))
endfunction
diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 3b9a8e93..1b0e0cfb 100644
--- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -721,8 +721,8 @@ PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('c0c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('d2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('c2c0'+ArgSeparator+'c2',ClassFileName,'file','y');
PrintStringInfo('z2z0'+ArgSeparator+'z2',ClassFileName,'file','y');
@@ -731,8 +731,8 @@ PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('c0c2'+ArgSeparator+'c2',ClassFileName,'file','y');
PrintStringInfo('z0z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('s2s2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('d2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
+PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('c2c2'+ArgSeparator+'c2',ClassFileName,'file','y');
PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y');