diff options
4 files changed, 36 insertions, 14 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index 716d61e3..1dd33b12 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -2,19 +2,36 @@ function mainfunction()
-//test variance +//test ones +//reals -c=[4 2 3 ;8 8 4; 3 4 5] -d=[4 2 3 ;8 8-1*%i 4; 3+4*%i 4 5] -disp (variance(c)) -disp (variance(c,1)) -disp (variance(c,2)) -disp (variance(d)) -disp (variance(d,1)) -disp (variance(d,2)) +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/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc index 9b6e2fe7..10aa99fe 100644 --- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc +++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc @@ -24,10 +24,8 @@ SWSRCS = \ $(CSRCDIR)/doubleComplex.c \ $(CSRCDIR)/floatComplex.c \ $(CSRCDIR)/RealToComplex.c \ - $(CSRCDIR)/ones.c \ $(CSRCDIR)/zeros.c \ $(CSRCDIR)/OpApex.c \ - $(CSRCDIR)/OpColon.c \ $(CSRCDIR)/OpDotHat.c \ $(CSRCDIR)/OpEqual.c \ $(CSRCDIR)/OpIns.c \ @@ -141,7 +139,6 @@ SWSRCS = \ $(CSRCDIR)/cconja.c\ $(CSRCDIR)/zconjs.c\ $(CSRCDIR)/zconja.c\ - $(CSRCDIR)/disp.c\ $(CSRCDIR)/ceyea.c\ $(CSRCDIR)/deyea.c\ $(CSRCDIR)/seyea.c\ @@ -413,7 +410,10 @@ SWSRCS = \ $(CSRCDIR)/cleva2.c \ $(CSRCDIR)/dleva2.c \ $(CSRCDIR)/sleva2.c \ - $(CSRCDIR)/zleva2.c + $(CSRCDIR)/zleva2.c \ + $(CSRCDIR)/cimplicitLists.c \ + $(CSRCDIR)/dimplicitLists.c \ + $(CSRCDIR)/simplicitLists.c \ diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h index 8baf8b24..e8ffb707 100644 --- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h +++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h @@ -135,7 +135,10 @@ #include "tanh.h" #include "int_tanh.h" - +/* IMPLICIT LISTS */ +/* interfacing implicitList/OpColon */ +#include "implicitList.h" +#include "int_OpColon.h" /* OPERATIONS */ @@ -183,6 +186,7 @@ /* interfacing infinite norm */ #include "infiniteNorm.h"
/* interfacing ones */ #include "ones.h" +#include "int_ones.h" /* interfacing trace */ #include "matrixTrace.h" #include "int_trace.h" diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_ones.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_ones.h new file mode 120000 index 00000000..8fffa016 --- /dev/null +++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_ones.h @@ -0,0 +1 @@ +../../../../matrixOperations/interfaces/int_ones.h
\ No newline at end of file |