Mercurial > hg > octave-lyh
annotate scripts/testfun/assert.m @ 17260:dac81d4b8ce1
assert.m: Fix typo stopping comparison of imaginary non-infinite values.
* scripts/testfun/assert.m: Fix typo stopping comparison of imaginary
non-infinite values.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 14 Aug 2013 12:05:51 -0700 |
parents | 684ccccbc15d |
children | e3870f594d8b |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14093
diff
changeset
|
1 ## Copyright (C) 2000-2012 Paul Kienzle |
5589 | 2 ## |
7016 | 3 ## This file is part of Octave. |
5589 | 4 ## |
7016 | 5 ## Octave is free software; you can redistribute it and/or modify it |
6 ## under the terms of the GNU General Public License as published by | |
7 ## the Free Software Foundation; either version 3 of the License, or (at | |
8 ## your option) any later version. | |
9 ## | |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
5589 | 14 ## |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
5589 | 18 |
19 ## -*- texinfo -*- | |
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
20 ## @deftypefn {Function File} {} assert (@var{cond}) |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
21 ## @deftypefnx {Function File} {} assert (@var{cond}, @var{errmsg}, @dots{}) |
9313 | 22 ## @deftypefnx {Function File} {} assert (@var{cond}, @var{msg_id}, @var{errmsg}, @dots{}) |
11563
3c6e8aaa9555
Grammarcheck m-files before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
23 ## @deftypefnx {Function File} {} assert (@var{observed}, @var{expected}) |
3c6e8aaa9555
Grammarcheck m-files before 3.4 release.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
24 ## @deftypefnx {Function File} {} assert (@var{observed}, @var{expected}, @var{tol}) |
5589 | 25 ## |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
26 ## Produce an error if the specified condition is not met. @code{assert} can |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
27 ## be called in three different ways. |
5589 | 28 ## |
29 ## @table @code | |
17178
d6499c14021c
doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents:
16994
diff
changeset
|
30 ## @item assert (@var{cond}) |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
31 ## @itemx assert (@var{cond}, @var{errmsg}, @dots{}) |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
32 ## @itemx assert (@var{cond}, @var{msg_id}, @var{errmsg}, @dots{}) |
5589 | 33 ## Called with a single argument @var{cond}, @code{assert} produces an |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
34 ## error if @var{cond} is zero. When called with more than one argument the |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
35 ## additional arguments are passed to the @code{error} function. |
5589 | 36 ## |
37 ## @item assert (@var{observed}, @var{expected}) | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
38 ## Produce an error if observed is not the same as expected. Note that |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
39 ## @var{observed} and @var{expected} can be scalars, vectors, matrices, |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
40 ## strings, cell arrays, or structures. |
5589 | 41 ## |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
42 ## @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
|
43 ## 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
|
44 ## comparison for numeric data uses a tolerance @var{tol}. |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
45 ## 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
|
46 ## an error if @code{abs (@var{observed} - @var{expected}) > abs (@var{tol})}. |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
47 ## 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
|
48 ## an error if @code{abs (@var{observed} - @var{expected}) > |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
49 ## abs (@var{tol} * @var{expected})}. If @var{expected} is zero @var{tol} will |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
50 ## always be interpreted as an absolute tolerance. If @var{tol} is not scalar |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
51 ## its dimensions must agree with those of @var{observed} and @var{expected} |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
52 ## and tests are performed on an element-wise basis. |
5589 | 53 ## @end table |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
54 ## @seealso{test, fail, error} |
5589 | 55 ## @end deftypefn |
56 | |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
57 function assert (cond, varargin) |
6494 | 58 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
59 if (nargin == 0 || nargin > 3) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
60 print_usage (); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
61 endif |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
62 |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
63 persistent call_depth = 0; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
64 persistent errmsg; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
65 |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
66 if (call_depth > 0) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
67 call_depth++; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
68 else |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
69 call_depth = 0; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
70 errmsg = ""; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
71 end |
6494 | 72 |
73 in = deblank (argn(1,:)); | |
74 for i = 2:rows (argn) | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14868
diff
changeset
|
75 in = [in "," deblank(argn(i,:))]; |
7151 | 76 endfor |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
14868
diff
changeset
|
77 in = ["(" in ")"]; |
5589 | 78 |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
79 if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1}))) |
9841
6f1ea8241c99
make isnumeric yield false on logicals
Jaroslav Hajek <highegg@gmail.com>
parents:
9448
diff
changeset
|
80 if ((! isnumeric (cond) && ! islogical (cond)) || ! all (cond(:))) |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
81 if (nargin == 1) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
82 ## Perhaps, say which elements failed? |
10549 | 83 error ("assert %s failed", in); |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
84 else |
10549 | 85 error (varargin{:}); |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
86 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11563
diff
changeset
|
87 endif |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
88 else |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
89 expected = varargin{1}; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
90 if (nargin < 3) |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
91 tol = 0; |
5589 | 92 else |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
93 tol = varargin{2}; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
94 endif |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
95 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
96 ## Add to list as the errors accumulate. If empty at end then no errors. |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
97 err.index = {}; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
98 err.observed = {}; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
99 err.expected = {}; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
100 err.reason = {}; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
101 |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
102 if (ischar (expected)) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
103 if (! ischar (cond)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
104 err.index{end+1} = "[]"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
105 err.expected{end+1} = expected; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
106 if (isnumeric (cond)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
107 err.observed{end+1} = num2str (cond); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
108 err.reason{end+1} = "Expected string, but observed number"; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
109 elseif (iscell (cond)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
110 err.observed{end+1} = "{}"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
111 err.reason{end+1} = "Expected string, but observed cell"; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
112 else |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
113 err.observed{end+1} = "[]"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
114 err.reason{end+1} = "Expected string, but observed struct"; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
115 end |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
116 elseif (! strcmp (cond, expected)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
117 err.index{end+1} = "[]"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
118 err.observed{end+1} = cond; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
119 err.expected{end+1} = expected; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
120 err.reason{end+1} = "Strings don't match"; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
121 endif |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
122 |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
123 elseif (iscell (expected)) |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
124 if (! iscell (cond) || any (size (cond) != size (expected))) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
125 err.index{end+1} = "{}"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
126 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
127 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
128 err.reason{end+1} = "Cell sizes don't match"; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
129 else |
10549 | 130 try |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
131 ## Recursively compare cell arrays |
10549 | 132 for i = 1:length (expected(:)) |
133 assert (cond{i}, expected{i}, tol); | |
134 endfor | |
135 catch | |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
136 err.index{end+1} = "{}"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
137 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
138 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
139 err.reason{end+1} = "Cell configuration error"; |
10549 | 140 end_try_catch |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
141 endif |
5589 | 142 |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
143 elseif (isstruct (expected)) |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
144 if (! isstruct (cond) || any (size (cond) != size (expected)) |
10549 | 145 || rows (fieldnames (cond)) != rows (fieldnames (expected))) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
146 err.index{end+1} = "{}"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
147 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
148 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
149 err.reason{end+1} = "Structure sizes don't match"; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
150 else |
10549 | 151 try |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
152 empty = isempty (cond); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
153 normal = (numel (cond) == 1); |
10549 | 154 for [v, k] = cond |
155 if (! isfield (expected, k)) | |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
156 err.index{end+1} = "."; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
157 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
158 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
159 err.reason{end+1} = ["'" k "'" " is not an expected field"]; |
10549 | 160 endif |
161 if (empty) | |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
162 v = {}; |
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
163 elseif (normal) |
10549 | 164 v = {v}; |
165 else | |
166 v = v(:)'; | |
167 endif | |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
168 ## Recursively call assert for struct array values |
10549 | 169 assert (v, {expected.(k)}, tol); |
170 endfor | |
171 catch | |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
172 err.index{end+1} = "."; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
173 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
174 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
175 err.reason{end+1} = "Structure configuration error"; |
10549 | 176 end_try_catch |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
177 endif |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
178 |
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
179 elseif (ndims (cond) != ndims (expected) |
10549 | 180 || any (size (cond) != size (expected))) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
181 err.index{end+1} = "."; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
182 err.observed{end+1} = ["O(" sprintf("%dx", size(cond))(1:end-1) ")"]; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
183 err.expected{end+1} = ["E(" sprintf("%dx", size(expected))(1:end-1) ")"]; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
184 err.reason{end+1} = "Dimensions don't match"; |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
185 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
186 else # Numeric comparison |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
187 if (nargin < 3) |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
188 ## Without explicit tolerance, be more strict. |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
189 if (! strcmp (class (cond), class (expected))) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
190 err.index{end+1} = "()"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
191 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
192 err.expected{end+1} = "E"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
193 err.reason{end+1} = ["Class " class(cond) " != " class(expected)]; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
194 elseif (isnumeric (cond)) |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
195 if (issparse (cond) != issparse (expected)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
196 err.index{end+1} = "()"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
197 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
198 err.expected{end+1} = "E"; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
199 if (issparse (cond)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
200 err.reason{end+1} = "sparse != non-sparse"; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
201 else |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
202 err.reason{end+1} = "non-sparse != sparse"; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
203 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
204 elseif (iscomplex (cond) != iscomplex (expected)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
205 err.index{end+1} = "()"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
206 err.observed{end+1} = "O"; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
207 err.expected{end+1} = "E"; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
208 if (iscomplex (cond)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
209 err.reason{end+1} = "complex != real"; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
210 else |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
211 err.reason{end+1} = "real != complex"; |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
212 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
213 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
214 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
215 endif |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
216 |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
217 if (isempty (err.index)) |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
218 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
219 A = cond; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
220 B = expected; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
221 |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
222 ## Check exceptional values. |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
223 erridx = find ( isna (real (A)) != isna (real (B)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
224 | isna (imag (A)) != isna (imag (B))); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
225 if (! isempty (erridx)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
226 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
227 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
228 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
229 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
230 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
231 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
232 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
233 cellstr (repmat ("'NA' mismatch", length (erridx), 1)); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
234 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
235 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
236 erridx = find ( isnan (real (A)) != isnan (real (B)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
237 | isnan (imag (A)) != isnan (imag (B))); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
238 if (! isempty (erridx)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
239 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
240 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
241 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
242 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
243 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
244 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
245 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
246 cellstr (repmat ("'NaN' mismatch", length (erridx), 1)); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
247 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
248 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
249 erridx = find (((isinf (real (A)) | isinf (real (B))) ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
250 & real (A) != real (B)) ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
251 | ((isinf (imag (A)) | isinf (imag (B))) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
252 & imag (A) != imag (B))); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
253 if (! isempty (erridx)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
254 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
255 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
256 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
257 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
258 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
259 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
260 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
261 cellstr (repmat ("'Inf' mismatch", length (erridx), 1)); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
262 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
263 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
264 ## Check normal values. |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
265 ## Replace exceptional values already checked above by zero. |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
266 A_null_real = real (A); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
267 B_null_real = real (B); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
268 exclude = ! isfinite (A_null_real) & ! isfinite (B_null_real); |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
269 A_null_real(exclude) = 0; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
270 B_null_real(exclude) = 0; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
271 A_null_imag = imag (A); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
272 B_null_imag = imag (B); |
17260
dac81d4b8ce1
assert.m: Fix typo stopping comparison of imaginary non-infinite values.
Rik <rik@octave.org>
parents:
17259
diff
changeset
|
273 exclude = ! isfinite (A_null_imag) & ! isfinite (B_null_imag); |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
274 A_null_imag(exclude) = 0; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
275 B_null_imag(exclude) = 0; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
276 A_null = complex (A_null_real, A_null_imag); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
277 B_null = complex (B_null_real, B_null_imag); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
278 if (isscalar (tol)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
279 mtol = repmat (tol, size (A)); |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
280 else |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
281 mtol = tol; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
282 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
283 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
284 k = (mtol == 0); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
285 erridx = find ((A_null != B_null) & k); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
286 if (! isempty (erridx)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
287 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
288 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
289 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
290 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
291 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
292 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
293 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
294 ostrsplit (deblank (sprintf ("Abs err %g exceeds tol %g\n", ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
295 [abs(A_null(erridx) - B_null(erridx)) mtol(erridx)]')), "\n"); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
296 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
297 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
298 k = (mtol > 0); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
299 erridx = find ((abs (A_null - B_null) > mtol) & k); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
300 if (! isempty (erridx)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
301 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
302 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
303 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
304 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
305 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
306 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
307 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
308 ostrsplit (deblank (sprintf ("Abs err %g exceeds tol %g\n", ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
309 [abs(A_null(erridx) - B_null(erridx)) mtol(erridx)]')), "\n"); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
310 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
311 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
312 k = (mtol < 0); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
313 if (any (k)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
314 ## Test for absolute error where relative error can't be calculated. |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
315 erridx = find ((B_null == 0) & abs (A_null) > abs (mtol) & k); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
316 if (! isempty (erridx)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
317 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
318 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
319 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
320 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
321 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
322 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
323 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
324 ostrsplit (deblank (sprintf ("Abs err %g exceeds tol %g\n", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
325 [abs(A_null(erridx) - B_null(erridx)) -mtol(erridx)]')), "\n"); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
326 endif |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
327 ## Test for relative error |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
328 Bdiv = Inf (size (B_null)); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
329 Bdiv(k & (B_null != 0)) = B_null(k & (B_null != 0)); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
330 relerr = abs ((A_null - B_null) ./ abs (Bdiv)); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
331 erridx = find ((relerr > abs (mtol)) & k); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
332 if (! isempty (erridx)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
333 err.index(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
334 ind2tuple (size (A), erridx); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
335 err.observed(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
336 strtrim (cellstr (num2str (A(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
337 err.expected(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
338 strtrim (cellstr (num2str (B(erridx) (:)))); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
339 err.reason(end+1:end + length (erridx)) = ... |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
340 ostrsplit (deblank (sprintf ("Rel err %g exceeds tol %g\n", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
341 [relerr(erridx) -mtol(erridx)]')), "\n"); |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
342 endif |
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
343 endif |
5589 | 344 endif |
9447
bb2ae2210e37
relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents:
9313
diff
changeset
|
345 |
5589 | 346 endif |
347 | |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
348 ## Print any errors |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
349 if (! isempty (err.index)) |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
350 if (! isempty (errmsg)) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
351 errmsg = [errmsg "\n"]; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
352 endif |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
353 errmsg = [errmsg, pprint(in, err)]; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
354 end |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
355 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
356 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
357 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
358 if (call_depth == 0) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
359 ## Last time through. If there were any errors on any pass, raise a flag. |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
360 if (! isempty (errmsg)) |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
361 error (errmsg); |
7770
c6a1a217ac3c
Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents:
7703
diff
changeset
|
362 endif |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
363 else |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
364 call_depth--; |
5589 | 365 endif |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
366 |
5589 | 367 endfunction |
368 | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
369 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
370 ## empty input |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
371 %!assert ([]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
372 %!assert (zeros (3,0), zeros (3,0)) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
373 %!error assert (zeros (3,0), zeros (0,2)) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
374 %!error assert (zeros (3,0), []) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
375 %!error <Dimensions don't match> assert (zeros (2,0,2), zeros (2,0)) |
5589 | 376 |
377 ## conditions | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
378 %!assert (isempty ([])) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
379 %!assert (1) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
380 %!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
|
381 %!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
|
382 %!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
|
383 %!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
|
384 %!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
|
385 %!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
|
386 %!error assert ([1,0;1,1]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
387 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
388 ## scalars |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
389 %!error assert (3, [3,3; 3,3]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
390 %!error assert ([3,3; 3,3], 3) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
391 %!assert (3, 3) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
392 %!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
|
393 %!assert (3, 3+eps, eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
394 %!error assert (3+2*eps, 3, eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
395 %!error assert (3, 3+2*eps, eps) |
5589 | 396 |
397 ## vectors | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
398 %!assert ([1,2,3],[1,2,3]); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
399 %!assert ([1;2;3],[1;2;3]); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
400 %!error assert ([2,2,3,3],[1,2,3,4]); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
401 %!error assert ([6;6;7;7],[5;6;7;8]); |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
402 %!error assert ([1,2,3],[1;2;3]); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
403 %!error assert ([1,2],[1,2,3]); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
404 %!error assert ([1;2;3],[1;2]); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
405 %!assert ([1,2;3,4],[1,2;3,4]); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
406 %!error assert ([1,4;3,4],[1,2;3,4]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
407 %!error assert ([1,3;2,4;3,5],[1,2;3,4]) |
5589 | 408 |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
409 ## matrices |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
410 %!test |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
411 %! A = [1 2 3]'*[1,2]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
412 %! assert (A,A); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
413 %! fail ("assert (A.*(A!=2),A)"); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
414 %! 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:
17178
diff
changeset
|
415 %! Y = X; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
416 %! Y (1,2,3) = 1; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
417 %! fail ("assert (X,Y)"); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
418 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
419 ## 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
|
420 %!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
|
421 %!assert (100, 100+100*eps, -2*eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
422 %!error assert (100+300*eps, 100, -2*eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
423 %!error assert (100, 100+300*eps, -2*eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
424 %!error assert (3, [3,3]) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
425 %!error assert (3, 4) |
5589 | 426 |
7027 | 427 ## test relative vs. absolute tolerances |
428 %!test assert (0.1+eps, 0.1, 2*eps); # accept absolute | |
429 %!error assert (0.1+eps, 0.1, -2*eps); # fail relative | |
430 %!test assert (100+100*eps, 100, -2*eps); # accept relative | |
431 %!error assert (100+100*eps, 100, 2*eps); # fail absolute | |
432 | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
433 ## exceptional values |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
434 %!assert ([NaN, NA, Inf, -Inf, 1+eps, eps], [NaN, NA, Inf, -Inf, 1, 0], eps) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
435 %!error assert (NaN, 1) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
436 %!error assert ([NaN 1], [1 NaN]) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
437 %!error assert (NA, 1) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
438 %!error assert ([NA 1]', [1 NA]') |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
439 %!error assert ([(complex (NA, 1)) (complex (2, NA))], [(complex (NA, 2)) 2]) |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
440 %!error assert (-Inf, Inf) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
441 %!error assert ([-Inf Inf], [Inf -Inf]) |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
442 %!error 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
|
443 |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
444 ## strings |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
445 %!assert ("dog", "dog") |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
446 %!error assert ("dog", "cat") |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
447 %!error assert ("dog", 3) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
448 %!error assert (3, "dog") |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
449 %!error assert (cellstr ("dog"), "dog") |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
450 %!error assert (cell2struct ({"dog"; 3}, {"pet", "age"}, 1), "dog"); |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
451 |
5589 | 452 ## structures |
453 %!shared x,y | |
454 %! x.a = 1; x.b=[2, 2]; | |
455 %! y.a = 1; y.b=[2, 2]; | |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
456 %!assert (x, y) |
5589 | 457 %!test y.b=3; |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
458 %!error assert (x, y) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
459 %!error assert (3, x) |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
460 %!error assert (x, 3) |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
461 %!test |
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
462 %! # Empty structures |
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
463 %! x = resize (x, 0, 1); |
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
464 %! y = resize (y, 0, 1); |
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
465 %! assert (x, y); |
5589 | 466 |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
467 ## cell arrays |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
468 %!test |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
469 %! 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
|
470 %! y = x; |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
471 %! assert (x, y); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
472 %! 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
|
473 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
474 %! 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
|
475 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
476 %! 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
|
477 %! fail ("assert (x, y)"); |
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
478 %! 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
|
479 %! fail ("assert (x, y)"); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
480 %! 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:
17178
diff
changeset
|
481 %! fail ("assert (x, y)"); |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
482 |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
483 ## variable tolerance |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
484 %!test |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
485 %! x = [-40:0]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
486 %! 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:
17178
diff
changeset
|
487 %! y2 = 10.^(2*x); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
488 %! assert (y1, y2, eps (y1)); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
489 %! 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:
17178
diff
changeset
|
490 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
491 ## test input validation |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
492 %!error assert () |
14070
c2c18e2e7c9c
assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents:
14038
diff
changeset
|
493 %!error assert (1,2,3,4) |
12882
724bb6b7e3d5
assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents:
12632
diff
changeset
|
494 |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
495 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
496 ## Convert all error indices into tuple format |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
497 function cout = ind2tuple (matsize, erridx) |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
498 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
499 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:
17178
diff
changeset
|
500 tmp = cell (1, numel (matsize)); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
501 [tmp{:}] = ind2sub (matsize, erridx (:)); |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
502 subs = [tmp{:}]; |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
503 if (numel (matsize) == 2) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
504 subs = subs(:, matsize != 1); |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
505 endif |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
506 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:
17178
diff
changeset
|
507 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:
17178
diff
changeset
|
508 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:
17178
diff
changeset
|
509 endfor |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
510 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
511 endfunction |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
512 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
513 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
514 ## Pretty print the various errors in a condensed tabular format. |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
515 function str = pprint (in, err) |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
516 |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
517 str = ["ASSERT errors for: assert " in "\n"]; |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
518 str = [str, "\n Location | Observed | Expected | Reason\n"]; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
519 for i = 1:length (err.index) |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
520 leni = length (err.index{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
521 leno = length (err.observed{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
522 lene = length (err.expected{i}); |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
523 str = [str, sprintf("%*s%*s %*s%*s %*s%*s %s\n", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
524 6+fix(leni/2), err.index{i} , 6-fix(leni/2), "", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
525 6+fix(leno/2), err.observed{i}, 6-fix(leno/2), "", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
526 6+fix(lene/2), err.expected{i}, 6-fix(lene/2), "", |
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
527 err.reason{i})]; |
17258
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
528 endfor |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
529 |
afd235a206a2
Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
17178
diff
changeset
|
530 endfunction |
17259
684ccccbc15d
assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents:
17258
diff
changeset
|
531 |