octave-lyh: scripts/testfun/assert.m annotate

annotate scripts/testfun/assert.m @ 17261:e3870f594d8b

assert.m: Fix recursive calls. * scripts/testfun/assert.m: Initialize call_depth to -1 and always increment call_depth at start of function and decrement call_depth at end of function. Properly indent err.

author	Daniel J Sebald <daniel.sebald@ieee.org>
date	Wed, 14 Aug 2013 16:45:50 -0500
parents	dac81d4b8ce1
children	a28c0d73e253

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

Mercurial > hg > octave-lyh

annotate scripts/testfun/assert.m @ 17261:e3870f594d8b