5 files changed, 81 insertions, 50 deletions
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/auxiliaryFunctions/mainfunctionAbsPb.sci b/src/Scilab2C/SCI2CTests/Mes_tests/auxiliaryFunctions/mainfunctionAbsPb.sci
deleted file mode 100644
index 5947adb9..00000000
--- a/src/Scilab2C/SCI2CTests/Mes_tests/auxiliaryFunctions/mainfunctionAbsPb.sci
+++ /dev/null
@@ -1,18 +0,0 @@
-//SCI2C: DEFAULT_PRECISION= FLOAT
-
-function mainfunction()
-
-
-s5= [1;2;3;4;5;6];
-s6=abs(s5);
-disp(s5);
-disp("------------")
-disp(s6);
-s7=[1 2;3 4;5 6];
-s8=abs(s7);
-disp("________________________")
-disp(s7);
-disp("------------")
-disp(s8);
-
-endfunction
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/elementary Functions/mainfunctionCeil_Fix_Floor_Int_Round.sci b/src/Scilab2C/SCI2CTests/Mes_tests/elementary Functions/mainfunctionCeil_Fix_Floor_Int_Round.sci
new file mode 100644
index 00000000..a5930c21
--- /dev/null
+++ b/src/Scilab2C/SCI2CTests/Mes_tests/elementary Functions/mainfunctionCeil_Fix_Floor_Int_Round.sci
@@ -0,0 +1,48 @@
+//SCI2C: DEFAULT_PRECISION= DOUBLE
+
+function mainfunction()
+
+
+// test ceil/fix/floor/int/round
+
+disp(ceil(4.2))
+disp(fix(4.2))
+disp(floor(4.2))
+disp(int(4.2))
+disp(round(4.2))
+
+disp(ceil(-4.2))
+disp(fix(-4.2))
+disp(floor(-4.2))
+disp(int(-4.2))
+disp(round(-4.2))
+
+
+disp(ceil(4.2 - 2.5*%i))
+disp(fix(4.2 - 2.5*%i))
+disp(floor(4.2 - 2.5*%i))
+disp(int(4.2 - 2.5*%i))
+disp(round(4.2 - 2.5*%i))
+
+disp(ceil(-4.2 + 2.5*%i))
+disp(fix(-4.2 + 2.5*%i))
+disp(floor(-4.2 + 2.5*%i))
+disp(int(-4.2 + 2.5*%i))
+disp(round(-4.2 + 2.5*%i))
+
+a=[12.5 1.3 1.74 ; -2.4 -3.8 1.000001 ; 1.23 1.99999 0.035; 0 2 -4.5];
+
+disp(ceil(a))
+disp(fix(a))
+disp(floor(a))
+disp(int(a))
+disp(round(a))
+
+b=a+[1.2 3.8 -3.9; 7 2.7 1.5; 0 -9.5 2.0001; 2.35 -1. 5.49]*%i;
+disp(ceil(b))
+disp(fix(b))
+disp(floor(b))
+disp(int(b))
+disp(round(b))
+
+endfunction
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/mainfunctionOpLogNot.sci b/src/Scilab2C/SCI2CTests/Mes_tests/mainfunctionOpLogNot.sci
new file mode 100644
index 00000000..6f17a306
--- /dev/null
+++ b/src/Scilab2C/SCI2CTests/Mes_tests/mainfunctionOpLogNot.sci
@@ -0,0 +1,29 @@
+//SCI2C: DEFAULT_PRECISION= DOUBLE
+
+function mainfunction()
+
+
+// test OpLogNot
+
+disp(~(-2))
+disp(~(0))
+disp(~(3))
+
+disp(~(0-2*%i))
+disp(~(0+0*%i))
+disp(~(0+3*%i))
+disp(~(3-5*%i))
+disp(~(3+0*%i))
+disp(~(3+6*%i))
+
+a=[-1 2 3; 0 -1 4; 2 -0 5];
+
+disp(~(a))
+
+b=[0+3*%i 2-%i 1 ; 0-2*%i 2+2*%i 1-%i; 0+0*%i 4+0*%i 5-0*%i]
+
+disp(~(b))
+
+
+
+endfunction
diff --git a/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionConvol.sci b/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionConvol.sci
index 72b7eefb..41c38603 100644
--- a/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionConvol.sci
+++ b/src/Scilab2C/SCI2CTests/Mes_tests/signalProcessing/mainfunctionConvol.sci
@@ -30,6 +30,8 @@ disp (convol(c,f))
 disp (convol(e,c))
 disp (convol(e,f))
 
+//the following lines don't exist in Scilab but are in Sci2C
+
 //g=[1 2; 3 4]
 //h=[4 5; 6 7]
 //i=[2+3*%i 4+4*%i; 7-5*%i 8+%i]
diff --git a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
index e9d11acd..78f2d34b 100644
--- a/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
+++ b/src/Scilab2C/SCI2CTests/test999_WorkingDir/scilabcode/mainfunction.sci
@@ -1,38 +1,8 @@
 //SCI2C: DEFAULT_PRECISION= DOUBLE
 
-function mainfunction()
+function mainfunction()
 
+rand()
 
-// test fftshift
-
-//1 input argument
-disp(fft(4))
-
-disp(fft([3 4 2 1; 1 4 5 2]));
-
-disp(fft(4-%i))
-
-
-disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2]));
-
-//2 input arguments
-
-disp(fft(4,1))
-
-disp(fft([3 4 2 1; 1 4 5 2],1));
-
-disp(fft(4-%i,1))
-
-
-disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2],1));
-
-disp(fft(4,-1))
-
-disp(fft([3 4 2 1; 1 4 5 2],-1));
-
-disp(fft(4-%i,-1))
-
-
-disp(fft([3+%i*2 4 2-%i 1; 1-%i*2 4 5 2],-1));
 
 endfunction