Mercurial > hg > octave-max
changeset 11472:1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
line wrap: on
line diff
--- a/scripts/@ftp/ftp.m +++ b/scripts/@ftp/ftp.m @@ -17,8 +17,8 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{f}} = ftp (@var{host}) -## @deftypefnx {Function File} {@var{f}} = ftp (@var{host}, @var{username}, @var{password}) +## @deftypefn {Function File} {@var{f} =} ftp (@var{host}) +## @deftypefnx {Function File} {@var{f} =} ftp (@var{host}, @var{username}, @var{password}) ## Connect to the FTP server @var{host} with @var{username} and @var{password}. ## If @var{username} and @var{password} are not specified, user "anonymous" ## with no password is used. The returned FTP object @var{f} represents the
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,117 @@ +2011-01-09 Rik <octave@nomad.inbox5.com> + + * audio/lin2mu.m, audio/loadaudio.m, audio/mu2lin.m, audio/saveaudio.m, + audio/wavwrite.m, deprecated/split.m, deprecated/values.m, + general/accumarray.m, general/bitcmp.m, general/cell2mat.m, + general/circshift.m, general/curl.m, general/divergence.m, + general/genvarname.m, general/interpft.m, general/interpn.m, + general/nextpow2.m, general/polyarea.m, general/repmat.m, + general/rot90.m, general/rotdim.m, general/shiftdim.m, + general/strerror.m, general/trapz.m, geometry/griddata.m, + geometry/griddata3.m, geometry/griddatan.m, geometry/rectint.m, + image/brighten.m, image/colormap.m, image/contrast.m, image/imagesc.m, + image/imfinfo.m, image/imread.m, linear-algebra/commutation_matrix.m, + linear-algebra/condest.m, linear-algebra/cross.m, + linear-algebra/duplication_matrix.m, linear-algebra/isdefinite.m, + linear-algebra/vech.m, miscellaneous/bincoeff.m, miscellaneous/cast.m, + miscellaneous/compare_versions.m, miscellaneous/fileparts.m, + miscellaneous/license.m, miscellaneous/private/__xzip__.m, + miscellaneous/substruct.m, miscellaneous/unpack.m, miscellaneous/xor.m, + optimization/sqp.m, pkg/get_forge_pkg.m, plot/backend.m, + plot/contourc.m, plot/cylinder.m, plot/hidden.m, plot/hold.m, + plot/orient.m, plot/private/__interp_cube__.m, plot/refreshdata.m, + plot/subplot.m, plot/surface.m, plot/surfnorm.m, plot/text.m, + plot/uimenu.m, polynomial/mkpp.m, polynomial/pchip.m, + polynomial/polyfit.m, polynomial/ppval.m, signal/arch_fit.m, + signal/arch_rnd.m, signal/arch_test.m, signal/arma_rnd.m, + signal/autoreg_matrix.m, signal/bartlett.m, signal/blackman.m, + signal/diffpara.m, signal/durbinlevinson.m, signal/fftfilt.m, + signal/fractdiff.m, signal/hamming.m, signal/hanning.m, signal/hurst.m, + signal/sinetone.m, signal/synthesis.m, signal/unwrap.m, + sparse/spaugment.m, specfun/factor.m, specfun/factorial.m, + specfun/legendre.m, specfun/nthroot.m, specfun/primes.m, + special-matrix/hadamard.m, special-matrix/magic.m, + statistics/distributions/betacdf.m, statistics/distributions/betainv.m, + statistics/distributions/betapdf.m, statistics/distributions/betarnd.m, + statistics/distributions/binocdf.m, statistics/distributions/binoinv.m, + statistics/distributions/binopdf.m, statistics/distributions/binornd.m, + statistics/distributions/cauchy_cdf.m, + statistics/distributions/cauchy_inv.m, + statistics/distributions/cauchy_pdf.m, + statistics/distributions/cauchy_rnd.m, + statistics/distributions/chi2cdf.m, statistics/distributions/chi2inv.m, + statistics/distributions/chi2pdf.m, statistics/distributions/chi2rnd.m, + statistics/distributions/discrete_cdf.m, + statistics/distributions/discrete_inv.m, + statistics/distributions/discrete_pdf.m, + statistics/distributions/discrete_rnd.m, + statistics/distributions/empirical_cdf.m, + statistics/distributions/empirical_inv.m, + statistics/distributions/empirical_pdf.m, + statistics/distributions/empirical_rnd.m, + statistics/distributions/expcdf.m, statistics/distributions/expinv.m, + statistics/distributions/exppdf.m, statistics/distributions/exprnd.m, + statistics/distributions/fcdf.m, statistics/distributions/finv.m, + statistics/distributions/fpdf.m, statistics/distributions/frnd.m, + statistics/distributions/gamcdf.m, statistics/distributions/gaminv.m, + statistics/distributions/gampdf.m, statistics/distributions/gamrnd.m, + statistics/distributions/geocdf.m, statistics/distributions/geoinv.m, + statistics/distributions/geopdf.m, statistics/distributions/geornd.m, + statistics/distributions/hygecdf.m, statistics/distributions/hygeinv.m, + statistics/distributions/hygepdf.m, statistics/distributions/hygernd.m, + statistics/distributions/kolmogorov_smirnov_cdf.m, + statistics/distributions/laplace_rnd.m, + statistics/distributions/logistic_rnd.m, + statistics/distributions/logncdf.m, statistics/distributions/logninv.m, + statistics/distributions/lognpdf.m, statistics/distributions/lognrnd.m, + statistics/distributions/nbincdf.m, statistics/distributions/nbininv.m, + statistics/distributions/nbinpdf.m, statistics/distributions/nbinrnd.m, + statistics/distributions/normcdf.m, statistics/distributions/norminv.m, + statistics/distributions/normpdf.m, statistics/distributions/normrnd.m, + statistics/distributions/poisscdf.m, + statistics/distributions/poissinv.m, + statistics/distributions/poisspdf.m, + statistics/distributions/poissrnd.m, + statistics/distributions/stdnormal_cdf.m, + statistics/distributions/stdnormal_rnd.m, + statistics/distributions/tcdf.m, statistics/distributions/tinv.m, + statistics/distributions/tpdf.m, statistics/distributions/trnd.m, + statistics/distributions/unidrnd.m, statistics/distributions/unifcdf.m, + statistics/distributions/unifinv.m, statistics/distributions/unifpdf.m, + statistics/distributions/unifrnd.m, statistics/distributions/wblcdf.m, + statistics/distributions/wblinv.m, statistics/distributions/wblpdf.m, + statistics/distributions/wblrnd.m, statistics/distributions/wienrnd.m, + statistics/models/logistic_regression.m, statistics/tests/anova.m, + statistics/tests/chisquare_test_homogeneity.m, + statistics/tests/cor_test.m, statistics/tests/f_test_regression.m, + statistics/tests/hotelling_test.m, statistics/tests/hotelling_test_2.m, + statistics/tests/kolmogorov_smirnov_test.m, + statistics/tests/kolmogorov_smirnov_test_2.m, + statistics/tests/manova.m, statistics/tests/mcnemar_test.m, + statistics/tests/prop_test_2.m, statistics/tests/sign_test.m, + statistics/tests/t_test.m, statistics/tests/t_test_2.m, + statistics/tests/t_test_regression.m, statistics/tests/u_test.m, + statistics/tests/var_test.m, statistics/tests/welch_test.m, + statistics/tests/wilcoxon_test.m, statistics/tests/z_test.m, + statistics/tests/z_test_2.m, strings/blanks.m, strings/index.m, + strings/strtrunc.m, strings/validatestring.m, time/addtodate.m, + time/datenum.m, time/datetick.m, time/datevec.m: Use uppercase for + variable names in error() strings to match Info documentation. + + * general/interp2.m, image/imshow.m, image/ind2rgb.m, + image/saveimage.m, io/dlmwrite.m, io/strread.m, io/textscan.m, + linear-algebra/expm.m, linear-algebra/krylov.m, linear-algebra/logm.m, + miscellaneous/delete.m, miscellaneous/run.m, plot/__marching_cube__.m, + sparse/bicgstab.m, sparse/cgs.m, strings/strmatch.m, + testfun/rundemos.m, testfun/runtests.m: Rewrite error string + + * @ftp/ftp.m, help/gen_doc_cache.m, miscellaneous/unix.m, + plot/__gnuplot_open_stream__.m, plot/private/__add_default_menu__.m, + polynomial/ppder.m, polynomial/ppint.m, polynomial/ppjumps.m, + signal/periodogram.m: Correct use of @deftypefn macro + + * miscellaneous/paren.m: Space @deffnx macro for readability + 2011-01-09 Rik <octave@nomad.inbox5.com> * general/arrayfun.m, general/blkdiag.m, general/structfun.m,
--- a/scripts/audio/lin2mu.m +++ b/scripts/audio/lin2mu.m @@ -48,7 +48,7 @@ endif elseif (nargin == 2) if (n != 0 && n != 8 && n != 16) - error ("lin2mu: n must be either 0, 8 or 16"); + error ("lin2mu: N must be either 0, 8 or 16"); endif else print_usage ();
--- a/scripts/audio/loadaudio.m +++ b/scripts/audio/loadaudio.m @@ -50,7 +50,7 @@ if (nargin < 3) bps = 8; elseif (bps != 8 && bps != 16) - error ("loadaudio: bps must be either 8 or 16"); + error ("loadaudio: BPS must be either 8 or 16"); endif name = [name, ".", ext];
--- a/scripts/audio/mu2lin.m +++ b/scripts/audio/mu2lin.m @@ -37,7 +37,7 @@ n = 8; elseif (nargin == 2) if (n != 0 && n != 8 && n != 16) - error ("mu2lin: n must be either 0, 8, or 16"); + error ("mu2lin: N must be either 0, 8, or 16"); endif else print_usage ();
--- a/scripts/audio/saveaudio.m +++ b/scripts/audio/saveaudio.m @@ -44,7 +44,7 @@ if (nargin < 4) bps = 8; elseif (bps != 8 && bps != 16) - error ("saveaudio: bps must be either 8 or 16"); + error ("saveaudio: BPS must be either 8 or 16"); endif [nr, nc] = size (x);
--- a/scripts/audio/wavwrite.m +++ b/scripts/audio/wavwrite.m @@ -97,7 +97,7 @@ ## open file for writing binary if (! ischar (filename)) - error ("wavwrite: expecting filename to be a character string"); + error ("wavwrite: expecting FILENAME to be a character string"); endif [fid, msg] = fopen (filename, "wb");
--- a/scripts/deprecated/split.m +++ b/scripts/deprecated/split.m @@ -77,7 +77,7 @@ m = s'; return; elseif (l_s < l_t) - error ("split: s must not be shorter than t"); + error ("split: S must not be shorter than T"); endif if (min (size (s)) != 1 || min (size (t)) != 1) @@ -107,7 +107,7 @@ m(i,1:length(tmp)) = s(tmp); endfor else - error ("split: both s and t must be strings"); + error ("split: both S and T must be strings"); endif else print_usage ();
--- a/scripts/deprecated/values.m +++ b/scripts/deprecated/values.m @@ -45,7 +45,7 @@ endif if (! (isvector (x))) - error ("values: x must be a vector"); + error ("values: X must be a vector"); endif i = any (isnan (x));
--- a/scripts/general/accumarray.m +++ b/scripts/general/accumarray.m @@ -93,7 +93,7 @@ ## Sparse case. Avoid linearizing the subscripts, because it could overflow. if (fillval != 0) - error ("accumarray: fillval must be zero in the sparse case"); + error ("accumarray: FILLVAL must be zero in the sparse case"); endif ## Ensure subscripts are a two-column matrix.
--- a/scripts/general/bitcmp.m +++ b/scripts/general/bitcmp.m @@ -43,7 +43,7 @@ endif if (nargin == 2 && (! isscalar (k) || (floor (k) != k))) - error ("bitcmp: k must be a scalar integer"); + error ("bitcmp: K must be a scalar integer"); endif if (isa (A, "double"))
--- a/scripts/general/cell2mat.m +++ b/scripts/general/cell2mat.m @@ -33,7 +33,7 @@ endif if (! iscell (c)) - error ("cell2mat: c is not a cell array"); + error ("cell2mat: C is not a cell array"); endif nb = numel (c);
--- a/scripts/general/circshift.m +++ b/scripts/general/circshift.m @@ -55,11 +55,11 @@ sz = size (x); if (! isvector (n) && length (n) > nd) - error ("circshift: n must be a vector, no longer than the number of dimension in x"); + error ("circshift: N must be a vector, no longer than the number of dimension in X"); endif if (any (n != floor (n))) - error ("circshift: all values of n must be integers"); + error ("circshift: all values of N must be integers"); endif idx = cell ();
--- a/scripts/general/curl.m +++ b/scripts/general/curl.m @@ -76,12 +76,12 @@ if ((nargin == 4) || (nargin == 2)) if (!size_equal (varargin{fidx}, varargin{fidx + 1})) - error ("curl: size of x and y must match."); + error ("curl: size of X and Y must match."); elseif (ndims (varargin{fidx}) != 2) - error ("curl: expected two-dimensional matrices x and y."); + error ("curl: expected two-dimensional matrices X and Y."); elseif ((length (dx) != columns (varargin{fidx})) || (length (dy) != rows (varargin{fidx}))) - error ("curl: size of dx and dy must match the respective dimension of x and y"); + error ("curl: size of dx and dy must match the respective dimension of X and Y"); endif dFx_dy = gradient (varargin{fidx}.', dy, dx).'; @@ -101,13 +101,13 @@ elseif ((nargin == 6) || (nargin == 3)) if (!size_equal (varargin{fidx}, varargin{fidx + 1}, varargin{fidx + 2})) - error ("curl: size of x, y, and z must match") + error ("curl: size of X, Y, and Z must match") elseif (ndims (varargin{fidx}) != 3) - error ("curl: expected two-dimensional matrices x, y, and z."); + error ("curl: expected two-dimensional matrices X, Y, and Z."); elseif ((length (dx) != size (varargin{fidx}, 2)) || (length (dy) != size (varargin{fidx}, 1)) || (length (dz) != size (varargin{fidx}, 3))) - error ("curl: size of dx, dy, and dz must match the respective dimesion of x, y, and z."); + error ("curl: size of dx, dy, and dz must match the respective dimesion of X, Y, and Z."); endif [~, dFx_dy, dFx_dz] = gradient (varargin{fidx}, dx, dy, dz);
--- a/scripts/general/divergence.m +++ b/scripts/general/divergence.m @@ -73,11 +73,11 @@ if ((nargin == 4) || (nargin == 2)) if (!size_equal (varargin{fidx},varargin{fidx + 1})) - error ("divergence: size of x and y must match."); + error ("divergence: size of X and Y must match."); elseif (ndims (varargin{fidx}) != 2) - error ("divergence: expected two-dimensional matrices x and y."); + error ("divergence: expected two-dimensional matrices X and Y."); elseif ((length (dx) != columns (varargin{fidx})) || (length (dy) != rows (varargin{fidx}))) - error ("divergence: size of dx and dy must match the respective dimension of x and y"); + error ("divergence: size of dx and dy must match the respective dimension of X and Y"); endif retval = gradient(varargin{fidx}, dx, dy); @@ -85,13 +85,13 @@ elseif ((nargin == 6) || (nargin == 3)) if (!size_equal (varargin{fidx},varargin{fidx + 1},varargin{fidx + 2})) - error ("divergence: size of x, y, and z must match") + error ("divergence: size of X, Y, and Z must match") elseif (ndims (varargin{fidx}) != 3) - error ("divergence: expected two-dimensional matrices x, y, and z."); + error ("divergence: expected two-dimensional matrices X, Y, and Z."); elseif ((length (dx) != size (varargin{fidx}, 2)) || (length (dy) != size (varargin{fidx}, 1)) || (length (dz) != size (varargin{fidx}, 3))) - error ("divergence: size of dx, dy, and dz must match the respective dimesion of x, y, and z."); + error ("divergence: size of dx, dy, and dz must match the respective dimesion of X, Y, and Z."); endif ## x-direction
--- a/scripts/general/genvarname.m +++ b/scripts/general/genvarname.m @@ -109,15 +109,15 @@ endif exclusions = {exclusions}; elseif (! iscellstr (exclusions)) - error ("genvarname: exclusions must be a string or a cellstr"); + error ("genvarname: EXCLUSIONS must be a string or a cellstr"); endif if (ischar (str)) if (rows (str) != 1) - error ("genvarname: if more than one str is given, it must be a cellstr"); + error ("genvarname: if more than one STR is given, it must be a cellstr"); endif str = {str}; elseif (! iscellstr (str)) - error ("genvarname: str must be a string or a cellstr"); + error ("genvarname: STR must be a string or a cellstr"); endif validchars = cstrcat ("A":"Z", "a":"z", "0":"9", "_");
--- a/scripts/general/interp2.m +++ b/scripts/general/interp2.m @@ -135,18 +135,18 @@ ## Type checking. if (!ismatrix (Z)) - error ("interp2: expected matrix Z"); + error ("interp2: Z must be a matrix"); endif if (!isempty (n) && !isscalar (n)) - error ("interp2: expected scalar n"); + error ("interp2: N must be a scalar"); endif if (!ischar (method)) - error ("interp2: expected string 'method'"); + error ("interp2: METHOD must be a string"); endif if (ischar (extrapval) || strcmp (extrapval, "extrap")) extrapval = []; elseif (!isscalar (extrapval)) - error ("interp2: expected n extrapval"); + error ("interp2: EXTRAPVAL must be a scalar"); endif ## Define X, Y, XI, YI if needed @@ -156,7 +156,7 @@ Y = 1:zr; endif if (! isnumeric (X) || ! isnumeric (Y)) - error ("interp2: expected numeric X, Y"); + error ("interp2: X, Y must be numeric matrices"); endif if (! isempty (n)) p = 2^n; @@ -164,7 +164,7 @@ YI = (p:p*zr)'/p; endif if (! isnumeric (XI) || ! isnumeric (YI)) - error ("interp2: expected numeric XI, YI"); + error ("interp2: XI, YI must be numeric"); endif @@ -180,7 +180,7 @@ error ("interp2: X and Y must be matrices of same size"); endif if (columns (Z) != length (X) || rows (Z) != length (Y)) - error ("interp2: X and Y size must match Z dimensions"); + error ("interp2: X and Y size must match the dimensions of Z"); endif ## If Xi and Yi are vectors of different orientation build a grid @@ -188,7 +188,7 @@ || (columns (XI) == 1 && rows (YI) == 1)) [XI, YI] = meshgrid (XI, YI); elseif (! size_equal (XI, YI)) - error ("interp2: XI and YI must be matrices of same size"); + error ("interp2: XI and YI must be matrices of equal size"); endif ## if XI, YI are vectors, X and Y should share their orientation. @@ -327,12 +327,12 @@ X = X(:).'; Y = Y(:); if (!isequal ([length(Y), length(X)], size(Z))) - error ("interp2: X and Y size must match Z dimensions"); + error ("interp2: X and Y size must match the dimensions of Z"); endif elseif (!size_equal (X, Y)) - error ("interp2: X and Y must be matrices of same size"); + error ("interp2: X and Y must be matrices of equal size"); if (! size_equal (X, Z)) - error ("interp2: X and Y size must match Z dimensions"); + error ("interp2: X and Y size must match the dimensions of Z"); endif endif @@ -341,7 +341,7 @@ XI = XI(:).'; YI = YI(:); elseif (! size_equal (XI, YI)) - error ("interp2: XI and YI must be matrices of same size"); + error ("interp2: XI and YI must be matrices of equal size"); endif ## FIXME bicubic/__splinen__ don't handle arbitrary XI, YI. @@ -406,7 +406,7 @@ error ("interp2: input data must have `meshgrid' format"); endif else - error ("interp2: interpolation method not recognized"); + error ("interp2: interpolation METHOD not recognized"); endif endif
--- a/scripts/general/interpft.m +++ b/scripts/general/interpft.m @@ -55,7 +55,7 @@ endif if (! isscalar (n)) - error ("interpft: n must be an integer scalar"); + error ("interpft: N must be an integer scalar"); endif nd = ndims (x);
--- a/scripts/general/interpn.m +++ b/scripts/general/interpn.m @@ -92,7 +92,7 @@ if (nargs == 2) m = varargin{2}; if (! isnumeric (m) || ! isscalar (m) || floor (m) != m) - error ("interpn: m is expected to be a integer scalar"); + error ("interpn: M is expected to be a integer scalar"); endif endif sz = size (v); @@ -199,7 +199,7 @@ elseif (strcmp (method, "cubic")) error ("interpn: cubic interpolation not yet implemented"); else - error ("interpn: unrecognized interpolation method"); + error ("interpn: unrecognized interpolation METHOD"); endif endfunction
--- a/scripts/general/nextpow2.m +++ b/scripts/general/nextpow2.m @@ -42,7 +42,7 @@ endif if (! (isscalar (x) || isvector (x))) - error ("nextpow2: x must be a scalar or a vector"); + error ("nextpow2: X must be a scalar or a vector"); endif t = length (x);
--- a/scripts/general/polyarea.m +++ b/scripts/general/polyarea.m @@ -57,7 +57,7 @@ a = abs (sum (x .* (shift (y, -1, dim) - shift (y, 1, dim)), dim)) / 2; endif else - error ("polyarea: x and y must have the same shape"); + error ("polyarea: X and Y must have the same shape"); endif endfunction
--- a/scripts/general/repmat.m +++ b/scripts/general/repmat.m @@ -38,7 +38,7 @@ if (nargin == 3) if (! (isscalar (m) && isscalar (n))) - error ("repmat: with 3 arguments m and n must be scalar"); + error ("repmat: with 3 arguments M and N must be scalar"); endif idx = [m, n]; else
--- a/scripts/general/rot90.m +++ b/scripts/general/rot90.m @@ -65,7 +65,7 @@ endif if (imag (k) != 0 || fix (k) != k) - error ("rot90: k must be an integer"); + error ("rot90: K must be an integer"); endif k = rem (k, 4);
--- a/scripts/general/rotdim.m +++ b/scripts/general/rotdim.m @@ -89,7 +89,7 @@ if (! (isvector (plane) && length (plane) == 2 && all (plane == round (plane)) && all (plane > 0) && all (plane < (nd + 1)) && plane(1) != plane(2))) - error ("rotdim: plane must be a 2 element integer vector defining a valid plane"); + error ("rotdim: PLANE must be a 2 element integer vector defining a valid PLANE"); endif endif
--- a/scripts/general/shiftdim.m +++ b/scripts/general/shiftdim.m @@ -65,7 +65,7 @@ endif if (! isscalar (n) || floor (n) != n) - error ("shiftdim: n must be a scalar integer"); + error ("shiftdim: N must be a scalar integer"); endif if (n >= nd)
--- a/scripts/general/strerror.m +++ b/scripts/general/strerror.m @@ -59,7 +59,7 @@ else - error ("strerror: unrecognized function name"); + error ("strerror: unrecognized function NAME"); endif
--- a/scripts/general/trapz.m +++ b/scripts/general/trapz.m @@ -85,7 +85,7 @@ z = 0.5 * sum (x(idx1{:}) + x(idx2{:}), dim); else if (! size_equal (x, y)) - error ("trapz: x and y must have same shape"); + error ("trapz: X and Y must have same shape"); endif z = 0.5 * sum ((x(idx1{:}) - x(idx2{:})) .* (y(idx1{:}) + y(idx2{:})), dim);
--- a/scripts/geometry/griddata.m +++ b/scripts/geometry/griddata.m @@ -55,9 +55,9 @@ [x, y] = meshgrid (x, y); elseif (! all (size (x) == size (y) & size (x) == size (z))) if (isvector (z)) - error ("griddata: x, y, and z, be vectors of same length."); + error ("griddata: X, Y, and Z, be vectors of same length."); else - error ("griddata: lengths of x, y must match the columns and rows of z."); + error ("griddata: lengths of X, Y must match the columns and rows of Z."); endif endif @@ -67,7 +67,7 @@ endif if (! size_equal (xi, yi)) - error ("griddata: xi and yi must be vectors or matrices of same size"); + error ("griddata: XI and YI must be vectors or matrices of same size"); endif [nr, nc] = size (xi); @@ -126,7 +126,7 @@ zi(valid) = -(N(:,1).*xi(:)(valid) + N(:,2).*yi(:)(valid) + D) ./ N(:,3); else - error ("griddata: unknown interpolation method"); + error ("griddata: unknown interpolation METHOD"); endif if (nargout == 3)
--- a/scripts/geometry/griddata3.m +++ b/scripts/geometry/griddata3.m @@ -37,7 +37,7 @@ endif if (!all (size (x) == size (y) & size (x) == size(z) & size(x) == size (v))) - error ("griddata3: x, y, z, and v must be vectors of same length"); + error ("griddata3: X, Y, Z, and V must be vectors of same length"); endif ## meshgrid xi, yi and zi if they are vectors unless they @@ -48,7 +48,7 @@ endif if (any (size(xi) != size(yi)) || any (size(xi) != size(zi))) - error ("griddata3: xi, yi and zi must be vectors or matrices of same size"); + error ("griddata3: XI, YI and ZI must be vectors or matrices of same size"); endif vi = griddatan ([x(:), y(:), z(:)], v(:), [xi(:), yi(:), zi(:)], varargin{:});
--- a/scripts/geometry/griddatan.m +++ b/scripts/geometry/griddatan.m @@ -80,7 +80,7 @@ yi(valid) = sum (y(tri(tri_list,:)) .* bary_list, 2); else - error ("griddatan: unknown interpolation method"); + error ("griddatan: unknown interpolation METHOD"); endif endfunction
--- a/scripts/geometry/rectint.m +++ b/scripts/geometry/rectint.m @@ -40,9 +40,9 @@ elseif (ndims (a) != 2 || ndims (b) != 2) error ("rectint: expecting arguments to be 2-d arrays"); elseif (columns (a) != 4) - error ("rectint: a must have 4 columns"); + error ("rectint: A must have 4 columns"); elseif (columns (b) != 4) - error ("rectint: b must have 4 columns"); + error ("rectint: B must have 4 columns"); elseif any ([a(:,3:4);b(:,3:4)](:) < 0) error ("rectint: all widths and heights must be > 0"); endif
--- a/scripts/help/gen_doc_cache.m +++ b/scripts/help/gen_doc_cache.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} gen_doc_cache (@var{out_file}, @var{directory}) +## @deftypefn {Function File} {} gen_doc_cache (@var{out_file}, @var{directory}) ## Generate documentation caches for all functions in a given directory. ## ## A documentation cache is generated for all functions in @var{directory}.
--- a/scripts/image/brighten.m +++ b/scripts/image/brighten.m @@ -54,7 +54,7 @@ endif if (! isscalar (beta) || beta <= -1 || beta >= 1) - error ("brighten: beta must be a scalar in the range (-1,1)"); + error ("brighten: BETA must be a scalar in the range (-1,1)"); endif if (beta > 0)
--- a/scripts/image/colormap.m +++ b/scripts/image/colormap.m @@ -56,10 +56,10 @@ if (! isempty (map)) if (columns (map) != 3) - error ("colormap: map must have 3 columns: [R,G,B]"); + error ("colormap: MAP must have 3 columns: [R,G,B]"); endif if (min (min (map)) < 0 || max (max (map)) > 1) - error ("colormap: map must have values in [0,1]"); + error ("colormap: MAP must have values in [0,1]"); endif ## Set the new color map set (gcf (), "colormap", map);
--- a/scripts/image/contrast.m +++ b/scripts/image/contrast.m @@ -30,7 +30,7 @@ n = rows (colormap); elseif (nargin == 2) if (! isscalar (n)) - error ("contrast: n must be a scalar"); + error ("contrast: N must be a scalar"); endif else print_usage ();
--- a/scripts/image/imagesc.m +++ b/scripts/image/imagesc.m @@ -115,7 +115,7 @@ if (length (limits) == 2 && limits(2) >= limits(1)) set (ax, "clim", limits); elseif (! isempty (limits)) - error ("imagesc: expected data limits to be [lo, hi]"); + error ("imagesc: expected data LIMITS to be [lo, hi]"); endif endfunction
--- a/scripts/image/imfinfo.m +++ b/scripts/image/imfinfo.m @@ -115,7 +115,7 @@ endif if (!ischar (filename)) - error ("imfinfo: filename must be a string"); + error ("imfinfo: FILENAME must be a string"); endif filename = tilde_expand (filename);
--- a/scripts/image/imread.m +++ b/scripts/image/imread.m @@ -42,7 +42,7 @@ endif if (! ischar (filename)) - error ("imread: filename must be a string"); + error ("imread: FILENAME must be a string"); endif filename = tilde_expand (filename);
--- a/scripts/image/imshow.m +++ b/scripts/image/imshow.m @@ -72,7 +72,7 @@ nd = ndims (im); if (! ((isnumeric (im) || islogical (im)) && (nd == 2 || nd == 3))) - error ("imshow: first argument must be an image or the filename of an image"); + error ("imshow: IM must be an image or the filename of an image"); endif if (nd == 2)
--- a/scripts/image/ind2rgb.m +++ b/scripts/image/ind2rgb.m @@ -42,12 +42,12 @@ ## Check if X is an indexed image. if (ndims (x) != 2 || any (x(:) != round (x(:))) || min (x(:)) < 1) - error ("ind2rgb: first input argument must be an indexed image"); + error ("ind2rgb: X must be an indexed image"); endif ## Check the color map. if (ndims (map) != 2 || columns (map) != 3) - error ("ind2rgb: second input argument must be a color map"); + error ("ind2rgb: MAP must be a valid colormap"); endif ## Do we have enough colors in the color map?
--- a/scripts/image/saveimage.m +++ b/scripts/image/saveimage.m @@ -92,13 +92,13 @@ [map_nr, map_nc] = size (map); if (map_nc != 3) - error ("saveimage: colormap should be an N x 3 matrix"); + error ("saveimage: MAP must be an N x 3 matrix"); endif if (nargin < 3) fmt = "img"; elseif (! ischar (fmt)) - error ("saveimage: image format specification must be a string"); + error ("saveimage: FMT specification must be a string"); elseif (! (strcmp (fmt, "img") || strcmp (fmt, "ppm") || strcmp (fmt, "ps"))) @@ -106,11 +106,11 @@ endif if (! ismatrix (img)) - warning ("image variable is not a matrix"); + warning ("IMG variable is not a matrix"); endif if (! ischar (fname)) - error ("saveimage: fname name must be a string"); + error ("saveimage: FNAME must be a string"); endif ## If we just want Octave image format, save and return. @@ -225,7 +225,7 @@ elseif (strcmp (fmt, "ps") == 1) if (! grey) - error ("saveimage: must have a greyscale color map for conversion to PostScript"); + error ("saveimage: must have a greyscale colormap for conversion to PostScript"); endif bps = 8;
--- a/scripts/io/dlmwrite.m +++ b/scripts/io/dlmwrite.m @@ -161,7 +161,7 @@ fid = file; msg = "invalid file number"; else - error ("dlmwrite: file must be a string file ID"); + error ("dlmwrite: FILE must be a filename string or numeric FID"); endif if (fid < 0)
--- a/scripts/io/strread.m +++ b/scripts/io/strread.m @@ -106,7 +106,7 @@ endif if (!ischar (str) || !ischar (format)) - error ("strread: first and second input arguments must be strings"); + error ("strread: STR and FORMAT arguments must be strings"); endif ## Parse options @@ -157,7 +157,7 @@ nfields = length (idx) - length (idx_star); if (max (nargout, 1) != nfields) - error ("strread: the number of output variables must match that of format specifiers"); + error ("strread: the number of output variables must match that specified byFORMAT"); endif ## Remove comments @@ -232,7 +232,7 @@ ## Ensure descriptive content is consistent if (numel (unique (data)) > 1 || ! strcmpi (unique (data), fmt_words{m})) - error ("strread: format does not match data") + error ("strread: FORMAT does not match data") endif endswitch endfor
--- a/scripts/io/textscan.m +++ b/scripts/io/textscan.m @@ -77,7 +77,7 @@ if (ischar (format)) if (ischar (fid)) if (nargout == 2) - error ("textscan: cannot provide postion information for character input") + error ("textscan: cannot provide position information for character input") endif str = fid; else @@ -114,10 +114,10 @@ endif else - error ("textscan: second input must be a format specification"); + error ("textscan: FORMAT must be a valid specification"); endif else - error ("textscan: expecting first argument to be a file id or character string"); + error ("textscan: first argument must be a file id or character string"); endif endfunction
--- a/scripts/linear-algebra/commutation_matrix.m +++ b/scripts/linear-algebra/commutation_matrix.m @@ -78,12 +78,12 @@ print_usage (); else if (! (isscalar (m) && m == round (m) && m > 0)) - error ("commutation_matrix: m must be a positive integer"); + error ("commutation_matrix: M must be a positive integer"); endif if (nargin == 1) n = m; elseif (! (isscalar (n) && n == round (n) && n > 0)) - error ("commutation_matrix: n must be a positive integer"); + error ("commutation_matrix: N must be a positive integer"); endif endif
--- a/scripts/linear-algebra/condest.m +++ b/scripts/linear-algebra/condest.m @@ -144,7 +144,7 @@ have_t = true; endif else - error ("condest: must supply both solve and solve_t"); + error ("condest: must supply both SOLVE and SOLVE_T"); endif endif elseif (nargin > 4)
--- a/scripts/linear-algebra/cross.m +++ b/scripts/linear-algebra/cross.m @@ -67,7 +67,7 @@ endif else if (size (x, dim) != 3) - error ("cross: dimension dim must have 3 elements"); + error ("cross: dimension DIM must have 3 elements"); endif endif @@ -87,7 +87,7 @@ y3 = y(idx3{:}); z = cat (dim, (x2.*y3 - x3.*y2), (x3.*y1 - x1.*y3), (x1.*y2 - x2.*y1)); else - error ("cross: x and y must have the same dimensions"); + error ("cross: X and Y must have the same dimensions"); endif endfunction
--- a/scripts/linear-algebra/duplication_matrix.m +++ b/scripts/linear-algebra/duplication_matrix.m @@ -70,7 +70,7 @@ endif if (! (isscalar (n) && n == round (n) && n > 0)) - error ("duplication_matrix: n must be a positive integer"); + error ("duplication_matrix: N must be a positive integer"); endif d = zeros (n * n, n * (n + 1) / 2);
--- a/scripts/linear-algebra/expm.m +++ b/scripts/linear-algebra/expm.m @@ -73,7 +73,7 @@ function r = expm (A) if (! ismatrix (A) || ! issquare (A)) - error ("expm: input must be a square matrix"); + error ("expm: A must be a square matrix"); endif if (isscalar (A))
--- a/scripts/linear-algebra/isdefinite.m +++ b/scripts/linear-algebra/isdefinite.m @@ -38,7 +38,7 @@ endif if (! ishermitian (x)) - error ("isdefinite: x must be a hermitian matrix"); + error ("isdefinite: X must be a hermitian matrix"); endif if (! isfloat (x))
--- a/scripts/linear-algebra/krylov.m +++ b/scripts/linear-algebra/krylov.m @@ -93,7 +93,7 @@ endif if (! isscalar (k)) - error ("krylov: third argument must be a scalar integer"); + error ("krylov: K must be a scalar integer"); endif Vnrm = norm (V, Inf);
--- a/scripts/linear-algebra/logm.m +++ b/scripts/linear-algebra/logm.m @@ -46,7 +46,7 @@ endif if (! issquare (A)) - error ("logm: argument must be a square matrix"); + error ("logm: A must be a square matrix"); endif [u, s] = schur (A); @@ -139,8 +139,8 @@ %!assert(norm(logm([1 -1;0 1]) - [0 -1; 0 0]) < 1e-5); %!assert(norm(expm(logm([-1 2 ; 4 -1])) - [-1 2 ; 4 -1]) < 1e-5); %!assert(logm([1 -1 -1;0 1 -1; 0 0 1]), [0 -1 -1.5; 0 0 -1; 0 0 0], 1e-5); -%! + %% Test input validation %!error logm (); %!error logm (1, 2, 3); -%!error <logm: argument must be a square matrix> logm([1 0;0 1; 2 2]); +%!error <logm: A must be a square matrix> logm([1 0;0 1; 2 2]);
--- a/scripts/linear-algebra/vech.m +++ b/scripts/linear-algebra/vech.m @@ -39,7 +39,7 @@ endif if (! issquare (x)) - error ("vech: x must be square"); + error ("vech: X must be square"); endif n = rows (x);
--- a/scripts/miscellaneous/bincoeff.m +++ b/scripts/miscellaneous/bincoeff.m @@ -66,7 +66,7 @@ [retval, n, k] = common_size (n, k); if (retval > 0) - error ("bincoeff: n and k must be of common size or scalars"); + error ("bincoeff: N and K must be of common size or scalars"); endif sz = size (n);
--- a/scripts/miscellaneous/cast.m +++ b/scripts/miscellaneous/cast.m @@ -36,7 +36,7 @@ error ("cast: type name `%s' is not a built-in type", typ); endif else - error ("cast: expecting type name as second argument"); + error ("cast: expecting TYPE name as second argument"); endif else print_usage ();
--- a/scripts/miscellaneous/compare_versions.m +++ b/scripts/miscellaneous/compare_versions.m @@ -89,9 +89,9 @@ ## check and make sure that the operator is valid if (! ischar (operator)) - error ("compare_versions: operator must be a character string"); + error ("compare_versions: OPERATOR must be a character string"); elseif (numel (operator) > 2) - error("compare_versions: operator cannot be more than 2 characters long"); + error("compare_versions: OPERATOR cannot be more than 2 characters long"); endif ## trim off any character data that is not part of a normal version @@ -166,9 +166,9 @@ ## Make sure that we don't have conflicting operators. if (gt_op && lt_op) - error ("compare_versions: operator cannot contain both greater and less than symbols"); + error ("compare_versions: OPERATOR cannot contain both greater and less than symbols"); elseif ((gt_op || lt_op) && not_op) - error ("compare_versions: operator cannot contain not and greater than or less than symbols"); + error ("compare_versions: OPERATOR cannot contain not and greater than or less than symbols"); endif ## Compare the versions (making sure that they're the same shape)
--- a/scripts/miscellaneous/delete.m +++ b/scripts/miscellaneous/delete.m @@ -47,7 +47,7 @@ ## Delete a graphics object. __go_delete__ (arg); else - error ("delete: expecting argument to be a filename or graphics handle"); + error ("delete: first argument must be a filename or graphics handle"); endif else print_usage ();
--- a/scripts/miscellaneous/fileparts.m +++ b/scripts/miscellaneous/fileparts.m @@ -51,7 +51,7 @@ endif version = ""; else - error ("fileparts: expecting filename argument to be a string"); + error ("fileparts: expecting FILENAME argument to be a string"); endif else print_usage ();
--- a/scripts/miscellaneous/license.m +++ b/scripts/miscellaneous/license.m @@ -156,7 +156,7 @@ elseif (strcmp (varargin{3}, "disable")) __octave_licenses__{p,3} = false; else - error ("toggle must be either `enable' of `disable'"); + error ("TOGGLE must be either `enable' of `disable'"); endif else error ("feature `%s' not found", feature);
--- a/scripts/miscellaneous/paren.m +++ b/scripts/miscellaneous/paren.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deffn {Operator} ( +## @deffn {Operator} ( ## @deffnx {Operator} ) ## Array index or function argument delimeter. ## @end deffn
--- a/scripts/miscellaneous/private/__xzip__.m +++ b/scripts/miscellaneous/private/__xzip__.m @@ -35,7 +35,7 @@ if (nargin == 4 || nargin == 5) if (! ischar (extension) || length (extension) == 0) - error ("__xzip__: extension has to be a string with finite length"); + error ("__xzip__: EXTENSION has to be a string with finite length"); endif if (nargin == 5 && ! exist (outdir, "dir"))
--- a/scripts/miscellaneous/run.m +++ b/scripts/miscellaneous/run.m @@ -39,7 +39,7 @@ unwind_protect cd (d); if (! exist (cstrcat (f, ext), "file")) - error ("run: file must exist and be a valid Octave script file"); + error ("run: file SCRIPT must exist and be a valid Octave scriptfile"); endif evalin ("caller", sprintf ("source (\"%s%s\");", f, ext), "rethrow (lasterror ())");
--- a/scripts/miscellaneous/substruct.m +++ b/scripts/miscellaneous/substruct.m @@ -59,12 +59,12 @@ cells = cellfun ("isclass", sub, "cell"); chars = cellfun ("isclass", sub, "char"); if (any (braces &! cells)) - error ("substruct: for type == () or {}, subs must be a cell array"); + error ("substruct: for TYPE == () or {}, SUBS must be a cell array"); elseif (any (dots &! chars)) - error ("substruct: for type == ., subs must be a character string"); + error ("substruct: for TYPE == ., SUBS must be a character string"); endif else - error ("substruct: expecting type to be one of \"()\", \"{}\", or \".\""); + error ("substruct: expecting TYPE to be one of \"()\", \"{}\", or \".\""); endif retval = struct ("type", typ, "subs", sub);
--- a/scripts/miscellaneous/unix.m +++ b/scripts/miscellaneous/unix.m @@ -17,8 +17,8 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{status}, @var{text}]} unix (@var{command}) -## @deftypefnx {Function File} {[@var{status}, @var{text}]} unix (@var{command}, "-echo") +## @deftypefn {Function File} {[@var{status}, @var{text}] =} unix (@var{command}) +## @deftypefnx {Function File} {[@var{status}, @var{text}] =} unix (@var{command}, "-echo") ## Execute a system command if running under a Unix-like operating ## system, otherwise do nothing. Return the exit status of the program ## in @var{status} and any output sent to the standard output in
--- a/scripts/miscellaneous/unpack.m +++ b/scripts/miscellaneous/unpack.m @@ -42,9 +42,9 @@ if (ischar (file)) if (isdir (file)) if (isempty (filetype)) - error ("unpack: filetype must be given for a directory"); + error ("unpack: FILETYPE must be given for a directory"); elseif (! any (strcmpi (filetype, "gunzip"))) - error ("unpack: filetype must be gunzip for a directory"); + error ("unpack: FILETYPE must be gunzip for a directory"); endif else [pathstr, name, ext] = fileparts (file);
--- a/scripts/miscellaneous/xor.m +++ b/scripts/miscellaneous/xor.m @@ -36,7 +36,7 @@ ## Typecast to logicals is necessary for other numeric types. z = logical (x) != logical (y); else - error ("xor: x and y must be of common size or scalars"); + error ("xor: X and Y must be of common size or scalars"); endif else print_usage ();
--- a/scripts/optimization/sqp.m +++ b/scripts/optimization/sqp.m @@ -365,7 +365,7 @@ if (isscalar (tolerance) && tolerance > 0) tol = tolerance; else - error ("sqp: invalid value for tolerance"); + error ("sqp: invalid value for TOLERANCE"); endif endif
--- a/scripts/pkg/get_forge_pkg.m +++ b/scripts/pkg/get_forge_pkg.m @@ -30,7 +30,7 @@ endif ## Verify that name is valid. if (! (ischar (name) && rows (name) == 1 && ndims (name) == 2)) - error ("get_forge_pkg: package name must be a string"); + error ("get_forge_pkg: package NAME must be a string"); elseif (! all (isalnum (name) | name == "-" | name == "." | name == "_")) error ("get_forge_pkg: invalid package name: %s", name); endif @@ -66,7 +66,7 @@ t = regexp (html, "<div class=""package"" id=""(\\w+)"">", "tokens"); t = horzcat (t{:}); if (any (strcmp (t, name))) - error ("get_forge_pkg: package name exists, but index page not available"); + error ("get_forge_pkg: package NAME exists, but index page not available"); else ## Try a simplistic method to determine close names. dist = cellfun (@(n) length (setdiff (name, n)), t);
--- a/scripts/plot/__gnuplot_open_stream__.m +++ b/scripts/plot/__gnuplot_open_stream__.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {@var{stream}} __gnuplot_open_stream__ (@var{npipes}, @var{h}) +## @deftypefn {Function File} {@var{stream} =} __gnuplot_open_stream__ (@var{npipes}, @var{h}) ## Undocumented internal function. ## @end deftypefn
--- a/scripts/plot/__marching_cube__.m +++ b/scripts/plot/__marching_cube__.m @@ -100,24 +100,24 @@ if (!ismatrix (xx) || !ismatrix (yy) || !ismatrix (zz) || !ismatrix (c) || ... ndims (xx) != 3 || ndims (yy) != 3 || ndims (zz) != 3 || ndims (c) != 3) - error ("__marching_cube__: xx, yy, zz, c have to be matrizes of dim 3"); + error ("__marching_cube__: XX, YY, ZZ, C must be matrices of dim 3"); endif if (!size_equal (xx, yy, zz, c)) - error ("__marching_cube__: xx, yy, zz, c are not the same size"); + error ("__marching_cube__: XX, YY, ZZ, C must be of equal size"); endif if (any (size (xx) < [2 2 2])) - error ("__marching_cube__: grid size has to be at least 2x2x2"); + error ("__marching_cube__: grid size must be at least 2x2x2"); endif if (!isscalar (iso)) - error ("__marching_cube__: iso needs to be scalar value"); + error ("__marching_cube__: ISO must be scalar value"); endif if (nargin == 6) if ( !ismatrix (colors) || ndims (colors) != 3 || size (colors) != size (c) ) - error ( "color has to be matrix of dim 3 and of same size as c" ); + error ( "COLORS must be a matrix of dim 3 and of same size as C" ); endif calc_cols = true; lindex = 5;
--- a/scripts/plot/backend.m +++ b/scripts/plot/backend.m @@ -37,7 +37,7 @@ if (ischar (varargin{1})) name = varargin{1}; else - error ("backend: invalid backend name"); + error ("backend: invalid backend NAME"); endif elseif (nargin == 2) if (isnumeric (varargin{1}) && ischar (varargin{2})) @@ -46,7 +46,7 @@ elseif (ischar (varargin{2})) error ("backend: invalid handle list"); else - error ("backend: invalid backend name"); + error ("backend: invalid backend NAME"); endif else print_usage ();
--- a/scripts/plot/contourc.m +++ b/scripts/plot/contourc.m @@ -86,7 +86,7 @@ endif if (!ismatrix (z) || isvector (z) || isscalar (z)) - error ("contourc: z argument must be a matrix"); + error ("contourc: Z argument must be a matrix"); endif if (isscalar (vn))
--- a/scripts/plot/cylinder.m +++ b/scripts/plot/cylinder.m @@ -65,7 +65,7 @@ endif if (length (r) < 2) - error ("cylinder: length(r) must be larger than 2") + error ("cylinder: length(R) must be larger than 2") endif phi = linspace (0, 2*pi, n+1);
--- a/scripts/plot/hidden.m +++ b/scripts/plot/hidden.m @@ -33,10 +33,10 @@ if (ischar (mode)) mode = tolower (mode); if (! strcmp (mode, "on") && ! strcmp (mode, "off")) - error ("hidden: mode expected to be 'on' or 'off'"); + error ("hidden: MODE expected to be 'on' or 'off'"); endif else - error ("hidden: expecting mode to be a string"); + error ("hidden: expecting MODE to be a string"); endif else print_usage ();
--- a/scripts/plot/hold.m +++ b/scripts/plot/hold.m @@ -77,7 +77,7 @@ elseif (strcmpi (state, "on")) turn_hold_off = false; else - error ("hold: invalid hold state"); + error ("hold: invalid hold STATE"); endif endif else
--- a/scripts/plot/orient.m +++ b/scripts/plot/orient.m @@ -62,7 +62,7 @@ papersize = get (cf, "papersize"); set (cf, "paperposition", [0.25, 0.25, (papersize - 0.5)]); else - error ("orient: unknown orientation"); + error ("orient: unknown ORIENTATION"); endif else print_usage ();
--- a/scripts/plot/private/__add_default_menu__.m +++ b/scripts/plot/private/__add_default_menu__.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} __add_default_menu__ (fig) +## @deftypefn {Function File} {} __add_default_menu__ (@var{fig}) ## Adds default menu to figure. All uimenu handles have ## set their property "handlevisibility" to "off". ## @end deftypefn
--- a/scripts/plot/private/__interp_cube__.m +++ b/scripts/plot/private/__interp_cube__.m @@ -34,10 +34,10 @@ y = y(:); z = z(:); else - error("__interp_cube__: x, y, z have wrong dimensions"); + error("__interp_cube__: X, Y, Z have wrong dimensions"); endif if (size (val) != [length(x), length(y), length(z)]) - error ("__interp_cube__: val has wrong dimensions"); + error ("__interp_cube__: VAL has wrong dimensions"); endif if (size (v, 2) != 3) error ( "v has to be N*3 matrix");
--- a/scripts/plot/refreshdata.m +++ b/scripts/plot/refreshdata.m @@ -68,7 +68,7 @@ if ( !ischar (workspace) || !(strcmpi (workspace, "base") || strcmpi (workspace, "caller"))) - error ("refreshdata: expecting workspace to be \"base\" or ""caller\""); + error ("refreshdata: expecting WORKSPACE to be \"base\" or ""caller\""); else workspace = tolower (workspace); endif
--- a/scripts/plot/subplot.m +++ b/scripts/plot/subplot.m @@ -83,7 +83,7 @@ if (nargin == 1) if (! (isscalar (rows) && rows >= 0)) - error ("subplot: input rcn has to be a positive scalar"); + error ("subplot: input RCN has to be a positive scalar"); endif tmp = rows; @@ -94,9 +94,9 @@ rows = rem (tmp, 10); elseif (! (isscalar (cols) && isscalar (rows))) - error ("subplot: cols, and rows must be scalars"); + error ("subplot: COLS, and ROWS must be scalars"); elseif (any (index < 1) || any (index > rows*cols)) - error ("subplot: index value must be greater than 1 and less than rows*cols") + error ("subplot: INDEX value must be greater than 1 and less than ROWS*COLS") endif cols = round (cols); @@ -104,11 +104,11 @@ index = round (index); if (index > cols*rows) - error ("subplot: index must be less than cols*rows"); + error ("subplot: INDEX must be less than COLS*ROWS"); endif if (cols < 1 || rows < 1 || index < 1) - error ("subplot: cols,rows,index must be be positive"); + error ("subplot: COLS,ROWS,INDEX must be be positive"); endif units = get (0, "defaultaxesunits");
--- a/scripts/plot/surface.m +++ b/scripts/plot/surface.m @@ -82,21 +82,21 @@ c = varargin{4}; if (! size_equal (z, c)) - error ("surface: z and c must have the same size"); + error ("surface: Z and C must have the same size"); endif if (isvector (x) && isvector (y) && ismatrix (z)) if (rows (z) == length (y) && columns (z) == length (x)) x = x(:)'; y = y(:); else - error ("surface: rows (z) must be the same as length (y) and columns (z) must be the same as length (x)"); + error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)"); endif elseif (ismatrix (x) && ismatrix (y) && ismatrix (z)) if (! size_equal (x, y, z)) - error ("surface: x, y, and z must have the same dimensions"); + error ("surface: X, Y, and Z must have the same dimensions"); endif else - error ("surface: x and y must be vectors and z must be a matrix"); + error ("surface: X and Y must be vectors and Z must be a matrix"); endif elseif (firststring == 4) x = varargin{1}; @@ -108,14 +108,14 @@ x = x(:)'; y = y(:); else - error ("surface: rows (z) must be the same as length (y) and columns (z) must be the same as length (x)"); + error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)"); endif elseif (ismatrix (x) && ismatrix (y) && ismatrix (z)) if (! size_equal (x, y, z)) - error ("surface: x, y, and z must have the same dimensions"); + error ("surface: X, Y, and Z must have the same dimensions"); endif else - error ("surface: x and y must be vectors and z must be a matrix"); + error ("surface: X and Y must be vectors and Z must be a matrix"); endif elseif (firststring == 3) z = varargin{1}; @@ -125,7 +125,7 @@ x = 1:nc; y = (1:nr)'; else - error ("surface: z argument must be a matrix"); + error ("surface: Z argument must be a matrix"); endif elseif (firststring == 2) z = varargin{1}; @@ -135,7 +135,7 @@ x = 1:nc; y = (1:nr)'; else - error ("surface: z argument must be a matrix"); + error ("surface: Z argument must be a matrix"); endif else bad_usage = true;
--- a/scripts/plot/surfnorm.m +++ b/scripts/plot/surfnorm.m @@ -72,10 +72,10 @@ endif if (!ismatrix (z) || isvector (z) || isscalar (z)) - error ("surfnorm: z argument must be a matrix"); + error ("surfnorm: Z argument must be a matrix"); endif if (! size_equal (x, y, z)) - error ("surfnorm: x, y, and z must have the same dimensions"); + error ("surfnorm: X, Y, and Z must have the same dimensions"); endif ## Make life easier, and avoid having to do the extrapolation later, do
--- a/scripts/plot/text.m +++ b/scripts/plot/text.m @@ -57,7 +57,7 @@ ny = numel (y); nz = numel (z); else - error ("text: expecting label to be a character string or cell array of character strings"); + error ("text: expecting LABEL to be a character string or cell array of character strings"); endif else x = y = z = 0; @@ -88,7 +88,7 @@ endfor __request_drawnow__ (); else - error ("text: dimension mismatch for coordinates and label"); + error ("text: dimension mismatch for coordinates and LABEL"); endif else error ("text: dimension mismatch for coordinates");
--- a/scripts/plot/uimenu.m +++ b/scripts/plot/uimenu.m @@ -88,7 +88,7 @@ endif if (rem (length (args), 2)) - error ("uimenu: expecting property/value pairs"); + error ("uimenu: expecting PROPERTY/VALUE pairs"); endif tmp = __go_uimenu__ (h, args{:});
--- a/scripts/polynomial/mkpp.m +++ b/scripts/polynomial/mkpp.m @@ -59,7 +59,7 @@ pp.orient = 0; if (size (P, 2) != n) - error ("mkpp: num intervals in x doesn't match num polynomials in P"); + error ("mkpp: num intervals in X doesn't match num polynomials in P"); endif endfunction
--- a/scripts/polynomial/pchip.m +++ b/scripts/polynomial/pchip.m @@ -91,11 +91,11 @@ h = diff (x); y = fliplr (y); elseif (any (h <= 0)) - error("pchip: x must be strictly monotonic"); + error("pchip: X must be strictly monotonic"); endif if (columns (y) != n) - error("pchip: size of x and y must match"); + error("pchip: size of X and Y must match"); endif f1 = y(:,1:n-1);
--- a/scripts/polynomial/polyfit.m +++ b/scripts/polynomial/polyfit.m @@ -74,11 +74,11 @@ endif if (! size_equal (x, y)) - error ("polyfit: x and y must be vectors of the same size"); + error ("polyfit: X and Y must be vectors of the same size"); endif if (! (isscalar (n) && n >= 0 && ! isinf (n) && n == round (n))) - error ("polyfit: n must be a nonnegative integer"); + error ("polyfit: N must be a nonnegative integer"); endif y_is_row_vector = (rows (y) == 1);
--- a/scripts/polynomial/ppder.m +++ b/scripts/polynomial/ppder.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {ppd =} ppder (pp) +## @deftypefn {Function File} {@var{ppd} =} ppder (@var{pp}) ## Computes the piecewise derivative of a piecewise polynomial struct @var{pp}. ## @seealso{mkpp,ppval} ## @end deftypefn @@ -27,7 +27,7 @@ print_usage (); endif if (! isstruct (pp)) - error ("ppder: expects a pp structure"); + error ("ppder: PP must be a structure"); endif [x, p, n, k, d] = unmkpp (pp);
--- a/scripts/polynomial/ppint.m +++ b/scripts/polynomial/ppint.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {ppd =} ppint (pp, c) +## @deftypefn {Function File} {@var{ppi} =} ppint (@var{pp}, @var{c}) ## Computes the antiderivative of a piecewise polynomial struct @var{pp}. ## @var{c}, if given, is the constant of integration. ## @seealso{mkpp,ppval} @@ -28,7 +28,7 @@ print_usage (); endif if (! isstruct (pp)) - error ("ppint: expects a pp structure"); + error ("ppint: PP must be a structure"); endif [x, p, n, k, d] = unmkpp (pp); @@ -52,4 +52,3 @@ endfunction -
--- a/scripts/polynomial/ppjumps.m +++ b/scripts/polynomial/ppjumps.m @@ -17,7 +17,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {ppd =} ppjumps (pp) +## @deftypefn {Function File} {@var{jumps} =} ppjumps (@var{pp}) ## Evaluates the boundary jumps of a piecewise polynomial. ## If there are n intervals, and the dimensionality of pp is d, ## the resulting array has dimensions @code{[d, n-1]}. @@ -28,7 +28,7 @@ print_usage (); endif if (! isstruct (pp)) - error ("ppjumps: expects a pp structure"); + error ("ppjumps: PP must be a structure"); endif ## Extract info. @@ -52,3 +52,5 @@ jumps = reshape (rlim - llim, [d, n-1]); endfunction + +
--- a/scripts/polynomial/ppval.m +++ b/scripts/polynomial/ppval.m @@ -36,7 +36,7 @@ print_usage (); endif if (! isstruct (pp)) - error ("ppval: expects a pp structure"); + error ("ppval: PP must be a structure"); endif ## Extract info.
--- a/scripts/signal/arch_fit.m +++ b/scripts/signal/arch_fit.m @@ -58,7 +58,7 @@ endif if (! (isvector (y))) - error ("arch_fit: y must be a vector"); + error ("arch_fit: Y must be a vector"); endif T = length (y); @@ -67,7 +67,7 @@ if ((rx == 1) && (cx == 1)) x = autoreg_matrix (y, x); elseif (! (rx == T)) - error ("arch_fit: either rows (x) == length (y), or x is a scalar"); + error ("arch_fit: either rows (X) == length (Y), or X is a scalar"); endif [T, k] = size (x);
--- a/scripts/signal/arch_rnd.m +++ b/scripts/signal/arch_rnd.m @@ -48,14 +48,14 @@ endif if (! ((min (size (a)) == 1) && (min (size (b)) == 1))) - error ("arch_rnd: a and b must both be scalars or vectors"); + error ("arch_rnd: A and B must both be scalars or vectors"); endif if (! (isscalar (t) && (t > 0) && (rem (t, 1) == 0))) error ("arch_rnd: T must be a positive integer"); endif if (! (a(1) > 0)) - error ("arch_rnd: a(1) must be positive"); + error ("arch_rnd: A(1) must be positive"); endif ## perhaps add a test for the roots of a(z) here ...
--- a/scripts/signal/arch_test.m +++ b/scripts/signal/arch_test.m @@ -73,7 +73,7 @@ endif if (! (isvector (y))) - error ("arch_test: y must be a vector"); + error ("arch_test: Y must be a vector"); endif T = length (y); y = reshape (y, T, 1); @@ -81,10 +81,10 @@ if ((rx == 1) && (cx == 1)) x = autoreg_matrix (y, x); elseif (! (rx == T)) - error ("arch_test: either rows(X) == length(y), or X is a scalar"); + error ("arch_test: either rows(X) == length(Y), or X is a scalar"); endif if (! (isscalar(p) && (rem(p, 1) == 0) && (p > 0))) - error ("arch_test: p must be a positive integer"); + error ("arch_test: P must be a positive integer"); endif [b, v_b, e] = ols (y, x);
--- a/scripts/signal/arma_rnd.m +++ b/scripts/signal/arma_rnd.m @@ -48,18 +48,18 @@ n = 100; elseif (nargin == 5) if (!isscalar (n)) - error ("arma_rnd: n must be a scalar"); + error ("arma_rnd: N must be a scalar"); endif else print_usage (); endif if ((min (size (a)) > 1) || (min (size (b)) > 1)) - error ("arma_rnd: a and b must not be matrices"); + error ("arma_rnd: A and B must not be matrices"); endif if (!isscalar (t)) - error ("arma_rnd: t must be a scalar"); + error ("arma_rnd: T must be a scalar"); endif ar = length (a);
--- a/scripts/signal/autoreg_matrix.m +++ b/scripts/signal/autoreg_matrix.m @@ -37,7 +37,7 @@ endif if (! (isvector (y))) - error ("autoreg_matrix: y must be a vector"); + error ("autoreg_matrix: Y must be a vector"); endif T = length (y);
--- a/scripts/signal/bartlett.m +++ b/scripts/signal/bartlett.m @@ -36,7 +36,7 @@ endif if (! (isscalar (m) && (m == round (m)) && (m > 0))) - error ("bartlett: m has to be an integer > 0"); + error ("bartlett: M has to be an integer > 0"); endif if (m == 1)
--- a/scripts/signal/blackman.m +++ b/scripts/signal/blackman.m @@ -35,7 +35,7 @@ endif if (! (isscalar (m) && (m == round (m)) && (m > 0))) - error ("blackman: m has to be an integer > 0"); + error ("blackman: M has to be an integer > 0"); endif if (m == 1)
--- a/scripts/signal/diffpara.m +++ b/scripts/signal/diffpara.m @@ -62,7 +62,7 @@ endif if (! (isscalar (a) && isscalar (b))) - error ("diffpara: a and b must be scalars"); + error ("diffpara: A and B must be scalars"); endif dd = zeros (b - a + 1, k);
--- a/scripts/signal/durbinlevinson.m +++ b/scripts/signal/durbinlevinson.m @@ -51,11 +51,11 @@ t = length (oldphi) + 1; if (length (c) < t+1) - error ("durbinlevinson: c too small"); + error ("durbinlevinson: C too small"); endif if (oldv == 0) - error ("durbinlevinson: oldv = 0"); + error ("durbinlevinson: OLDV = 0"); endif if (rows (oldphi) > 1)
--- a/scripts/signal/fftfilt.m +++ b/scripts/signal/fftfilt.m @@ -55,7 +55,7 @@ [r_b, c_b] = size (b); if min ([r_b, c_b]) != 1 - error ("fftfilt: b should be a vector"); + error ("fftfilt: B should be a vector"); endif l_b = r_b * c_b; @@ -70,7 +70,7 @@ else ## Use overlap-add method ... if (! (isscalar (n))) - error ("fftfilt: n has to be a scalar"); + error ("fftfilt: N has to be a scalar"); endif n = 2 ^ (ceil (log (max ([n, l_b])) / log (2))); L = n - l_b + 1;
--- a/scripts/signal/fractdiff.m +++ b/scripts/signal/fractdiff.m @@ -35,11 +35,11 @@ N = 100; if (! isvector (x)) - error ("fractdiff: x must be a vector"); + error ("fractdiff: X must be a vector"); endif if (! isscalar (d)) - error ("fractdiff: d must be a scalar"); + error ("fractdiff: D must be a scalar"); endif @@ -63,7 +63,7 @@ endif else - error ("fractdiff: d must be > -1"); + error ("fractdiff: D must be > -1"); endif
--- a/scripts/signal/hamming.m +++ b/scripts/signal/hamming.m @@ -35,7 +35,7 @@ endif if (! (isscalar (m) && (m == round (m)) && (m > 0))) - error ("hamming: m has to be an integer > 0"); + error ("hamming: M has to be an integer > 0"); endif if (m == 1)
--- a/scripts/signal/hanning.m +++ b/scripts/signal/hanning.m @@ -35,7 +35,7 @@ endif if (! (isscalar (m) && (m == round (m)) && (m > 0))) - error ("hanning: m has to be an integer > 0"); + error ("hanning: M has to be an integer > 0"); endif if (m == 1)
--- a/scripts/signal/hurst.m +++ b/scripts/signal/hurst.m @@ -34,7 +34,7 @@ endif if (isscalar (x)) - error ("hurst: x must not be a scalar"); + error ("hurst: X must not be a scalar"); elseif (isvector (x)) x = reshape (x, length (x), 1); endif
--- a/scripts/signal/periodogram.m +++ b/scripts/signal/periodogram.m @@ -19,7 +19,7 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {[Pxx,w]} = periodogram (@var{x}) +## @deftypefn {Function File} {[Pxx,w] =} periodogram (@var{x}) ## For a data matrix @var{x} from a sample of size @var{n}, return the ## periodogram. w returns the angular frequency. ##
--- a/scripts/signal/sinetone.m +++ b/scripts/signal/sinetone.m @@ -46,11 +46,11 @@ [err, freq, ampl] = common_size (freq, ampl); if (err || ! isvector (freq)) - error ("sinetone: freq and ampl must be vectors of common size"); + error ("sinetone: FREQ and AMPL must be vectors of common size"); endif if (! (isscalar (rate) && isscalar (sec))) - error ("sinetone: rate and sec must be scalars"); + error ("sinetone: RATE and SEC must be scalars"); endif n = length (freq);
--- a/scripts/signal/synthesis.m +++ b/scripts/signal/synthesis.m @@ -41,7 +41,7 @@ [nr, nc] = size (c); if (nr * nc != 3) - error ("synthesis: c must contain exactly 3 elements"); + error ("synthesis: C must contain exactly 3 elements"); endif w_size = c(1);
--- a/scripts/signal/unwrap.m +++ b/scripts/signal/unwrap.m @@ -37,7 +37,7 @@ endif if (!isnumeric(x)) - error ("unwrap: x must be a numeric matrix or vector"); + error ("unwrap: X must be a numeric matrix or vector"); endif if (nargin < 2 || isempty (tol))
--- a/scripts/sparse/bicgstab.m +++ b/scripts/sparse/bicgstab.m @@ -47,26 +47,26 @@ if (nargin < 2 || nargin > 7 || nargout > 5) print_usage (); - elseif (!isnumeric (A) || rows (A) != columns (A)) - error ("bicgstab: the first argument must be a n-by-n matrix"); + elseif (!(isnumeric (A) && issquare (A))) + error ("bicgstab: A must be a square numeric matrix"); elseif (!isvector (b)) - error ("bicgstab: b must be a vector"); + error ("bicgstab: B must be a vector"); elseif (!any (b)) - error ("bicgstab: b shuldn't be a vector of zeros"); + error ("bicgstab: B must not be a vector of all zeros"); elseif (rows (A) != rows (b)) - error ("bicgstab: the first and second argument must have the same number of rows"); + error ("bicgstab: A and B must have the same number of rows"); elseif (nargin > 2 && !isscalar (tol)) - error ("bicgstab: tol must be a scalar"); + error ("bicgstab: TOL must be a scalar"); elseif (nargin > 3 && !isscalar (maxit)) - error ("bicgstab: maxit must be a scalar"); + error ("bicgstab: MAXIT must be a scalar"); elseif (nargin > 4 && ismatrix (M1) && (rows (M1) != rows (A) || columns (M1) != columns (A))) error ("bicgstab: M1 must have the same number of rows and columns as A"); elseif (nargin > 5 && (!ismatrix (M2) || rows (M2) != rows (A) || columns (M2) != columns (A))) error ("bicgstab: M2 must have the same number of rows and columns as A"); elseif (nargin > 6 && !isvector (x0)) - error ("bicgstab: x0 must be a vector"); + error ("bicgstab: X0 must be a vector"); elseif (nargin > 6 && rows (x0) != rows (b)) - error ("bicgstab: x0 must have the same number of rows as b"); + error ("bicgstab: X0 must have the same number of rows as B"); endif ## Default tolerance.
--- a/scripts/sparse/cgs.m +++ b/scripts/sparse/cgs.m @@ -37,24 +37,24 @@ if (nargin < 2 || nargin > 7 || nargout > 5) print_usage (); - elseif (!isnumeric (A) || rows (A) != columns (A)) - error ("cgs: first argument must be a n-by-n matrix"); + elseif (!(isnumeric (A) && issquare (A))) + error ("cgs: A must be a square numeric matrix"); elseif (!isvector (b)) - error ("cgs: b must be a vector"); + error ("cgs: B must be a vector"); elseif (rows (A) != rows (b)) - error ("cgs: first and second argument must have the same number of rows"); + error ("cgs: A and B must have the same number of rows"); elseif (nargin > 2 && !isscalar (tol)) - error ("cgs: tol must be a scalar"); + error ("cgs: TOL must be a scalar"); elseif (nargin > 3 && !isscalar (maxit)) - error ("cgs: maxit must be a scalar"); + error ("cgs: MAXIT must be a scalar"); elseif (nargin > 4 && ismatrix (M1) && (rows (M1) != rows (A) || columns (M1) != columns (A))) error ("cgs: M1 must have the same number of rows and columns as A"); elseif (nargin > 5 && (!ismatrix (M2) || rows (M2) != rows (A) || columns (M2) != columns (A))) error ("cgs: M2 must have the same number of rows and columns as A"); elseif (nargin > 6 && !isvector (x0)) - error ("cgs: x0 must be a vector"); + error ("cgs: X0 must be a vector"); elseif (nargin > 6 && rows (x0) != rows (b)) - error ("cgs: x0 must have the same number of rows as b"); + error ("cgs: X0 must have the same number of rows as B"); endif ## Default tolerance.
--- a/scripts/sparse/spaugment.m +++ b/scripts/sparse/spaugment.m @@ -84,7 +84,7 @@ endif endif elseif (!isscalar (c)) - error ("spaugment: c must be a scalar"); + error ("spaugment: C must be a scalar"); endif [m, n] = size (A);
--- a/scripts/specfun/factor.m +++ b/scripts/specfun/factor.m @@ -44,7 +44,7 @@ endif if (! isscalar (q) || q != fix (q)) - error ("factor: q must be a scalar integer"); + error ("factor: Q must be a scalar integer"); endif ## Special case of no primes less than sqrt(q).
--- a/scripts/specfun/factorial.m +++ b/scripts/specfun/factorial.m @@ -30,7 +30,7 @@ if (nargin != 1) print_usage (); elseif (any (n(:) < 0 | n(:) != round (n(:)))) - error ("factorial: n must all be nonnegative integers"); + error ("factorial: N must all be nonnegative integers"); endif x = round (gamma (n+1)); endfunction
--- a/scripts/specfun/legendre.m +++ b/scripts/specfun/legendre.m @@ -174,7 +174,7 @@ case "unnorm" scale = 1; otherwise - error ('legendre: expecting normalization option to be "norm", "sch", or "unnorm"'); + error ('legendre: expecting NORMALIZATION option to be "norm", "sch", or "unnorm"'); endswitch if (rows (x) != 1)
--- a/scripts/specfun/nthroot.m +++ b/scripts/specfun/nthroot.m @@ -47,7 +47,7 @@ endif if (! isscalar (n)) - error ("nthroot: n must be a nonzero scalar"); + error ("nthroot: N must be a nonzero scalar"); endif if (n == 3) @@ -61,7 +61,7 @@ if (n == round (n) && mod (n, 2) == 1) y = abs (x) .^ (1/n) .* sign (x); elseif (any (x(:) < 0)) - error ("nthroot: if x contains negative values, n must be an odd integer"); + error ("nthroot: if X contains negative values, N must be an odd integer"); else y = x .^ (1/n); endif
--- a/scripts/specfun/primes.m +++ b/scripts/specfun/primes.m @@ -37,7 +37,7 @@ ## @end deftypefn ## Author: Paul Kienzle -## Author: Francesco Potortì +## Author: Francesco Potortì ## Author: Dirk Laurie function x = primes (n) @@ -47,7 +47,7 @@ endif if (! isscalar (n)) - error ("primes: n must be a scalar"); + error ("primes: N must be a scalar"); endif if (n > 100000)
--- a/scripts/special-matrix/hadamard.m +++ b/scripts/special-matrix/hadamard.m @@ -93,7 +93,7 @@ case 7 h = hnormalize (h28 ()); otherwise - error ("hadamard: n must be 2^k*p, for p = 1, 12, 20 or 28"); + error ("hadamard: N must be 2^k*p, for p = 1, 12, 20 or 28"); endswitch ## Build H(2^k*n) from kron(H(2^k),H(n)).
--- a/scripts/special-matrix/magic.m +++ b/scripts/special-matrix/magic.m @@ -31,7 +31,7 @@ endif if (n != floor (n) || n < 0 || n == 2) - error ("magic: n must be an positive integer not equal to 2"); + error ("magic: N must be an positive integer not equal to 2"); endif if (n == 0)
--- a/scripts/statistics/distributions/betacdf.m +++ b/scripts/statistics/distributions/betacdf.m @@ -35,7 +35,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("betacdf: x, a and b must be of common size or scalar"); + error ("betacdf: X, A and B must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/betainv.m +++ b/scripts/statistics/distributions/betainv.m @@ -35,7 +35,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("betainv: x, a and b must be of common size or scalars"); + error ("betainv: X, A and B must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/betapdf.m +++ b/scripts/statistics/distributions/betapdf.m @@ -35,7 +35,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("betapdf: x, a and b must be of common size or scalar"); + error ("betapdf: X, A and B must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/betarnd.m +++ b/scripts/statistics/distributions/betarnd.m @@ -37,23 +37,23 @@ if (!isscalar(a) || !isscalar(b)) [retval, a, b] = common_size (a, b); if (retval > 0) - error ("betarnd: a and b must be of common size or scalar"); + error ("betarnd: A and B must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("betarnd: r must be a positive integer"); + error ("betarnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("betarnd: c must be a positive integer"); + error ("betarnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("betarnd: a and b must be scalar or of size [r,c]"); + error ("betarnd: A and B must be scalar or of size [R,C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -61,12 +61,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("betarnd: r must be a positive integer or vector"); + error ("betarnd: R must be a positive integer or vector"); endif if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("betarnd: a and b must be scalar or of size sz"); + error ("betarnd: A and B must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(a);
--- a/scripts/statistics/distributions/binocdf.m +++ b/scripts/statistics/distributions/binocdf.m @@ -34,7 +34,7 @@ if (!isscalar (n) || !isscalar (p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("binocdf: x, n and p must be of common size or scalar"); + error ("binocdf: X, N and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/binoinv.m +++ b/scripts/statistics/distributions/binoinv.m @@ -34,7 +34,7 @@ if (!isscalar (n) || !isscalar (p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("binoinv: x, n and p must be of common size or scalars"); + error ("binoinv: X, N and P must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/binopdf.m +++ b/scripts/statistics/distributions/binopdf.m @@ -35,7 +35,7 @@ if (! isscalar (n) || ! isscalar (p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("binopdf: x, n and p must be of common size or scalar"); + error ("binopdf: X, N and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/binornd.m +++ b/scripts/statistics/distributions/binornd.m @@ -37,23 +37,23 @@ if (!isscalar(n) || !isscalar(p)) [retval, n, p] = common_size (n, p); if (retval > 0) - error ("binornd: n and p must be of common size or scalar"); + error ("binornd: N and P must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("binornd: r must be a positive integer"); + error ("binornd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("binornd: c must be a positive integer"); + error ("binornd: C must be a positive integer"); endif sz = [r, c]; if (any (size (n) != 1) && (length (size (n)) != length (sz) || any (size (n) != sz))) - error ("binornd: n and must be scalar or of size [r, c]"); + error ("binornd: N and must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -61,12 +61,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("binornd: r must be a positive integer or vector"); + error ("binornd: R must be a positive integer or vector"); endif if (any (size (n) != 1) && (length (size (n)) != length (sz) || any (size (n) != sz))) - error ("binornd: n and must be scalar or of size sz"); + error ("binornd: N and must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(n);
--- a/scripts/statistics/distributions/cauchy_cdf.m +++ b/scripts/statistics/distributions/cauchy_cdf.m @@ -42,7 +42,7 @@ if (!isscalar (location) || !isscalar (scale)) [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) - error ("cauchy_cdf: x, location and scale must be of common size or scalar"); + error ("cauchy_cdf: X, LOCATION and SCALE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/cauchy_inv.m +++ b/scripts/statistics/distributions/cauchy_inv.m @@ -42,7 +42,7 @@ if (!isscalar (location) || !isscalar (scale)) [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) - error ("cauchy_inv: x, location and scale must be of common size or scalar"); + error ("cauchy_inv: X, LOCATION and SCALE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/cauchy_pdf.m +++ b/scripts/statistics/distributions/cauchy_pdf.m @@ -42,7 +42,7 @@ if (!isscalar (location) || !isscalar (scale)) [retval, x, location, scale] = common_size (x, location, scale); if (retval > 0) - error ("cauchy_pdf: x, location and scale must be of common size or scalar"); + error ("cauchy_pdf: X, LOCATION and SCALE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/cauchy_rnd.m +++ b/scripts/statistics/distributions/cauchy_rnd.m @@ -37,24 +37,24 @@ if (!isscalar (location) || !isscalar (scale)) [retval, location, scale] = common_size (location, scale); if (retval > 0) - error ("cauchy_rnd: location and scale must be of common size or scalar"); + error ("cauchy_rnd: LOCATION and SCALE must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("cauchy_rnd: r must be a positive integer"); + error ("cauchy_rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("cauchy_rnd: c must be a positive integer"); + error ("cauchy_rnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (location) != 1) && (length (size (location)) != length (sz) || any (size (location) != sz))) - error ("cauchy_rnd: location and scale must be scalar or of size [r, c]"); + error ("cauchy_rnd: LOCATION and SCALE must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -62,13 +62,13 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("cauchy_rnd: r must be a positive integer or vector"); + error ("cauchy_rnd: R must be a positive integer or vector"); endif if (any (size (location) != 1) && (length (size (location)) != length (sz) || any (size (location) != sz))) - error ("cauchy_rnd: location and scale must be scalar or of size sz"); + error ("cauchy_rnd: LOCATION and SCALE must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(location);
--- a/scripts/statistics/distributions/chi2cdf.m +++ b/scripts/statistics/distributions/chi2cdf.m @@ -35,7 +35,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("chi2cdf: x and n must be of common size or scalar"); + error ("chi2cdf: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/chi2inv.m +++ b/scripts/statistics/distributions/chi2inv.m @@ -35,7 +35,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("chi2inv: x and n must be of common size or scalar"); + error ("chi2inv: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/chi2pdf.m +++ b/scripts/statistics/distributions/chi2pdf.m @@ -35,7 +35,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("chi2pdf: x and n must be of common size or scalar"); + error ("chi2pdf: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/chi2rnd.m +++ b/scripts/statistics/distributions/chi2rnd.m @@ -34,16 +34,16 @@ if (nargin == 3) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("chi2rnd: r must be a positive integer"); + error ("chi2rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("chi2rnd: c must be a positive integer"); + error ("chi2rnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (n) != 1) && (length (size (n)) != length (sz) || any (size (n) != sz))) - error ("chi2rnd: n must be scalar or of size [r, c]"); + error ("chi2rnd: N must be scalar or of size [R, C]"); endif elseif (nargin == 2) if (isscalar (r) && (r > 0)) @@ -51,12 +51,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("chi2rnd: r must be a positive integer or vector"); + error ("chi2rnd: R must be a positive integer or vector"); endif if (any (size (n) != 1) && (length (size (n)) != length (sz) || any (size (n) != sz))) - error ("chi2rnd: n must be scalar or of size sz"); + error ("chi2rnd: N must be scalar or of size SZ"); endif elseif (nargin == 1) sz = size(n);
--- a/scripts/statistics/distributions/discrete_cdf.m +++ b/scripts/statistics/distributions/discrete_cdf.m @@ -32,11 +32,11 @@ sz = size (x); if (! isvector (v)) - error ("discrete_cdf: v must be a vector"); + error ("discrete_cdf: V must be a vector"); elseif (! isvector (p) || (length (p) != length (v))) - error ("discrete_cdf: p must be a vector with length (v) elements"); + error ("discrete_cdf: P must be a vector with length (V) elements"); elseif (! (all (p >= 0) && any (p))) - error ("discrete_cdf: p must be a nonzero, nonnegative vector"); + error ("discrete_cdf: P must be a nonzero, nonnegative vector"); endif n = numel (x);
--- a/scripts/statistics/distributions/discrete_inv.m +++ b/scripts/statistics/distributions/discrete_inv.m @@ -36,11 +36,11 @@ sz = size (x); if (! isvector (v)) - error ("discrete_inv: v must be a vector"); + error ("discrete_inv: V must be a vector"); elseif (! isvector (p) || (length (p) != length (v))) - error ("discrete_inv: p must be a vector with length (v) elements"); + error ("discrete_inv: P must be a vector with length (V) elements"); elseif (! (all (p >= 0) && any (p))) - error ("discrete_inv: p must be a nonzero, nonnegative vector"); + error ("discrete_inv: P must be a nonzero, nonnegative vector"); endif n = numel (x);
--- a/scripts/statistics/distributions/discrete_pdf.m +++ b/scripts/statistics/distributions/discrete_pdf.m @@ -36,11 +36,11 @@ sz = size (x); if (! isvector (v)) - error ("discrete_pdf: v must be a vector"); + error ("discrete_pdf: V must be a vector"); elseif (! isvector (p) || (length (p) != length (v))) - error ("discrete_pdf: p must be a vector with length (v) elements"); + error ("discrete_pdf: P must be a vector with length (V) elements"); elseif (! (all (p >= 0) && any (p))) - error ("discrete_pdf: p must be a nonzero, nonnegative vector"); + error ("discrete_pdf: P must be a nonzero, nonnegative vector"); endif n = numel (x);
--- a/scripts/statistics/distributions/discrete_rnd.m +++ b/scripts/statistics/distributions/discrete_rnd.m @@ -37,10 +37,10 @@ if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("discrete_rnd: r must be a positive integer"); + error ("discrete_rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("discrete_rnd: c must be a positive integer"); + error ("discrete_rnd: C must be a positive integer"); endif sz = [r, c]; elseif (nargin == 3) @@ -59,7 +59,7 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("discrete_rnd: r must be a positive integer or vector"); + error ("discrete_rnd: R must be a positive integer or vector"); endif endif else @@ -67,11 +67,11 @@ endif if (! isvector (v)) - error ("discrete_rnd: v must be a vector"); + error ("discrete_rnd: V must be a vector"); elseif (! isvector (p) || (length (p) != length (v))) - error ("discrete_rnd: p must be a vector with length (v) elements"); + error ("discrete_rnd: P must be a vector with length (V) elements"); elseif (! (all (p >= 0) && any (p))) - error ("discrete_rnd: p must be a nonzero, nonnegative vector"); + error ("discrete_rnd: P must be a nonzero, nonnegative vector"); endif rnd = v (lookup (cumsum (p (1 : end-1)) / sum(p), rand (sz)) + 1);
--- a/scripts/statistics/distributions/empirical_cdf.m +++ b/scripts/statistics/distributions/empirical_cdf.m @@ -33,7 +33,7 @@ endif if (! isvector (data)) - error ("empirical_cdf: data must be a vector"); + error ("empirical_cdf: DATA must be a vector"); endif cdf = discrete_cdf (x, data, ones (size (data)) / length (data));
--- a/scripts/statistics/distributions/empirical_inv.m +++ b/scripts/statistics/distributions/empirical_inv.m @@ -33,7 +33,7 @@ endif if (! isvector (data)) - error ("empirical_inv: data must be a vector"); + error ("empirical_inv: DATA must be a vector"); endif inv = discrete_inv (x, data, ones (size (data)) / length (data));
--- a/scripts/statistics/distributions/empirical_pdf.m +++ b/scripts/statistics/distributions/empirical_pdf.m @@ -33,7 +33,7 @@ endif if (! isvector (data)) - error ("empirical_pdf: data must be a vector"); + error ("empirical_pdf: DATA must be a vector"); endif pdf = discrete_pdf (x, data, ones (size (data)) / length (data));
--- a/scripts/statistics/distributions/empirical_rnd.m +++ b/scripts/statistics/distributions/empirical_rnd.m @@ -45,7 +45,7 @@ endif if (! isvector (data)) - error ("empirical_rnd: data must be a vector"); + error ("empirical_rnd: DATA must be a vector"); endif rnd = discrete_rnd (data, ones (size (data)) / length (data), r, c);
--- a/scripts/statistics/distributions/expcdf.m +++ b/scripts/statistics/distributions/expcdf.m @@ -37,7 +37,7 @@ if (!isscalar (x) && !isscalar(lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("expcdf: x and lambda must be of common size or scalar"); + error ("expcdf: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/expinv.m +++ b/scripts/statistics/distributions/expinv.m @@ -35,7 +35,7 @@ if (!isscalar (x) && !isscalar(lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("expinv: x and lambda must be of common size or scalar"); + error ("expinv: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/exppdf.m +++ b/scripts/statistics/distributions/exppdf.m @@ -34,7 +34,7 @@ if (!isscalar (x) && !isscalar(lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("exppdf: x and lambda must be of common size or scalar"); + error ("exppdf: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/exprnd.m +++ b/scripts/statistics/distributions/exprnd.m @@ -35,16 +35,16 @@ if (nargin == 3) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("exprnd: r must be a positive integer"); + error ("exprnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("exprnd: c must be a positive integer"); + error ("exprnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (lambda) != 1) && (length (size (lambda)) != length (sz) || any (size (lambda) != sz))) - error ("exprnd: lambda must be scalar or of size [r, c]"); + error ("exprnd: LAMBDA must be scalar or of size [R, C]"); endif elseif (nargin == 2) if (isscalar (r) && (r > 0)) @@ -52,12 +52,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("exprnd: r must be a positive integer or vector"); + error ("exprnd: R must be a positive integer or vector"); endif if (any (size (lambda) != 1) && ((length (size (lambda)) != length (sz)) || any (size (lambda) != sz))) - error ("exprnd: lambda must be scalar or of size sz"); + error ("exprnd: LAMBDA must be scalar or of size SZ"); endif elseif (nargin == 1) sz = size (lambda);
--- a/scripts/statistics/distributions/fcdf.m +++ b/scripts/statistics/distributions/fcdf.m @@ -35,7 +35,7 @@ if (!isscalar (m) || !isscalar (n)) [retval, x, m, n] = common_size (x, m, n); if (retval > 0) - error ("fcdf: x, m and n must be of common size or scalar"); + error ("fcdf: X, M and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/finv.m +++ b/scripts/statistics/distributions/finv.m @@ -35,7 +35,7 @@ if (!isscalar (m) || !isscalar (n)) [retval, x, m, n] = common_size (x, m, n); if (retval > 0) - error ("finv: x, m and n must be of common size or scalar"); + error ("finv: X, M and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/fpdf.m +++ b/scripts/statistics/distributions/fpdf.m @@ -35,7 +35,7 @@ if (!isscalar (m) || !isscalar (n)) [retval, x, m, n] = common_size (x, m, n); if (retval > 0) - error ("fpdf: x, m and n must be of common size or scalar"); + error ("fpdf: X, M and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/frnd.m +++ b/scripts/statistics/distributions/frnd.m @@ -38,7 +38,7 @@ if (!isscalar(m) || !isscalar(n)) [retval, m, n] = common_size (m, n); if (retval > 0) - error ("frnd: m and n must be of common size or scalar"); + error ("frnd: M and N must be of common size or scalar"); endif endif endif @@ -46,16 +46,16 @@ if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("frnd: r must be a positive integer"); + error ("frnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("frnd: c must be a positive integer"); + error ("frnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (m) != 1) && ((length (size (m)) != length (sz)) || any (size (m) != sz))) - error ("frnd: m and n must be scalar or of size [r,c]"); + error ("frnd: M and N must be scalar or of size [R,C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -63,12 +63,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("frnd: r must be a positive integer or vector"); + error ("frnd: R must be a positive integer or vector"); endif if (any (size (m) != 1) && ((length (size (m)) != length (sz)) || any (size (m) != sz))) - error ("frnd: m and n must be scalar or of size sz"); + error ("frnd: M and N must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(a);
--- a/scripts/statistics/distributions/gamcdf.m +++ b/scripts/statistics/distributions/gamcdf.m @@ -36,7 +36,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("gamcdf: x, a and b must be of common size or scalars"); + error ("gamcdf: X, A and B must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/gaminv.m +++ b/scripts/statistics/distributions/gaminv.m @@ -36,7 +36,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("gaminv: x, a and b must be of common size or scalars"); + error ("gaminv: X, A and B must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/gampdf.m +++ b/scripts/statistics/distributions/gampdf.m @@ -36,7 +36,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("gampdf: x, a and b must be of common size or scalars"); + error ("gampdf: X, A and B must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/gamrnd.m +++ b/scripts/statistics/distributions/gamrnd.m @@ -38,23 +38,23 @@ if (!isscalar(a) || !isscalar(b)) [retval, a, b] = common_size (a, b); if (retval > 0) - error ("gamrnd: a and b must be of common size or scalar"); + error ("gamrnd: A and B must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("gamrnd: r must be a positive integer"); + error ("gamrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("gamrnd: c must be a positive integer"); + error ("gamrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("gamrnd: a and b must be scalar or of size [r, c]"); + error ("gamrnd: A and B must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -62,12 +62,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("gamrnd: r must be a positive integer or vector"); + error ("gamrnd: R must be a positive integer or vector"); endif if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("gamrnd: a and b must be scalar or of size sz"); + error ("gamrnd: A and B must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(a);
--- a/scripts/statistics/distributions/geocdf.m +++ b/scripts/statistics/distributions/geocdf.m @@ -34,7 +34,7 @@ if (!isscalar (x) && !isscalar (p)) [retval, x, p] = common_size (x, p); if (retval > 0) - error ("geocdf: x and p must be of common size or scalar"); + error ("geocdf: X and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/geoinv.m +++ b/scripts/statistics/distributions/geoinv.m @@ -34,7 +34,7 @@ if (!isscalar (x) && !isscalar (p)) [retval, x, p] = common_size (x, p); if (retval > 0) - error ("geoinv: x and p must be of common size or scalar"); + error ("geoinv: X and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/geopdf.m +++ b/scripts/statistics/distributions/geopdf.m @@ -34,7 +34,7 @@ if (!isscalar (x) && !isscalar (p)) [retval, x, p] = common_size (x, p); if (retval > 0) - error ("geopdf: x and p must be of common size or scalar"); + error ("geopdf: X and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/geornd.m +++ b/scripts/statistics/distributions/geornd.m @@ -35,16 +35,16 @@ if (nargin == 3) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("geornd: r must be a positive integer"); + error ("geornd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("geornd: c must be a positive integer"); + error ("geornd: C must be a positive integer"); endif sz = [r, c]; if (any (size (p) != 1) && ((length (size (p)) != length (sz)) || any (size (p) != sz))) - error ("geornd: p must be scalar or of size [r, c]"); + error ("geornd: P must be scalar or of size [R, C]"); endif elseif (nargin == 2) if (isscalar (r) && (r > 0)) @@ -52,12 +52,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("geornd: r must be a positive integer or vector"); + error ("geornd: R must be a positive integer or vector"); endif if (any (size (p) != 1) && ((length (size (p)) != length (sz)) || any (size (p) != sz))) - error ("geornd: n must be scalar or of size sz"); + error ("geornd: n must be scalar or of size SZ"); endif elseif (nargin == 1) sz = size(n);
--- a/scripts/statistics/distributions/hygecdf.m +++ b/scripts/statistics/distributions/hygecdf.m @@ -39,7 +39,7 @@ endif if (!isscalar (t) || !isscalar (m) || !isscalar (n)) - error ("hygecdf: t, m and n must all be positive integers"); + error ("hygecdf: T, M and N must all be positive integers"); endif if (t < 0 || m < 0 || n <= 0 || t != round (t) || m != round (m)
--- a/scripts/statistics/distributions/hygeinv.m +++ b/scripts/statistics/distributions/hygeinv.m @@ -36,7 +36,7 @@ endif if (!isscalar (t) || !isscalar (m) || !isscalar (n)) - error ("hygeinv: t, m and n must all be positive integers"); + error ("hygeinv: T, M and N must all be positive integers"); endif if (t < 0 || m < 0 || n <= 0 || t != round (t) || m != round (m)
--- a/scripts/statistics/distributions/hygepdf.m +++ b/scripts/statistics/distributions/hygepdf.m @@ -39,7 +39,7 @@ if (!isscalar (t) || !isscalar (m) || !isscalar (n)) [retval, x, t, m, n] = common_size (x, t, m, n); if (retval > 0) - error ("hygepdf: x, t, m, and n must be of common size or scalar"); + error ("hygepdf: X, T, M, and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/hygernd.m +++ b/scripts/statistics/distributions/hygernd.m @@ -36,10 +36,10 @@ if (nargin == 5) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("hygernd: r must be a positive integer"); + error ("hygernd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("hygernd: c must be a positive integer"); + error ("hygernd: C must be a positive integer"); endif sz = [r, c]; elseif (nargin == 4) @@ -50,7 +50,7 @@ sz = r(:)'; endif else - error ("hygernd: r must be a vector of positive integers"); + error ("hygernd: R must be a vector of positive integers"); endif elseif (nargin != 3) print_usage (); @@ -59,11 +59,11 @@ if (! isscalar (t) || ! isscalar (m) || ! isscalar (n)) [retval, t, m, n] = common_size (t, m, n); if (retval > 0) - error ("hygernd: t, m and n must be of common size or scalar"); + error ("hygernd: T, M and N must be of common size or scalar"); endif if (nargin > 3) if (any (sz != size (t))) - error ("hygernd: t, m and n must have the same size as implied by r and c or must be scalar"); + error ("hygernd: T, M and N must have the same size as implied by R and C or must be scalar"); endif else sz = size (t);
--- a/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m +++ b/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m @@ -58,7 +58,7 @@ endif else if (! (isscalar (tol) && (tol > 0))) - error ("kolmogorov_smirnov_cdf: tol must be a positive scalar"); + error ("kolmogorov_smirnov_cdf: TOL must be a positive scalar"); endif endif
--- a/scripts/statistics/distributions/laplace_rnd.m +++ b/scripts/statistics/distributions/laplace_rnd.m @@ -32,10 +32,10 @@ if (nargin == 2) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("laplace_rnd: r must be a positive integer"); + error ("laplace_rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("laplace_rnd: c must be a positive integer"); + error ("laplace_rnd: C must be a positive integer"); endif sz = [r, c]; elseif (nargin == 1) @@ -44,7 +44,7 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("laplace_rnd: r must be a positive integer or vector"); + error ("laplace_rnd: R must be a positive integer or vector"); endif else print_usage ();
--- a/scripts/statistics/distributions/logistic_rnd.m +++ b/scripts/statistics/distributions/logistic_rnd.m @@ -33,10 +33,10 @@ if (nargin == 2) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("logistic_rnd: r must be a positive integer"); + error ("logistic_rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("logistic_rnd: c must be a positive integer"); + error ("logistic_rnd: C must be a positive integer"); endif sz = [r, c]; elseif (nargin == 1) @@ -45,7 +45,7 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("logistic_rnd: r must be a positive integer or vector"); + error ("logistic_rnd: R must be a positive integer or vector"); endif else print_usage ();
--- a/scripts/statistics/distributions/logncdf.m +++ b/scripts/statistics/distributions/logncdf.m @@ -49,7 +49,7 @@ if (!isscalar (mu) || !isscalar (sigma)) [retval, x, mu, sigma] = common_size (x, mu, sigma); if (retval > 0) - error ("logncdf: x, mu and sigma must be of common size or scalars"); + error ("logncdf: X, MU and SIGMA must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/logninv.m +++ b/scripts/statistics/distributions/logninv.m @@ -49,7 +49,7 @@ if (!isscalar (mu) || !isscalar (sigma)) [retval, x, mu, sigma] = common_size (x, mu, sigma); if (retval > 0) - error ("logninv: x, mu and sigma must be of common size or scalars"); + error ("logninv: X, MU and SIGMA must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/lognpdf.m +++ b/scripts/statistics/distributions/lognpdf.m @@ -49,7 +49,7 @@ if (!isscalar (mu) || !isscalar (sigma)) [retval, x, mu, sigma] = common_size (x, mu, sigma); if (retval > 0) - error ("lognpdf: x, mu and sigma must be of common size or scalars"); + error ("lognpdf: X, MU and SIGMA must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/lognrnd.m +++ b/scripts/statistics/distributions/lognrnd.m @@ -37,23 +37,23 @@ if (!isscalar(mu) || !isscalar(sigma)) [retval, mu, sigma] = common_size (mu, sigma); if (retval > 0) - error ("lognrnd: mu and sigma must be of common size or scalar"); + error ("lognrnd: MU and SIGMA must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("lognrnd: r must be a positive integer"); + error ("lognrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("lognrnd: c must be a positive integer"); + error ("lognrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (mu) != 1) && ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) - error ("lognrnd: mu and sigma must be scalar or of size [r, c]"); + error ("lognrnd: MU and SIGMA must be scalar or of size [R, C]"); endif elseif (nargin == 3) @@ -62,12 +62,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("lognrnd: r must be a positive integer or vector"); + error ("lognrnd: R must be a positive integer or vector"); endif if (any (size (mu) != 1) && ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) - error ("lognrnd: mu and sigma must be scalar or of size sz"); + error ("lognrnd: MU and SIGMA must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(mu);
--- a/scripts/statistics/distributions/nbincdf.m +++ b/scripts/statistics/distributions/nbincdf.m @@ -38,7 +38,7 @@ if (!isscalar(n) || !isscalar(p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("nbincdf: x, n and p must be of common size or scalar"); + error ("nbincdf: X, N and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/nbininv.m +++ b/scripts/statistics/distributions/nbininv.m @@ -39,7 +39,7 @@ if (!isscalar(n) || !isscalar(p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("nbininv: x, n and p must be of common size or scalar"); + error ("nbininv: X, N and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/nbinpdf.m +++ b/scripts/statistics/distributions/nbinpdf.m @@ -39,7 +39,7 @@ if (!isscalar(n) || !isscalar(p)) [retval, x, n, p] = common_size (x, n, p); if (retval > 0) - error ("nbinpdf: x, n and p must be of common size or scalar"); + error ("nbinpdf: X, N and P must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/nbinrnd.m +++ b/scripts/statistics/distributions/nbinrnd.m @@ -37,23 +37,23 @@ if (!isscalar(n) || !isscalar(p)) [retval, n, p] = common_size (n, p); if (retval > 0) - error ("nbinrnd: n and p must be of common size or scalar"); + error ("nbinrnd: N and P must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("nbinrnd: r must be a positive integer"); + error ("nbinrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("nbinrnd: c must be a positive integer"); + error ("nbinrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (n) != 1) && ((length (size (n)) != length (sz)) || any (size (n) != sz))) - error ("nbinrnd: n and p must be scalar or of size [r, c]"); + error ("nbinrnd: N and P must be scalar or of size [R, C]"); endif elseif (nargin == 3) @@ -62,12 +62,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("nbinrnd: r must be a positive integer or vector"); + error ("nbinrnd: R must be a positive integer or vector"); endif if (any (size (n) != 1) && ((length (size (n)) != length (sz)) || any (size (n) != sz))) - error ("nbinrnd: n and p must be scalar or of size sz"); + error ("nbinrnd: N and P must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(n);
--- a/scripts/statistics/distributions/normcdf.m +++ b/scripts/statistics/distributions/normcdf.m @@ -42,7 +42,7 @@ if (!isscalar (m) || !isscalar (s)) [retval, x, m, s] = common_size (x, m, s); if (retval > 0) - error ("normcdf: x, m and s must be of common size or scalar"); + error ("normcdf: X, M and S must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/norminv.m +++ b/scripts/statistics/distributions/norminv.m @@ -42,7 +42,7 @@ if (!isscalar (m) || !isscalar (s)) [retval, x, m, s] = common_size (x, m, s); if (retval > 0) - error ("norminv: x, m and s must be of common size or scalars"); + error ("norminv: X, M and S must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/normpdf.m +++ b/scripts/statistics/distributions/normpdf.m @@ -42,7 +42,7 @@ if (!isscalar (m) || !isscalar (s)) [retval, x, m, s] = common_size (x, m, s); if (retval > 0) - error ("normpdf: x, m and s must be of common size or scalars"); + error ("normpdf: X, M and S must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/normrnd.m +++ b/scripts/statistics/distributions/normrnd.m @@ -37,23 +37,23 @@ if (!isscalar (m) || !isscalar (s)) [retval, m, s] = common_size (m, s); if (retval > 0) - error ("normrnd: m and s must be of common size or scalar"); + error ("normrnd: M and S must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("normrnd: r must be a positive integer"); + error ("normrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("normrnd: c must be a positive integer"); + error ("normrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (m) != 1) && (length (size (m)) != length (sz) || any (size (m) != sz))) - error ("normrnd: m and s must be scalar or of size [r, c]"); + error ("normrnd: M and S must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -61,12 +61,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("normrnd: r must be a positive integer or vector"); + error ("normrnd: R must be a positive integer or vector"); endif if (any (size (m) != 1) && (length (size (m)) != length (sz) || any (size (m) != sz))) - error ("normrnd: m and s must be scalar or of size sz"); + error ("normrnd: M and S must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(m);
--- a/scripts/statistics/distributions/poisscdf.m +++ b/scripts/statistics/distributions/poisscdf.m @@ -35,7 +35,7 @@ if (!isscalar (lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("poisscdf: x and lambda must be of common size or scalar"); + error ("poisscdf: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/poissinv.m +++ b/scripts/statistics/distributions/poissinv.m @@ -35,7 +35,7 @@ if (!isscalar (lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("poissinv: x and lambda must be of common size or scalar"); + error ("poissinv: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/poisspdf.m +++ b/scripts/statistics/distributions/poisspdf.m @@ -34,7 +34,7 @@ if (!isscalar (lambda)) [retval, x, lambda] = common_size (x, lambda); if (retval > 0) - error ("poisspdf: x and lambda must be of common size or scalar"); + error ("poisspdf: X and LAMBDA must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/poissrnd.m +++ b/scripts/statistics/distributions/poissrnd.m @@ -33,16 +33,16 @@ if (nargin == 3) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("poissrnd: r must be a positive integer"); + error ("poissrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("poissrnd: c must be a positive integer"); + error ("poissrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (lambda) != 1) && ((length (size (lambda)) != length (sz)) || any (size (lambda) != sz))) - error ("poissrnd: lambda must be scalar or of size [r, c]"); + error ("poissrnd: LAMBDA must be scalar or of size [R, C]"); endif elseif (nargin == 2) if (isscalar (r) && (r > 0)) @@ -50,12 +50,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("poissrnd: r must be a positive integer or vector"); + error ("poissrnd: R must be a positive integer or vector"); endif if (any (size (lambda) != 1) && ((length (size (lambda)) != length (sz)) || any (size (lambda) != sz))) - error ("poissrnd: lambda must be scalar or of size sz"); + error ("poissrnd: LAMBDA must be scalar or of size sz"); endif elseif (nargin == 1) sz = size (lambda);
--- a/scripts/statistics/distributions/stdnormal_cdf.m +++ b/scripts/statistics/distributions/stdnormal_cdf.m @@ -34,7 +34,7 @@ sz = size (x); if (numel(x) == 0) - error ("stdnormal_cdf: x must not be empty"); + error ("stdnormal_cdf: X must not be empty"); endif cdf = erfc (x / (-sqrt(2))) / 2;
--- a/scripts/statistics/distributions/stdnormal_rnd.m +++ b/scripts/statistics/distributions/stdnormal_rnd.m @@ -35,10 +35,10 @@ if (nargin == 2) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("stdnormal_rnd: r must be a positive integer"); + error ("stdnormal_rnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("stdnormal_rnd: c must be a positive integer"); + error ("stdnormal_rnd: C must be a positive integer"); endif sz = [r, c]; else @@ -47,7 +47,7 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("stdnormal_rnd: r must be a positive integer or vector"); + error ("stdnormal_rnd: R must be a positive integer or vector"); endif endif
--- a/scripts/statistics/distributions/tcdf.m +++ b/scripts/statistics/distributions/tcdf.m @@ -35,7 +35,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("tcdf: x and n must be of common size or scalar"); + error ("tcdf: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/tinv.m +++ b/scripts/statistics/distributions/tinv.m @@ -41,7 +41,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("tinv: x and n must be of common size or scalar"); + error ("tinv: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/tpdf.m +++ b/scripts/statistics/distributions/tpdf.m @@ -35,7 +35,7 @@ if (!isscalar (n)) [retval, x, n] = common_size (x, n); if (retval > 0) - error ("tpdf: x and n must be of common size or scalar"); + error ("tpdf: X and N must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/trnd.m +++ b/scripts/statistics/distributions/trnd.m @@ -35,16 +35,16 @@ if (nargin == 3) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("trnd: r must be a positive integer"); + error ("trnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("trnd: c must be a positive integer"); + error ("trnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (n) != 1) && ((length (size (n)) != length (sz)) || any (size (n) != sz))) - error ("trnd: n must be scalar or of size sz"); + error ("trnd: N must be scalar or of size SZ"); endif elseif (nargin == 2) if (isscalar (r) && (r > 0)) @@ -52,12 +52,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("trnd: r must be a positive integer or vector"); + error ("trnd: R must be a positive integer or vector"); endif if (any (size (n) != 1) && ((length (size (n)) != length (sz)) || any (size (n) != sz))) - error ("trnd: n must be scalar or of size sz"); + error ("trnd: N must be scalar or of size SZ"); endif elseif (nargin == 1) sz = size (n);
--- a/scripts/statistics/distributions/unidrnd.m +++ b/scripts/statistics/distributions/unidrnd.m @@ -49,7 +49,7 @@ endfor dims = [varargin{:}]; else - error ("unidrnd: Usage unirnd (n, ...)"); + print_usage (); endif if (isscalar (n) || (length (size (n)) == length (dims) && all (size (n) == dims)))
--- a/scripts/statistics/distributions/unifcdf.m +++ b/scripts/statistics/distributions/unifcdf.m @@ -41,7 +41,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("unifcdf: x, a and b must be of common size or scalar"); + error ("unifcdf: X, A and B must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/unifinv.m +++ b/scripts/statistics/distributions/unifinv.m @@ -41,7 +41,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("unifinv: x, a and b must be of common size or scalar"); + error ("unifinv: X, A and B must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/unifpdf.m +++ b/scripts/statistics/distributions/unifpdf.m @@ -41,7 +41,7 @@ if (!isscalar (a) || !isscalar(b)) [retval, x, a, b] = common_size (x, a, b); if (retval > 0) - error ("unifpdf: x, a and b must be of common size or scalars"); + error ("unifpdf: X, A and B must be of common size or scalars"); endif endif
--- a/scripts/statistics/distributions/unifrnd.m +++ b/scripts/statistics/distributions/unifrnd.m @@ -36,23 +36,23 @@ if (!isscalar(a) || !isscalar(b)) [retval, a, b] = common_size (a, b); if (retval > 0) - error ("unifrnd: a and b must be of common size or scalar"); + error ("unifrnd: A and B must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("unifrnd: r must be a positive integer"); + error ("unifrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("unifrnd: c must be a positive integer"); + error ("unifrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("unifrnd: a and b must be scalar or of size [r, c]"); + error ("unifrnd: A and B must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -60,12 +60,12 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("unifrnd: r must be a positive integer or vector"); + error ("unifrnd: R must be a positive integer or vector"); endif if (any (size (a) != 1) && (length (size (a)) != length (sz) || any (size (a) != sz))) - error ("unifrnd: a and b must be scalar or of size sz"); + error ("unifrnd: A and B must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(a);
--- a/scripts/statistics/distributions/wblcdf.m +++ b/scripts/statistics/distributions/wblcdf.m @@ -56,7 +56,7 @@ if (!isscalar (shape) || !isscalar (scale)) [retval, x, shape, scale] = common_size (x, shape, scale); if (retval > 0) - error ("wblcdf: x, scale and shape must be of common size or scalar"); + error ("wblcdf: X, SCALE and SHAPE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/wblinv.m +++ b/scripts/statistics/distributions/wblinv.m @@ -43,7 +43,7 @@ if (!isscalar (scale) || !isscalar (shape)) [retval, x, scale, shape] = common_size (x, scale, shape); if (retval > 0) - error ("wblinv: x, scale and shape must be of common size or scalar"); + error ("wblinv: X, SCALE and SHAPE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/wblpdf.m +++ b/scripts/statistics/distributions/wblpdf.m @@ -55,7 +55,7 @@ if (!isscalar (scale) || !isscalar (shape)) [retval, x, scale, shape] = common_size (x, scale, shape); if (retval > 0) - error ("wblpdf: x, scale and shape must be of common size or scalar"); + error ("wblpdf: X, SCALE and SHAPE must be of common size or scalar"); endif endif
--- a/scripts/statistics/distributions/wblrnd.m +++ b/scripts/statistics/distributions/wblrnd.m @@ -37,24 +37,24 @@ if (!isscalar(scale) || !isscalar(shape)) [retval, scale, shape] = common_size (scale, shape); if (retval > 0) - error ("wblrnd: scale and shape must be of common size or scalar"); + error ("wblrnd: SCALE and SHAPE must be of common size or scalar"); endif endif endif if (nargin == 4) if (! (isscalar (r) && (r > 0) && (r == round (r)))) - error ("wblrnd: r must be a positive integer"); + error ("wblrnd: R must be a positive integer"); endif if (! (isscalar (c) && (c > 0) && (c == round (c)))) - error ("wblrnd: c must be a positive integer"); + error ("wblrnd: C must be a positive integer"); endif sz = [r, c]; if (any (size (scale) != 1) && ((length (size (scale)) != length (sz)) || any (size (scale) != sz))) - error ("wblrnd: scale and shape must be scalar or of size [r, c]"); + error ("wblrnd: SCALE and SHAPE must be scalar or of size [R, C]"); endif elseif (nargin == 3) if (isscalar (r) && (r > 0)) @@ -62,13 +62,13 @@ elseif (isvector(r) && all (r > 0)) sz = r(:)'; else - error ("wblrnd: r must be a positive integer or vector"); + error ("wblrnd: R must be a positive integer or vector"); endif if (any (size (scale) != 1) && ((length (size (scale)) != length (sz)) || any (size (scale) != sz))) - error ("wblrnd: scale and shape must be scalar or of size sz"); + error ("wblrnd: SCALE and SHAPE must be scalar or of size SZ"); endif elseif (nargin == 2) sz = size(scale);
--- a/scripts/statistics/distributions/wienrnd.m +++ b/scripts/statistics/distributions/wienrnd.m @@ -43,7 +43,7 @@ endif if (!isscalar (t) || !isscalar (d) || !isscalar (n)) - error ("wienrnd: t, d and n must all be positive integers"); + error ("wienrnd: T, D and N must all be positive integers"); endif retval = randn (n * t, d);
--- a/scripts/statistics/models/logistic_regression.m +++ b/scripts/statistics/models/logistic_regression.m @@ -96,7 +96,7 @@ endif; [mx, nx] = size (x); if (mx != my) - error ("logistic_regression: x and y must have the same number of observations"); + error ("logistic_regression: X and Y must have the same number of observations"); endif ## initial calculations
--- a/scripts/statistics/tests/anova.m +++ b/scripts/statistics/tests/anova.m @@ -51,18 +51,18 @@ print_usage (); elseif (nargin == 1) if (isvector (y)) - error ("anova: for `anova (y)', y must not be a vector"); + error ("anova: for `anova (Y)', Y must not be a vector"); endif [group_count, k] = size (y); n = group_count * k; group_mean = mean (y); else if (! isvector (y)) - error ("anova: for `anova (y, g)', y must be a vector"); + error ("anova: for `anova (Y, G)', Y must be a vector"); endif n = length (y); if (! isvector (g) || (length (g) != n)) - error ("anova: g must be a vector of the same length as y"); + error ("anova: G must be a vector of the same length as Y"); endif s = sort (g); i = find (s (2 : n) > s(1 : (n-1)));
--- a/scripts/statistics/tests/chisquare_test_homogeneity.m +++ b/scripts/statistics/tests/chisquare_test_homogeneity.m @@ -44,12 +44,12 @@ endif if (! (isvector(x) && isvector(y) && isvector(c))) - error ("chisquare_test_homogeneity: x, y and c must be vectors"); + error ("chisquare_test_homogeneity: X, Y and C must be vectors"); endif ## Now test c for strictly increasing entries df = length (c); if (any ((c(2 : df) - c(1 : (df - 1))) <= 0)) - error ("chisquare_test_homogeneity: c must be increasing"); + error ("chisquare_test_homogeneity: C must be increasing"); endif c = [(reshape (c, 1, df)), Inf];
--- a/scripts/statistics/tests/cor_test.m +++ b/scripts/statistics/tests/cor_test.m @@ -79,7 +79,7 @@ if (nargin < 3) alt = "!="; elseif (! ischar (alt)) - error ("cor_test: alt must be a string"); + error ("cor_test: ALT must be a string"); endif if (nargin < 4)
--- a/scripts/statistics/tests/f_test_regression.m +++ b/scripts/statistics/tests/f_test_regression.m @@ -44,19 +44,19 @@ [T, k] = size (x); if (! (isvector (y) && (length (y) == T))) - error ("f_test_regression: y must be a vector of length rows (X)"); + error ("f_test_regression: Y must be a vector of length rows (X)"); endif y = reshape (y, T, 1); [q, c_R ] = size (rr); if (c_R != k) - error ("f_test_regression: rr must have as many columns as x"); + error ("f_test_regression: RR must have as many columns as X"); endif if (nargin == 4) s_r = size (r); if ((min (s_r) != 1) || (max (s_r) != q)) - error ("f_test_regression: r must be a vector of length rows (rr)"); + error ("f_test_regression: R must be a vector of length rows (RR)"); endif r = reshape (r, q, 1); else
--- a/scripts/statistics/tests/hotelling_test.m +++ b/scripts/statistics/tests/hotelling_test.m @@ -44,22 +44,22 @@ if (isvector (x)) if (! isscalar (m)) - error ("hotelling_test: if x is a vector, m must be a scalar"); + error ("hotelling_test: if X is a vector, M must be a scalar"); endif n = length (x); p = 1; elseif (ismatrix (x)) [n, p] = size (x); if (n <= p) - error ("hotelling_test: x must have more rows than columns"); + error ("hotelling_test: X must have more rows than columns"); endif if (isvector (m) && length (m) == p) m = reshape (m, 1, p); else - error ("hotelling_test: if x is a matrix, m must be a vector of length columns (x)"); + error ("hotelling_test: if X is a matrix, M must be a vector of length columns (X)"); endif else - error ("hotelling_test: x must be a matrix or vector"); + error ("hotelling_test: X must be a matrix or vector"); endif d = mean (x) - m;
--- a/scripts/statistics/tests/hotelling_test_2.m +++ b/scripts/statistics/tests/hotelling_test_2.m @@ -59,7 +59,7 @@ if (isvector (x)) n_x = length (x); if (! isvector (y)) - error ("hotelling_test_2: if x is a vector, y must also be a vector"); + error ("hotelling_test_2: if X is a vector, Y must also be a vector"); else n_y = length (y); p = 1; @@ -68,10 +68,10 @@ [n_x, p] = size (x); [n_y, q] = size (y); if (p != q) - error ("hotelling_test_2: x and y must have the same number of columns"); + error ("hotelling_test_2: X and Y must have the same number of columns"); endif else - error ("hotelling_test_2: x and y must be matrices (or vectors)"); + error ("hotelling_test_2: X and Y must be matrices (or vectors)"); endif d = mean (x) - mean (y);
--- a/scripts/statistics/tests/kolmogorov_smirnov_test.m +++ b/scripts/statistics/tests/kolmogorov_smirnov_test.m @@ -61,7 +61,7 @@ endif if (! isvector (x)) - error ("kolmogorov_smirnov_test: x must be a vector"); + error ("kolmogorov_smirnov_test: X must be a vector"); endif n = length (x);
--- a/scripts/statistics/tests/kolmogorov_smirnov_test_2.m +++ b/scripts/statistics/tests/kolmogorov_smirnov_test_2.m @@ -53,14 +53,14 @@ endif if (! (isvector (x) && isvector (y))) - error ("kolmogorov_smirnov_test_2: both x and y must be vectors"); + error ("kolmogorov_smirnov_test_2: both X and Y must be vectors"); endif if (nargin == 2) alt = "!="; else if (! ischar (alt)) - error ("kolmogorov_smirnov_test_2: alt must be a string"); + error ("kolmogorov_smirnov_test_2: ALT must be a string"); endif endif
--- a/scripts/statistics/tests/manova.m +++ b/scripts/statistics/tests/manova.m @@ -54,7 +54,7 @@ [n, p] = size (x); if (!isvector (g) || (length (g) != n)) - error ("manova: g must be a vector of length rows (Y)"); + error ("manova: G must be a vector of length rows (Y)"); endif s = sort (g);
--- a/scripts/statistics/tests/mcnemar_test.m +++ b/scripts/statistics/tests/mcnemar_test.m @@ -42,9 +42,9 @@ endif if (! (min (size (x)) > 1) && issquare (x)) - error ("mcnemar_test: x must be a square matrix of size > 1"); + error ("mcnemar_test: X must be a square matrix of size > 1"); elseif (! (all (all (x >= 0)) && all (all (x == round (x))))) - error ("mcnemar_test: all entries of x must be nonnegative integers"); + error ("mcnemar_test: all entries of X must be nonnegative integers"); endif r = rows (x);
--- a/scripts/statistics/tests/prop_test_2.m +++ b/scripts/statistics/tests/prop_test_2.m @@ -62,7 +62,7 @@ endif if (! ischar (alt)) - error ("prop_test_2: alt must be a string"); + error ("prop_test_2: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/sign_test.m +++ b/scripts/statistics/tests/sign_test.m @@ -50,7 +50,7 @@ endif if (! (isvector (x) && isvector (y) && (length (x) == length (y)))) - error ("sign_test: x and y must be vectors of the same length"); + error ("sign_test: X and Y must be vectors of the same length"); endif n = length (x); @@ -65,7 +65,7 @@ endif if (! ischar (alt)) - error ("sign_test: alt must be a string"); + error ("sign_test: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/t_test.m +++ b/scripts/statistics/tests/t_test.m @@ -49,10 +49,10 @@ endif if (! isvector (x)) - error ("t_test: x must be a vector"); + error ("t_test: X must be a vector"); endif if (! isscalar (m)) - error ("t_test: m must be a scalar"); + error ("t_test: M must be a scalar"); endif n = length (x); @@ -65,7 +65,7 @@ endif if (! ischar (alt)) - error ("t_test: alt must be a string"); + error ("t_test: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/t_test_2.m +++ b/scripts/statistics/tests/t_test_2.m @@ -49,7 +49,7 @@ endif if (! (isvector (x) && isvector (y))) - error ("t_test_2: both x and y must be vectors"); + error ("t_test_2: both X and Y must be vectors"); endif n_x = length (x); @@ -66,7 +66,7 @@ endif if (! ischar (alt)) - error ("t_test_2: alt must be a string"); + error ("t_test_2: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/t_test_regression.m +++ b/scripts/statistics/tests/t_test_regression.m @@ -59,18 +59,18 @@ endif if (! isscalar (r)) - error ("t_test_regression: r must be a scalar"); + error ("t_test_regression: R must be a scalar"); elseif (! ischar (alt)) - error ("t_test_regression: alt must be a string"); + error ("t_test_regression: ALT must be a string"); endif [T, k] = size (x); if (! (isvector (y) && (length (y) == T))) - error ("t_test_regression: y must be a vector of length rows (X)"); + error ("t_test_regression: Y must be a vector of length rows (X)"); endif s = size (rr); if (! ((max (s) == k) && (min (s) == 1))) - error ("t_test_regression: rr must be a vector of length columns (X)"); + error ("t_test_regression: RR must be a vector of length columns (X)"); endif rr = reshape (rr, 1, k);
--- a/scripts/statistics/tests/u_test.m +++ b/scripts/statistics/tests/u_test.m @@ -51,7 +51,7 @@ endif if (! (isvector (x) && isvector (y))) - error ("u_test: both x and y must be vectors"); + error ("u_test: both X and Y must be vectors"); endif n_x = length (x); @@ -67,7 +67,7 @@ endif if (! ischar (alt)) - error("u_test: alt must be a string"); + error("u_test: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/var_test.m +++ b/scripts/statistics/tests/var_test.m @@ -49,7 +49,7 @@ endif if (! (isvector (x) && isvector (y))) - error ("var_test: both x and y must be vectors"); + error ("var_test: both X and Y must be vectors"); endif df_num = length (x) - 1; @@ -62,7 +62,7 @@ endif if (! ischar (alt)) - error ("var_test: alt must be a string"); + error ("var_test: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/welch_test.m +++ b/scripts/statistics/tests/welch_test.m @@ -48,7 +48,7 @@ endif if (! (isvector (x) && isvector (y))) - error ("welch_test: both x and y must be vectors"); + error ("welch_test: both X and Y must be vectors"); endif n_x = length (x); @@ -67,7 +67,7 @@ endif if (! ischar (alt)) - error ("welch_test: alt must be a string"); + error ("welch_test: ALT must be a string"); endif if (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf);
--- a/scripts/statistics/tests/wilcoxon_test.m +++ b/scripts/statistics/tests/wilcoxon_test.m @@ -50,7 +50,7 @@ endif if (! (isvector (x) && isvector (y) && (length (x) == length (y)))) - error ("wilcoxon_test: x and y must be vectors of the same length"); + error ("wilcoxon_test: X and Y must be vectors of the same length"); endif n = length (x); @@ -74,7 +74,7 @@ endif if (! ischar (alt)) - error("wilcoxon_test: alt must be a string"); + error("wilcoxon_test: ALT must be a string"); elseif (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf); elseif (strcmp (alt, ">"))
--- a/scripts/statistics/tests/z_test.m +++ b/scripts/statistics/tests/z_test.m @@ -49,13 +49,13 @@ endif if (! isvector (x)) - error ("z_test: x must be a vector"); + error ("z_test: X must be a vector"); endif if (! isscalar (m)) - error ("z_test: m must be a scalar"); + error ("z_test: M must be a scalar"); endif if (! (isscalar (v) && (v > 0))) - error ("z_test: v must be a positive scalar"); + error ("z_test: V must be a positive scalar"); endif n = length (x); @@ -67,7 +67,7 @@ endif if (! ischar (alt)) - error ("z_test: alt must be a string"); + error ("z_test: ALT must be a string"); elseif (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf); elseif (strcmp (alt, ">"))
--- a/scripts/statistics/tests/z_test_2.m +++ b/scripts/statistics/tests/z_test_2.m @@ -49,10 +49,10 @@ endif if (! (isvector (x) && isvector (y))) - error("z_test_2: both x and y must be vectors"); + error("z_test_2: both X and Y must be vectors"); elseif (! (isscalar (v_x) && (v_x > 0) && isscalar (v_y) && (v_y > 0))) - error ("z_test_2: both v_x and v_y must be positive scalars"); + error ("z_test_2: both V_X and V_Y must be positive scalars"); endif n_x = length (x); @@ -67,7 +67,7 @@ endif if (! ischar (alt)) - error ("z_test_2: alt must be a string"); + error ("z_test_2: ALT must be a string"); elseif (strcmp (alt, "!=") || strcmp (alt, "<>")) pval = 2 * min (cdf, 1 - cdf); elseif (strcmp (alt, ">"))
--- a/scripts/strings/blanks.m +++ b/scripts/strings/blanks.m @@ -42,7 +42,7 @@ if (nargin != 1) print_usage (); elseif (! (isscalar (n) && n == round (n))) - error ("blanks: n must be a non-negative integer"); + error ("blanks: N must be a non-negative integer"); endif ## If 1:n is empty, the following expression will create an empty
--- a/scripts/strings/index.m +++ b/scripts/strings/index.m @@ -74,7 +74,7 @@ n = f(1); endif else - error ("index: direction must be either \"first\" or \"last\""); + error ("index: DIRECTION must be either \"first\" or \"last\""); endif endfunction
--- a/scripts/strings/strmatch.m +++ b/scripts/strings/strmatch.m @@ -53,7 +53,7 @@ endif if (! ischar (s)) - error ("strmatch: first argument must be a string"); + error ("strmatch: S must be a string"); endif ## Truncate trailing whitespace. @@ -87,7 +87,7 @@ idx = find (match); endif else - error ("strmatch: second argument must be a string or cell array of strings"); + error ("strmatch: A must be a string or cell array of strings"); endif endfunction
--- a/scripts/strings/strtrunc.m +++ b/scripts/strings/strtrunc.m @@ -43,7 +43,7 @@ s{i} = s{i}(:,1:(min (n, columns (s{i})))); endfor else - error ("strtrunc: s must be a character string or a cell array of strings"); + error ("strtrunc: S must be a character string or a cell array of strings"); endif if (s_was_char)
--- a/scripts/strings/validatestring.m +++ b/scripts/strings/validatestring.m @@ -74,21 +74,21 @@ ## Check the inputs if (! ischar (str)) - error ("validatestring: str must be a character string"); + error ("validatestring: STR must be a character string"); elseif (rows (str) != 1) - error ("validatestring: str must have only one row"); + error ("validatestring: STR must have only one row"); elseif (! iscellstr (strarray)) - error ("validatestring: strarray must be a cellstr"); + error ("validatestring: STRARRAY must be a cellstr"); elseif (! ischar (funcname)) - error ("validatestring: funcname must be a character string"); + error ("validatestring: FUNCNAME must be a character string"); elseif (! isempty (funcname) && (rows (funcname) != 1)) - error ("validatestring: funcname must be exactly one row"); + error ("validatestring: FUNCNAME must be exactly one row"); elseif (! ischar (varname)) - error ("validatestring: varname must be a character string"); + error ("validatestring: VARNAME must be a character string"); elseif (! isempty (varname) && (rows (varname) != 1)) - error ("validatestring: varname must be exactly one row"); + error ("validatestring: VARNAME must be exactly one row"); elseif (position < 0) - error ("validatestring: position must be >= 0"); + error ("validatestring: POSITION must be >= 0"); endif ## make the part of the error that will use funcname, varname, and
--- a/scripts/testfun/rundemos.m +++ b/scripts/testfun/rundemos.m @@ -34,7 +34,7 @@ if (! isempty (fullname)) dirs = {fullname}; else - error ("rundemos: expecting argument to be a directory name"); + error ("rundemos: DIRECTORY argument must be a valid pathname"); endif endif else
--- a/scripts/testfun/runtests.m +++ b/scripts/testfun/runtests.m @@ -35,7 +35,7 @@ if (! isempty (fullname)) dirs = {fullname}; else - error ("runtests: expecting argument to be a directory name"); + error ("runtests: DIRECTORY argument must be a valid pathname"); endif endif else
--- a/scripts/time/addtodate.m +++ b/scripts/time/addtodate.m @@ -34,7 +34,7 @@ elseif (! (ischar (f) && rows (f) == 1)) ## FIXME: enhance the function so that it works with cellstrs of the ## same size as the output. - error ("addtodate: f must be a single row character string"); + error ("addtodate: F must be a single row character string"); endif if (numel (d) == 1 && numel (q) > 1)
--- a/scripts/time/datenum.m +++ b/scripts/time/datenum.m @@ -85,7 +85,7 @@ if (nargin == 1) nc = columns (year); if (nc > 6 || nc < 3) - error ("datenum: expected date vector containing [year, month, day, hour, minute, second]"); + error ("datenum: expected date vector containing [YEAR, MONTH, DAY, HOUR, MINUTE, SECOND]"); endif second = minute = hour = 0; if (nc >= 6) second = year(:,6); endif
--- a/scripts/time/datetick.m +++ b/scripts/time/datetick.m @@ -117,7 +117,7 @@ if (! isempty (form)) if (isnumeric (form)) if (! isscalar (form) || floor (form) != form || form < 0) - error ("datetick: expecting form argument to be a positive integer"); + error ("datetick: expecting FORM argument to be a positive integer"); endif elseif (! ischar (form)) error ("datetick: expecting valid date format string");
--- a/scripts/time/datevec.m +++ b/scripts/time/datevec.m @@ -128,7 +128,7 @@ endif endfor if (! found) - error ("datevec: none of the standard formats match the date string"); + error ("datevec: none of the standard formats match the DATE string"); endif endfor else @@ -137,7 +137,7 @@ for k = 1:nd [found y(k) m(k) d(k) h(k) mi(k) s(k)] = __date_str2vec__ (date{k}, p, f, rY, ry, fy, fm, fd, fh, fmi, fs); if (! found) - error ("datevec: date not parsed correctly with given format"); + error ("datevec: DATE not parsed correctly with given format"); endif endfor endif