Mercurial > octave
annotate scripts/testfun/assert.m @ 28525:286fe9352cd6 stable
Interpreter errors on unassigned inputs (bug #58686)
* libinterp/parse-tree/pt-eval.cc (tree_evaluator::convert_to_const_vector):
Throw a proper error instead of silently ignoring the undefined value.
* scripts/testfun/assert.m: Fix comparison of empty structures. Now that the
interpreter is stricter on unassigned inputs to functions.
* test/nest/nest.tst: Mark xtest, because the test never worked. Octave's test
framework got fooled by the interpreter.
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Thu, 02 Jul 2020 15:06:36 +0900 |
parents | 70576ed5cc42 |
children | 8558c6ad4d71 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 ######################################################################## |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 ## |
27919
1891570abac8
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27918
diff
changeset
|
3 ## Copyright (C) 2000-2020 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26593
diff
changeset
|
4 ## |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 ## See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 ## distribution or <https://octave.org/copyright/>. |
5589 | 7 ## |
7016 | 8 ## This file is part of Octave. |
5589 | 9 ## |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24081
diff
changeset
|
10 ## Octave is free software: you can redistribute it and/or modify it |
7016 | 11 ## under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24081
diff
changeset
|
12 ## the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
13 ## (at your option) any later version. |
7016 | 14 ## |
15 ## Octave is distributed in the hope that it will be useful, but | |
16 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
18 ## GNU General Public License for more details. |
5589 | 19 ## |
20 ## You should have received a copy of the GNU General Public License | |
7016 | 21 ## along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24081
diff
changeset
|
22 ## <https://www.gnu.org/licenses/>. |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 ## |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 ######################################################################## |
5589 | 25 |
26 ## -*- texinfo -*- | |
20852
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
27 ## @deftypefn {} {} assert (@var{cond}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
28 ## @deftypefnx {} {} assert (@var{cond}, @var{errmsg}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
29 ## @deftypefnx {} {} assert (@var{cond}, @var{errmsg}, @dots{}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
30 ## @deftypefnx {} {} assert (@var{cond}, @var{msg_id}, @var{errmsg}, @dots{}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
31 ## @deftypefnx {} {} assert (@var{observed}, @var{expected}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
32 ## @deftypefnx {} {} assert (@var{observed}, @var{expected}, @var{tol}) |
5589 | 33 ## |
19025
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
34 ## Produce an error if the specified condition is not met. |
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
35 ## |
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
36 ## @code{assert} can be called in three different ways. |
5589 | 37 ## |
38 ## @table @code | |
17170
d6499c14021c
doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents:
16994
diff
changeset
|
39 ## @item assert (@var{cond}) |
19025
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
40 ## @itemx assert (@var{cond}, @var{errmsg}) |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
41 ## @itemx assert (@var{cond}, @var{errmsg}, @dots{}) |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
42 ## @itemx assert (@var{cond}, @var{msg_id}, @var{errmsg}, @dots{}) |
20162
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
43 ## Called with a single argument @var{cond}, @code{assert} produces an error if |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
44 ## @var{cond} is false (numeric zero). |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
45 ## |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
46 ## Any additional arguments are passed to the @code{error} function for |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
47 ## processing. |
5589 | 48 ## |
49 ## @item assert (@var{observed}, @var{expected}) | |
20162
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
50 ## Produce an error if observed is not the same as expected. |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
51 ## |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
52 ## Note that @var{observed} and @var{expected} can be scalars, vectors, |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
53 ## matrices, strings, cell arrays, or structures. |
5589 | 54 ## |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
55 ## @item assert (@var{observed}, @var{expected}, @var{tol}) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
56 ## Produce an error if observed is not the same as expected but equality |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
57 ## comparison for numeric data uses a tolerance @var{tol}. |
20181
aa36fb998a4d
maint: Remove unnecessary whitespace at end of lines.
Rik <rik@octave.org>
parents:
20162
diff
changeset
|
58 ## |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
59 ## If @var{tol} is positive then it is an absolute tolerance which will produce |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
60 ## an error if @code{abs (@var{observed} - @var{expected}) > abs (@var{tol})}. |
20181
aa36fb998a4d
maint: Remove unnecessary whitespace at end of lines.
Rik <rik@octave.org>
parents:
20162
diff
changeset
|
61 ## |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
62 ## If @var{tol} is negative then it is a relative tolerance which will produce |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
63 ## an error if @code{abs (@var{observed} - @var{expected}) > |
19025
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
64 ## abs (@var{tol} * @var{expected})}. |
20162
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
65 ## |
19025
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
66 ## If @var{expected} is zero @var{tol} will always be interpreted as an |
20162
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
67 ## absolute tolerance. |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
68 ## |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
69 ## If @var{tol} is not scalar its dimensions must agree with those of |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
70 ## @var{observed} and @var{expected} and tests are performed on an |
2645f9ef8c88
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
20054
diff
changeset
|
71 ## element-by-element basis. |
5589 | 72 ## @end table |
19025
f27140dd13a6
doc: Update documentation for assert, rundemos, runtests.
Rik <rik@octave.org>
parents:
18552
diff
changeset
|
73 ## @seealso{fail, test, error, isequal} |
5589 | 74 ## @end deftypefn |
75 | |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
76 function assert (cond, varargin) |
6494 | 77 |
18370
7994d3ce6e8e
assert.m: Fix regression and accept more than 3 arguments for certain cases (bug #41332).
Rik <rik@octave.org>
parents:
17907
diff
changeset
|
78 if (nargin == 0) |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
79 print_usage (); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
80 endif |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
81 |
17253
e3870f594d8b
assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17252
diff
changeset
|
82 persistent call_depth = -1; |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
83 persistent errmsg; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
84 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
85 unwind_protect |
6494 | 86 |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20181
diff
changeset
|
87 call_depth += 1; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
88 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
89 if (call_depth == 0) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
90 errmsg = ""; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
91 endif |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
92 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
93 if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1}))) |
20054
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
94 if ((! isnumeric (cond) && ! islogical (cond)) |
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
95 || isempty (cond) || ! all (cond(:))) |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
96 if (nargin == 1) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
97 ## Perhaps, say which elements failed? |
26214
c0ac6fc191d7
allow inputname to return non-ID arguments (bug #55213)
John W. Eaton <jwe@octave.org>
parents:
26208
diff
changeset
|
98 argin = ["(" inputname(1, false) ")"]; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
99 error ("assert %s failed", argin); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
100 else |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
101 error (varargin{:}); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
102 endif |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
103 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
104 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
105 expected = varargin{1}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
106 if (nargin < 3) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
107 tol = 0; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
108 elseif (nargin == 3) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
109 tol = varargin{2}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
110 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
111 print_usage (); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
112 endif |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
113 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
114 ## Add to list as the errors accumulate. If empty at end then no errors. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
115 err.index = {}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
116 err.observed = {}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
117 err.expected = {}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
118 err.reason = {}; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
119 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
120 if (ischar (expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
121 if (! ischar (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
122 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
123 err.expected{end+1} = expected; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
124 if (isnumeric (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
125 err.observed{end+1} = num2str (cond); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
126 err.reason{end+1} = "Expected string, but observed number"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
127 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
128 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
129 err.reason{end+1} = ["Expected string, but observed " class(cond)]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
130 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
131 elseif (! strcmp (cond, expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
132 err.index{end+1} = "[]"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
133 err.observed{end+1} = cond; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
134 err.expected{end+1} = expected; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
135 err.reason{end+1} = "Strings don't match"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
136 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
137 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
138 elseif (iscell (expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
139 if (! iscell (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
140 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
141 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
142 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
143 err.reason{end+1} = ["Expected cell, but observed " class(cond)]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
144 elseif (ndims (cond) != ndims (expected) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
145 || any (size (cond) != size (expected))) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
146 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
147 err.observed{end+1} = ["O(" sprintf("%dx", size(cond))(1:end-1) ")"]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
148 err.expected{end+1} = ["E(" sprintf("%dx", size(expected))(1:end-1) ")"]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
149 err.reason{end+1} = "Dimensions don't match"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
150 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
151 try |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
152 ## Recursively compare cell arrays |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
153 for i = 1:length (expected(:)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
154 assert (cond{i}, expected{i}, tol); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
155 endfor |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
156 catch |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
157 err.index{end+1} = "{}"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
158 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
159 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
160 err.reason{end+1} = "Cell configuration error"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
161 end_try_catch |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
162 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
163 |
18548
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
164 elseif (is_function_handle (expected)) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
165 if (! is_function_handle (cond)) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
166 err.index{end+1} = "@"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
167 err.observed{end+1} = "O"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
168 err.expected{end+1} = "E"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
169 err.reason{end+1} = ["Expected function handle, but observed " class(cond)]; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
170 elseif (! isequal (cond, expected)) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
171 err.index{end+1} = "@"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
172 err.observed{end+1} = "O"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
173 err.expected{end+1} = "E"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
174 err.reason{end+1} = "Function handles don't match"; |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
175 endif |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
176 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
177 elseif (isstruct (expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
178 if (! isstruct (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
179 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
180 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
181 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
182 err.reason{end+1} = ["Expected struct, but observed " class(cond)]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
183 elseif (ndims (cond) != ndims (expected) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
184 || any (size (cond) != size (expected)) |
18552
b83fca22bb4c
maint: Periodic merge of gui-release to default.
John W. Eaton <jwe@octave.org>
diff
changeset
|
185 || numfields (cond) != numfields (expected)) |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
186 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
187 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
188 err.observed{end+1} = ["O(" sprintf("%dx", size(cond))(1:end-1) ")"]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
189 err.expected{end+1} = ["E(" sprintf("%dx", size(expected))(1:end-1) ")"]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
190 err.reason{end+1} = "Structure sizes don't match"; |
28525
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
191 elseif (! strcmp (sort (fieldnames (cond)), |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
192 sort (fieldnames (expected)))) |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
193 err.index{end+1} = "."; |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
194 err.observed{end+1} = "O"; |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
195 err.expected{end+1} = "E"; |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
196 err.reason{end+1} = "Structure fieldname mismatch"; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
197 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
198 try |
28525
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
199 assert (isempty (cond), isempty (expected)); |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
200 |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
201 if (! isempty (cond)) |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
202 for [v, k] = cond |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
203 if (numel (cond) == 1) |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
204 v = {v}; |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
205 else |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
206 v = v(:)'; |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
207 endif |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
208 ## Recursively call assert for struct array values |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
209 assert (v, {expected.(k)}, tol); |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
210 endfor |
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
211 endif |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
212 catch |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
213 err.index{end+1} = "."; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
214 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
215 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
216 err.reason{end+1} = "Structure configuration error"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
217 end_try_catch |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
218 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
219 |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
220 elseif (ndims (cond) != ndims (expected) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
221 || any (size (cond) != size (expected))) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
222 err.index{end+1} = "."; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
223 err.observed{end+1} = ["O(" sprintf("%dx", size(cond))(1:end-1) ")"]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
224 err.expected{end+1} = ["E(" sprintf("%dx", size(expected))(1:end-1) ")"]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
225 err.reason{end+1} = "Dimensions don't match"; |
5589 | 226 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
227 else # Numeric comparison |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
228 if (nargin < 3) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
229 ## Without explicit tolerance, be more strict. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
230 if (! strcmp (class (cond), class (expected))) |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
231 err.index{end+1} = "()"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
232 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
233 err.expected{end+1} = "E"; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
234 err.reason{end+1} = ["Class " class(cond) " != " class(expected)]; |
26593
ec3c4f31823b
assert.m: Check sparsity of logical values.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
235 elseif (isnumeric (cond) || islogical (cond)) |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
236 if (issparse (cond) != issparse (expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
237 err.index{end+1} = "()"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
238 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
239 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
240 if (issparse (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
241 err.reason{end+1} = "sparse != non-sparse"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
242 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
243 err.reason{end+1} = "non-sparse != sparse"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
244 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
245 elseif (iscomplex (cond) != iscomplex (expected)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
246 err.index{end+1} = "()"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
247 err.observed{end+1} = "O"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
248 err.expected{end+1} = "E"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
249 if (iscomplex (cond)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
250 err.reason{end+1} = "complex != real"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
251 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
252 err.reason{end+1} = "real != complex"; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
253 endif |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
254 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
255 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
256 endif |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
257 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
258 if (isempty (err.index)) |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
259 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
260 A = cond; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
261 B = expected; |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
262 |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
263 ## Check exceptional values. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
264 errvec = ( isna (real (A)) != isna (real (B)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
265 | isna (imag (A)) != isna (imag (B))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
266 erridx = find (errvec); |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
267 if (! isempty (erridx)) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
268 err.index(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
269 ind2tuple (size (A), erridx); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
270 err.observed(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
271 strtrim (cellstr (num2str (A(erridx) (:)))); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
272 err.expected(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
273 strtrim (cellstr (num2str (B(erridx) (:)))); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
274 err.reason(end+1:end+length (erridx)) = ... |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
275 repmat ({"'NA' mismatch"}, length (erridx), 1); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
276 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
277 errseen = errvec; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
278 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
279 errvec = ( isnan (real (A)) != isnan (real (B)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
280 | isnan (imag (A)) != isnan (imag (B))); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
281 erridx = find (errvec & ! errseen); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
282 if (! isempty (erridx)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
283 err.index(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
284 ind2tuple (size (A), erridx); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
285 err.observed(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
286 strtrim (cellstr (num2str (A(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
287 err.expected(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
288 strtrim (cellstr (num2str (B(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
289 err.reason(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
290 repmat ({"'NaN' mismatch"}, length (erridx), 1); |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
291 endif |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
292 errseen |= errvec; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
293 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
294 errvec = ((isinf (real (A)) | isinf (real (B))) ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
295 & (real (A) != real (B))) ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
296 | ((isinf (imag (A)) | isinf (imag (B))) ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
297 & (imag (A) != imag (B))); |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
298 erridx = find (errvec & ! errseen); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
299 if (! isempty (erridx)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
300 err.index(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
301 ind2tuple (size (A), erridx); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
302 err.observed(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
303 strtrim (cellstr (num2str (A(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
304 err.expected(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
305 strtrim (cellstr (num2str (B(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
306 err.reason(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
307 repmat ({"'Inf' mismatch"}, length (erridx), 1); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
308 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
309 errseen |= errvec; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
310 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
311 ## Check normal values. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
312 ## Replace exceptional values already checked above by zero. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
313 A_null_real = real (A); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
314 B_null_real = real (B); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
315 exclude = errseen ... |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
316 | ! isfinite (A_null_real) & ! isfinite (B_null_real); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
317 A_null_real(exclude) = 0; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
318 B_null_real(exclude) = 0; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
319 A_null_imag = imag (A); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
320 B_null_imag = imag (B); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
321 exclude = errseen ... |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
322 | ! isfinite (A_null_imag) & ! isfinite (B_null_imag); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
323 A_null_imag(exclude) = 0; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
324 B_null_imag(exclude) = 0; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
325 A_null = complex (A_null_real, A_null_imag); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
326 B_null = complex (B_null_real, B_null_imag); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
327 if (isscalar (tol)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
328 mtol = tol * ones (size (A)); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
329 else |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
330 mtol = tol; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
331 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
332 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
333 k = (mtol == 0); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
334 erridx = find ((A_null != B_null) & k); |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
335 if (! isempty (erridx)) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
336 err.index(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
337 ind2tuple (size (A), erridx); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
338 err.observed(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
339 strtrim (cellstr (num2str (A(erridx) (:)))); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
340 err.expected(end+1:end+length (erridx)) = ... |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
341 strtrim (cellstr (num2str (B(erridx) (:)))); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
342 err.reason(end+1:end+length (erridx)) = ... |
24081
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
343 ostrsplit (deblank ( |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
344 sprintf ("Abs err %.5g exceeds tol %.5g by %.1g\n", |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
345 [abs(A_null(erridx) - B_null(erridx))(:), mtol(erridx)(:), ... |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
346 abs(A_null(erridx) - B_null(erridx))(:)-mtol(erridx)(:)].')), |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
347 "\n"); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
348 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
349 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
350 k = (mtol > 0); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
351 erridx = find ((abs (A_null - B_null) > mtol) & k); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
352 if (! isempty (erridx)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
353 err.index(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
354 ind2tuple (size (A), erridx); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
355 err.observed(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
356 strtrim (cellstr (num2str (A(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
357 err.expected(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
358 strtrim (cellstr (num2str (B(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
359 err.reason(end+1:end+length (erridx)) = ... |
24081
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
360 ostrsplit (deblank ( |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
361 sprintf ("Abs err %.5g exceeds tol %.5g by %.1g\n", |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
362 [abs(A_null(erridx) - B_null(erridx))(:), mtol(erridx)(:), ... |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
363 abs(A_null(erridx) - B_null(erridx))(:)-mtol(erridx)(:)].')), |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
364 "\n"); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
365 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
366 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
367 k = (mtol < 0); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
368 if (any (k(:))) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
369 ## Test for absolute error where relative error can't be calculated. |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
370 erridx = find ((B_null == 0) & abs (A_null) > abs (mtol) & k); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
371 if (! isempty (erridx)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
372 err.index(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
373 ind2tuple (size (A), erridx); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
374 err.observed(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
375 strtrim (cellstr (num2str (A(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
376 err.expected(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
377 strtrim (cellstr (num2str (B(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
378 err.reason(end+1:end+length (erridx)) = ... |
24081
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
379 ostrsplit (deblank ( |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
380 sprintf ("Abs err %.5g exceeds tol %.5g by %.1g\n", |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
381 [abs(A_null(erridx) - B_null(erridx)), -mtol(erridx), ... |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
382 abs(A_null(erridx) - B_null(erridx))+mtol(erridx)].')), |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
383 "\n"); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
384 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
385 ## Test for relative error |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
386 Bdiv = Inf (size (B_null)); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
387 Bdiv(k & (B_null != 0)) = B_null(k & (B_null != 0)); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
388 relerr = abs ((A_null - B_null) ./ abs (Bdiv)); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
389 erridx = find ((relerr > abs (mtol)) & k); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
390 if (! isempty (erridx)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
391 err.index(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
392 ind2tuple (size (A), erridx); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
393 err.observed(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
394 strtrim (cellstr (num2str (A(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
395 err.expected(end+1:end+length (erridx)) = ... |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
396 strtrim (cellstr (num2str (B(erridx) (:)))); |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
397 err.reason(end+1:end+length (erridx)) = ... |
24081
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
398 ostrsplit (deblank ( |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
399 sprintf ("Rel err %.5g exceeds tol %.5g by %.1g\n", |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
400 [relerr(erridx)(:), -mtol(erridx)(:), ... |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
401 relerr(erridx)(:)+mtol(erridx)(:)].')), |
ae8e3e81f372
Clarify assert() test with the amount by which the test fails (bug #52004).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
23951
diff
changeset
|
402 "\n"); |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
403 endif |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
404 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
405 endif |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
406 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
407 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
408 |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
409 ## Print any errors |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
410 if (! isempty (err.index)) |
26208
fc7b842daca1
use inputname function instead of argn automatic variable
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
411 arg_names = cell (nargin, 1); |
fc7b842daca1
use inputname function instead of argn automatic variable
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
412 for i = 1:nargin |
26214
c0ac6fc191d7
allow inputname to return non-ID arguments (bug #55213)
John W. Eaton <jwe@octave.org>
parents:
26208
diff
changeset
|
413 arg_names{i} = inputname (i, false); |
26208
fc7b842daca1
use inputname function instead of argn automatic variable
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
414 endfor |
fc7b842daca1
use inputname function instead of argn automatic variable
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
415 argin = ["(" strjoin(arg_names, ",") ")"]; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
416 if (! isempty (errmsg)) |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
417 errmsg = [errmsg "\n"]; |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
418 endif |
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
419 errmsg = [errmsg, pprint(argin, err)]; |
5589 | 420 endif |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
421 |
5589 | 422 endif |
423 | |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
424 unwind_protect_cleanup |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20181
diff
changeset
|
425 call_depth -= 1; |
18547
9472e3c8f43e
prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents:
18370
diff
changeset
|
426 end_unwind_protect |
17253
e3870f594d8b
assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17252
diff
changeset
|
427 |
e3870f594d8b
assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17252
diff
changeset
|
428 if (call_depth == -1) |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
429 ## Last time through. If there were any errors on any pass, raise a flag. |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
430 if (! isempty (errmsg)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
431 error (errmsg); |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
432 endif |
5589 | 433 endif |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
434 |
5589 | 435 endfunction |
436 | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
437 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
438 ## empty input |
20054
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
439 %!error assert ([]) |
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
440 %!error assert ("") |
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
441 %!error assert ({}) |
cbba639b956b
fail if single argument to assert is empty. (bug #44793)
John W. Eaton <jwe@octave.org>
parents:
19833
diff
changeset
|
442 %!error assert (struct ([])) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
443 %!assert (zeros (3,0), zeros (3,0)) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
444 %!error <O\(3x0\)\s+E\(0x2\)> assert (zeros (3,0), zeros (0,2)) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
445 %!error <Dimensions don't match> assert (zeros (3,0), []) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
446 %!error <Dimensions don't match> assert (zeros (2,0,2), zeros (2,0)) |
5589 | 447 |
448 ## conditions | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
449 %!assert (isempty ([])) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
450 %!assert (1) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
451 %!error assert (0) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
452 %!assert (ones (3,1)) |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
453 %!assert (ones (1,3)) |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
454 %!assert (ones (3,4)) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
455 %!error assert ([1,0,1]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
456 %!error assert ([1;1;0]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
457 %!error assert ([1,0;1,1]) |
18370
7994d3ce6e8e
assert.m: Fix regression and accept more than 3 arguments for certain cases (bug #41332).
Rik <rik@octave.org>
parents:
17907
diff
changeset
|
458 %!error <2-part error> assert (false, "%s %s", "2-part", "error") |
7994d3ce6e8e
assert.m: Fix regression and accept more than 3 arguments for certain cases (bug #41332).
Rik <rik@octave.org>
parents:
17907
diff
changeset
|
459 %!error <2-part error> assert (false, "TST:msg_id", "%s %s", "2-part", "error") |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
460 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
461 ## scalars |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
462 %!error <Dimensions don't match> assert (3, [3,3]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
463 %!error <Dimensions don't match> assert (3, [3,3; 3,3]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
464 %!error <Dimensions don't match> assert ([3,3; 3,3], 3) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
465 %!assert (3, 3) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
466 %!error <Abs err 1 exceeds tol> assert (3, 4) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
467 %!assert (3+eps, 3, eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
468 %!assert (3, 3+eps, eps) |
17907
6a381b9ae055
assert.m: Modify 4 failing %!error tests to accept 3 digit exponents for MinGW.
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
469 %!error <Abs err 4.4409e-0?16 exceeds tol> assert (3+2*eps, 3, eps) |
6a381b9ae055
assert.m: Modify 4 failing %!error tests to accept 3 digit exponents for MinGW.
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
470 %!error <Abs err 4.4409e-0?16 exceeds tol> assert (3, 3+2*eps, eps) |
5589 | 471 |
472 ## vectors | |
21317
a4faec57f4c8
maint: remove semicolon after %!assert tests to follow Octave conventions.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
473 %!assert ([1,2,3],[1,2,3]) |
a4faec57f4c8
maint: remove semicolon after %!assert tests to follow Octave conventions.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
474 %!assert ([1;2;3],[1;2;3]) |
21581
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
475 %!error <Abs err 1 exceeds tol 0> assert ([2,2,3,3],[1,2,3,4]) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
476 %!error <Abs err 1 exceeds tol 0.5> assert ([2,2,3,3],[1,2,3,4],0.5) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
477 %!error <Rel err 1 exceeds tol 0.1> assert ([2,2,3,5],[1,2,3,4],-0.1) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
478 %!error <Abs err 1 exceeds tol 0> assert ([6;6;7;7],[5;6;7;8]) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
479 %!error <Abs err 1 exceeds tol 0.5> assert ([6;6;7;7],[5;6;7;8],0.5) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
480 %!error <Rel err .* exceeds tol 0.1> assert ([6;6;7;7],[5;6;7;8],-0.1) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
481 %!error <Dimensions don't match> assert ([1,2,3],[1;2;3]) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
482 %!error <Dimensions don't match> assert ([1,2],[1,2,3]) |
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
483 %!error <Dimensions don't match> assert ([1;2;3],[1;2]) |
5589 | 484 |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
485 ## matrices |
21317
a4faec57f4c8
maint: remove semicolon after %!assert tests to follow Octave conventions.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
486 %!assert ([1,2;3,4],[1,2;3,4]) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
487 %!error <\(1,2\)\s+4\s+2> assert ([1,4;3,4],[1,2;3,4]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
488 %!error <Dimensions don't match> assert ([1,3;2,4;3,5],[1,2;3,4]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
489 %!test # 2-D matrix |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
490 %! A = [1 2 3]'*[1,2]; |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
491 %! assert (A, A); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
492 %! fail ("assert (A.*(A!=2),A)"); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
493 %!test # N-D matrix |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
494 %! X = zeros (2,2,3); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
495 %! Y = X; |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
496 %! Y(1,2,3) = 1.5; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
497 %! fail ("assert (X,Y)", "\(1,2,3\).*Abs err 1.5 exceeds tol 0"); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
498 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
499 ## must give a small tolerance for floating point errors on relative |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
500 %!assert (100+100*eps, 100, -2*eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
501 %!assert (100, 100+100*eps, -2*eps) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
502 %!error <Rel err .* exceeds tol> assert (100+300*eps, 100, -2*eps) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
503 %!error <Rel err .* exceeds tol> assert (100, 100+300*eps, -2*eps) |
5589 | 504 |
7027 | 505 ## test relative vs. absolute tolerances |
21562
6c2fd62db1f7
maint: Eliminate accidental double spaces in code.
Rik <rik@octave.org>
parents:
21317
diff
changeset
|
506 %!test assert (0.1+eps, 0.1, 2*eps); |
21581
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
507 %!error <Rel err 2.2204e-0?15 exceeds tol> assert (0.1+eps, 0.1, -2*eps) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
508 %!test assert (100+100*eps, 100, -2*eps); |
21581
6fab85c1538f
maint: Follow Octave conventions for use of semicolon in BIST tests.
Rik <rik@octave.org>
parents:
21562
diff
changeset
|
509 %!error <Abs err 2.8422e-0?14 exceeds tol> assert (100+100*eps, 100, 2*eps) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
510 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
511 ## Corner case of relative tolerance with 0 divider |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
512 %!error <Abs err 2 exceeds tol 0.1> assert (2, 0, -0.1) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
513 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
514 ## Extra checking of inputs when tolerance unspecified. |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
515 %!error <Class single != double> assert (single (1), 1) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
516 %!error <Class uint8 != uint16> assert (uint8 (1), uint16 (1)) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
517 %!error <sparse != non-sparse> assert (sparse([1]), [1]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
518 %!error <non-sparse != sparse> assert ([1], sparse([1])) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
519 %!error <complex != real> assert (1+i, 1) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
520 %!error <real != complex> assert (1, 1+i) |
7027 | 521 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
522 ## exceptional values |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
523 %!assert ([NaN, NA, Inf, -Inf, 1+eps, eps], [NaN, NA, Inf, -Inf, 1, 0], eps) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
524 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
525 %!error <'NaN' mismatch> assert (NaN, 1) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
526 %!error <'NaN' mismatch> assert ([NaN 1], [1 NaN]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
527 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
528 %! try |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
529 %! assert ([NaN 1], [1 NaN]); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
530 %! catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
531 %! errmsg = lasterr (); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
532 %! if (sum (errmsg () == "\n") != 4) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
533 %! error ("Too many errors reported for NaN assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
534 %! elseif (strfind (errmsg, "NA")) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
535 %! error ("NA reported for NaN assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
536 %! elseif (strfind (errmsg, "Abs err NaN exceeds tol 0")) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
537 %! error ("Abs err reported for NaN assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
538 %! endif |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
539 %! end_try_catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
540 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
541 %!error <'NA' mismatch> assert (NA, 1) |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
542 %!error assert ([NA 1]', [1 NA]') |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
543 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
544 %! try |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
545 %! assert ([NA 1]', [1 NA]'); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
546 %! catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
547 %! errmsg = lasterr (); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
548 %! if (sum (errmsg () == "\n") != 4) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
549 %! error ("Too many errors reported for NA assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
550 %! elseif (strfind (errmsg, "NaN")) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
551 %! error ("NaN reported for NA assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
552 %! elseif (strfind (errmsg, "Abs err NA exceeds tol 0")) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
553 %! error ("Abs err reported for NA assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
554 %! endif |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
555 %! end_try_catch |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
556 %!error assert ([(complex (NA, 1)) (complex (2, NA))], [(complex (NA, 2)) 2]) |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
557 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
558 %!error <'Inf' mismatch> assert (-Inf, Inf) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
559 %!error <'Inf' mismatch> assert ([-Inf Inf], [Inf -Inf]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
560 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
561 %! try |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
562 %! assert (complex (Inf, 0.2), complex (-Inf, 0.2 + 2*eps), eps); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
563 %! catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
564 %! errmsg = lasterr (); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
565 %! if (sum (errmsg () == "\n") != 3) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
566 %! error ("Too many errors reported for Inf assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
567 %! elseif (strfind (errmsg, "Abs err")) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
568 %! error ("Abs err reported for Inf assert"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
569 %! endif |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
570 %! end_try_catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
571 %!error <Abs err> assert (complex (Inf, 0.2), complex (Inf, 0.2 + 2*eps), eps) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
572 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
573 ## strings |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
574 %!assert ("dog", "dog") |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
575 %!error <Strings don't match> assert ("dog", "cat") |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
576 %!error <Expected string, but observed number> assert (3, "dog") |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
577 %!error <Class char != double> assert ("dog", [3 3 3]) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
578 %!error <Expected string, but observed cell> assert ({"dog"}, "dog") |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
579 %!error <Expected string, but observed struct> assert (struct ("dog", 3), "dog") |
5589 | 580 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
581 ## cell arrays |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
582 %!error <Expected cell, but observed double> assert (1, {1}) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
583 %!error <Dimensions don't match> assert (cell (1,2,3), cell (3,2,1)) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
584 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
585 %! x = {{{1}}, 2}; # cell with multiple levels |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
586 %! y = x; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
587 %! assert (x,y); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
588 %! y{1}{1}{1} = 3; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
589 %! fail ("assert (x,y)", "Abs err 2 exceeds tol 0"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
590 |
18548
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
591 ## function handles |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
592 %!assert (@sin, @sin) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
593 %!error <Function handles don't match> assert (@sin, @cos) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
594 %!error <Expected function handle, but observed double> assert (pi, @cos) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
595 %!error <Class function_handle != double> assert (@sin, pi) |
06970f4625b8
assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents:
18547
diff
changeset
|
596 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
597 %!test |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
598 %! x = {[3], [1,2,3]; 100+100*eps, "dog"}; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
599 %! y = x; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
600 %! assert (x, y); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
601 %! y = x; y(1,1) = [2]; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
602 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
603 %! y = x; y(1,2) = [0, 2, 3]; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
604 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
605 %! y = x; y(2,1) = 101; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
606 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
607 %! y = x; y(2,2) = "cat"; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
608 %! fail ("assert (x, y)"); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
609 %! y = x; y(1,1) = [2]; y(1,2) = [0, 2, 3]; y(2,1) = 101; y(2,2) = "cat"; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
610 %! fail ("assert (x, y)"); |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
611 |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
612 ## structures |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
613 %!error <Expected struct, but observed double> assert (1, struct ("a", 1)) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
614 %!error <Structure sizes don't match> |
17314
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
615 %! x(1,2,3).a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
616 %! y(1,2).a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
617 %! assert (x,y); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
618 %!error <Structure sizes don't match> |
17314
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
619 %! x(1,2,3).a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
620 %! y(3,2,2).a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
621 %! assert (x,y); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
622 %!error <Structure sizes don't match> |
17314
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
623 %! x.a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
624 %! x.b = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
625 %! y.a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
626 %! assert (x,y); |
28525
286fe9352cd6
Interpreter errors on unassigned inputs (bug #58686)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
27947
diff
changeset
|
627 %!error <Structure fieldname mismatch> |
17314
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
628 %! x.b = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
629 %! y.a = 1; |
7f27a3cbdb41
Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
630 %! assert (x,y); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
631 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
632 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
633 %! x.a = 1; x.b=[2, 2]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
634 %! y.a = 1; y.b=[2, 2]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
635 %! assert (x, y); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
636 %! y.b=3; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
637 %! fail ("assert (x, y)"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
638 %! fail ("assert (3, x)"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
639 %! fail ("assert (x, 3)"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
640 %! ## Empty structures |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
641 %! x = resize (x, 0, 1); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
642 %! y = resize (y, 0, 1); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
643 %! assert (x, y); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
644 |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
645 ## vector of tolerances |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
646 %!test |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
647 %! x = [-40:0]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
648 %! y1 = (10.^x).*(10.^x); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
649 %! y2 = 10.^(2*x); |
23951
2c3a69791ca2
assert.m: Increase tolerance in BIST because of bug in mingw-w64 (bug #48365).
Markus Mützel <markus.muetzel@gmx.de>
parents:
23220
diff
changeset
|
650 %! ## Increase tolerance from eps (y1) to 4*eps (y1) because of an upstream bug |
2c3a69791ca2
assert.m: Increase tolerance in BIST because of bug in mingw-w64 (bug #48365).
Markus Mützel <markus.muetzel@gmx.de>
parents:
23220
diff
changeset
|
651 %! ## in mingw-w64: https://sourceforge.net/p/mingw-w64/bugs/466/ |
2c3a69791ca2
assert.m: Increase tolerance in BIST because of bug in mingw-w64 (bug #48365).
Markus Mützel <markus.muetzel@gmx.de>
parents:
23220
diff
changeset
|
652 %! assert (y1, y2, 4*eps (y1)); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
653 %! fail ("assert (y1, y2 + eps*1e-70, eps (y1))"); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
654 |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
655 ## Multiple tolerances |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
656 %!test |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
657 %! x = [1 2; 3 4]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
658 %! y = [0 -1; 1 2]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
659 %! tol = [-0.1 0; -0.2 0.3]; |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
660 %! try |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
661 %! assert (x, y, tol); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
662 %! catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
663 %! errmsg = lasterr (); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
664 %! if (sum (errmsg () == "\n") != 6) |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
665 %! error ("Incorrect number of errors reported"); |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
666 %! endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
667 %! assert (! isempty (regexp (errmsg, '\(1,2\).*Abs err 3 exceeds tol 0\>'))); |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
668 %! assert (! isempty (regexp (errmsg, '\(2,2\).*Abs err 2 exceeds tol 0.3'))); |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
669 %! assert (! isempty (regexp (errmsg, '\(1,1\).*Abs err 1 exceeds tol 0.1'))); |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
670 %! assert (! isempty (regexp (errmsg, '\(2,1\).*Rel err 2 exceeds tol 0.2'))); |
17255
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
671 %! end_try_catch |
a28c0d73e253
assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents:
17253
diff
changeset
|
672 |
27947
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
673 %!test <*57615> |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
674 %! try |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
675 %! assert (complex (pi*1e-17,2*pi), 0, 1e-1); |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
676 %! catch |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
677 %! errmsg = lasterr (); |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
678 %! assert (isempty (strfind (errmsg, "sprintf: invalid field width"))); |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
679 %! end_try_catch |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
680 |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
681 ## test input validation |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
682 %!error assert () |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
683 %!error assert (1,2,3,4) |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
684 |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
685 |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
686 ## Convert all error indices into tuple format |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
687 function cout = ind2tuple (matsize, erridx) |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
688 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
689 cout = cell (numel (erridx), 1); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
690 tmp = cell (1, numel (matsize)); |
19725
5f2c0ca0ef51
Ensure that numbers passed to integer *printf format codes are integers (bug #44245).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
691 [tmp{:}] = ind2sub (matsize, erridx(:)); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
692 subs = [tmp{:}]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
693 if (numel (matsize) == 2) |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
694 subs = subs(:, matsize != 1); |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
695 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
696 for i = 1:numel (erridx) |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
697 loc = sprintf ("%d,", subs(i,:)); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
698 cout{i} = ["(" loc(1:end-1) ")"]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
699 endfor |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
700 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
701 endfunction |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
702 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
703 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
704 ## Pretty print the various errors in a condensed tabular format. |
17467
b8ecdb6ce2f8
assert.m: Speed up function by ~16% by not pre-calculating warning message.
Rik <rik@octave.org>
parents:
17314
diff
changeset
|
705 function str = pprint (argin, err) |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
706 |
17467
b8ecdb6ce2f8
assert.m: Speed up function by ~16% by not pre-calculating warning message.
Rik <rik@octave.org>
parents:
17314
diff
changeset
|
707 str = ["ASSERT errors for: assert " argin "\n"]; |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
708 str = [str, "\n Location | Observed | Expected | Reason\n"]; |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
709 for i = 1:length (err.index) |
17251
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
710 leni = length (err.index{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
711 leno = length (err.observed{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
712 lene = length (err.expected{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17250
diff
changeset
|
713 str = [str, sprintf("%*s%*s %*s%*s %*s%*s %s\n", |
27947
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
714 6+fix(leni/2), err.index{i} , max (6-fix(leni/2), 0), "", |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
715 6+fix(leno/2), err.observed{i}, max (6-fix(leno/2), 0), "", |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
716 6+fix(lene/2), err.expected{i}, max (6-fix(lene/2), 0), "", |
70576ed5cc42
assert.m: Fix regression when observed output is large (bug #57615).
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
717 err.reason{i})]; |
17250
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
718 endfor |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
719 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17170
diff
changeset
|
720 endfunction |