diff options
| author | torset | 2009-01-29 15:32:39 +0000 |
|---|---|---|
| committer | torset | 2009-01-29 15:32:39 +0000 |
| commit | 8d8ec5b2681da7579851dc0e44f2d2b909195e1e (patch) | |
| tree | b4bf9dae35549d5699dca75298379909ee9dc560 /src/Scilab2C | |
| parent | e1bbfe0b1363205c11bda68e88cb5246659e066a (diff) | |
| download | scilab2c-8d8ec5b2681da7579851dc0e44f2d2b909195e1e.tar.gz scilab2c-8d8ec5b2681da7579851dc0e44f2d2b909195e1e.tar.bz2 scilab2c-8d8ec5b2681da7579851dc0e44f2d2b909195e1e.zip | |
Update
Diffstat (limited to 'src/Scilab2C')
| -rw-r--r-- | src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci | 70 | ||||
| -rw-r--r-- | src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc | 37 |
2 files changed, 49 insertions, 58 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci index 0231faa2..d56328d1 100644 --- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci +++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci @@ -1,56 +1,30 @@ //SCI2C: DEFAULT_PRECISION= DOUBLE function mainfunction()
-//test multiplication - -//d0d0 -disp (5/3) -//d0z0 -disp (1/%i) -//z0d0 -disp (%i/5) -//z0z0 -disp (%i/(3*%i)) - -a=[1 2 3; 4 5 6] +//test exp and expm + +//d0 +disp (exp(3)) + +//z0 +disp (exp(3+%i*4)) + + +a=[1 2 3; 5 5 6] c=[4 2 3 ;8 8 4; 3 4 5] b=[1+%i,2+4*%i 3+1*%i; 4 5 6+2*%i] d=[4 2 3 ;8 8-1*%i 4; 3+4*%i 4 5] -e=[4 2 ;3 8 ;8-1*%i 4; 3+4*%i 4] - -//d2d2 -disp(a*c) -disp(a.*a) -//d2z2 -disp(a*d) -disp(a.*b) -//z2d2 -disp(e*a) -disp(b.*a) -//z2z2 -disp(b*d) -disp(b.*b) - - - - -//d2d0 -disp(a*1) -//d0d2 -disp(1*a) -//d2z0 -disp(a*%i) -//z0d2 -disp(%i*a) - - -//z2d0 -disp(b*1) -//d0z2 -disp(1*b) -//z2z0 -disp(b*%i) -//z0z2 -disp(%i*b) + +//d2 +disp (exp(a)) +disp (exp(c)) +disp (expm(c)) + +//z2 +disp (exp(b)) +disp (exp(d)) +disp (expm(d)) + + endfunction diff --git a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc index 735f07f3..d88537e7 100644 --- a/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc +++ b/src/Scilab2C/Scilab2C/CCodeGeneration/SCI2CMakefileTemplate.rc @@ -70,14 +70,6 @@ SWSRCS = \ $(CSRCDIR)/dmeana.c \ $(CSRCDIR)/cmeana.c \ $(CSRCDIR)/zmeana.c \ - $(CSRCDIR)/sexps.c \ - $(CSRCDIR)/dexps.c \ - $(CSRCDIR)/cexps.c \ - $(CSRCDIR)/zexps.c \ - $(CSRCDIR)/sexpa.c \ - $(CSRCDIR)/dexpa.c \ - $(CSRCDIR)/cexpa.c \ - $(CSRCDIR)/zexpa.c \ $(CSRCDIR)/slog10s.c \ $(CSRCDIR)/dlog10s.c \ $(CSRCDIR)/slog10a.c \ @@ -260,8 +252,33 @@ SWSRCS = \ $(CSRCDIR)/cldivma.c \ $(CSRCDIR)/dldivma.c \ $(CSRCDIR)/sldivma.c \ - $(CSRCDIR)/zldivma.c - + $(CSRCDIR)/zldivma.c \ +##### invesion #########\ + $(CSRCDIR)/cinverma.c \ + $(CSRCDIR)/dinverma.c \ + $(CSRCDIR)/sinverma.c \ + $(CSRCDIR)/zinverma.c \ +##### exp and expm #########\ + $(CSRCDIR)/cexps.c \ + $(CSRCDIR)/dexps.c \ + $(CSRCDIR)/cexps.c \ + $(CSRCDIR)/zexps.c \ + $(CSRCDIR)/cexpa.c \ + $(CSRCDIR)/dexpa.c \ + $(CSRCDIR)/sexpa.c \ + $(CSRCDIR)/zexpa.c \ + $(CSRCDIR)/cexpma.c \ + $(CSRCDIR)/dexpma.c \ + $(CSRCDIR)/sexpma.c \ + $(CSRCDIR)/zexpma.c \ +##### frexp #########\ + $(CSRCDIR)/dfrexps.c \ + $(CSRCDIR)/sfrexps.c \ +##### frexp #########\ + $(CSRCDIR)/cinfnorma.c \ + $(CSRCDIR)/dinfnorma.c \ + $(CSRCDIR)/sinfnorma.c \ + $(CSRCDIR)/zinfnorma.c |