Mercurial > hg > octave-nkf

annotate scripts/testfun/assert.m @ 18620:b83fca22bb4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 07 Mar 2014 13:02:43 -0500
parents fcd87f68af4f 06970f4625b8
children f27140dd13a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17744
d63878346099 maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents: 17690
diff changeset
1 ## Copyright (C) 2000-2013 Paul Kienzle
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
2 ##
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
3 ## This file is part of Octave.
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
4 ##
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
6 ## under the terms of the GNU General Public License as published by
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
8 ## your option) any later version.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
9 ##
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
13 ## General Public License for more details.
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
14 ##
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6494
diff changeset
17 ## <http://www.gnu.org/licenses/>.
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
18
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
330672f4daaa fix texinfo bug
Thorsten Meyer <thorsten.meyier@gmx.de>
parents: 9051
diff changeset
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
28 ##
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
29 ## @table @code
17170
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
36 ##
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
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
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: 17170
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: 17170
diff changeset
52 ## and tests are performed on an element-wise basis.
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
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
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
55 ## @end deftypefn
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
56
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
57 function assert (cond, varargin)
6494
76a1a953533d [project @ 2007-04-05 16:09:03 by jwe]
jwe
parents: 6455
diff changeset
58
18438
7994d3ce6e8e assert.m: Fix regression and accept more than 3 arguments for certain cases (bug #41332).
Rik <rik@octave.org>
parents: 17907
diff changeset
59 if (nargin == 0)
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
60 print_usage ();
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
61 endif
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
62
17253
e3870f594d8b assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17252
diff changeset
63 persistent call_depth = -1;
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
64 persistent errmsg;
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
65
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
66 unwind_protect
6494
76a1a953533d [project @ 2007-04-05 16:09:03 by jwe]
jwe
parents: 6455
diff changeset
67
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
68 call_depth++;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
69
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
70 if (call_depth == 0)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
71 errmsg = "";
7770
c6a1a217ac3c Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents: 7703
diff changeset
72 endif
c6a1a217ac3c Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents: 7703
diff changeset
73
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
74 if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1})))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
75 if ((! isnumeric (cond) && ! islogical (cond)) || ! all (cond(:)))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
76 if (nargin == 1)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
77 ## Perhaps, say which elements failed?
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
78 argin = ["(" strjoin(cellstr (argn), ",") ")"];
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
79 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
80 else
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
81 error (varargin{:});
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
82 endif
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
83 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
84 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
85 expected = varargin{1};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
86 if (nargin < 3)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
87 tol = 0;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
88 elseif (nargin == 3)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
89 tol = varargin{2};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
90 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
91 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
92 endif
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
93
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
94 ## 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: 18438
diff changeset
95 err.index = {};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
96 err.observed = {};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
97 err.expected = {};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
98 err.reason = {};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
99
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
100 if (ischar (expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
101 if (! ischar (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
102 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
103 err.expected{end+1} = expected;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
104 if (isnumeric (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
105 err.observed{end+1} = num2str (cond);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
106 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: 18438
diff changeset
107 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
108 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
109 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: 18438
diff changeset
110 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
111 elseif (! strcmp (cond, expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
112 err.index{end+1} = "[]";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
113 err.observed{end+1} = cond;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
114 err.expected{end+1} = expected;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
115 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: 18438
diff changeset
116 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
117
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
118 elseif (iscell (expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
119 if (! iscell (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
120 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
121 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
122 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
123 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: 18438
diff changeset
124 elseif (ndims (cond) != ndims (expected)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
125 || any (size (cond) != size (expected)))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
126 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
127 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: 18438
diff changeset
128 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: 18438
diff changeset
129 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: 18438
diff changeset
130 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
131 try
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
132 ## Recursively compare cell arrays
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
133 for i = 1:length (expected(:))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
134 assert (cond{i}, expected{i}, tol);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
135 endfor
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
136 catch
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
137 err.index{end+1} = "{}";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
138 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
139 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
140 err.reason{end+1} = "Cell configuration error";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
141 end_try_catch
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
142 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
143
18616
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
144 elseif (is_function_handle (expected))
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
145 if (! is_function_handle (cond))
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
146 err.index{end+1} = "@";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
147 err.observed{end+1} = "O";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
148 err.expected{end+1} = "E";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
149 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: 18615
diff changeset
150 elseif (! isequal (cond, expected))
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
151 err.index{end+1} = "@";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
152 err.observed{end+1} = "O";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
153 err.expected{end+1} = "E";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
154 err.reason{end+1} = "Function handles don't match";
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
155 endif
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
156
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
157 elseif (isstruct (expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
158 if (! isstruct (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
159 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
160 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
161 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
162 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: 18438
diff changeset
163 elseif (ndims (cond) != ndims (expected)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
164 || any (size (cond) != size (expected))
18620
b83fca22bb4c maint: Periodic merge of gui-release to default.
John W. Eaton <jwe@octave.org>
parents: 18606 18616
diff changeset
165 || numfields (cond) != numfields (expected))
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
166
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
167 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
168 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: 18438
diff changeset
169 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: 18438
diff changeset
170 err.reason{end+1} = "Structure sizes don't match";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
171 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
172 try
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
173 empty = isempty (cond);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
174 normal = (numel (cond) == 1);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
175 for [v, k] = cond
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
176 if (! isfield (expected, k))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
177 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
178 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
179 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
180 err.reason{end+1} = ["'" k "'" " is not an expected field"];
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
181 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
182 if (empty)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
183 v = {};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
184 elseif (normal)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
185 v = {v};
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
186 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
187 v = v(:)';
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
188 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
189 ## Recursively call assert for struct array values
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
190 assert (v, {expected.(k)}, tol);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
191 endfor
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
192 catch
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
193 err.index{end+1} = ".";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
194 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
195 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
196 err.reason{end+1} = "Structure configuration error";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
197 end_try_catch
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
198 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
199
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
200 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
201 || 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
202 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
203 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
204 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
205 err.reason{end+1} = "Dimensions don't match";
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
206
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
207 else # Numeric comparison
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
208 if (nargin < 3)
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
209 ## Without explicit tolerance, be more strict.
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
210 if (! strcmp (class (cond), class (expected)))
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
211 err.index{end+1} = "()";
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
212 err.observed{end+1} = "O";
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
213 err.expected{end+1} = "E";
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
214 err.reason{end+1} = ["Class " class(cond) " != " class(expected)];
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
215 elseif (isnumeric (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
216 if (issparse (cond) != issparse (expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
217 err.index{end+1} = "()";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
218 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
219 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
220 if (issparse (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
221 err.reason{end+1} = "sparse != non-sparse";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
222 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
223 err.reason{end+1} = "non-sparse != sparse";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
224 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
225 elseif (iscomplex (cond) != iscomplex (expected))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
226 err.index{end+1} = "()";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
227 err.observed{end+1} = "O";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
228 err.expected{end+1} = "E";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
229 if (iscomplex (cond))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
230 err.reason{end+1} = "complex != real";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
231 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
232 err.reason{end+1} = "real != complex";
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
233 endif
9447
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
234 endif
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
235 endif
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
236 endif
7770
c6a1a217ac3c Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents: 7703
diff changeset
237
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
238 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
239
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
240 A = cond;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
241 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
242
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
243 ## Check exceptional values.
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
244 errvec = ( isna (real (A)) != isna (real (B))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
245 | isna (imag (A)) != isna (imag (B)));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
246 erridx = find (errvec);
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
247 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
248 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
249 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
250 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
251 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
252 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
253 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
254 err.reason(end+1:end+length (erridx)) = ...
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
255 repmat ({"'NA' mismatch"}, length (erridx), 1);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
256 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
257 errseen = errvec;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
258
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
259 errvec = ( isnan (real (A)) != isnan (real (B))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
260 | isnan (imag (A)) != isnan (imag (B)));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
261 erridx = find (errvec & !errseen);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
262 if (! isempty (erridx))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
263 err.index(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
264 ind2tuple (size (A), erridx);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
265 err.observed(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
266 strtrim (cellstr (num2str (A(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
267 err.expected(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
268 strtrim (cellstr (num2str (B(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
269 err.reason(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
270 repmat ({"'NaN' mismatch"}, length (erridx), 1);
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
271 endif
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
272 errseen |= errvec;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
273
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
274 errvec = ((isinf (real (A)) | isinf (real (B))) ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
275 & (real (A) != real (B))) ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
276 | ((isinf (imag (A)) | isinf (imag (B))) ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
277 & (imag (A) != imag (B)));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
278 erridx = find (errvec & !errseen);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
279 if (! isempty (erridx))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
280 err.index(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
281 ind2tuple (size (A), erridx);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
282 err.observed(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
283 strtrim (cellstr (num2str (A(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
284 err.expected(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
285 strtrim (cellstr (num2str (B(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
286 err.reason(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
287 repmat ({"'Inf' mismatch"}, length (erridx), 1);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
288 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
289 errseen |= errvec;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
290
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
291 ## Check normal values.
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
292 ## 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: 18438
diff changeset
293 A_null_real = real (A);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
294 B_null_real = real (B);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
295 exclude = errseen | ! isfinite (A_null_real) & ! isfinite (B_null_real);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
296 A_null_real(exclude) = 0;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
297 B_null_real(exclude) = 0;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
298 A_null_imag = imag (A);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
299 B_null_imag = imag (B);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
300 exclude = errseen | ! isfinite (A_null_imag) & ! isfinite (B_null_imag);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
301 A_null_imag(exclude) = 0;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
302 B_null_imag(exclude) = 0;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
303 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: 18438
diff changeset
304 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: 18438
diff changeset
305 if (isscalar (tol))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
306 mtol = tol * ones (size (A));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
307 else
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
308 mtol = tol;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
309 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
310
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
311 k = (mtol == 0);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
312 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
313 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
314 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
315 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
316 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
317 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
318 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
319 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
320 err.reason(end+1:end+length (erridx)) = ...
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
321 ostrsplit (deblank (sprintf ("Abs err %.5g exceeds tol %.5g\n",...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
322 [abs(A_null(erridx) - B_null(erridx))(:) mtol(erridx)(:)]')), "\n");
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
323 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
324
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
325 k = (mtol > 0);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
326 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: 18438
diff changeset
327 if (! isempty (erridx))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
328 err.index(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
329 ind2tuple (size (A), erridx);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
330 err.observed(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
331 strtrim (cellstr (num2str (A(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
332 err.expected(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
333 strtrim (cellstr (num2str (B(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
334 err.reason(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
335 ostrsplit (deblank (sprintf ("Abs err %.5g exceeds tol %.5g\n",...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
336 [abs(A_null(erridx) - B_null(erridx))(:) mtol(erridx)(:)]')), "\n");
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
337 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
338
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
339 k = (mtol < 0);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
340 if (any (k(:)))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
341 ## 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: 18438
diff changeset
342 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: 18438
diff changeset
343 if (! isempty (erridx))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
344 err.index(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
345 ind2tuple (size (A), erridx);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
346 err.observed(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
347 strtrim (cellstr (num2str (A(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
348 err.expected(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
349 strtrim (cellstr (num2str (B(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
350 err.reason(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
351 ostrsplit (deblank (sprintf ("Abs err %.5g exceeds tol %.5g\n",
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
352 [abs(A_null(erridx) - B_null(erridx)) -mtol(erridx)]')), "\n");
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
353 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
354 ## Test for relative error
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
355 Bdiv = Inf (size (B_null));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
356 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: 18438
diff changeset
357 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: 18438
diff changeset
358 erridx = find ((relerr > abs (mtol)) & k);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
359 if (! isempty (erridx))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
360 err.index(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
361 ind2tuple (size (A), erridx);
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
362 err.observed(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
363 strtrim (cellstr (num2str (A(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
364 err.expected(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
365 strtrim (cellstr (num2str (B(erridx) (:))));
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
366 err.reason(end+1:end+length (erridx)) = ...
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
367 ostrsplit (deblank (sprintf ("Rel err %.5g exceeds tol %.5g\n",
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
368 [relerr(erridx)(:) -mtol(erridx)(:)]')), "\n");
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
369 endif
9447
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
370 endif
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
371 endif
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
372
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
373 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
374
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
375 ## Print any errors
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
376 if (! isempty (err.index))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
377 argin = ["(" strjoin(cellstr (argn), ",") ")"];
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
378 if (! isempty (errmsg))
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
379 errmsg = [errmsg "\n"];
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
380 endif
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
381 errmsg = [errmsg, pprint(argin, err)];
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
382 endif
9447
bb2ae2210e37 relax assert for exact matches
Jaroslav Hajek <highegg@gmail.com>
parents: 9313
diff changeset
383
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
384 endif
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
385
18615
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
386 unwind_protect_cleanup
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
387 call_depth--;
9472e3c8f43e prevent interrupt from causing assert to fail (bug #41756)
John W. Eaton <jwe@octave.org>
parents: 18438
diff changeset
388 end_unwind_protect
17253
e3870f594d8b assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17252
diff changeset
389
e3870f594d8b assert.m: Fix recursive calls.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17252
diff changeset
390 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
391 ## 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
392 if (! isempty (errmsg))
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
393 error (errmsg);
7770
c6a1a217ac3c Compatibility fix for assert
David Bateman <dbateman@free.fr>
parents: 7703
diff changeset
394 endif
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
395 endif
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
396
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
397 endfunction
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
398
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
399
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
400 ## empty input
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
401 %!assert ([])
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
402 %!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
403 %!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
404 %!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
405 %!error <Dimensions don't match> assert (zeros (2,0,2), zeros (2,0))
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
406
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
407 ## conditions
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
408 %!assert (isempty ([]))
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
409 %!assert (1)
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
410 %!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
411 %!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
412 %!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
413 %!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
414 %!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
415 %!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
416 %!error assert ([1,0;1,1])
18438
7994d3ce6e8e assert.m: Fix regression and accept more than 3 arguments for certain cases (bug #41332).
Rik <rik@octave.org>
parents: 17907
diff changeset
417 %!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
418 %!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
419
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
420 ## scalars
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
421 %!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
422 %!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
423 %!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
424 %!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
425 %!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
426 %!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
427 %!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
428 %!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
429 %!error <Abs err 4.4409e-0?16 exceeds tol> assert (3, 3+2*eps, eps)
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
430
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
431 ## vectors
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
432 %!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
433 %!assert ([1;2;3],[1;2;3]);
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
434 %!error <Abs err 1 exceeds tol 0> assert ([2,2,3,3],[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
435 %!error <Abs err 1 exceeds tol 0.5> assert ([2,2,3,3],[1,2,3,4],0.5);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
436 %!error <Rel err 1 exceeds tol 0.1> assert ([2,2,3,5],[1,2,3,4],-0.1);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
437 %!error <Abs err 1 exceeds tol 0> assert ([6;6;7;7],[5;6;7;8]);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
438 %!error <Abs err 1 exceeds tol 0.5> assert ([6;6;7;7],[5;6;7;8],0.5);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
439 %!error <Rel err .* exceeds tol 0.1> assert ([6;6;7;7],[5;6;7;8],-0.1);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
440 %!error <Dimensions don't match> assert ([1,2,3],[1;2;3]);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
441 %!error <Dimensions don't match> assert ([1,2],[1,2,3]);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
442 %!error <Dimensions don't match> assert ([1;2;3],[1;2]);
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
443
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
444 ## matrices
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
445 %!assert ([1,2;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
446 %!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
447 %!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
448 %!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
449 %! 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
450 %! 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
451 %! 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
452 %!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
453 %! 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
454 %! Y = X;
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
455 %! 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
456 %! 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
457
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
458 ## 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
459 %!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
460 %!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
461 %!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
462 %!error <Rel err .* exceeds tol> assert (100, 100+300*eps, -2*eps)
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
463
7027
3e2a59c78b9d [project @ 2007-10-15 08:22:54 by dbateman]
dbateman
parents: 7017
diff changeset
464 ## test relative vs. absolute tolerances
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
465 %!test assert (0.1+eps, 0.1, 2*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
466 %!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
467 %!test assert (100+100*eps, 100, -2*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
468 %!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
469
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
470 ## 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
471 %!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
472
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
473 ## 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
474 %!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
475 %!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
476 %!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
477 %!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
478 %!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
479 %!error <real != complex> assert (1, 1+i)
7027
3e2a59c78b9d [project @ 2007-10-15 08:22:54 by dbateman]
dbateman
parents: 7017
diff changeset
480
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
481 ## exceptional values
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
482 %!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
483
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
484 %!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
485 %!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
486 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
487 %! try
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
488 %! 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
489 %! catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
490 %! errmsg = lasterr ();
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
491 %! 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
492 %! 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
493 %! 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
494 %! 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
495 %! 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
496 %! 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
497 %! endif
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
498 %! end_try_catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
499
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
500 %!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
501 %!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
502 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
503 %! try
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
504 %! 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
505 %! catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
506 %! errmsg = lasterr ();
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
507 %! 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
508 %! 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
509 %! 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
510 %! 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
511 %! 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
512 %! 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
513 %! endif
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
514 %! 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
515 %!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
516
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
517 %!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
518 %!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
519 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
520 %! try
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
521 %! 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
522 %! catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
523 %! errmsg = lasterr ();
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
524 %! 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
525 %! 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
526 %! 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
527 %! 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
528 %! endif
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
529 %! end_try_catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
530 %!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
531
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
532 ## strings
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
533 %!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
534 %!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
535 %!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
536 %!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
537 %!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
538 %!error <Expected string, but observed struct> assert (struct ("dog", 3), "dog")
5589
f812a0680d05 [project @ 2006-01-06 00:14:42 by jwe]
jwe
parents:
diff changeset
539
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
540 ## cell arrays
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
541 %!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
542 %!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
543 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
544 %! 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
545 %! y = x;
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
546 %! assert (x,y);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
547 %! 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
548 %! 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
549
18616
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
550 ## function handles
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
551 %!assert (@sin, @sin)
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
552 %!error <Function handles don't match> assert (@sin, @cos)
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
553 %!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: 18615
diff changeset
554 %!error <Class function_handle != double> assert (@sin, pi)
06970f4625b8 assert.m: allow assertions for function handles
John W. Eaton <jwe@octave.org>
parents: 18615
diff changeset
555
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
556 %!test
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
557 %! 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
558 %! y = x;
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
559 %! assert (x, y);
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
560 %! 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
561 %! fail ("assert (x, y)");
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
562 %! 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
563 %! fail ("assert (x, y)");
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
564 %! 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
565 %! fail ("assert (x, y)");
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
566 %! 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
567 %! 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
568 %! 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
569 %! fail ("assert (x, y)");
12882
724bb6b7e3d5 assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents: 12632
diff changeset
570
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
571 ## structures
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
572 %!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
573 %!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
574 %! 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
575 %! y(1,2).a = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
576 %! 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
577 %!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
578 %! 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
579 %! 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
580 %! 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
581 %!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
582 %! x.a = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
583 %! x.b = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
584 %! y.a = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
585 %! 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
586 %!error <'b' is not an expected field>
17314
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
587 %! x.b = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
588 %! y.a = 1;
7f27a3cbdb41 Use Octave coding convention of 1 space after '%!' test prefix.
Rik <rik@octave.org>
parents: 17306
diff changeset
589 %! 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
590
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
591 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
592 %! 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
593 %! 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
594 %! assert (x, y);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
595 %! y.b=3;
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
596 %! 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
597 %! 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
598 %! 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
599 %! ## Empty structures
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
600 %! 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
601 %! 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
602 %! assert (x, y);
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
603
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
604 ## 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
605 %!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
606 %! 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
607 %! 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
608 %! 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: 17170
diff changeset
609 %! 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: 17170
diff changeset
610 %! 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
611
17255
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
612 ## Multiple tolerances
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
613 %!test
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
614 %! 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
615 %! 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
616 %! 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
617 %! try
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
618 %! 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
619 %! catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
620 %! errmsg = lasterr ();
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
621 %! 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
622 %! 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
623 %! endif
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
624 %! assert (!isempty (regexp (errmsg, '\(1,2\).*Abs err 3 exceeds tol 0\>')));
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
625 %! assert (!isempty (regexp (errmsg, '\(2,2\).*Abs err 2 exceeds tol 0.3')));
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
626 %! assert (!isempty (regexp (errmsg, '\(1,1\).*Abs err 1 exceeds tol 0.1')));
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
627 %! assert (!isempty (regexp (errmsg, '\(2,1\).*Rel err 2 exceeds tol 0.2')));
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
628 %! end_try_catch
a28c0d73e253 assert.m: Added many more %!tests for function. Fixed multiple bugs discovered.
Rik <rik@octave.org>
parents: 17253
diff changeset
629
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
630 ## test input validation
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
631 %!error assert ()
14070
c2c18e2e7c9c assert.m: Update documentation string, add %!tests for cell arrays.
Rik <octave@nomad.inbox5.com>
parents: 14038
diff changeset
632 %!error assert (1,2,3,4)
12882
724bb6b7e3d5 assert.m: Correctly compare empty structures.
Rik <octave@nomad.inbox5.com>
parents: 12632
diff changeset
633
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
634
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
635 ## Convert all error indices into tuple format
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
636 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
637
afd235a206a2 Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17170
diff changeset
638 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
639 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: 17170
diff changeset
640 [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: 17170
diff changeset
641 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
642 if (numel (matsize) == 2)
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
643 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
644 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
645 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
646 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
647 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
648 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
649
afd235a206a2 Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17170
diff changeset
650 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
651
afd235a206a2 Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17170
diff changeset
652
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 ## 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
654 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
655
17467
b8ecdb6ce2f8 assert.m: Speed up function by ~16% by not pre-calculating warning message.
Rik <rik@octave.org>
parents: 17314
diff changeset
656 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
657 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
658 for i = 1:length (err.index)
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
659 leni = length (err.index{i});
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
660 leno = length (err.observed{i});
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
661 lene = length (err.expected{i});
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
662 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: 17250
diff changeset
663 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: 17250
diff changeset
664 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: 17250
diff changeset
665 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: 17250
diff changeset
666 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
667 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
668
afd235a206a2 Allow vector/matrix tolerance and improve error messages for assert.m script
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17170
diff changeset
669 endfunction
17251
684ccccbc15d assert.m: Add vector checking for relative errors.
Rik <rik@octave.org>
parents: 17250
diff changeset
670