diff options
author | Antoine ELIAS <antoine.elias@scilab-enterprises.com> | 2015-08-27 11:53:54 +0200 |
---|---|---|
committer | Clément DAVID <clement.david@scilab-enterprises.com> | 2015-08-28 14:35:47 +0200 |
commit | 621419c95c49784d735a780a3e8cd691aa1b1ed6 (patch) | |
tree | 459e4ecf6c48ed14dc3fb099a1e1fe2dacebc51a | |
parent | 044c2cf8a25e74c04c70f8d7330bcfc99db25b9f (diff) | |
download | scilab-621419c95c49784d735a780a3e8cd691aa1b1ed6.zip scilab-621419c95c49784d735a780a3e8cd691aa1b1ed6.tar.gz |
add "CLI SHELL MODE" in all tests that do not have :
- "XCOS TEST"
- "CLI SHELL MODE"
- "JVM NOT MANDATORY"
- "TEST WITH GRAPHIC"
- "INTERACTIVE TEST"
use "mode_nwni" or "mode_nwni_profiling" in test_run will skipped tests without "CLI SHELL MODE".
+ fix some refs
command to update script :
sed -i "1i// <-- CLI SHELL MODE -->" $(grep -L "<-- XCOS TEST -->" $(grep -L "<-- CLI SHELL MODE -->" $(grep -L "<-- JVM NOT MANDATORY -->" $(grep -L "<-- TEST WITH GRAPHIC -->" $(find . -name *.tst)))))
Change-Id: I15a5b6c2bf7f9e23f160ec6f797b128d63dcc105
1347 files changed, 4222 insertions, 4450 deletions
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_11093.dia.ref b/scilab/modules/api_scilab/tests/nonreg_tests/bug_11093.dia.ref index 8432794..452a39f 100644 --- a/scilab/modules/api_scilab/tests/nonreg_tests/bug_11093.dia.ref +++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_11093.dia.ref | |||
@@ -22,6 +22,7 @@ if haveacompiler() then | |||
22 | DEST = TMPDIR + "/" + BUGNAME + "/" + BUGNAME + ".c"; | 22 | DEST = TMPDIR + "/" + BUGNAME + "/" + BUGNAME + ".c"; |
23 | copyfile(SCI + "/modules/api_scilab/tests/nonreg_tests/" + BUGNAME + ".c", DEST); | 23 | copyfile(SCI + "/modules/api_scilab/tests/nonreg_tests/" + BUGNAME + ".c", DEST); |
24 | assert_checkequal(isfile(DEST), %T); | 24 | assert_checkequal(isfile(DEST), %T); |
25 | |||
25 | gw_functions = [BUGNAME, "sci_" + BUGNAME]; | 26 | gw_functions = [BUGNAME, "sci_" + BUGNAME]; |
26 | ilib_build("lib" + BUGNAME, gw_functions, BUGNAME + ".c", []); | 27 | ilib_build("lib" + BUGNAME, gw_functions, BUGNAME + ".c", []); |
27 | exec loader.sce; | 28 | exec loader.sce; |
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.dia.ref b/scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.dia.ref index 0abd967..9c52047 100644 --- a/scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.dia.ref +++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_11461.dia.ref | |||
@@ -12,7 +12,7 @@ | |||
12 | // http://bugzilla.scilab.org/show_bug.cgi?id=11461 | 12 | // http://bugzilla.scilab.org/show_bug.cgi?id=11461 |
13 | // | 13 | // |
14 | // <-- Short Description --> | 14 | // <-- Short Description --> |
15 | // | 15 | // |
16 | // api_list was not able to create lists and sub lists with undefined items | 16 | // api_list was not able to create lists and sub lists with undefined items |
17 | listRef = list(); | 17 | listRef = list(); |
18 | listRef(1) = 1; | 18 | listRef(1) = 1; |
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_9264.dia.ref b/scilab/modules/api_scilab/tests/nonreg_tests/bug_9264.dia.ref index ba151f1..b52ae98 100644 --- a/scilab/modules/api_scilab/tests/nonreg_tests/bug_9264.dia.ref +++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_9264.dia.ref | |||
@@ -4,7 +4,6 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // | ||
8 | // <-- CLI SHELL MODE --> | 7 | // <-- CLI SHELL MODE --> |
9 | // | 8 | // |
10 | // <-- Non-regression test for bug 9264 --> | 9 | // <-- Non-regression test for bug 9264 --> |
@@ -23,6 +22,7 @@ if haveacompiler() then | |||
23 | if ~isfile(TMPDIR + "/bug_9264/bug_9264.c") then bugmes();quit;end | 22 | if ~isfile(TMPDIR + "/bug_9264/bug_9264.c") then bugmes();quit;end |
24 | ilib_build("build_c",["bug9264","sci_bug9264"], "bug_9264.c", []); | 23 | ilib_build("build_c",["bug9264","sci_bug9264"], "bug_9264.c", []); |
25 | exec loader.sce; | 24 | exec loader.sce; |
25 | |||
26 | M = string(rand(200,1000)); | 26 | M = string(rand(200,1000)); |
27 | tic(); | 27 | tic(); |
28 | bug9264(M); | 28 | bug9264(M); |
diff --git a/scilab/modules/api_scilab/tests/unit_tests/hypermatExample.dia.ref b/scilab/modules/api_scilab/tests/unit_tests/hypermatExample.dia.ref index e65a3f2..251378b 100644 --- a/scilab/modules/api_scilab/tests/unit_tests/hypermatExample.dia.ref +++ b/scilab/modules/api_scilab/tests/unit_tests/hypermatExample.dia.ref | |||
@@ -1,6 +1,6 @@ | |||
1 | // ============================================================================= | 1 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises | 3 | // Copyright (C) 2013 - Scilab Enterprises |
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
diff --git a/scilab/modules/api_scilab/tests/unit_tests/hypermatIntExample.dia.ref b/scilab/modules/api_scilab/tests/unit_tests/hypermatIntExample.dia.ref index 95e27cf..5dd52a1 100644 --- a/scilab/modules/api_scilab/tests/unit_tests/hypermatIntExample.dia.ref +++ b/scilab/modules/api_scilab/tests/unit_tests/hypermatIntExample.dia.ref | |||
@@ -1,6 +1,6 @@ | |||
1 | // ============================================================================= | 1 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises | 3 | // Copyright (C) 2013 - Scilab Enterprises |
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
diff --git a/scilab/modules/arnoldi/tests/nonreg_tests/bug_12992.dia.ref b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12992.dia.ref index d1b4a29..86c68f5 100644 --- a/scilab/modules/arnoldi/tests/nonreg_tests/bug_12992.dia.ref +++ b/scilab/modules/arnoldi/tests/nonreg_tests/bug_12992.dia.ref | |||
@@ -25,5 +25,4 @@ assert_checkalmostequal(cld, d0(1), [], %eps); | |||
25 | assert_checkalmostequal(d, v0(1), [], %eps); | 25 | assert_checkalmostequal(d, v0(1), [], %eps); |
26 | assert_checkalmostequal(abs(v), abs(d0(:,1)), [], %eps) | 26 | assert_checkalmostequal(abs(v), abs(d0(:,1)), [], %eps) |
27 | ans = | 27 | ans = |
28 | 28 | T | |
29 | T | ||
diff --git a/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.dia.ref b/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.dia.ref index d75f287..b2d0eb7 100644 --- a/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.dia.ref +++ b/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - SE - Sylvestre Ledru | 4 | // Copyright (C) 2012 - SE - Sylvestre Ledru |
diff --git a/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.tst b/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.tst index 80faf85..2b0e0d1 100644 --- a/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.tst +++ b/scilab/modules/arnoldi/tests/unit_tests/znaupd-win.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - SE - Sylvestre Ledru | 4 | // Copyright (C) 2012 - SE - Sylvestre Ledru |
diff --git a/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.dia.ref b/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.dia.ref index d75f287..b2d0eb7 100644 --- a/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.dia.ref +++ b/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - SE - Sylvestre Ledru | 4 | // Copyright (C) 2012 - SE - Sylvestre Ledru |
diff --git a/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.tst b/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.tst index 80faf85..2b0e0d1 100644 --- a/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.tst +++ b/scilab/modules/arnoldi/tests/unit_tests/zneupd-win.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - SE - Sylvestre Ledru | 4 | // Copyright (C) 2012 - SE - Sylvestre Ledru |
diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_3006.dia.ref b/scilab/modules/ast/tests/nonreg_tests/bug_3006.dia.ref index 19688c7..fbd4567 100644 --- a/scilab/modules/ast/tests/nonreg_tests/bug_3006.dia.ref +++ b/scilab/modules/ast/tests/nonreg_tests/bug_3006.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr> | 4 | // Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr> |
diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_3006.tst b/scilab/modules/ast/tests/nonreg_tests/bug_3006.tst index 12c7dd1..5705133 100644 --- a/scilab/modules/ast/tests/nonreg_tests/bug_3006.tst +++ b/scilab/modules/ast/tests/nonreg_tests/bug_3006.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr> | 4 | // Copyright (C) 2007-2008 - INRIA - Serge STEER <serge.steer@inria.fr> |
diff --git a/scilab/modules/ast/tests/nonreg_tests/bug_9344.unix.dia.ref b/scilab/modules/ast/tests/nonreg_tests/bug_9344.unix.dia.ref index 7e708c5..727e37a 100644 --- a/scilab/modules/ast/tests/nonreg_tests/bug_9344.unix.dia.ref +++ b/scilab/modules/ast/tests/nonreg_tests/bug_9344.unix.dia.ref | |||
@@ -18,3 +18,4 @@ execstr("mclose(1"); | |||
18 | [Scilab6] ^ | 18 | [Scilab6] ^ |
19 | [Scilab6] prompt : 1.1 - 2.1 : syntax error, unexpected end of line, expecting "," or ) | 19 | [Scilab6] prompt : 1.1 - 2.1 : syntax error, unexpected end of line, expecting "," or ) |
20 | at line 31 of executed file TMPDIR/bug_9344.tst | 20 | at line 31 of executed file TMPDIR/bug_9344.tst |
21 | |||
diff --git a/scilab/modules/ast/tests/unit_tests/colon_insert.dia.ref b/scilab/modules/ast/tests/unit_tests/colon_insert.dia.ref index 7a6280f..d742eb4 100644 --- a/scilab/modules/ast/tests/unit_tests/colon_insert.dia.ref +++ b/scilab/modules/ast/tests/unit_tests/colon_insert.dia.ref | |||
@@ -124,7 +124,7 @@ assert_checkequal(a, mat); | |||
124 | a=mat; a(:,:,2) = mat(:); | 124 | a=mat; a(:,:,2) = mat(:); |
125 | assert_checkequal(a, matrix([mat(:);mat(:)], 2, 4, 2)); | 125 | assert_checkequal(a, matrix([mat(:);mat(:)], 2, 4, 2)); |
126 | a=mat; a(:,:,:,2) = mat(:) | 126 | a=mat; a(:,:,:,2) = mat(:) |
127 | a = | 127 | a = |
128 | (:,:,1,1) | 128 | (:,:,1,1) |
129 | 1. 2. 3. 4. | 129 | 1. 2. 3. 4. |
130 | 5. 6. 7. 8. | 130 | 5. 6. 7. 8. |
diff --git a/scilab/modules/ast/tests/unit_tests/multiplication.dia.ref b/scilab/modules/ast/tests/unit_tests/multiplication.dia.ref index 0f08494..e8759f4 100644 --- a/scilab/modules/ast/tests/unit_tests/multiplication.dia.ref +++ b/scilab/modules/ast/tests/unit_tests/multiplication.dia.ref | |||
@@ -4,9 +4,7 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================ | 6 | // ============================================================================ |
7 | |||
8 | // <-- CLI SHELL MODE --> | 7 | // <-- CLI SHELL MODE --> |
9 | |||
10 | r = 2; | 8 | r = 2; |
11 | R = [1,2;3,4]; | 9 | R = [1,2;3,4]; |
12 | R3(:,:,1) = R; | 10 | R3(:,:,1) = R; |
@@ -15,10 +13,7 @@ c = 1 + 2*%i; | |||
15 | C = [1+2*%i,2+4*%i;3+6*%i,4+8*%i]; | 13 | C = [1+2*%i,2+4*%i;3+6*%i,4+8*%i]; |
16 | C3(:,:,1) = C; | 14 | C3(:,:,1) = C; |
17 | C3(:,:,2) = C'; | 15 | C3(:,:,2) = C'; |
18 | |||
19 | |||
20 | // double * double | 16 | // double * double |
21 | |||
22 | // r * r | 17 | // r * r |
23 | assert_checkequal(r * r, 4); | 18 | assert_checkequal(r * r, 4); |
24 | // r * c | 19 | // r * c |
@@ -27,10 +22,7 @@ assert_checkequal(r * c, 2+%i*4); | |||
27 | assert_checkequal(c * r, 2+%i*4); | 22 | assert_checkequal(c * r, 2+%i*4); |
28 | // c * c | 23 | // c * c |
29 | assert_checkequal(c * c, -3+%i*4); | 24 | assert_checkequal(c * c, -3+%i*4); |
30 | |||
31 | |||
32 | // double * DOUBLE | 25 | // double * DOUBLE |
33 | |||
34 | // r * R | 26 | // r * R |
35 | assert_checkequal(r * R, [2,4;6,8]); | 27 | assert_checkequal(r * R, [2,4;6,8]); |
36 | rR3ref(:,:,1) = [2,4;6,8]; | 28 | rR3ref(:,:,1) = [2,4;6,8]; |
@@ -51,10 +43,7 @@ assert_checkequal(c * C, [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]); | |||
51 | cC3ref(:,:,1) = [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]; | 43 | cC3ref(:,:,1) = [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]; |
52 | cC3ref(:,:,2) = [ 5, 15; 10, 20]; | 44 | cC3ref(:,:,2) = [ 5, 15; 10, 20]; |
53 | assert_checkequal(c * C3, cC3ref); | 45 | assert_checkequal(c * C3, cC3ref); |
54 | |||
55 | |||
56 | // DOUBLE * double | 46 | // DOUBLE * double |
57 | |||
58 | // R * r | 47 | // R * r |
59 | assert_checkequal(R * r, [2,4;6,8]); | 48 | assert_checkequal(R * r, [2,4;6,8]); |
60 | R3rref(:,:,1) = [2,4;6,8]; | 49 | R3rref(:,:,1) = [2,4;6,8]; |
@@ -75,10 +64,7 @@ assert_checkequal(C * c, [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]); | |||
75 | C3cref(:,:,1) = [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]; | 64 | C3cref(:,:,1) = [-3+%i*4,-6+%i*8;-9+%i*12,-12+%i*16]; |
76 | C3cref(:,:,2) = [ 5, 15; 10, 20]; | 65 | C3cref(:,:,2) = [ 5, 15; 10, 20]; |
77 | assert_checkequal(C3 * c, C3cref); | 66 | assert_checkequal(C3 * c, C3cref); |
78 | |||
79 | |||
80 | // DOUBLE * DOUBLE | 67 | // DOUBLE * DOUBLE |
81 | |||
82 | // R * R | 68 | // R * R |
83 | assert_checkequal(R * R, [7,10;15,22]); | 69 | assert_checkequal(R * R, [7,10;15,22]); |
84 | // R * C | 70 | // R * C |
diff --git a/scilab/modules/ast/tests/unit_tests/newtype.dia.ref b/scilab/modules/ast/tests/unit_tests/newtype.dia.ref index edd8a6c..802e2d2 100644 --- a/scilab/modules/ast/tests/unit_tests/newtype.dia.ref +++ b/scilab/modules/ast/tests/unit_tests/newtype.dia.ref | |||
@@ -25,7 +25,7 @@ This is my type. | |||
25 | disp(a) | 25 | disp(a) |
26 | This is my type. | 26 | This is my type. |
27 | l=list(2, a, "test") | 27 | l=list(2, a, "test") |
28 | l = | 28 | l = |
29 | l(1) | 29 | l(1) |
30 | 2. | 30 | 2. |
31 | l(2) | 31 | l(2) |
@@ -43,7 +43,7 @@ b = | |||
43 | disp(b) | 43 | disp(b) |
44 | %nt_p: This is my type. | 44 | %nt_p: This is my type. |
45 | l=list(2, b, "test") | 45 | l=list(2, b, "test") |
46 | l = | 46 | l = |
47 | l(1) | 47 | l(1) |
48 | 2. | 48 | 2. |
49 | l(2) | 49 | l(2) |
diff --git a/scilab/modules/ast/tests/unit_tests/power.dia.ref b/scilab/modules/ast/tests/unit_tests/power.dia.ref index 703859a..05eeb5c 100644 --- a/scilab/modules/ast/tests/unit_tests/power.dia.ref +++ b/scilab/modules/ast/tests/unit_tests/power.dia.ref | |||
@@ -4,9 +4,7 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================ | 6 | // ============================================================================ |
7 | |||
8 | // <-- CLI SHELL MODE --> | 7 | // <-- CLI SHELL MODE --> |
9 | |||
10 | r = 2; | 8 | r = 2; |
11 | R = [1,2;3,4]; | 9 | R = [1,2;3,4]; |
12 | c = 1 + 2*%i; | 10 | c = 1 + 2*%i; |
@@ -15,12 +13,8 @@ pR = 1 + 2*%s*%s + 3*%s*%s*%s; | |||
15 | pC = pR + pR*%i; | 13 | pC = pR + pR*%i; |
16 | PR = [pR,pR;pR,pR]; | 14 | PR = [pR,pR;pR,pR]; |
17 | PC = [pC,pC;pC,pC]; | 15 | PC = [pC,pC;pC,pC]; |
18 | |||
19 | |||
20 | //DOUBLE | 16 | //DOUBLE |
21 | |||
22 | // double ^ double | 17 | // double ^ double |
23 | |||
24 | //r ^ r | 18 | //r ^ r |
25 | assert_checkalmostequal(r ^ r, 4); | 19 | assert_checkalmostequal(r ^ r, 4); |
26 | //r ^ c | 20 | //r ^ c |
@@ -29,7 +23,6 @@ assert_checkalmostequal(r ^ c, 0.3669139494866+%i*1.9660554808225); | |||
29 | assert_checkequal(c ^ r, -3+%i*4); | 23 | assert_checkequal(c ^ r, -3+%i*4); |
30 | //c ^ c | 24 | //c ^ c |
31 | assert_checkalmostequal(c ^ c, -0.2225171568018+%i*0.1007091311361); | 25 | assert_checkalmostequal(c ^ c, -0.2225171568018+%i*0.1007091311361); |
32 | |||
33 | // DOUBLE ^ double | 26 | // DOUBLE ^ double |
34 | //R ^ r | 27 | //R ^ r |
35 | assert_checkequal(R ^ r, [7,10;15,22]); | 28 | assert_checkequal(R ^ r, [7,10;15,22]); |
@@ -39,7 +32,6 @@ assert_checkalmostequal(R ^ c, [-1.251952645008-%i*0.28072150763376,-1.825029337 | |||
39 | assert_checkequal(C ^ r, [-21+%i*28,-30+%i*40;-45+%i*60,-66+%i*88]); | 32 | assert_checkequal(C ^ r, [-21+%i*28,-30+%i*40;-45+%i*60,-66+%i*88]); |
40 | //C ^ c | 33 | //C ^ c |
41 | assert_checkalmostequal(C ^ c, [-27.051150278703-%i*25.062777693306, 12.961689280285+%i*11.342742208568; 19.442533920428+%i*17.014113312852,-7.6086163582745-%i*8.048664380454]); | 34 | assert_checkalmostequal(C ^ c, [-27.051150278703-%i*25.062777693306, 12.961689280285+%i*11.342742208568; 19.442533920428+%i*17.014113312852,-7.6086163582745-%i*8.048664380454]); |
42 | |||
43 | // double ^ DOUBLE | 35 | // double ^ DOUBLE |
44 | //r ^ R | 36 | //r ^ R |
45 | assert_checkequal(r ^ R, [2,4;8,16]); | 37 | assert_checkequal(r ^ R, [2,4;8,16]); |
@@ -49,24 +41,17 @@ assert_checkalmostequal(r ^ C, [ 0.3669139494866+%i*1.9660554808225,-3.730748307 | |||
49 | assert_checkequal(c ^ R, [ 1+%i*2,-3+%i*4;-11-%i*2,-7-%i*24]); | 41 | assert_checkequal(c ^ R, [ 1+%i*2,-3+%i*4;-11-%i*2,-7-%i*24]); |
50 | //c ^ C | 42 | //c ^ C |
51 | assert_checkalmostequal(c ^ C, [-0.2225171568018+%i*0.1007091311361, 0.0393715559770-%i*0.0448190190488;-0.0042471622281+%i*0.0139380758833,-0.0004586250484-%i*0.0035291890346]); | 43 | assert_checkalmostequal(c ^ C, [-0.2225171568018+%i*0.1007091311361, 0.0393715559770-%i*0.0448190190488;-0.0042471622281+%i*0.0139380758833,-0.0004586250484-%i*0.0035291890346]); |
52 | |||
53 | |||
54 | //POLY | 44 | //POLY |
55 | |||
56 | //poly ^ double | 45 | //poly ^ double |
57 | |||
58 | //pR ^ r | 46 | //pR ^ r |
59 | assert_checkequal(pR ^ r, 1+4*%s^2+6*%s^3+4*%s^4+12*%s^5+9*%s^6); | 47 | assert_checkequal(pR ^ r, 1+4*%s^2+6*%s^3+4*%s^4+12*%s^5+9*%s^6); |
60 | //pC ^ r | 48 | //pC ^ r |
61 | assert_checkequal(pC ^ r, %i*2+(%i*8)*%s^2+(%i*12)*%s^3+(%i*8)*%s^4+(%i*24)*%s^5+(%i*18)*%s^6); | 49 | assert_checkequal(pC ^ r, %i*2+(%i*8)*%s^2+(%i*12)*%s^3+(%i*8)*%s^4+(%i*24)*%s^5+(%i*18)*%s^6); |
62 | |||
63 | //poly ^ DOUBLE | 50 | //poly ^ DOUBLE |
64 | |||
65 | //pR ^ R | 51 | //pR ^ R |
66 | assert_checkequal(pR ^ R, [1+2*%s^2+3*%s^3,1+4*%s^2+6*%s^3+4*%s^4+12*%s^5+9*%s^6;1+6*%s^2+9*%s^3+12*%s^4+36*%s^5+35*%s^6+36*%s^7+54*%s^8+27*%s^9,1+8*%s^2+12*%s^3+24*%s^4+72*%s^5+86*%s^6+144*%s^7+232*%s^8+204*%s^9+216*%s^10+216*%s^11+81*%s^12]); | 52 | assert_checkequal(pR ^ R, [1+2*%s^2+3*%s^3,1+4*%s^2+6*%s^3+4*%s^4+12*%s^5+9*%s^6;1+6*%s^2+9*%s^3+12*%s^4+36*%s^5+35*%s^6+36*%s^7+54*%s^8+27*%s^9,1+8*%s^2+12*%s^3+24*%s^4+72*%s^5+86*%s^6+144*%s^7+232*%s^8+204*%s^9+216*%s^10+216*%s^11+81*%s^12]); |
67 | //pC ^ R | 53 | //pC ^ R |
68 | assert_checkequal(pC ^ R, [1+%i+(2+%i*2)*%s^2+(3+%i*3)*%s^3,%i*2+(%i*8)*%s^2+(%i*12)*%s^3+(%i*8)*%s^4+(%i*24)*%s^5+(%i*18)*%s^6;-2+%i*2+(-12+%i*12)*%s^2+(-18+%i*18)*%s^3+(-24+%i*24)*%s^4+(-72+%i*72)*%s^5+(-70+%i*70)*%s^6+(-72+%i*72)*%s^7+(-108+%i*108)*%s^8+(-54+%i*54)*%s^9,-4-32*%s^2-48*%s^3-96*%s^4-288*%s^5-344*%s^6-576*%s^7-928*%s^8-816*%s^9-864*%s^10-864*%s^11-324*%s^12]); | 54 | assert_checkequal(pC ^ R, [1+%i+(2+%i*2)*%s^2+(3+%i*3)*%s^3,%i*2+(%i*8)*%s^2+(%i*12)*%s^3+(%i*8)*%s^4+(%i*24)*%s^5+(%i*18)*%s^6;-2+%i*2+(-12+%i*12)*%s^2+(-18+%i*18)*%s^3+(-24+%i*24)*%s^4+(-72+%i*72)*%s^5+(-70+%i*70)*%s^6+(-72+%i*72)*%s^7+(-108+%i*108)*%s^8+(-54+%i*54)*%s^9,-4-32*%s^2-48*%s^3-96*%s^4-288*%s^5-344*%s^6-576*%s^7-928*%s^8-816*%s^9-864*%s^10-864*%s^11-324*%s^12]); |
69 | |||
70 | //POLY ^ double | 55 | //POLY ^ double |
71 | //PR ^ r | 56 | //PR ^ r |
72 | assert_checkequal(PR ^ r, [2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6,2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6;2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6,2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6]); | 57 | assert_checkequal(PR ^ r, [2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6,2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6;2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6,2+8*%s^2+12*%s^3+8*%s^4+24*%s^5+18*%s^6]); |
diff --git a/scilab/modules/ast/tests/unit_tests/transposition.dia.ref b/scilab/modules/ast/tests/unit_tests/transposition.dia.ref index 54a4a05..42bab5b 100644 --- a/scilab/modules/ast/tests/unit_tests/transposition.dia.ref +++ b/scilab/modules/ast/tests/unit_tests/transposition.dia.ref | |||
@@ -9,7 +9,7 @@ S = 123; | |||
9 | C = [1 2;3 4]; | 9 | C = [1 2;3 4]; |
10 | R = [1 2 3;4 5 6]; | 10 | R = [1 2 3;4 5 6]; |
11 | SC = 1+2*%i | 11 | SC = 1+2*%i |
12 | SC = | 12 | SC = |
13 | 1. + 2.i | 13 | 1. + 2.i |
14 | CC = C + %i * [5 6;7 8]; | 14 | CC = C + %i * [5 6;7 8]; |
15 | RC = R + %i * [7 8 9;10 11 12]; | 15 | RC = R + %i * [7 8 9;10 11 12]; |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_11199.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_11199.dia.ref index 80a9773..8ede8cf 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_11199.dia.ref +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_11199.dia.ref | |||
@@ -4,6 +4,7 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- CLI SHELL MODE --> | ||
7 | // <-- ENGLISH IMPOSED --> | 8 | // <-- ENGLISH IMPOSED --> |
8 | // <-- TEST WITH ATOMS --> | 9 | // <-- TEST WITH ATOMS --> |
9 | // | 10 | // |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_11199.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_11199.tst index bc0aeba..13d0550 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_11199.tst +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_11199.tst | |||
@@ -4,7 +4,7 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | 7 | // <-- CLI SHELL MODE --> | |
8 | // <-- ENGLISH IMPOSED --> | 8 | // <-- ENGLISH IMPOSED --> |
9 | // <-- TEST WITH ATOMS --> | 9 | // <-- TEST WITH ATOMS --> |
10 | // | 10 | // |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13108.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_13108.dia.ref index 67676cf..edf8df0 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13108.dia.ref +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13108.dia.ref | |||
@@ -5,6 +5,8 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // | 7 | // |
8 | // <-- CLI SHELL MODE --> | ||
9 | // | ||
8 | // <-- TEST WITH ATOMS --> | 10 | // <-- TEST WITH ATOMS --> |
9 | // | 11 | // |
10 | // <-- Non-regression test for bug 13108 --> | 12 | // <-- Non-regression test for bug 13108 --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13108.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_13108.tst index 3c88ac1..d9b1d99 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13108.tst +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13108.tst | |||
@@ -5,6 +5,8 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // | 7 | // |
8 | // <-- CLI SHELL MODE --> | ||
9 | // | ||
8 | // <-- TEST WITH ATOMS --> | 10 | // <-- TEST WITH ATOMS --> |
9 | // | 11 | // |
10 | // <-- Non-regression test for bug 13108 --> | 12 | // <-- Non-regression test for bug 13108 --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13367.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_13367.dia.ref index e7afca7..d1576ca 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13367.dia.ref +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13367.dia.ref | |||
@@ -6,6 +6,8 @@ | |||
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- TEST WITH ATOMS --> | 7 | // <-- TEST WITH ATOMS --> |
8 | // | 8 | // |
9 | // <-- CLI SHELL MODE --> | ||
10 | // | ||
9 | // <-- Non-regression test for bug 13367 --> | 11 | // <-- Non-regression test for bug 13367 --> |
10 | // | 12 | // |
11 | // <-- Bugzilla URL --> | 13 | // <-- Bugzilla URL --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13367.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_13367.tst index f98de88..e53b157 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13367.tst +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13367.tst | |||
@@ -7,6 +7,8 @@ | |||
7 | 7 | ||
8 | // <-- TEST WITH ATOMS --> | 8 | // <-- TEST WITH ATOMS --> |
9 | // | 9 | // |
10 | // <-- CLI SHELL MODE --> | ||
11 | // | ||
10 | // <-- Non-regression test for bug 13367 --> | 12 | // <-- Non-regression test for bug 13367 --> |
11 | // | 13 | // |
12 | // <-- Bugzilla URL --> | 14 | // <-- Bugzilla URL --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref index 74752e6..e5231a8 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.dia.ref | |||
@@ -5,7 +5,7 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- TEST WITH ATOMS --> | 7 | // <-- TEST WITH ATOMS --> |
8 | // | 8 | // <-- CLI SHELL MODE --> |
9 | // <-- LINUX ONLY --> | 9 | // <-- LINUX ONLY --> |
10 | // | 10 | // |
11 | // <-- Non-regression test for bug 13674 --> | 11 | // <-- Non-regression test for bug 13674 --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst index 08216cf..9037d84 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_13674.tst | |||
@@ -6,7 +6,7 @@ | |||
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | 7 | ||
8 | // <-- TEST WITH ATOMS --> | 8 | // <-- TEST WITH ATOMS --> |
9 | // | 9 | // <-- CLI SHELL MODE --> |
10 | // <-- LINUX ONLY --> | 10 | // <-- LINUX ONLY --> |
11 | // | 11 | // |
12 | // <-- Non-regression test for bug 13674 --> | 12 | // <-- Non-regression test for bug 13674 --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_9805.dia.ref b/scilab/modules/atoms/tests/nonreg_tests/bug_9805.dia.ref index 1fbcdd3..8d08e12 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_9805.dia.ref +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_9805.dia.ref | |||
@@ -5,6 +5,7 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- ENGLISH IMPOSED --> | 7 | // <-- ENGLISH IMPOSED --> |
8 | // <-- CLI SHELL MODE --> | ||
8 | // <-- TEST WITH ATOMS --> | 9 | // <-- TEST WITH ATOMS --> |
9 | // | 10 | // |
10 | // <-- Non-regression test for bug 9805 --> | 11 | // <-- Non-regression test for bug 9805 --> |
diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_9805.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_9805.tst index 10cdba6..f35ffc4 100644 --- a/scilab/modules/atoms/tests/nonreg_tests/bug_9805.tst +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_9805.tst | |||
@@ -6,6 +6,7 @@ | |||
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | 7 | ||
8 | // <-- ENGLISH IMPOSED --> | 8 | // <-- ENGLISH IMPOSED --> |
9 | // <-- CLI SHELL MODE --> | ||
9 | // <-- TEST WITH ATOMS --> | 10 | // <-- TEST WITH ATOMS --> |
10 | // | 11 | // |
11 | // <-- Non-regression test for bug 9805 --> | 12 | // <-- Non-regression test for bug 9805 --> |
diff --git a/scilab/modules/atoms/tests/unit_tests/atomsLoad.dia.ref b/scilab/modules/atoms/tests/unit_tests/atomsLoad.dia.ref index ff51b40..517d0d3 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsLoad.dia.ref +++ b/scilab/modules/atoms/tests/unit_tests/atomsLoad.dia.ref | |||
@@ -25,9 +25,9 @@ atomsSetConfig("Verbose" ,"False"); | |||
25 | atomsInstall("toolbox_5V6"); | 25 | atomsInstall("toolbox_5V6"); |
26 | // Check if the module is really installed | 26 | // Check if the module is really installed |
27 | if ~ and( atomsIsInstalled( ["toolbox_5V6" "1.2" ; .. | 27 | if ~ and( atomsIsInstalled( ["toolbox_5V6" "1.2" ; .. |
28 | "toolbox_4V6" "1.1" ; .. | 28 | "toolbox_4V6" "1.1" ; .. |
29 | "toolbox_2V6" "1.0" ; .. | 29 | "toolbox_2V6" "1.0" ; .. |
30 | "toolbox_1V6" "2.0"])) then bugmes();quit;end | 30 | "toolbox_1V6" "2.0"])) then bugmes();quit;end |
31 | atomsLoad("toolbox_5V6"); | 31 | atomsLoad("toolbox_5V6"); |
32 | Start Toolbox 1 | 32 | Start Toolbox 1 |
33 | Load macros | 33 | Load macros |
@@ -40,17 +40,17 @@ Start Toolbox 5 | |||
40 | if ~ atomsIsLoaded("toolbox_5V6") then bugmes();quit;end | 40 | if ~ atomsIsLoaded("toolbox_5V6") then bugmes();quit;end |
41 | if ~ atomsIsLoaded(["toolbox_5V6" "1.2"]) then bugmes();quit;end | 41 | if ~ atomsIsLoaded(["toolbox_5V6" "1.2"]) then bugmes();quit;end |
42 | if ~ and(atomsIsLoaded(["toolbox_5V6"; .. | 42 | if ~ and(atomsIsLoaded(["toolbox_5V6"; .. |
43 | "toolbox_2V6"; .. | 43 | "toolbox_2V6"; .. |
44 | "toolbox_1V6"; .. | 44 | "toolbox_1V6"; .. |
45 | "toolbox_4V6"])) then bugmes();quit;end | 45 | "toolbox_4V6"])) then bugmes();quit;end |
46 | if ~ and(atomsIsLoaded(["toolbox_5V6" "1.2"; .. | 46 | if ~ and(atomsIsLoaded(["toolbox_5V6" "1.2"; .. |
47 | "toolbox_2V6" "1.0"; .. | 47 | "toolbox_2V6" "1.0"; .. |
48 | "toolbox_1V6" "2.0"; .. | 48 | "toolbox_1V6" "2.0"; .. |
49 | "toolbox_4V6" "1.1"])) then bugmes();quit;end | 49 | "toolbox_4V6" "1.1"])) then bugmes();quit;end |
50 | if or( t5_version() <> ["Toolbox 5 -> version = 1.2"; .. | 50 | if or( t5_version() <> ["Toolbox 5 -> version = 1.2"; .. |
51 | "Toolbox 4 -> version = 1.1"; .. | 51 | "Toolbox 4 -> version = 1.1"; .. |
52 | "Toolbox 2 -> version = 1.0"; .. | 52 | "Toolbox 2 -> version = 1.0"; .. |
53 | "Toolbox 1 -> version = 2.0" ] ) then bugmes();quit;end | 53 | "Toolbox 1 -> version = 2.0" ] ) then bugmes();quit;end |
54 | atomsRemove("toolbox_5V6"); | 54 | atomsRemove("toolbox_5V6"); |
55 | the package toolbox_5V6 (1.2-1) is currently loaded, It will be removed at next Scilab start | 55 | the package toolbox_5V6 (1.2-1) is currently loaded, It will be removed at next Scilab start |
56 | the package toolbox_4V6 (1.1-1) is currently loaded, It will be removed at next Scilab start | 56 | the package toolbox_4V6 (1.1-1) is currently loaded, It will be removed at next Scilab start |
diff --git a/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.dia.ref b/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.dia.ref index 5077d18..241ee4b 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.dia.ref +++ b/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.dia.ref | |||
@@ -5,6 +5,7 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- ENGLISH IMPOSED --> | 7 | // <-- ENGLISH IMPOSED --> |
8 | // <-- CLI SHELL MODE --> | ||
8 | load("SCI/modules/atoms/macros/atoms_internals/lib"); | 9 | load("SCI/modules/atoms/macros/atoms_internals/lib"); |
9 | // If previous test did not end properly, restore, else backup config file | 10 | // If previous test did not end properly, restore, else backup config file |
10 | atomsRestoreConfig(%T); | 11 | atomsRestoreConfig(%T); |
diff --git a/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.tst b/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.tst index 362fa2b..a2bb009 100644 --- a/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.tst +++ b/scilab/modules/atoms/tests/unit_tests/atomsSetConfig.tst | |||
@@ -7,6 +7,8 @@ | |||
7 | 7 | ||
8 | // <-- ENGLISH IMPOSED --> | 8 | // <-- ENGLISH IMPOSED --> |
9 | 9 | ||
10 | // <-- CLI SHELL MODE --> | ||
11 | |||
10 | load("SCI/modules/atoms/macros/atoms_internals/lib"); | 12 | load("SCI/modules/atoms/macros/atoms_internals/lib"); |
11 | 13 | ||
12 | // If previous test did not end properly, restore, else backup config file | 14 | // If previous test did not end properly, restore, else backup config file |
diff --git a/scilab/modules/boolean/tests/nonreg_tests/bug_2799.dia.ref b/scilab/modules/boolean/tests/nonreg_tests/bug_2799.dia.ref index add16cd..2711641 100644 --- a/scilab/modules/boolean/tests/nonreg_tests/bug_2799.dia.ref +++ b/scilab/modules/boolean/tests/nonreg_tests/bug_2799.dia.ref | |||
@@ -4,13 +4,14 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- CLI SHELL MODE --> | ||
7 | // <-- Non-regression test for bug 2799 --> | 8 | // <-- Non-regression test for bug 2799 --> |
8 | // | 9 | // |
9 | // <-- Bugzilla URL --> | 10 | // <-- Bugzilla URL --> |
10 | // http://bugzilla.scilab.org/show_bug.cgi?id=2799 | 11 | // http://bugzilla.scilab.org/show_bug.cgi?id=2799 |
11 | // | 12 | // |
12 | // <-- Short Description --> | 13 | // <-- Short Description --> |
13 | // Failure to assign boolean values to a sub-matrix when the matrix does | 14 | // Failure to assign boolean values to a sub-matrix when the matrix does |
14 | // not exist | 15 | // not exist |
15 | // clear A;A(:,1) = [%t;%f]; | 16 | // clear A;A(:,1) = [%t;%f]; |
16 | clear A;A(:,1) = [%t;%f]; | 17 | clear A;A(:,1) = [%t;%f]; |
diff --git a/scilab/modules/boolean/tests/nonreg_tests/bug_3006.dia.ref b/scilab/modules/boolean/tests/nonreg_tests/bug_3006.dia.ref index b1b4363..2788ef3 100644 --- a/scilab/modules/boolean/tests/nonreg_tests/bug_3006.dia.ref +++ b/scilab/modules/boolean/tests/nonreg_tests/bug_3006.dia.ref | |||
@@ -4,13 +4,14 @@ | |||
4 | // | 4 | // |
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- CLI SHELL MODE --> | ||
7 | // <-- Non-regression test for bug 3006 --> | 8 | // <-- Non-regression test for bug 3006 --> |
8 | // | 9 | // |
9 | // <-- Bugzilla URL --> | 10 | // <-- Bugzilla URL --> |
10 | // http://bugzilla.scilab.org/show_bug.cgi?id=3006 | 11 | // http://bugzilla.scilab.org/show_bug.cgi?id=3006 |
11 | // | 12 | // |
12 | // <-- Short Description --> | 13 | // <-- Short Description --> |
13 | // submatrix assignment impossible when the matrix is indexed with a boolean array of falses | 14 | // submatrix assignment impossible when the matrix is indexed with a boolean array of falses |
14 | a=[%f %t;%t %t];a_ref=a; | 15 | a=[%f %t;%t %t];a_ref=a; |
15 | a(1,[%f %f])=[]; | 16 | a(1,[%f %f])=[]; |
16 | if or(a<>a_ref) then bugmes();quit;end | 17 | if or(a<>a_ref) then bugmes();quit;end |
diff --git a/scilab/modules/boolean/tests/nonreg_tests/bug_5042.dia.ref b/scilab/modules/boolean/tests/nonreg_tests/bug_5042.dia.ref index 45f6de7..7369628 100644 --- a/scilab/modules/boolean/tests/nonreg_tests/bug_5042.dia.ref +++ b/scilab/modules/boolean/tests/nonreg_tests/bug_5042.dia.ref | |||
@@ -33,6 +33,6 @@ if ~and(ref_and == res) then bugmes();quit;end | |||
33 | ref_or = [%T %F %T;%T %T %F]; | 33 | ref_or = [%T %F %T;%T %T %F]; |
34 | res = ([1,0,1;1,1,0]|[1,0,1;1,1,0]); | 34 | res = ([1,0,1;1,1,0]|[1,0,1;1,1,0]); |
35 | if ~and(ref_or == res) then bugmes();quit;end | 35 | if ~and(ref_or == res) then bugmes();quit;end |
36 | ref_and = [%T %F %T; %T %T %F]; | 36 | ref_and = [%T %F %T; %T %T %F]; |
37 | res = ([1,0,1;1,1,0]&[1,0,1;1,1,0]); | 37 | res = ([1,0,1;1,1,0]&[1,0,1;1,1,0]); |
38 | if ~and(ref_and == res) then bugmes();quit;end | 38 | if ~and(ref_and == res) then bugmes();quit;end |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_11092.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_11092.dia.ref index 001b8b8..ec0c6e1 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_11092.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_11092.dia.ref | |||
@@ -17,7 +17,7 @@ | |||
17 | //Incorrect argument check in h_inf | 17 | //Incorrect argument check in h_inf |
18 | G=syslin("c",1/%s^3); | 18 | G=syslin("c",1/%s^3); |
19 | [P,r]=macglov(G); | 19 | [P,r]=macglov(G); |
20 | assert_checktrue(execstr("[K,ro]=h_inf(P,r,0,1,30)","errcatch")==0); | 20 | assert_checktrue(execstr("[K,ro]=h_inf(P,r,0,1,30)","errcatch")==0); |
21 | h_inf: P22 is stabilizable. | 21 | h_inf: P22 is stabilizable. |
22 | h_inf: P22 is detectable. | 22 | h_inf: P22 is detectable. |
23 | gama = 1.4142135624 Unfeasible (Hx hamiltonian) test = 0.30000E+01 | 23 | gama = 1.4142135624 Unfeasible (Hx hamiltonian) test = 0.30000E+01 |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_11300.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_11300.dia.ref index 7434e06..3a14f08 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_11300.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_11300.dia.ref | |||
@@ -17,5 +17,5 @@ | |||
17 | s = %s; | 17 | s = %s; |
18 | h = syslin('c', 0.5 * (2*s+1)/s^2 / (s^2 + 0.4*s + 4)); | 18 | h = syslin('c', 0.5 * (2*s+1)/s^2 / (s^2 + 0.4*s + 4)); |
19 | hc = (2*h) /. 1; | 19 | hc = (2*h) /. 1; |
20 | ref= [0.3098445669312;0.0720289283079]; | 20 | ref= [0.3098445669312;0.0720289283079]; |
21 | assert_checkalmostequal(freson(hc), ref); | 21 | assert_checkalmostequal(freson(hc), ref); |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.dia.ref index bdae2df..66d71a1 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> | 4 | // Copyright (C) 2005-2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.tst index 5c6ca56..e27c635 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_1198.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> | 4 | // Copyright (C) 2005-2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.dia.ref index 6809cde..322b9e3 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.tst index 518753e..127be69 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12174.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.dia.ref index 9c0d457..2cd9f2e 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.tst index 264b685..9ffdd5b 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12221.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.dia.ref index e2629da..d2b0da3 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.tst index 8da7c45..450940b 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12828.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.dia.ref index 75085a4..9054f7b 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.tst index 8f543e5..28e7a16 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12829.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.dia.ref index a7f04b7..e9c8246 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.tst index de18705..9a0028d 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_12875.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.dia.ref index 290a3e1..eff300e 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
@@ -12,7 +13,7 @@ | |||
12 | // <-- Short Description --> | 13 | // <-- Short Description --> |
13 | // There is an offset in the result of a step response for transfer function | 14 | // There is an offset in the result of a step response for transfer function |
14 | // (a*s^2+b*s+c)/(d*s^2+e*s+f) | 15 | // (a*s^2+b*s+c)/(d*s^2+e*s+f) |
15 | s=poly(0,'s'); | 16 | s=poly(0,'s'); |
16 | Uo=6; | 17 | Uo=6; |
17 | Da=0.5; | 18 | Da=0.5; |
18 | Go=1/15; | 19 | Go=1/15; |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.tst index 205d1cf..f5bbecd 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_13233.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
2 | // Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET | 3 | // Copyright (C) 2014 - Scilab Enterprises - Charlotte HECQUET |
3 | // | 4 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.dia.ref index 7a2f85c..d0ddaaf 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Vincent COUVERT | 4 | // Copyright (C) 2008 - INRIA - Vincent COUVERT |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.tst index b0c7fe4..2d791b6 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_1508.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Vincent COUVERT | 4 | // Copyright (C) 2008 - INRIA - Vincent COUVERT |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.dia.ref index 7bd1775..dd94d4d 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 4 | // Copyright (C) 2008 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.tst index 2e576ce..39aec9e 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_2252.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 4 | // Copyright (C) 2008 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.dia.ref index cd304b7..b716150 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA -Serge Steer | 4 | // Copyright (C) 2005-2008 - INRIA -Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.tst index f51be9d..846494e 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_2836.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA -Serge Steer | 4 | // Copyright (C) 2005-2008 - INRIA -Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.dia.ref index 9fdcf49..930bd63 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 4 | // Copyright (C) 2008 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.tst index f61a0be..6da49c5 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3323.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - INRIA - Serge Steer | 4 | // Copyright (C) 2008 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.dia.ref index 618b9ec..89aa043 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - DIGITEO - Allan CORNET | 4 | // Copyright (C) 2008 - DIGITEO - Allan CORNET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.tst index e76ee29..f94d1c2 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3767.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2008 - DIGITEO - Allan CORNET | 4 | // Copyright (C) 2008 - DIGITEO - Allan CORNET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.dia.ref index 28726b9..d3c707b 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA - Serge.Steer@inria.fr | 4 | // Copyright (C) 2005-2008 - INRIA - Serge.Steer@inria.fr |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.tst index 1370246..2efe257 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3880.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA - Serge.Steer@inria.fr | 4 | // Copyright (C) 2005-2008 - INRIA - Serge.Steer@inria.fr |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.dia.ref index 7935e44c..fbd633d 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Vincent COUVERT | 4 | // Copyright (C) 2009 - DIGITEO - Vincent COUVERT |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.tst index 90d0d21..c8ceca8 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3934.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Vincent COUVERT | 4 | // Copyright (C) 2009 - DIGITEO - Vincent COUVERT |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_3967.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_3967.dia.ref index 467a0cb..57c1aac 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_3967.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_3967.dia.ref | |||
@@ -10,9 +10,11 @@ | |||
10 | // http://bugzilla.scilab.org/show_bug.cgi?id=3967 | 10 | // http://bugzilla.scilab.org/show_bug.cgi?id=3967 |
11 | // | 11 | // |
12 | // <-- Short Description --> | 12 | // <-- Short Description --> |
13 | // when called with a transfer function, pfss returns a set of state-space systems as a result. | 13 | // when called with a transfer function, pfss returns a set of state-space systems as a result. |
14 | // pfss used to return a transfer functions when called with a transfer function (verified of 4.1.2). | 14 | // pfss used to return a transfer functions when called with a transfer function (verified of 4.1.2). |
15 | // When called with a tf, pfss should of course return a tf. | 15 | // When called with a tf, pfss should of course return a tf. |
16 | // | ||
17 | // <-- CLI SHELL MODE --> | ||
16 | tf = syslin("c", 1/%s); | 18 | tf = syslin("c", 1/%s); |
17 | ss = tf2ss(tf); | 19 | ss = tf2ss(tf); |
18 | if pfss(tf)<>list(tf) then bugmes();quit;end | 20 | if pfss(tf)<>list(tf) then bugmes();quit;end |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.dia.ref index a5fea1a..da4f462 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.tst index e3f7f4b..dc5bbae 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4275.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.dia.ref index a516797..e1f5a03 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU | 4 | // Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.tst index fa19b30..a68e023 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4297.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU | 4 | // Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.dia.ref index 048ce22..b2462bf 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
@@ -15,34 +16,30 @@ | |||
15 | //2 states | 16 | //2 states |
16 | A = [-5,-6; | 17 | A = [-5,-6; |
17 | 6,-4] | 18 | 6,-4] |
18 | A = | 19 | A = |
19 | 20 | - 5. - 6. | |
20 | - 5. - 6. | 21 | 6. - 4. |
21 | 6. - 4. | ||
22 | //five inputs | 22 | //five inputs |
23 | B = [0,-14,17,2,9; | 23 | B = [0,-14,17,2,9; |
24 | 2,17,19,-10,-9] | 24 | 2,17,19,-10,-9] |
25 | B = | 25 | B = |
26 | 26 | 0. - 14. 17. 2. 9. | |
27 | 0. - 14. 17. 2. 9. | 27 | 2. 17. 19. - 10. - 9. |
28 | 2. 17. 19. - 10. - 9. | ||
29 | //three outputs | 28 | //three outputs |
30 | C = [0,-17; | 29 | C = [0,-17; |
31 | 3,-14; | 30 | 3,-14; |
32 | 8,7] | 31 | 8,7] |
33 | C = | 32 | C = |
34 | 33 | 0. - 17. | |
35 | 0. - 17. | 34 | 3. - 14. |
36 | 3. - 14. | 35 | 8. 7. |
37 | 8. 7. | ||
38 | D = [1,1,1,3,4; | 36 | D = [1,1,1,3,4; |
39 | 1,1,6,0,2; | 37 | 1,1,6,0,2; |
40 | 1,1,7,5,5] | 38 | 1,1,7,5,5] |
41 | D = | 39 | D = |
42 | 40 | 1. 1. 1. 3. 4. | |
43 | 1. 1. 1. 3. 4. | 41 | 1. 1. 6. 0. 2. |
44 | 1. 1. 6. 0. 2. | 42 | 1. 1. 7. 5. 5. |
45 | 1. 1. 7. 5. 5. | ||
46 | PP=syslin('c',A,B,C,D); | 43 | PP=syslin('c',A,B,C,D); |
47 | gopt=gamitg(PP,[1 1]); | 44 | gopt=gamitg(PP,[1 1]); |
48 | if execstr('KK=ccontrg(PP,[1 1],gopt+0.1)','errcatch')<>0 then bugmes();quit;end | 45 | if execstr('KK=ccontrg(PP,[1 1],gopt+0.1)','errcatch')<>0 then bugmes();quit;end |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.tst index 415c479..75360b6 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4319.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.dia.ref index 56492b5..191a1b9 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
@@ -15,11 +16,9 @@ s=%s; | |||
15 | K=485000.; | 16 | K=485000.; |
16 | h=syslin('c', K / ( s * (s+100)^2 ) ); | 17 | h=syslin('c', K / ( s * (s+100)^2 ) ); |
17 | [gm,fr]=g_margin(h) | 18 | [gm,fr]=g_margin(h) |
18 | fr = | 19 | fr = |
19 | 20 | 15.915494 | |
20 | 15.915494 | 21 | gm = |
21 | gm = | 22 | 12.305765 |
22 | |||
23 | 12.305765 | ||
24 | if gm==[] then bugmes();quit;end | 23 | if gm==[] then bugmes();quit;end |
25 | if abs(2*%pi*fr-100)>100*%eps then bugmes();quit;end | 24 | if abs(2*%pi*fr-100)>100*%eps then bugmes();quit;end |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.tst index 4012967..7b5b75b 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4596.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.dia.ref index d32e879..fbd6809 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.tst index 09cbbf8..e97d26d 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4731.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET | 4 | // Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.dia.ref index d34c981..b67936c 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Allan CORNET | 4 | // Copyright (C) 2009 - DIGITEO - Allan CORNET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.tst index 86d1fc6..89e9f93 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_4767.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - DIGITEO - Allan CORNET | 4 | // Copyright (C) 2009 - DIGITEO - Allan CORNET |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.dia.ref index fc918ca..1a19cb0 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - Scilab Enterprises - Cedric Delamarre | 4 | // Copyright (C) 2012 - Scilab Enterprises - Cedric Delamarre |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.tst index 0d523ea..ebda18a 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6538.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - Scilab Enterprises - Cedric Delamarre | 4 | // Copyright (C) 2012 - Scilab Enterprises - Cedric Delamarre |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.dia.ref index aab1d59..1077984 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2010 - INRIA - Serge Steer | 4 | // Copyright (C) 2010 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.tst index d563c57..352fe1c 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6635.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2010 - INRIA - Serge Steer | 4 | // Copyright (C) 2010 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6744.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_6744.dia.ref index 361d66a..34875ef 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6744.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6744.dia.ref | |||
@@ -5,7 +5,7 @@ | |||
5 | // This file is distributed under the same license as the Scilab package. | 5 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 6 | // ============================================================================= |
7 | // <-- Non-regression test for bug 6744 --> | 7 | // <-- Non-regression test for bug 6744 --> |
8 | // <-- CLI SHELL MODE --> | 8 | // <-- CLI SHELL MODE --> |
9 | // <-- Bugzilla URL --> | 9 | // <-- Bugzilla URL --> |
10 | // http://bugzilla.scilab.org/show_bug.cgi?id=6744 | 10 | // http://bugzilla.scilab.org/show_bug.cgi?id=6744 |
11 | // | 11 | // |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_68.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_68.dia.ref index f2305dc..c6802c0 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_68.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_68.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA -Serge Steer | 4 | // Copyright (C) 2005-2008 - INRIA -Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_68.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_68.tst index 720dd6d..7ff8c8f 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_68.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_68.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2005-2008 - INRIA -Serge Steer | 4 | // Copyright (C) 2005-2008 - INRIA -Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.dia.ref index 2616fdd..07e7fcc 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.tst b/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.tst index d69cffc..2f386fd 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.tst +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_6829.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2009 - INRIA - Serge Steer | 4 | // Copyright (C) 2009 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/nonreg_tests/bug_9285.dia.ref b/scilab/modules/cacsd/tests/nonreg_tests/bug_9285.dia.ref index 08f21f1..a1f1d09 100644 --- a/scilab/modules/cacsd/tests/nonreg_tests/bug_9285.dia.ref +++ b/scilab/modules/cacsd/tests/nonreg_tests/bug_9285.dia.ref | |||
@@ -10,7 +10,7 @@ | |||
10 | // <-- Non-regression test for bug 9285 --> | 10 | // <-- Non-regression test for bug 9285 --> |
11 | // | 11 | // |
12 | // <-- Bugzilla URL --> | 12 | // <-- Bugzilla URL --> |
13 | // http://bugzilla.scilab.org/show_bug.cgi?id=9285 | 13 | // http://bugzilla.scilab.org/show_bug.cgi?id=9285 |
14 | // | 14 | // |
15 | // <-- Short Description --> | 15 | // <-- Short Description --> |
16 | // g_margin returned bad results in some special cases. | 16 | // g_margin returned bad results in some special cases. |
@@ -28,7 +28,7 @@ ty=0.1; | |||
28 | Process=(k*s^2-tw*s+1)/((k*s^2+(tw/2)*s+1)*(1+ts*s)^2*(ta*s+au)); | 28 | Process=(k*s^2-tw*s+1)/((k*s^2+(tw/2)*s+1)*(1+ts*s)^2*(ta*s+au)); |
29 | FeedBack=1/((ty*ty)*s^2+(ty*2^0.5)*s+1) * (1 + (Kd*Td*s)/(Kd+Td*s)); | 29 | FeedBack=1/((ty*ty)*s^2+(ty*2^0.5)*s+1) * (1 + (Kd*Td*s)/(Kd+Td*s)); |
30 | REG=(Kp * ( 1 + Ki/s)); | 30 | REG=(Kp * ( 1 + Ki/s)); |
31 | FT20_0_ = syslin('c', REG * Process * FeedBack); | 31 | FT20_0_ = syslin("c", REG * Process * FeedBack); |
32 | [gm,fr]=g_margin(FT20_0_); | 32 | [gm,fr]=g_margin(FT20_0_); |
33 | assert_checkalmostequal(fr,0.11730083,0,6e-9); | 33 | assert_checkalmostequal(fr,0.11730083,0,6e-9); |
34 | assert_checkalmostequal(gm,6.69326173,0,6e-9); | 34 | assert_checkalmostequal(gm,6.69326173,0,6e-9); |
diff --git a/scilab/modules/cacsd/tests/unit_tests/arma.dia.ref b/scilab/modules/cacsd/tests/unit_tests/arma.dia.ref index 8b65373..5a83ca8 100644 --- a/scilab/modules/cacsd/tests/unit_tests/arma.dia.ref +++ b/scilab/modules/cacsd/tests/unit_tests/arma.dia.ref | |||
@@ -1,4 +1,11 @@ | |||
1 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n+1} + sig*1*e_{n+1} | 1 | //<-- CLI SHELL MODE --> |
2 | // ============================================================================= | ||
3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
4 | // Copyright (C) ????-2008 - INRIA | ||
5 | // | ||
6 | // This file is distributed under the same license as the Scilab package. | ||
7 | // ============================================================================= | ||
8 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n+1} + sig*1*e_{n+1} | ||
2 | Ar=armac([1,-1,-2],[1,2,3],[1],1,3,0); | 9 | Ar=armac([1,-1,-2],[1,2,3],[1],1,3,0); |
3 | u= (1:4).*.ones(3,1); | 10 | u= (1:4).*.ones(3,1); |
4 | y1=arsimul(Ar,u); | 11 | y1=arsimul(Ar,u); |
@@ -11,7 +18,7 @@ y1=arsimul(Ar,u); | |||
11 | rand('seed',a); | 18 | rand('seed',a); |
12 | y2=narsimul(Ar,u); | 19 | y2=narsimul(Ar,u); |
13 | if y1<>y2 then bugmes();quit;end; | 20 | if y1<>y2 then bugmes();quit;end; |
14 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n} + sig*1*e_{n+1} | 21 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n} + sig*1*e_{n+1} |
15 | Ar=armac([1,-1,-2],[0,0,0,1,2,3],[1],1,3,0); | 22 | Ar=armac([1,-1,-2],[0,0,0,1,2,3],[1],1,3,0); |
16 | u= (1:4).*.ones(3,1); | 23 | u= (1:4).*.ones(3,1); |
17 | y1=arsimul(Ar,u); | 24 | y1=arsimul(Ar,u); |
@@ -24,7 +31,7 @@ y1=arsimul(Ar,u); | |||
24 | rand('seed',a); | 31 | rand('seed',a); |
25 | y2=narsimul(Ar,u); | 32 | y2=narsimul(Ar,u); |
26 | if y1<>y2 then bugmes();quit;end; | 33 | if y1<>y2 then bugmes();quit;end; |
27 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n+1} -[4,5,6]*U_{n}+[7,8,9]*U_{n-1} + sig*1*e_{n+1} | 34 | // y_{n+1} = y_n + 2*y_{n-1} + [1,2,3]*U_{n+1} -[4,5,6]*U_{n}+[7,8,9]*U_{n-1} + sig*1*e_{n+1} |
28 | Ar=armac([1,-1,-2],[1,2,3,-4,-5,-6,7,8,9],[1],1,3,0); | 35 | Ar=armac([1,-1,-2],[1,2,3,-4,-5,-6,7,8,9],[1],1,3,0); |
29 | u= (1:4).*.ones(3,1); | 36 | u= (1:4).*.ones(3,1); |
30 | y1=arsimul(Ar,u); | 37 | y1=arsimul(Ar,u); |
@@ -38,7 +45,7 @@ rand('seed',a); | |||
38 | y2=narsimul(Ar,u); | 45 | y2=narsimul(Ar,u); |
39 | if y1<>y2 then bugmes();quit;end; | 46 | if y1<>y2 then bugmes();quit;end; |
40 | // y_{n+1} = eye(2,2)*y_n + 2*eye(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} | 47 | // y_{n+1} = eye(2,2)*y_n + 2*eye(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} |
41 | // +[7,8,9;7,8,9]*U_{n-1} + sig*eye(2,2)*e_{n+1} | 48 | // +[7,8,9;7,8,9]*U_{n-1} + sig*eye(2,2)*e_{n+1} |
42 | Ar=armac([1,-1,-2].*.eye(2,2),[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[eye(2,2)],2,3,0); | 49 | Ar=armac([1,-1,-2].*.eye(2,2),[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[eye(2,2)],2,3,0); |
43 | u= (1:4).*.ones(3,1); | 50 | u= (1:4).*.ones(3,1); |
44 | y1=arsimul(Ar,u); | 51 | y1=arsimul(Ar,u); |
@@ -52,7 +59,7 @@ rand('seed',a); | |||
52 | y2=narsimul(Ar,u); | 59 | y2=narsimul(Ar,u); |
53 | if y1<>y2 then bugmes();quit;end; | 60 | if y1<>y2 then bugmes();quit;end; |
54 | // y_{n+1} = ones(2,2)*y_n + 2*ones(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} | 61 | // y_{n+1} = ones(2,2)*y_n + 2*ones(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} |
55 | // +[7,8,9;7,8,9]*U_{n-1} + sig*eye(2,2)*e_{n+1} | 62 | // +[7,8,9;7,8,9]*U_{n-1} + sig*eye(2,2)*e_{n+1} |
56 | Ar=armac([eye(2,2),-ones(2,2),-2*ones(2,2)],[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[eye(2,2)],2,3,0); | 63 | Ar=armac([eye(2,2),-ones(2,2),-2*ones(2,2)],[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[eye(2,2)],2,3,0); |
57 | u= (1:4).*.ones(3,1); | 64 | u= (1:4).*.ones(3,1); |
58 | y1=arsimul(Ar,u); | 65 | y1=arsimul(Ar,u); |
@@ -66,7 +73,7 @@ rand('seed',a); | |||
66 | y2=narsimul(Ar,u); | 73 | y2=narsimul(Ar,u); |
67 | if y1<>y2 then bugmes();quit;end; | 74 | if y1<>y2 then bugmes();quit;end; |
68 | // y_{n+1} = ones(2,2)*y_n + 2*ones(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} | 75 | // y_{n+1} = ones(2,2)*y_n + 2*ones(2,2)*y_{n-1} + [1,2,3;1,2,3]*U_{n+1} -[4,5,6;4,5,6]*U_{n} |
69 | // +[7,8,9;7,8,9]*U_{n-1} + sig*D*e_{n+1} | 76 | // +[7,8,9;7,8,9]*U_{n-1} + sig*D*e_{n+1} |
70 | // D=rand(2,10) | 77 | // D=rand(2,10) |
71 | D=rand(2,10); | 78 | D=rand(2,10); |
72 | Ar=armac([eye(2,2),-ones(2,2),-2*ones(2,2)],[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[D],2,3,1.0); | 79 | Ar=armac([eye(2,2),-ones(2,2),-2*ones(2,2)],[1,2,3,-4,-5,-6,7,8,9].*.[1;1],[D],2,3,1.0); |
diff --git a/scilab/modules/cacsd/tests/unit_tests/arma.tst b/scilab/modules/cacsd/tests/unit_tests/arma.tst index dec7f38..17fc279 100644 --- a/scilab/modules/cacsd/tests/unit_tests/arma.tst +++ b/scilab/modules/cacsd/tests/unit_tests/arma.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) ????-2008 - INRIA | 4 | // Copyright (C) ????-2008 - INRIA |
diff --git a/scilab/modules/cacsd/tests/unit_tests/arma2ss.dia.ref b/scilab/modules/cacsd/tests/unit_tests/arma2ss.dia.ref index acd870f..4953dd8 100644 --- a/scilab/modules/cacsd/tests/unit_tests/arma2ss.dia.ref +++ b/scilab/modules/cacsd/tests/unit_tests/arma2ss.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - INRIA - Serge Steer | 4 | // Copyright (C) 2012 - INRIA - Serge Steer |
@@ -6,12 +7,10 @@ | |||
6 | // ============================================================================= | 7 | // ============================================================================= |
7 | // | 8 | // |
8 | ny=1,nu=1,sig=0.01; | 9 | ny=1,nu=1,sig=0.01; |
9 | ny = | 10 | ny = |
10 | 11 | 1. | |
11 | 1. | 12 | nu = |
12 | nu = | 13 | 1. |
13 | |||
14 | 1. | ||
15 | ar=armac(1,[0,0.2],[0,1],ny,nu,sig); | 14 | ar=armac(1,[0,0.2],[0,1],ny,nu,sig); |
16 | [S,Sn]=arma2ss(ar); | 15 | [S,Sn]=arma2ss(ar); |
17 | A=[0,0.2;0,0];B=[0;1];C=[1,0];D=0; | 16 | A=[0,0.2;0,0];B=[0;1];C=[1,0];D=0; |
@@ -26,9 +25,8 @@ assert_checkequal(Sn.C,C); | |||
26 | assert_checkequal(Sn.D,D); | 25 | assert_checkequal(Sn.D,D); |
27 | // | 26 | // |
28 | ny=1,nu=1; | 27 | ny=1,nu=1; |
29 | ny = | 28 | ny = |
30 | 29 | 1. | |
31 | 1. | ||
32 | ar=armac([1,-0.8,0.2],0.001,0,ny,nu,0); | 30 | ar=armac([1,-0.8,0.2],0.001,0,ny,nu,0); |
33 | [S,Sn]=arma2ss(ar); | 31 | [S,Sn]=arma2ss(ar); |
34 | A=[0.8,-0.2;1,0];B=[0.001;0];C=[1,0];D=0; | 32 | A=[0.8,-0.2;1,0];B=[0.001;0];C=[1,0];D=0; |
diff --git a/scilab/modules/cacsd/tests/unit_tests/arma2ss.tst b/scilab/modules/cacsd/tests/unit_tests/arma2ss.tst index e41261e..7762282 100644 --- a/scilab/modules/cacsd/tests/unit_tests/arma2ss.tst +++ b/scilab/modules/cacsd/tests/unit_tests/arma2ss.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) 2012 - INRIA - Serge Steer | 4 | // Copyright (C) 2012 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/unit_tests/calfrq.dia.ref b/scilab/modules/cacsd/tests/unit_tests/calfrq.dia.ref index 87e39b7..670f4cb 100644 --- a/scilab/modules/cacsd/tests/unit_tests/calfrq.dia.ref +++ b/scilab/modules/cacsd/tests/unit_tests/calfrq.dia.ref | |||
@@ -1,10 +1,11 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) ????-2008 - INRIA - Serge Steer | 4 | // Copyright (C) ????-2008 - INRIA - Serge Steer |
4 | // | 5 | // |
5 | // This file is distributed under the same license as the Scilab package. | 6 | // This file is distributed under the same license as the Scilab package. |
6 | // ============================================================================= | 7 | // ============================================================================= |
7 | K=0.001; // Minimum relative prediction error in the nyquist plan | 8 | K=0.001; // Minimum relative prediction error in the nyquist plan |
8 | Epss=0.002; // minimum frequency distance with a singularity | 9 | Epss=0.002; // minimum frequency distance with a singularity |
9 | nptmax=5000; //maximum number of discretization points | 10 | nptmax=5000; //maximum number of discretization points |
10 | pas=100/(2*%pi); | 11 | pas=100/(2*%pi); |
diff --git a/scilab/modules/cacsd/tests/unit_tests/calfrq.tst b/scilab/modules/cacsd/tests/unit_tests/calfrq.tst index 807726d..00d0107 100644 --- a/scilab/modules/cacsd/tests/unit_tests/calfrq.tst +++ b/scilab/modules/cacsd/tests/unit_tests/calfrq.tst | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) ????-2008 - INRIA - Serge Steer | 4 | // Copyright (C) ????-2008 - INRIA - Serge Steer |
diff --git a/scilab/modules/cacsd/tests/unit_tests/coff.dia.ref b/scilab/modules/cacsd/tests/unit_tests/coff.dia.ref index e9bd1aa..98af769 100644 --- a/scilab/modules/cacsd/tests/unit_tests/coff.dia.ref +++ b/scilab/modules/cacsd/tests/unit_tests/coff.dia.ref | |||
@@ -1,3 +1,4 @@ | |||
1 | //<-- CLI SHELL MODE --> | ||
1 | // ============================================================================= | 2 | // ============================================================================= |
2 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | 3 | // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab |
3 | // Copyright (C) ????-2008 - INRIA - Serge Steer | 4 | // Copyright (C) ????-2008 - INRIA - Serge Steer |