diff options
7 files changed, 127 insertions, 28 deletions
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionEye.sci b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionEye.sci index 972d0f55..b077c9f4 100644 --- a/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionEye.sci +++ b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionEye.sci @@ -1,20 +1,37 @@ -//SCI2C: DEFAULT_PRECISION= FLOAT +//SCI2C: DEFAULT_PRECISION= DOUBLE function mainfunction()
-s1=eye(1);//teste s0eyes0 -s2=eye(4+3*%i);//teste c0eyec0 -s3=eye(2,2);//teste s0s0eyes2 -s4=eye(3,2);//teste s0s0eyes2 -a=[1 2 3 ; 4 5 6] -s5=eye(a);//teste s2eyes2 -b=[1 2 3 ; 4 5 6]+%i*[1 2 3 ; 4 5 6] -s6=eye(b)//teste c2eyec2 - -disp(s1); -disp(s2); -disp(s3); -disp(s4); -disp(s(); +//test eye + +//reals + + +disp(eye()) + +disp(eye(1)) + +disp(eye(4)) + +disp(eye(1,1)) + +disp(eye(1,4)) + +disp(eye(4,4)) + +disp(eye(4,1)) + +a=[1 2 3; 4 5 6; 7 8 9] + +disp(eye(a)) + +//complexe + +disp(eye(2+%i)) + +b=a+%i + +disp(eye(b)) + endfunction diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionOnes.sci b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionOnes.sci new file mode 100644 index 00000000..15b57b61 --- /dev/null +++ b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionOnes.sci @@ -0,0 +1,37 @@ +//SCI2C: DEFAULT_PRECISION= DOUBLE + +function mainfunction()
+ +//test ones + +//reals + + +//disp(ones()) + +disp(ones(1)) + +disp(ones(4)) + +disp(ones(1,1)) + +disp(ones(1,4)) + +disp(ones(4,4)) + +disp(ones(4,1)) + +a=[1 2 3; 4 5 6; 7 8 9] + +disp(ones(a)) + +//complexe + +disp(ones(2+%i)) + +b=a+%i + +disp(ones(b)) + + +endfunction diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionZeros.sci b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionZeros.sci new file mode 100644 index 00000000..7b4b0f9d --- /dev/null +++ b/src/Scilab2C/SCI2CTests/Mes_tests/matrixOperations/mainfunctionZeros.sci @@ -0,0 +1,37 @@ +//SCI2C: DEFAULT_PRECISION= DOUBLE + +function mainfunction()
+ +//test zeros + +//reals + + +//disp(zeros()) + +disp(zeros(1)) + +disp(zeros(4)) + +disp(zeros(1,1)) + +disp(zeros(1,4)) + +disp(zeros(4,4)) + +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)) + + +endfunction diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index 1dd33b12..d0cb7715 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -1,37 +1,37 @@ -//SCI2C: DEFAULT_PRECISION= DOUBLE +//SCI2C: DEFAULT_PRECISION= FLOAT function mainfunction()
-//test ones +//test zeros //reals +//disp(zeros()) +disp(zeros(1)) -disp(ones(1)) +disp(zeros(4)) -disp(ones(4)) +disp(zeros(1,1)) -disp(ones(1,1)) +disp(zeros(1,4)) -disp(ones(1,4)) +disp(zeros(4,4)) -disp(ones(4,4)) - -disp(ones(4,1)) +disp(zeros(4,1)) a=[1 2 3; 4 5 6; 7 8 9] -disp(ones(a)) +disp(zeros(a)) //complexe -disp(ones(2+%i)) +disp(zeros(2+%i)) b=a+%i -disp(ones(b)) +disp(zeros(b)) endfunction diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc index 10aa99fe..36e83163 100644 --- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc +++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc @@ -414,6 +414,11 @@ SWSRCS = \ $(CSRCDIR)/cimplicitLists.c \ $(CSRCDIR)/dimplicitLists.c \ $(CSRCDIR)/simplicitLists.c \ + $(CSRCDIR)/zimplicitLists.c \ + $(CSRCDIR)/czerosa.c \ + $(CSRCDIR)/dzerosa.c \ + $(CSRCDIR)/szerosa.c \ + $(CSRCDIR)/zzerosa.c diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h index e8ffb707..2e7ab212 100644 --- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h +++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h @@ -191,7 +191,9 @@ #include "matrixTrace.h" #include "int_trace.h" /* interfacing tranpose */ -#include "matrixTranspose.h" +#include "matrixTranspose.h"
/* interfacing zeros */ +#include "zeros.h" +#include "int_zeros.h" /* STATISTICS FUNCTIONS */ diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci index c5493b8b..dc4a68e6 100644 --- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -434,6 +434,7 @@ PrintStringInfo('OUT(1).SZ(2)= IN(2).VAL',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); + PrintStringInfo(ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo(ArgSeparator+'d0',ClassFileName,'file','y'); |