summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAllan Cornet <allan.cornet@scilab.org>2007-01-16 15:08:50 +0000
committerAllan Cornet <allan.cornet@scilab.org>2007-01-16 15:08:50 +0000
commit865eb7c2f29d99638b228893ba10fa9e9f423f62 (patch)
tree0c1b784adc6ec44193565d7f28cdb2674787471f /tests
parent79660544f70475e5982d17011e103cd8bc8dea4d (diff)
downloadscilab-865eb7c2f29d99638b228893ba10fa9e9f423f62.zip
scilab-865eb7c2f29d99638b228893ba10fa9e9f423f62.tar.gz
add int SendScilabJobs(char **jobs,int nbjobs);
no need to use double ' with SendScilabJobs update java tests
Diffstat (limited to 'tests')
-rw-r--r--tests/java/Exec.java2
-rw-r--r--tests/java/Real1.java20
-rw-r--r--tests/java/Real2.java8
-rw-r--r--tests/java/Real3.java2
-rw-r--r--tests/java/String1.java4
-rw-r--r--tests/java/Strings1.java2
-rw-r--r--tests/java/clf.java4
-rw-r--r--tests/java/disp.java2
8 files changed, 22 insertions, 22 deletions
diff --git a/tests/java/Exec.java b/tests/java/Exec.java
index a52f298..852ef5b 100644
--- a/tests/java/Exec.java
+++ b/tests/java/Exec.java
@@ -6,7 +6,7 @@ class Exec
6 6
7 public static void main(String[] args) 7 public static void main(String[] args)
8 { 8 {
9 Scilab.Exec("disp(''Hello from Scilab'');"); 9 Scilab.Exec("disp('Hello from Scilab');");
10 } 10 }
11} 11}
12 12
diff --git a/tests/java/Real1.java b/tests/java/Real1.java
index 0de3da1..937644c 100644
--- a/tests/java/Real1.java
+++ b/tests/java/Real1.java
@@ -17,19 +17,19 @@ class Real1
17 E.Send(); 17 E.Send();
18 18
19 19
20 Scilab.Exec("disp(''A='');disp(A);"); 20 Scilab.Exec("disp('A=');disp(A);");
21 Scilab.Exec("disp(''B='');disp(B);"); 21 Scilab.Exec("disp('B=');disp(B);");
22 Scilab.Exec("disp(''C='');disp(C);"); 22 Scilab.Exec("disp('C=');disp(C);");
23 Scilab.Exec("disp(''E='');disp(E);"); 23 Scilab.Exec("disp('E=');disp(E);");
24 24
25 Scilab.Exec("C=A+B;"); 25 Scilab.Exec("C=A+B;");
26 D.Job("Dim=size(C)"); 26 D.Job("Dim=size(C);");
27 27
28 Scilab.Exec("disp(''A='');disp(A);"); 28 Scilab.Exec("disp('A=');disp(A);");
29 Scilab.Exec("disp(''B='');disp(B);"); 29 Scilab.Exec("disp('B=');disp(B);");
30 Scilab.Exec("disp(''C='');disp(C);"); 30 Scilab.Exec("disp('C=');disp(C);");
31 Scilab.Exec("disp(''Dim='');disp(Dim);"); 31 Scilab.Exec("disp('Dim=');disp(Dim);");
32 Scilab.Exec("disp(''E='');disp(E);"); 32 Scilab.Exec("disp('E=');disp(E);");
33 33
34 } 34 }
35/********************************************************************************************************/ 35/********************************************************************************************************/
diff --git a/tests/java/Real2.java b/tests/java/Real2.java
index 009144d..10fc1ba 100644
--- a/tests/java/Real2.java
+++ b/tests/java/Real2.java
@@ -12,11 +12,11 @@ public static void main(String[] args)
12 F.Send(); 12 F.Send();
13 G.Send(); 13 G.Send();
14 14
15 Scilab.Exec("disp(''F='');disp(F);"); 15 Scilab.Exec("disp('F=');disp(F);");
16 Scilab.Exec("disp(''G='');disp(G);"); 16 Scilab.Exec("disp('G=');disp(G);");
17 17
18 Scilab.Exec("H=F*G;"); 18 Scilab.Exec("H=F*G;");
19 DimH.Job("DimH=size(H)"); 19 DimH.Job("DimH=size(H);");
20 20
21 double DxDy[]=DimH.getData(); 21 double DxDy[]=DimH.getData();
22 22
@@ -25,7 +25,7 @@ public static void main(String[] args)
25 25
26 H.Get(); 26 H.Get();
27 27
28 Scilab.Exec("disp(''H='');disp(H);"); 28 Scilab.Exec("disp('H=');disp(H);");
29 29
30} 30}
31/********************************************************************************************************/ 31/********************************************************************************************************/
diff --git a/tests/java/Real3.java b/tests/java/Real3.java
index b801b65..1f5fc30 100644
--- a/tests/java/Real3.java
+++ b/tests/java/Real3.java
@@ -32,7 +32,7 @@ class Real3
32 E.Send(); 32 E.Send();
33 33
34 Scilab.Exec("C=A+B;"); 34 Scilab.Exec("C=A+B;");
35 D.Job("Dim=size(C)"); 35 D.Job("Dim=size(C);");
36 36
37 DisplayResult(A.getName(),A.getData(),A.getRow(),A.getCol()); 37 DisplayResult(A.getName(),A.getData(),A.getRow(),A.getCol());
38 DisplayResult(B.getName(),B.getData(),B.getRow(),B.getCol()); 38 DisplayResult(B.getName(),B.getData(),B.getRow(),B.getCol());
diff --git a/tests/java/String1.java b/tests/java/String1.java
index c4cadf1..2f8bcda 100644
--- a/tests/java/String1.java
+++ b/tests/java/String1.java
@@ -14,8 +14,8 @@ class String1
14 System.out.println("S1 : "+ S1.getName()+" = "+S1.getData()); 14 System.out.println("S1 : "+ S1.getName()+" = "+S1.getData());
15 System.out.println("S2 : "+ S2.getName()+" = "+S2.getData()); 15 System.out.println("S2 : "+ S2.getName()+" = "+S2.getData());
16 16
17 Scilab.Exec("Sentence1=''You are the best !'';"); 17 Scilab.Exec("Sentence1='You are the best !';");
18 Scilab.Exec("Sentence3=Sentence1+'' ''+Sentence2;"); 18 Scilab.Exec("Sentence3=Sentence1+' '+Sentence2;");
19 19
20 System.out.println("S3 : "+ S3.getName()+" = "+S3.getData()); 20 System.out.println("S3 : "+ S3.getName()+" = "+S3.getData());
21 21
diff --git a/tests/java/Strings1.java b/tests/java/Strings1.java
index ca5542a..6b49039 100644
--- a/tests/java/Strings1.java
+++ b/tests/java/Strings1.java
@@ -11,7 +11,7 @@ class Strings1 {
11 String [] d=new String[row*col]; 11 String [] d=new String[row*col];
12 12
13 SciStringArray a = new SciStringArray("A",row,col); 13 SciStringArray a = new SciStringArray("A",row,col);
14 Scilab.Exec("A=[''Aaa'',''Bbb'',''Ccc'',''Ddd'';''Eee'',''Fff'',''Ggg'',''Hhh''];"); 14 Scilab.Exec("A=['Aaa','Bbb','Ccc','Ddd';'Eee','Fff','Ggg','Hhh'];");
15 a.Get(); 15 a.Get();
16 System.out.println("----------------------------------------------------"); 16 System.out.println("----------------------------------------------------");
17 for(r=1;r<=a.getRow();r++) 17 for(r=1;r<=a.getRow();r++)
diff --git a/tests/java/clf.java b/tests/java/clf.java
index 519d34e..a0c92a7 100644
--- a/tests/java/clf.java
+++ b/tests/java/clf.java
@@ -6,9 +6,9 @@ class clf
6 6
7 public static void main(String[] args) 7 public static void main(String[] args)
8 { 8 {
9 Scilab.Exec("disp(''Test clf 1'');"); 9 Scilab.Exec("disp('Test clf 1');");
10 Scilab.Exec("clf();"); 10 Scilab.Exec("clf();");
11 Scilab.Exec("disp(''Test clf 2'');"); 11 Scilab.Exec("disp('Test clf 2');");
12 } 12 }
13} 13}
14 14
diff --git a/tests/java/disp.java b/tests/java/disp.java
index d371a06..ef37ce5 100644
--- a/tests/java/disp.java
+++ b/tests/java/disp.java
@@ -8,7 +8,7 @@ class disp
8 { 8 {
9 SciDoubleArray A = new SciDoubleArray("A",4,1, new double [] {100.1,102.2,103.3,104.4} ); 9 SciDoubleArray A = new SciDoubleArray("A",4,1, new double [] {100.1,102.2,103.3,104.4} );
10 A.Send(); 10 A.Send();
11 Scilab.Exec("disp(''A='');disp(A)"); 11 Scilab.Exec("disp('A=');disp(A)");
12 } 12 }
13} 13}
14 14