summaryrefslogtreecommitdiff
path: root/src/Scilab2C
diff options
context:
space:
mode:
authortorset2009-02-18 15:16:17 +0000
committertorset2009-02-18 15:16:17 +0000
commit138f436a9ed2bbe04c9df5acdd6a2b4e9c36807e (patch)
treee35d8f7dd8afc1f8e6087c40fb56bd562f381838 /src/Scilab2C
parent8128e4cef706f19a7b30ed3a8260a1901e49ae33 (diff)
downloadscilab2c-138f436a9ed2bbe04c9df5acdd6a2b4e9c36807e.tar.gz
scilab2c-138f436a9ed2bbe04c9df5acdd6a2b4e9c36807e.tar.bz2
scilab2c-138f436a9ed2bbe04c9df5acdd6a2b4e9c36807e.zip
Add real and imag interfaces
Diffstat (limited to 'src/Scilab2C')
-rw-r--r--src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci34
-rw-r--r--src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h7
l---------src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_imag.h1
l---------src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_real.h1
4 files changed, 19 insertions, 24 deletions
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index 5d7af3a3..02b5c3a7 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,30 +1,20 @@
//SCI2C: DEFAULT_PRECISION= DOUBLE
-function mainfunction()
+function mainfunction()
+
+disp(real(4));
+disp(imag(4));
-//test max && min
+disp(real(1+2*%i));
+disp(imag(1+2*%i));
-//reals
+a=[4 2 7 5;4 8 6 1];
-disp(norm(3))
-disp(max(3,1))
-disp(max(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]
-
-
-disp(max(a))
-disp(max(a,1))
-disp(max(a,2))
-
-disp(min(a))
-disp(min(a,1))
-disp(min(a,2))
+disp(real(a));
+disp(imag(a));
+b=a+%i*2*a
+disp(real(b));
+disp(imag(b));
endfunction
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
index 16b8b970..9d4a3726 100644
--- a/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cincludes/sci2clib.h
@@ -220,8 +220,6 @@
-
-
/* STATISTICS FUNCTIONS */
/* interfacing max */
@@ -238,4 +236,9 @@
#include "variance.h"
#include "int_variance.h"
+/* TYPE */
+/* interfacing real */
+#include "int_real.h"
+/* interfacing imag */
+#include "int_imag.h"
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_imag.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_imag.h
new file mode 120000
index 00000000..3fcea215
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_imag.h
@@ -0,0 +1 @@
+../../../../type/int_imag.h \ No newline at end of file
diff --git a/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_real.h b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_real.h
new file mode 120000
index 00000000..5651ef5d
--- /dev/null
+++ b/src/Scilab2C/Scilab2C/CFiles/sci2cinterfaces/int_real.h
@@ -0,0 +1 @@
+../../../../type/int_real.h \ No newline at end of file