diff options
author | Pierre Marechal <pierre.marechal@scilab.org> | 2007-02-26 10:50:57 +0000 |
---|---|---|
committer | Pierre Marechal <pierre.marechal@scilab.org> | 2007-02-26 10:50:57 +0000 |
commit | a239ab8090bfca8c98908f1410969500f8cba7b6 (patch) | |
tree | 34ed66f8feb6c52902431fcab33accc8d713fdf1 /tests | |
parent | e684d20a7fd9d30469c730f39552bdae57b1ecaa (diff) | |
download | scilab-a239ab8090bfca8c98908f1410969500f8cba7b6.zip scilab-a239ab8090bfca8c98908f1410969500f8cba7b6.tar.gz |
Split tests into modules
Diffstat (limited to 'tests')
-rw-r--r-- | tests/java/Boolean.dia.ref | 11 | ||||
-rw-r--r-- | tests/java/Boolean.java | 29 | ||||
-rw-r--r-- | tests/java/BooleanArray.dia.ref | 20 | ||||
-rw-r--r-- | tests/java/BooleanArray.java | 49 | ||||
-rw-r--r-- | tests/java/Exec.dia.ref | 2 | ||||
-rw-r--r-- | tests/java/Exec.java | 12 | ||||
-rw-r--r-- | tests/java/JavaTests.sce | 130 | ||||
-rw-r--r-- | tests/java/Makefile | 19 | ||||
-rw-r--r-- | tests/java/Makefile.mak | 11 | ||||
-rw-r--r-- | tests/java/Real1.dia.ref | 60 | ||||
-rw-r--r-- | tests/java/Real1.java | 37 | ||||
-rw-r--r-- | tests/java/Real2.dia.ref | 15 | ||||
-rw-r--r-- | tests/java/Real2.java | 33 | ||||
-rw-r--r-- | tests/java/Real3.dia.ref | 16 | ||||
-rw-r--r-- | tests/java/Real3.java | 45 | ||||
-rw-r--r-- | tests/java/String1.dia.ref | 3 | ||||
-rw-r--r-- | tests/java/String1.java | 26 | ||||
-rw-r--r-- | tests/java/Strings1.dia.ref | 7 | ||||
-rw-r--r-- | tests/java/Strings1.java | 50 | ||||
-rw-r--r-- | tests/java/Strings2.dia.ref | 8 | ||||
-rw-r--r-- | tests/java/Strings2.java | 60 | ||||
-rw-r--r-- | tests/java/clf.dia.ref | 4 | ||||
-rw-r--r-- | tests/java/clf.java | 14 | ||||
-rw-r--r-- | tests/java/disp.dia.ref | 7 | ||||
-rw-r--r-- | tests/java/disp.java | 14 |
25 files changed, 0 insertions, 682 deletions
diff --git a/tests/java/Boolean.dia.ref b/tests/java/Boolean.dia.ref deleted file mode 100644 index 46d1780..0000000 --- a/tests/java/Boolean.dia.ref +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | ---------------------------------------------------- | ||
2 | boolean A= | ||
3 | |||
4 | T | ||
5 | ---------------------------------------------------- | ||
6 | true | ||
7 | ---------------------------------------------------- | ||
8 | boolean P= | ||
9 | |||
10 | F | ||
11 | ---------------------------------------------------- | ||
diff --git a/tests/java/Boolean.java b/tests/java/Boolean.java deleted file mode 100644 index 3562377..0000000 --- a/tests/java/Boolean.java +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | |||
4 | class Boolean { | ||
5 | |||
6 | public static void main(String[] args) { | ||
7 | |||
8 | boolean b; | ||
9 | |||
10 | SciBoolean a = new SciBoolean("A"); | ||
11 | Scilab.Exec("A=%t;"); | ||
12 | System.out.println("----------------------------------------------------"); | ||
13 | a.disp(); | ||
14 | System.out.println("----------------------------------------------------"); | ||
15 | b=a.getData(); | ||
16 | |||
17 | System.out.println(b); | ||
18 | |||
19 | System.out.println("----------------------------------------------------"); | ||
20 | SciBoolean d = new SciBoolean("D",true); | ||
21 | d.Send(); | ||
22 | SciBoolean p = new SciBoolean("P"); | ||
23 | Scilab.Exec("P=~D;"); | ||
24 | p.disp(); | ||
25 | System.out.println("----------------------------------------------------"); | ||
26 | Scilab.Finish(); | ||
27 | } | ||
28 | } | ||
29 | |||
diff --git a/tests/java/BooleanArray.dia.ref b/tests/java/BooleanArray.dia.ref deleted file mode 100644 index 6b18b11..0000000 --- a/tests/java/BooleanArray.dia.ref +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | ---------------------------------------------------- | ||
2 | Matrix A= | ||
3 | |||
4 | T T T F | ||
5 | F T T T | ||
6 | ---------------------------------------------------- | ||
7 | A(1,1)=true A(1,2)=true A(1,3)=true A(1,4)=false | ||
8 | A(2,1)=false A(2,2)=true A(2,3)=true A(2,4)=true | ||
9 | ---------------------------------------------------- | ||
10 | b(0,0)=true b(0,1)=true b(0,2)=true b(0,3)=false | ||
11 | b(1,0)=false b(1,1)=true b(1,2)=true b(1,3)=true | ||
12 | ---------------------------------------------------- | ||
13 | Matrix B= | ||
14 | |||
15 | F F F T | ||
16 | T F F F | ||
17 | ---------------------------------------------------- | ||
18 | A ScilabType : 4 | ||
19 | B ScilabType : 4 | ||
20 | ---------------------------------------------------- | ||
diff --git a/tests/java/BooleanArray.java b/tests/java/BooleanArray.java deleted file mode 100644 index 031df64..0000000 --- a/tests/java/BooleanArray.java +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | |||
4 | class BooleanArray { | ||
5 | |||
6 | public static void main(String[] args) { | ||
7 | int col=4; | ||
8 | int row=2; | ||
9 | int r,c; | ||
10 | boolean [] b=new boolean[row*col]; | ||
11 | |||
12 | SciBooleanArray a = new SciBooleanArray("A",row,col); | ||
13 | SciBooleanArray bsci = new SciBooleanArray("B",row,col); | ||
14 | |||
15 | Scilab.Exec("A=[%t,%t,%t,%f;%f %t %t %t];"); | ||
16 | System.out.println("----------------------------------------------------"); | ||
17 | a.disp(); | ||
18 | System.out.println("----------------------------------------------------"); | ||
19 | for(r=1;r<=a.getRow();r++) | ||
20 | { | ||
21 | for(c=1;c<=a.getCol();c++) | ||
22 | { | ||
23 | System.out.print("A("+(r)+","+(c)+")="+a.GetElement(r,c)+" "); | ||
24 | } | ||
25 | System.out.println(" "); | ||
26 | } | ||
27 | System.out.println("----------------------------------------------------"); | ||
28 | |||
29 | b=a.getData(); | ||
30 | |||
31 | for(r=0;r<row;r++) | ||
32 | { | ||
33 | for(c=0;c<col;c++) | ||
34 | { | ||
35 | System.out.print("b("+r+","+(c)+")="+ b[c*row+r] +" "); | ||
36 | } | ||
37 | System.out.println(" "); | ||
38 | } | ||
39 | System.out.println("----------------------------------------------------"); | ||
40 | Scilab.Exec("B=~A;"); | ||
41 | bsci.disp(); | ||
42 | System.out.println("----------------------------------------------------"); | ||
43 | System.out.println("A ScilabType : "+Scilab.TypeVar("A")); | ||
44 | System.out.println("B ScilabType : "+Scilab.TypeVar("B")); | ||
45 | System.out.println("----------------------------------------------------"); | ||
46 | Scilab.Finish(); | ||
47 | } | ||
48 | } | ||
49 | |||
diff --git a/tests/java/Exec.dia.ref b/tests/java/Exec.dia.ref deleted file mode 100644 index 5f105cf..0000000 --- a/tests/java/Exec.dia.ref +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | |||
2 | Hello from Scilab | ||
diff --git a/tests/java/Exec.java b/tests/java/Exec.java deleted file mode 100644 index 852ef5b..0000000 --- a/tests/java/Exec.java +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | |||
4 | class Exec | ||
5 | { | ||
6 | |||
7 | public static void main(String[] args) | ||
8 | { | ||
9 | Scilab.Exec("disp('Hello from Scilab');"); | ||
10 | } | ||
11 | } | ||
12 | |||
diff --git a/tests/java/JavaTests.sce b/tests/java/JavaTests.sce deleted file mode 100644 index 33421e4..0000000 --- a/tests/java/JavaTests.sce +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | // Allan CORNET 2005 | ||
2 | //--------------------------------------------------------------- | ||
3 | // Tests Interface Scilab Java | ||
4 | //--------------------------------------------------------------- | ||
5 | tests = ['clf.java';'disp.java';'Exec.java';'Real1.java';'Real2.java';'Real3.java';'String1.java';'Strings1.java';'Strings2.java';'Boolean.java';'BooleanArray.java']; | ||
6 | //--------------------------------------------------------------- | ||
7 | // Compilation du fichier Java | ||
8 | function ret=BuildJava(filename) | ||
9 | if MSDOS then | ||
10 | Command='javac -deprecation -d '+SCI+'\bin -classpath '+SCI+'\bin '+filename; | ||
11 | else | ||
12 | Command='javac -deprecation -d '+SCI+'/bin -classpath '+SCI+'/bin '+filename; | ||
13 | end | ||
14 | [rep,stat]=unix_g(Command); | ||
15 | if ~(stat==0) then | ||
16 | disp('error compilation '+filename); | ||
17 | ret=%F; | ||
18 | else | ||
19 | ret=%T; | ||
20 | end | ||
21 | endfunction | ||
22 | //--------------------------------------------------------------- | ||
23 | // Execution du fichier Java | ||
24 | function ExecJava(filename,buildref) | ||
25 | currentdir=pwd(); | ||
26 | repfilename=''; | ||
27 | chdir(SCI+'\bin'); | ||
28 | if ~MSDOS then | ||
29 | setenv('LD_LIBRARY_PATH','$LD_LIBRARY_PATH:'+pwd()); | ||
30 | setenv('CLASSPATH','$CLASSPATH:'+pwd()+':.'); | ||
31 | setenv('SHLIB_PATH','$SHLIB_PATH:'+pwd()+':.'); | ||
32 | end | ||
33 | [path,fname,extension]=fileparts(filename); | ||
34 | if (buildref == %T) then | ||
35 | if MSDOS then | ||
36 | repfilename=currentdir+'\'+fname+'.dia.ref'; | ||
37 | else | ||
38 | repfilename=currentdir+'/'+fname+'.dia.ref'; | ||
39 | end | ||
40 | else | ||
41 | if MSDOS then | ||
42 | repfilename=currentdir+'\'+fname+'.dia'; | ||
43 | else | ||
44 | repfilename=currentdir+'/'+fname+'.dia'; | ||
45 | end | ||
46 | end | ||
47 | |||
48 | if MSDOS then | ||
49 | commandline='..\modules\jvm\bin\jre\bin\java '+fname +' > '+repfilename; | ||
50 | else | ||
51 | commandline='../modules/jvm/bin/jre/bin/java '+fname +' > '+repfilename; | ||
52 | end | ||
53 | |||
54 | unix(commandline); | ||
55 | chdir(currentdir); | ||
56 | endfunction | ||
57 | //--------------------------------------------------------------- | ||
58 | // Nettoyage apres tests du fichier .class généré | ||
59 | function CleanClass(filename) | ||
60 | currentdir=pwd(); | ||
61 | chdir(SCI+'\bin'); | ||
62 | [path,fname,extension]=fileparts(filename); | ||
63 | if MSDOS then | ||
64 | unix_s('del '+fname+'.class'); | ||
65 | else | ||
66 | unix_s('rm -f '+fname+'.class'); | ||
67 | end | ||
68 | chdir(currentdir); | ||
69 | endfunction | ||
70 | //--------------------------------------------------------------- | ||
71 | // Comparaison avec la reference | ||
72 | function CompareDiary(filename) | ||
73 | [path,fname,extension]=fileparts(filename); | ||
74 | fpdia=mopen(fname+'.dia','r'); | ||
75 | fpref=mopen(fname+'.dia.ref','r'); | ||
76 | dia=mgetl(fpdia); | ||
77 | mclose(fpdia); | ||
78 | ref=mgetl(fpref); | ||
79 | mclose(fpref); | ||
80 | |||
81 | dia=strsubst(dia,' ',''); | ||
82 | ref=strsubst(ref,' ',''); | ||
83 | |||
84 | if or(ref<>dia) then | ||
85 | disp('Test Failed SEE : diff -w '+fname+'.dia '+fname+'.dia.ref '); | ||
86 | else | ||
87 | disp('Test '+fname+' passed'); | ||
88 | end | ||
89 | endfunction | ||
90 | //--------------------------------------------------------------- | ||
91 | // Construction de la reference | ||
92 | function BuildRef(filename) | ||
93 | ExecJava(filename,%T); | ||
94 | endfunction | ||
95 | //--------------------------------------------------------------- | ||
96 | function maketests() | ||
97 | Dim=size(tests); | ||
98 | i=Dim(1); | ||
99 | lines(0); | ||
100 | for indice=1:i | ||
101 | disp('//---------------------------------------------------------------'); | ||
102 | if ( BuildJava(tests(indice)) ) then | ||
103 | ExecJava(tests(indice),%F); | ||
104 | CleanClass(tests(indice)); | ||
105 | CompareDiary(tests(indice)); | ||
106 | end | ||
107 | end | ||
108 | disp('//---------------------------------------------------------------'); | ||
109 | endfunction | ||
110 | //--------------------------------------------------------------- | ||
111 | function makeref() | ||
112 | Dim=size(tests); | ||
113 | i=Dim(1); | ||
114 | lines(0); | ||
115 | for indice=1:i | ||
116 | if ( BuildJava(tests(indice)) ) then | ||
117 | ExecJava(tests(indice),%T); | ||
118 | CleanClass(tests(indice)); | ||
119 | end | ||
120 | end | ||
121 | endfunction | ||
122 | //--------------------------------------------------------------- | ||
123 | // Fonction principale | ||
124 | function main() | ||
125 | maketests(); | ||
126 | quit | ||
127 | endfunction | ||
128 | //--------------------------------------------------------------- | ||
129 | main(); | ||
130 | //--------------------------------------------------------------- | ||
diff --git a/tests/java/Makefile b/tests/java/Makefile deleted file mode 100644 index dc1c2cc..0000000 --- a/tests/java/Makefile +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SHELL = /bin/sh | ||
2 | |||
3 | SCIDIR = ../.. | ||
4 | |||
5 | include ../../Makefile.incl | ||
6 | |||
7 | info: | ||
8 | @echo "Type \"make tests\" in tests directory" | ||
9 | @echo " to test the distribution" | ||
10 | @echo " SEE THE README FILE (IMPORTANT) " | ||
11 | |||
12 | tests: | ||
13 | $(SCIDIR)/bin/scilab -nwni -nb -f JavaTests.sce | ||
14 | |||
15 | clean :: | ||
16 | $(RM) *.dia | ||
17 | |||
18 | distclean:: | ||
19 | $(RM) *.dia | ||
diff --git a/tests/java/Makefile.mak b/tests/java/Makefile.mak deleted file mode 100644 index c96ebf5..0000000 --- a/tests/java/Makefile.mak +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | |||
2 | SCIDIR1 = ..\.. | ||
3 | |||
4 | tests: | ||
5 | $(SCIDIR1)\bin\scilex -nb -f JavaTests.sce | ||
6 | |||
7 | clean :: | ||
8 | @del *.dia | ||
9 | |||
10 | distclean:: | ||
11 | @del *.dia | ||
diff --git a/tests/java/Real1.dia.ref b/tests/java/Real1.dia.ref deleted file mode 100644 index ccb592a..0000000 --- a/tests/java/Real1.dia.ref +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | |||
2 | A= | ||
3 | |||
4 | 1.1 | ||
5 | 2.2 | ||
6 | 3.3 | ||
7 | 4.4 | ||
8 | |||
9 | B= | ||
10 | |||
11 | 4.4 | ||
12 | 3.3 | ||
13 | 2.2 | ||
14 | 1.1 | ||
15 | |||
16 | C= | ||
17 | |||
18 | 1. | ||
19 | 1. | ||
20 | 1. | ||
21 | 1. | ||
22 | |||
23 | E= | ||
24 | |||
25 | 1. | ||
26 | 1. | ||
27 | 1. | ||
28 | 1. | ||
29 | |||
30 | A= | ||
31 | |||
32 | 1.1 | ||
33 | 2.2 | ||
34 | 3.3 | ||
35 | 4.4 | ||
36 | |||
37 | B= | ||
38 | |||
39 | 4.4 | ||
40 | 3.3 | ||
41 | 2.2 | ||
42 | 1.1 | ||
43 | |||
44 | C= | ||
45 | |||
46 | 5.5 | ||
47 | 5.5 | ||
48 | 5.5 | ||
49 | 5.5 | ||
50 | |||
51 | Dim= | ||
52 | |||
53 | 4. 1. | ||
54 | |||
55 | E= | ||
56 | |||
57 | 1. | ||
58 | 1. | ||
59 | 1. | ||
60 | 1. | ||
diff --git a/tests/java/Real1.java b/tests/java/Real1.java deleted file mode 100644 index 937644c..0000000 --- a/tests/java/Real1.java +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | /********************************************************************************************************/ | ||
3 | class Real1 | ||
4 | { | ||
5 | /********************************************************************************************************/ | ||
6 | public static void main(String[] args) | ||
7 | { | ||
8 | SciDoubleArray A = new SciDoubleArray("A",4,1, new double [] {1.1,2.2,3.3,4.4} ); | ||
9 | A.Send(); | ||
10 | SciDoubleArray B = new SciDoubleArray("B",4,1, new double [] {4.4,3.3,2.2,1.1} ); | ||
11 | B.Send(); | ||
12 | SciDoubleArray C = new SciDoubleArray("C",4,1, new double [] {1. ,1. ,1. ,1.} ); | ||
13 | C.Send(); | ||
14 | SciDoubleArray D = new SciDoubleArray("Dim",1,2); | ||
15 | D.Send(); | ||
16 | SciDoubleArray E = new SciDoubleArray("E",C); | ||
17 | E.Send(); | ||
18 | |||
19 | |||
20 | Scilab.Exec("disp('A=');disp(A);"); | ||
21 | Scilab.Exec("disp('B=');disp(B);"); | ||
22 | Scilab.Exec("disp('C=');disp(C);"); | ||
23 | Scilab.Exec("disp('E=');disp(E);"); | ||
24 | |||
25 | Scilab.Exec("C=A+B;"); | ||
26 | D.Job("Dim=size(C);"); | ||
27 | |||
28 | Scilab.Exec("disp('A=');disp(A);"); | ||
29 | Scilab.Exec("disp('B=');disp(B);"); | ||
30 | Scilab.Exec("disp('C=');disp(C);"); | ||
31 | Scilab.Exec("disp('Dim=');disp(Dim);"); | ||
32 | Scilab.Exec("disp('E=');disp(E);"); | ||
33 | |||
34 | } | ||
35 | /********************************************************************************************************/ | ||
36 | } | ||
37 | /********************************************************************************************************/ | ||
diff --git a/tests/java/Real2.dia.ref b/tests/java/Real2.dia.ref deleted file mode 100644 index 070d2cc..0000000 --- a/tests/java/Real2.dia.ref +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | |||
2 | F= | ||
3 | |||
4 | 1. 3. | ||
5 | 2. 4. | ||
6 | |||
7 | G= | ||
8 | |||
9 | 5. 7. | ||
10 | 6. 8. | ||
11 | |||
12 | H= | ||
13 | |||
14 | 23. 31. | ||
15 | 34. 46. | ||
diff --git a/tests/java/Real2.java b/tests/java/Real2.java deleted file mode 100644 index 10fc1ba..0000000 --- a/tests/java/Real2.java +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | /********************************************************************************************************/ | ||
3 | class Real2 | ||
4 | { | ||
5 | /********************************************************************************************************/ | ||
6 | public static void main(String[] args) | ||
7 | { | ||
8 | SciDoubleArray F = new SciDoubleArray("F",2,2, new double [] {1,2,3,4} ); | ||
9 | SciDoubleArray G = new SciDoubleArray("G",2,2, new double [] {5,6,7,8} ); | ||
10 | SciDoubleArray DimH = new SciDoubleArray("DimH",1,2); | ||
11 | |||
12 | F.Send(); | ||
13 | G.Send(); | ||
14 | |||
15 | Scilab.Exec("disp('F=');disp(F);"); | ||
16 | Scilab.Exec("disp('G=');disp(G);"); | ||
17 | |||
18 | Scilab.Exec("H=F*G;"); | ||
19 | DimH.Job("DimH=size(H);"); | ||
20 | |||
21 | double DxDy[]=DimH.getData(); | ||
22 | |||
23 | SciDoubleArray H = new SciDoubleArray("H",(int)DxDy[0],(int)DxDy[1]); | ||
24 | Scilab.Exec("H=F*G;"); | ||
25 | |||
26 | H.Get(); | ||
27 | |||
28 | Scilab.Exec("disp('H=');disp(H);"); | ||
29 | |||
30 | } | ||
31 | /********************************************************************************************************/ | ||
32 | } | ||
33 | /********************************************************************************************************/ | ||
diff --git a/tests/java/Real3.dia.ref b/tests/java/Real3.dia.ref deleted file mode 100644 index 2385caa..0000000 --- a/tests/java/Real3.dia.ref +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | row= 4 | ||
2 | col= 1 | ||
3 | A= | ||
4 | 1.1 2.2 3.3 4.4 | ||
5 | row= 4 | ||
6 | col= 1 | ||
7 | B= | ||
8 | 4.4 3.3 2.2 1.1 | ||
9 | row= 4 | ||
10 | col= 1 | ||
11 | C= | ||
12 | 5.5 5.5 5.5 5.5 | ||
13 | row= 4 | ||
14 | col= 1 | ||
15 | E= | ||
16 | 1.0 1.0 1.0 1.0 | ||
diff --git a/tests/java/Real3.java b/tests/java/Real3.java deleted file mode 100644 index 1f5fc30..0000000 --- a/tests/java/Real3.java +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | /********************************************************************************************************/ | ||
3 | class Real3 | ||
4 | { | ||
5 | /********************************************************************************************************/ | ||
6 | private static void DisplayResult(String name,double []mat,int r,int c) | ||
7 | { | ||
8 | int i=0; | ||
9 | |||
10 | System.out.println("row= "+r); | ||
11 | System.out.println("col= "+c); | ||
12 | System.out.println(name+"= "); | ||
13 | for(i=0;i<r;i++) | ||
14 | { | ||
15 | System.out.print(mat[i]+" "); | ||
16 | } | ||
17 | System.out.println(" "); | ||
18 | } | ||
19 | |||
20 | /********************************************************************************************************/ | ||
21 | public static void main(String[] args) | ||
22 | { | ||
23 | SciDoubleArray A = new SciDoubleArray("A",4,1, new double [] {1.1,2.2,3.3,4.4} ); | ||
24 | A.Send(); | ||
25 | SciDoubleArray B = new SciDoubleArray("B",4,1, new double [] {4.4,3.3,2.2,1.1} ); | ||
26 | B.Send(); | ||
27 | SciDoubleArray C = new SciDoubleArray("C",4,1, new double [] {1. ,1. ,1. ,1.} ); | ||
28 | C.Send(); | ||
29 | SciDoubleArray D = new SciDoubleArray("Dim",1,2); | ||
30 | D.Send(); | ||
31 | SciDoubleArray E = new SciDoubleArray("E",C); | ||
32 | E.Send(); | ||
33 | |||
34 | Scilab.Exec("C=A+B;"); | ||
35 | D.Job("Dim=size(C);"); | ||
36 | |||
37 | DisplayResult(A.getName(),A.getData(),A.getRow(),A.getCol()); | ||
38 | DisplayResult(B.getName(),B.getData(),B.getRow(),B.getCol()); | ||
39 | DisplayResult(C.getName(),C.getData(),C.getRow(),C.getCol()); | ||
40 | DisplayResult(E.getName(),E.getData(),E.getRow(),E.getCol()); | ||
41 | |||
42 | } | ||
43 | /********************************************************************************************************/ | ||
44 | } | ||
45 | /********************************************************************************************************/ | ||
diff --git a/tests/java/String1.dia.ref b/tests/java/String1.dia.ref deleted file mode 100644 index cd0bed1..0000000 --- a/tests/java/String1.dia.ref +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | S1 : Sentence1 = Who is the best ? | ||
2 | S2 : Sentence2 = I have a dream ... | ||
3 | S3 : Sentence3 = You are the best ! I have a dream ... | ||
diff --git a/tests/java/String1.java b/tests/java/String1.java deleted file mode 100644 index 2f8bcda..0000000 --- a/tests/java/String1.java +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | /********************************************************************************************************/ | ||
3 | class String1 | ||
4 | { | ||
5 | /********************************************************************************************************/ | ||
6 | public static void main(String[] args) | ||
7 | { | ||
8 | SciString S1 = new SciString("Sentence1","Who is the best ?"); | ||
9 | SciString S2 = new SciString("Sentence2","I have a dream ..."); | ||
10 | SciString S3 = new SciString("Sentence3"); | ||
11 | S1.Send(); | ||
12 | S2.Send(); | ||
13 | |||
14 | System.out.println("S1 : "+ S1.getName()+" = "+S1.getData()); | ||
15 | System.out.println("S2 : "+ S2.getName()+" = "+S2.getData()); | ||
16 | |||
17 | Scilab.Exec("Sentence1='You are the best !';"); | ||
18 | Scilab.Exec("Sentence3=Sentence1+' '+Sentence2;"); | ||
19 | |||
20 | System.out.println("S3 : "+ S3.getName()+" = "+S3.getData()); | ||
21 | |||
22 | |||
23 | } | ||
24 | /********************************************************************************************************/ | ||
25 | } | ||
26 | /********************************************************************************************************/ | ||
diff --git a/tests/java/Strings1.dia.ref b/tests/java/Strings1.dia.ref deleted file mode 100644 index fefbb16..0000000 --- a/tests/java/Strings1.dia.ref +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | ---------------------------------------------------- | ||
2 | A(1,1)=Aaa A(1,2)=Bbb A(1,3)=Ccc A(1,4)=Ddd | ||
3 | A(2,1)=Eee A(2,2)=Fff A(2,3)=Ggg A(2,4)=Hhh | ||
4 | ---------------------------------------------------- | ||
5 | b(0,0)=Aaa b(0,1)=Bbb b(0,2)=Ccc b(0,3)=Ddd | ||
6 | b(1,0)=Eee b(1,1)=Fff b(1,2)=Ggg b(1,3)=Hhh | ||
7 | ---------------------------------------------------- | ||
diff --git a/tests/java/Strings1.java b/tests/java/Strings1.java deleted file mode 100644 index 6b49039..0000000 --- a/tests/java/Strings1.java +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | class Strings1 { | ||
4 | |||
5 | public static void main(String[] args) | ||
6 | { | ||
7 | int col=4; | ||
8 | int row=2; | ||
9 | int r,c,k; | ||
10 | String [] b=new String [row*col]; | ||
11 | String [] d=new String[row*col]; | ||
12 | |||
13 | SciStringArray a = new SciStringArray("A",row,col); | ||
14 | Scilab.Exec("A=['Aaa','Bbb','Ccc','Ddd';'Eee','Fff','Ggg','Hhh'];"); | ||
15 | a.Get(); | ||
16 | System.out.println("----------------------------------------------------"); | ||
17 | for(r=1;r<=a.getRow();r++) | ||
18 | { | ||
19 | for(c=1;c<=a.getCol();c++) | ||
20 | { | ||
21 | System.out.print("A("+(r)+","+(c)+")="+a.GetElement(r,c)+" "); | ||
22 | } | ||
23 | System.out.println(" "); | ||
24 | } | ||
25 | System.out.println("----------------------------------------------------"); | ||
26 | |||
27 | b=a.getData(); | ||
28 | |||
29 | for(r=0;r<row;r++) | ||
30 | { | ||
31 | for(c=0;c<col;c++) | ||
32 | { | ||
33 | System.out.print("b("+r+","+(c)+")="+ b[c*row+r] +" "); | ||
34 | } | ||
35 | System.out.println(" "); | ||
36 | } | ||
37 | System.out.println("----------------------------------------------------"); | ||
38 | |||
39 | |||
40 | for (k=0;k<row*col;k++) | ||
41 | { | ||
42 | d[k]=new String("Sentence ")+k; | ||
43 | } | ||
44 | |||
45 | SciStringArray D = new SciStringArray("D",2,4,d); | ||
46 | D.Send(); | ||
47 | |||
48 | } | ||
49 | } | ||
50 | |||
diff --git a/tests/java/Strings2.dia.ref b/tests/java/Strings2.dia.ref deleted file mode 100644 index 67c75c1..0000000 --- a/tests/java/Strings2.dia.ref +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | |||
2 | 1. 1000. | ||
3 | |||
4 | 1. 1000. | ||
5 | |||
6 | 3104. | ||
7 | |||
8 | PSAP1000 | ||
diff --git a/tests/java/Strings2.java b/tests/java/Strings2.java deleted file mode 100644 index 161b0a9..0000000 --- a/tests/java/Strings2.java +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | import javasci.*; | ||
2 | |||
3 | public class Strings2 | ||
4 | { | ||
5 | public static void main(String[] args) | ||
6 | { | ||
7 | String[] s=new String[1000]; | ||
8 | char[] ch=new char[3100]; | ||
9 | int r,c,k; | ||
10 | k=0; | ||
11 | for(int i=0;i<s.length;i++) | ||
12 | { | ||
13 | for(int j=0;j<ch.length;j++) | ||
14 | { | ||
15 | if (k == 0) | ||
16 | { | ||
17 | ch[j]='P'; | ||
18 | k++; | ||
19 | } | ||
20 | else if (k == 1) | ||
21 | { | ||
22 | ch[j]='S'; | ||
23 | k++; | ||
24 | } | ||
25 | else | ||
26 | { | ||
27 | ch[j]='A'; | ||
28 | k=0; | ||
29 | } | ||
30 | |||
31 | } | ||
32 | s[i]=new String(ch); | ||
33 | } | ||
34 | |||
35 | SciStringArray sSA=new SciStringArray("A",s.length,1,s); | ||
36 | //sSA.disp(); | ||
37 | Scilab.Exec("Sa=size(A);"); | ||
38 | Scilab.Exec("disp(Sa);"); | ||
39 | |||
40 | SciStringArray ssB = new SciStringArray("B",s.length,1); | ||
41 | Scilab.Exec("B=A+string([1:"+s.length+"]);"); | ||
42 | |||
43 | ssB.Get(); | ||
44 | //ssB.disp(); | ||
45 | |||
46 | |||
47 | Scilab.Exec("Sb=size(B);"); | ||
48 | Scilab.Exec("disp(Sb);"); | ||
49 | // 1 1000 taille matrice de chaines | ||
50 | |||
51 | Scilab.Exec("len=length(B(Sb(2)));"); | ||
52 | Scilab.Exec("disp(len);"); | ||
53 | // 3104 caracteres | ||
54 | |||
55 | Scilab.Exec("TEST=part(B(Sb(2)),len-7:len);"); | ||
56 | // PSAP1000 | ||
57 | Scilab.Exec("disp(TEST);"); | ||
58 | |||
59 | } | ||
60 | } | ||
diff --git a/tests/java/clf.dia.ref b/tests/java/clf.dia.ref deleted file mode 100644 index 0d059b9..0000000 --- a/tests/java/clf.dia.ref +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | |||
2 | Test clf 1 | ||
3 | |||
4 | Test clf 2 | ||
diff --git a/tests/java/clf.java b/tests/java/clf.java deleted file mode 100644 index a0c92a7..0000000 --- a/tests/java/clf.java +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | |||
4 | class clf | ||
5 | { | ||
6 | |||
7 | public static void main(String[] args) | ||
8 | { | ||
9 | Scilab.Exec("disp('Test clf 1');"); | ||
10 | Scilab.Exec("clf();"); | ||
11 | Scilab.Exec("disp('Test clf 2');"); | ||
12 | } | ||
13 | } | ||
14 | |||
diff --git a/tests/java/disp.dia.ref b/tests/java/disp.dia.ref deleted file mode 100644 index a2b9b57..0000000 --- a/tests/java/disp.dia.ref +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | |||
2 | A= | ||
3 | |||
4 | 100.1 | ||
5 | 102.2 | ||
6 | 103.3 | ||
7 | 104.4 | ||
diff --git a/tests/java/disp.java b/tests/java/disp.java deleted file mode 100644 index ef37ce5..0000000 --- a/tests/java/disp.java +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | import javasci.* ; | ||
2 | |||
3 | |||
4 | class disp | ||
5 | { | ||
6 | |||
7 | public static void main(String[] args) | ||
8 | { | ||
9 | SciDoubleArray A = new SciDoubleArray("A",4,1, new double [] {100.1,102.2,103.3,104.4} ); | ||
10 | A.Send(); | ||
11 | Scilab.Exec("disp('A=');disp(A)"); | ||
12 | } | ||
13 | } | ||
14 | |||