diff options
| author | torset | 2009-02-18 13:30:04 +0000 |
|---|---|---|
| committer | torset | 2009-02-18 13:30:04 +0000 |
| commit | 2d1620f79eebcf1469a4ed62cacd1f66695dedb1 (patch) | |
| tree | cfcb99131672b7f9e4991eb664cd2d3af93eaa8e /src/Scilab2C | |
| parent | 113403de8c73c7f95c78cf082d64b42cea75d4db (diff) | |
| download | scilab2c-2d1620f79eebcf1469a4ed62cacd1f66695dedb1.tar.gz scilab2c-2d1620f79eebcf1469a4ed62cacd1f66695dedb1.tar.bz2 scilab2c-2d1620f79eebcf1469a4ed62cacd1f66695dedb1.zip | |
Update
Diffstat (limited to 'src/Scilab2C')
| -rw-r--r-- | src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci | 19 | ||||
| -rw-r--r-- | src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc | 14 |
2 files changed, 27 insertions, 6 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index 7379e218..5d7af3a3 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -6,16 +6,25 @@ function mainfunction() //reals -disp(max(3,-2)) +disp(norm(3)) +disp(max(3,1)) +disp(max(3,2)) -disp(min(3,-2)) + +disp(min(7)) +disp(min(7,1)) +disp(min(7,2)) a=[4 -2 4 8;-3 4 5 -1;1 -4 5 6; -7 -4 5 3] -b=[2 7 1 4; 3 -5 4 8; 2 -6 9 7; 1 -2 3 -4] -disp(max(a,b)) -disp(min(a,b)) +disp(max(a)) +disp(max(a,1)) +disp(max(a,2)) + +disp(min(a)) +disp(min(a,1)) +disp(min(a,2)) endfunction diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc index 8e1cd74a..4c38ac68 100644 --- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc +++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc @@ -420,7 +420,19 @@ SWSRCS = \ $(CSRCDIR)/cspec2a.c \ $(CSRCDIR)/dspec2a.c \ $(CSRCDIR)/sspec2a.c \ - $(CSRCDIR)/zspec2a.c + $(CSRCDIR)/zspec2a.c \ + $(CSRCDIR)/smina.c \ + $(CSRCDIR)/smaxa.c \ + $(CSRCDIR)/srowmina.c \ + $(CSRCDIR)/srowmaxa.c \ + $(CSRCDIR)/scolumnmina.c \ + $(CSRCDIR)/scolumnmaxa.c \ + $(CSRCDIR)/dmina.c \ + $(CSRCDIR)/dmaxa.c \ + $(CSRCDIR)/drowmina.c \ + $(CSRCDIR)/drowmaxa.c \ + $(CSRCDIR)/dcolumnmina.c \ + $(CSRCDIR)/dcolumnmaxa.c |