# HG changeset patch # User Rik # Date 1669473128 28800 # Node ID fd29c7a50a780b74f5b91bb8317b9ca9798d0aa2 # Parent ed7b17c7ddf3f1b8d569d1c536a337fba528e9dd maint: use commas, semicolons consistently with Octave conventions. * makeValidName.m: Remove %!test and move BIST %!asserts to column 1. * base64decode.m, base64encode.m, which.m, logm.m, uniquetol.m, perms.m: Delete semicolon (';') at end of %!assert BIST. * lin2mu.m, interp2.m, interpn.m, lsqnonneg.m, pqpnonneg.m, uniquetol.m, betainc.m, normalize.m: Add semicolon (';') to end of assert statement within %!test BIST. * __memoize__.m, tar_is_bsd.m, publish.m: Add semicolon (';') to line with keyword "persistent". * stft.m: Use comma (',') after "case" keyword when code immediately follows. * gallery.m: Align commas used in case statements in massive switch block. Remove unnecessary parentheses around a numeric case argument. * ranks.m: Remove semicolon (';') from case statemnt argument. diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/+matlab/+lang/makeValidName.m --- a/scripts/+matlab/+lang/makeValidName.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/+matlab/+lang/makeValidName.m Sat Nov 26 06:32:08 2022 -0800 @@ -119,9 +119,8 @@ %! assert (varname, "octave"); ## Check for keywords -%!test -%! assert (matlab.lang.makeValidName ("for"), "xFor") -%! assert (matlab.lang.makeValidName ("For"), "For") +%!assert (matlab.lang.makeValidName ("for"), "xFor") +%!assert (matlab.lang.makeValidName ("For"), "For") %!error matlab.lang.makeValidName ("for", "Prefix", "for") ## Test input validation diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/+matlab/+net/base64decode.m --- a/scripts/+matlab/+net/base64decode.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/+matlab/+net/base64decode.m Sat Nov 26 06:32:08 2022 -0800 @@ -52,11 +52,11 @@ ## Test char vector input -%!assert (matlab.net.base64decode ("AQ=="), uint8 (1)); -%!assert (matlab.net.base64decode ("/w=="), uint8 (255)); -%!assert (matlab.net.base64decode ("AQID"), uint8 (1:3)); -%!assert (matlab.net.base64decode ("YQ=="), uint8 ("a")); -%!assert (matlab.net.base64decode ("YWJjZGVmZw=="), uint8 ("abcdefg")); +%!assert (matlab.net.base64decode ("AQ=="), uint8 (1)) +%!assert (matlab.net.base64decode ("/w=="), uint8 (255)) +%!assert (matlab.net.base64decode ("AQID"), uint8 (1:3)) +%!assert (matlab.net.base64decode ("YQ=="), uint8 ("a")) +%!assert (matlab.net.base64decode ("YWJjZGVmZw=="), uint8 ("abcdefg")) ## Test input validation %!error matlab.net.base64decode () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/+matlab/+net/base64encode.m --- a/scripts/+matlab/+net/base64encode.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/+matlab/+net/base64encode.m Sat Nov 26 06:32:08 2022 -0800 @@ -55,11 +55,11 @@ ## Test char vector input -%!assert (matlab.net.base64encode (1), "AQ=="); -%!assert (matlab.net.base64encode (255), "/w=="); -%!assert (matlab.net.base64encode (1:3), "AQID"); -%!assert (matlab.net.base64encode ("a"), "YQ=="); -%!assert (matlab.net.base64encode ("abcdefg"), "YWJjZGVmZw=="); +%!assert (matlab.net.base64encode (1), "AQ==") +%!assert (matlab.net.base64encode (255), "/w==") +%!assert (matlab.net.base64encode (1:3), "AQID") +%!assert (matlab.net.base64encode ("a"), "YQ==") +%!assert (matlab.net.base64encode ("abcdefg"), "YWJjZGVmZw==") ## Test input validation %!error matlab.net.base64encode () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/audio/lin2mu.m --- a/scripts/audio/lin2mu.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/audio/lin2mu.m Sat Nov 26 06:32:08 2022 -0800 @@ -80,8 +80,8 @@ %!test %! x = -1:1; %! y = x'; -%! assert (lin2mu (x), (lin2mu (y))') -%! assert (lin2mu (x), [0, 255, 128]) +%! assert (lin2mu (x), (lin2mu (y))'); +%! assert (lin2mu (x), [0, 255, 128]); %!assert (lin2mu ([0, 1, NaN, inf, -inf], 8), [255, 231, NaN, 128, 0]) %!assert (lin2mu ([]), []) diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/general/interp2.m --- a/scripts/general/interp2.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/general/interp2.m Sat Nov 26 06:32:08 2022 -0800 @@ -676,8 +676,8 @@ %! interp_complex = interp2 (orig, xi, yi, method{1}); %! interp_real = interp2 (real (orig), xi, yi, method{1}); %! interp_imag = interp2 (imag (orig), xi, yi, method{1}); -%! assert (real (interp_complex), interp_real) -%! assert (imag (interp_complex), interp_imag) +%! assert (real (interp_complex), interp_real); +%! assert (imag (interp_complex), interp_imag); %! endfor %!test # 2^n refinement form @@ -760,7 +760,7 @@ %!assert (interp2 (z, [3; 3; 3], [2; 3; 1], "cubic"), [7; 9; 5], tol) %!test <62132> %! # FIXME: single column yields single row with spline interpolation (numbers are correct) -%! assert (interp2 (z, [3; 3; 3], [2; 3; 1], "spline"), [7; 9; 5], tol) +%! assert (interp2 (z, [3; 3; 3], [2; 3; 1], "spline"), [7; 9; 5], tol); ## Test input validation %!error interp2 (1, 1, 1, 1, 1, 2) # only 5 numeric inputs diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/general/interpn.m --- a/scripts/general/interpn.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/general/interpn.m Sat Nov 26 06:32:08 2022 -0800 @@ -367,8 +367,8 @@ %! vi_complex = interpn (v, yi, xi, zi, method{1}); %! vi_real = interpn (real (v), yi, xi, zi, method{1}); %! vi_imag = interpn (imag (v), yi, xi, zi, method{1}); -%! assert (real (vi_complex), vi_real, 2*eps) -%! assert (imag (vi_complex), vi_imag, 2*eps) +%! assert (real (vi_complex), vi_real, 2*eps); +%! assert (imag (vi_complex), vi_imag, 2*eps); %! endfor ## Test input validation diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/help/which.m --- a/scripts/help/which.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/help/which.m Sat Nov 26 06:32:08 2022 -0800 @@ -102,7 +102,7 @@ %!test %! str = which ("fftw"); %! assert (str(end-7:end), "fftw.oct"); -%!assert <*49434> (which ("inputParser"), file_in_loadpath ("inputParser.m")); +%!assert <*49434> (which ("inputParser"), file_in_loadpath ("inputParser.m")) %!test %! x = 3; %! str = which ("x"); diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/linear-algebra/logm.m --- a/scripts/linear-algebra/logm.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/linear-algebra/logm.m Sat Nov 26 06:32:08 2022 -0800 @@ -203,8 +203,8 @@ %! endif %! warning ("off", "Octave:logm:non-principal", "local"); %! assert (expm (logm (A)), A, tol); -%!assert (expm (logm (eye (3))), eye (3)); -%!assert (expm (logm (zeros (3))), zeros (3)); +%!assert (expm (logm (eye (3))), eye (3)) +%!assert (expm (logm (zeros (3))), zeros (3)) ## Test input validation %!error logm () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/miscellaneous/private/__memoize__.m --- a/scripts/miscellaneous/private/__memoize__.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/miscellaneous/private/__memoize__.m Sat Nov 26 06:32:08 2022 -0800 @@ -32,7 +32,7 @@ ## @end deftypefn function mem_fcn_handle = __memoize__ (fcn_handle) - persistent cached_mem_fcn_handle + persistent cached_mem_fcn_handle; if (nargin) diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/miscellaneous/private/tar_is_bsd.m --- a/scripts/miscellaneous/private/tar_is_bsd.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/miscellaneous/private/tar_is_bsd.m Sat Nov 26 06:32:08 2022 -0800 @@ -38,7 +38,7 @@ function out = tar_is_bsd () ## BSD tar needs to be handled differently from GNU tar - persistent cache + persistent cache; if (isempty (cache)) [status, tar_ver_str] = system ("tar --version"); if (status) diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/miscellaneous/publish.m --- a/scripts/miscellaneous/publish.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/miscellaneous/publish.m Sat Nov 26 06:32:08 2022 -0800 @@ -1087,7 +1087,7 @@ function cstr = eval_context (op) ## EVAL_CONTEXT temporary evaluation context. - persistent ctext + persistent ctext; ## Variable cstr in "eval_code_helper" is newly created anyways. forbidden_var_names = {"__code__"}; diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/optimization/lsqnonneg.m --- a/scripts/optimization/lsqnonneg.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/optimization/lsqnonneg.m Sat Nov 26 06:32:08 2022 -0800 @@ -247,7 +247,7 @@ %! assert (resn, 0, 10*eps); %! assert (resid, [0 0 0]', 10*eps); %! assert (lambda, [0 0]', 10*eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resn, resid, ~, ~, lambda] = lsqnonneg ([1 0; 0 1; 2 1], [1 -1 1]'); @@ -255,7 +255,7 @@ %! assert (resn, 1.2, 10*eps); %! assert (resid, [0.4 -1 -0.2]', 10*eps); %! assert (lambda, [0 -1.2]', 10*eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resn, resid, ~, ~, lambda] = lsqnonneg ([1 0; 0 1; 2 1], [-1 1 -1]'); @@ -263,7 +263,7 @@ %! assert (resn, 3, 10*eps); %! assert (resid, [-1 1 -1]', 10*eps); %! assert (lambda, [-3 0]', 10*eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resn, resid, ~, ~, lambda] = lsqnonneg ([1 0; 0 1; 2 1], [-1 -1 -3]'); @@ -271,7 +271,7 @@ %! assert (resn, 11, 20*eps); %! assert (resid, [-1 -1 -3]', 10*eps); %! assert (lambda, [-7 -4]', 10*eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); ## Test input validation %!error lsqnonneg () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/optimization/pqpnonneg.m --- a/scripts/optimization/pqpnonneg.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/optimization/pqpnonneg.m Sat Nov 26 06:32:08 2022 -0800 @@ -249,28 +249,28 @@ %! assert (x, [0 0]', eps); %! assert (resid, 0, eps); %! assert (lambda, [-6 -5]', eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resid, ~, ~, lambda] = pqpnonneg ([3 2; 2 2], [6; -5]); %! assert (x, [0 2.5]', eps); %! assert (resid, -6.25, eps); %! assert (lambda, [-11 0]', eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resid, ~, ~, lambda] = pqpnonneg ([3 2; 2 2], [-6; 5]); %! assert (x, [2 0]', eps); %! assert (resid, -6, eps); %! assert (lambda, [0 -9]', eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); %!test %! [x, resid, ~, ~, lambda] = pqpnonneg ([3 2; 2 2], [-6; -5]); %! assert (x, [1 1.5]', 10*eps); %! assert (resid, -6.75, 10*eps); %! assert (lambda, [0 0]', eps); -%! assert (x .* lambda, [0 0]') +%! assert (x .* lambda, [0 0]'); ## Test input validation %!error pqpnonneg () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/set/uniquetol.m --- a/scripts/set/uniquetol.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/set/uniquetol.m Sat Nov 26 06:32:08 2022 -0800 @@ -308,9 +308,9 @@ %!assert (uniquetol ([1 1 2; 1 0 1; 1 1 2+10*eps], "byrows", true), %! [1 0 1; 1 1 2]) %!assert (uniquetol ([1]), [1]) -%!assert (uniquetol ([2, 1]), [1, 2]); +%!assert (uniquetol ([2, 1]), [1, 2]) %!assert (uniquetol ([1; 2]), [1; 2]) -%!assert (uniquetol ([-Inf, 1, NaN, Inf, NaN, Inf]), [-Inf, 1, Inf, NaN, NaN]); +%!assert (uniquetol ([-Inf, 1, NaN, Inf, NaN, Inf]), [-Inf, 1, Inf, NaN, NaN]) %!assert (uniquetol ([1,2,2,3,2,4], "byrows", true), [1,2,2,3,2,4]) %!assert (uniquetol ([1,2,2,3,2,4]), [1,2,3,4]) %!assert (uniquetol ([1,2,2,3,2,4].', "byrows", true), [1;2;3;4]) @@ -325,8 +325,8 @@ ## Test 2D array sorting %!test %! a = [magic(3); 2 * magic(3)]; -%! assert (uniquetol (a), [1:10,12,14,16,18]') -%! assert (uniquetol (a, "byrows", true), sortrows (a)) +%! assert (uniquetol (a), [1:10,12,14,16,18]'); +%! assert (uniquetol (a, "byrows", true), sortrows (a)); ## Matlab compatibility of output %!test diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/signal/stft.m --- a/scripts/signal/stft.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/signal/stft.m Sat Nov 26 06:32:08 2022 -0800 @@ -72,9 +72,9 @@ if (ischar (win_type)) switch (tolower (win_type)) - case "hanning" win_type = 1; - case "hamming" win_type = 2; - case "rectangle" win_type = 3; + case "hanning" , win_type = 1; + case "hamming" , win_type = 2; + case "rectangle" , win_type = 3; otherwise error ("stft: unknown window type '%s'", win_type); endswitch @@ -95,9 +95,9 @@ ## compute the window coefficients switch (win_type) - case 1 win_coef = hanning (win_size); - case 2 win_coef = hamming (win_size); - case 3 win_coef = ones (win_size, 1); + case 1 , win_coef = hanning (win_size); + case 2 , win_coef = hamming (win_size); + case 3 , win_coef = ones (win_size, 1); endswitch ## Create a matrix Z whose columns contain the windowed time-slices. diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/specfun/betainc.m --- a/scripts/specfun/betainc.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/specfun/betainc.m Sat Nov 26 06:32:08 2022 -0800 @@ -257,10 +257,10 @@ %! assert (betainc (0.5, 1, Inf), 1); %!test <*62329> -%! assert (betainc (2e-20, 1, 0.5), 1e-20, -1e-15) -%! assert (betainc (2e-5, 1, 0.5), 2e-5 / (1 + sqrt (1 - 2e-5)), -1e-15) -%! assert (betainc (0.99, 1, 0.5, "upper"), 0.1, -1e-15) -%! assert (betainc (0.99, 0.5, 1, "upper"), - expm1 (log (0.99)/2), -1e-15) +%! assert (betainc (2e-20, 1, 0.5), 1e-20, -1e-15); +%! assert (betainc (2e-5, 1, 0.5), 2e-5 / (1 + sqrt (1 - 2e-5)), -1e-15); +%! assert (betainc (0.99, 1, 0.5, "upper"), 0.1, -1e-15); +%! assert (betainc (0.99, 0.5, 1, "upper"), - expm1 (log (0.99)/2), -1e-15); ## Test input validation %!error betainc () diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/specfun/perms.m --- a/scripts/specfun/perms.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/specfun/perms.m Sat Nov 26 06:32:08 2022 -0800 @@ -189,7 +189,7 @@ %!assert (unique (perms (1:5)(:))', 1:5) %!assert (perms (int8 (1:4)), int8 (perms (1:4))) -%!assert (sortrows (perms ("abb", "unique")), ["abb"; "bab"; "bba"]); +%!assert (sortrows (perms ("abb", "unique")), ["abb"; "bab"; "bba"]) %!assert (size (perms ([1 1 1 1 2 2 2 3 3], "unique")), [1260 9]) %!assert (size (perms (int8([1 1 1 1 1 2 2 2 2 3 3 3]), "unique")), [27720 12]) diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/special-matrix/gallery.m --- a/scripts/special-matrix/gallery.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/special-matrix/gallery.m Sat Nov 26 06:32:08 2022 -0800 @@ -440,48 +440,48 @@ switch (tolower (name)) case "binomial" error ("gallery: matrix %s not implemented", name); - case "cauchy" , [varargout{1:n_out}] = cauchy (varargin{:}); - case "chebspec" , [varargout{1:n_out}] = chebspec (varargin{:}); - case "chebvand" , [varargout{1:n_out}] = chebvand (varargin{:}); - case "chow" , [varargout{1:n_out}] = chow (varargin{:}); - case "circul" , [varargout{1:n_out}] = circul (varargin{:}); - case "clement" , [varargout{1:n_out}] = clement (varargin{:}); - case "compar" , [varargout{1:n_out}] = compar (varargin{:}); - case "condex" , [varargout{1:n_out}] = condex (varargin{:}); - case "cycol" , [varargout{1:n_out}] = cycol (varargin{:}); - case "dorr" , [varargout{1:n_out}] = dorr (varargin{:}); - case "dramadah" , [varargout{1:n_out}] = dramadah (varargin{:}); - case "fiedler" , [varargout{1:n_out}] = fiedler (varargin{:}); - case "forsythe" , [varargout{1:n_out}] = forsythe (varargin{:}); - case "frank" , [varargout{1:n_out}] = frank (varargin{:}); - case "gearmat" , [varargout{1:n_out}] = gearmat (varargin{:}); - case "gcdmat" , [varargout{1:n_out}] = gcdmat (varargin{:}); - case "grcar" , [varargout{1:n_out}] = grcar (varargin{:}); - case "hanowa" , [varargout{1:n_out}] = hanowa (varargin{:}); - case "house" , [varargout{1:n_out}] = house (varargin{:}); - case "integerdata", [varargout{1:n_out}] = integerdata (varargin{:}); - case "invhess" , [varargout{1:n_out}] = invhess (varargin{:}); - case "invol" , [varargout{1:n_out}] = invol (varargin{:}); - case "ipjfact" , [varargout{1:n_out}] = ipjfact (varargin{:}); - case "jordbloc" , [varargout{1:n_out}] = jordbloc (varargin{:}); - case "kahan" , [varargout{1:n_out}] = kahan (varargin{:}); - case "kms" , [varargout{1:n_out}] = kms (varargin{:}); - case "krylov" , [varargout{1:n_out}] = krylov (varargin{:}); - case "lauchli" , [varargout{1:n_out}] = lauchli (varargin{:}); - case "lehmer" , [varargout{1:n_out}] = lehmer (varargin{:}); + case "cauchy" , [varargout{1:n_out}] = cauchy (varargin{:}); + case "chebspec" , [varargout{1:n_out}] = chebspec (varargin{:}); + case "chebvand" , [varargout{1:n_out}] = chebvand (varargin{:}); + case "chow" , [varargout{1:n_out}] = chow (varargin{:}); + case "circul" , [varargout{1:n_out}] = circul (varargin{:}); + case "clement" , [varargout{1:n_out}] = clement (varargin{:}); + case "compar" , [varargout{1:n_out}] = compar (varargin{:}); + case "condex" , [varargout{1:n_out}] = condex (varargin{:}); + case "cycol" , [varargout{1:n_out}] = cycol (varargin{:}); + case "dorr" , [varargout{1:n_out}] = dorr (varargin{:}); + case "dramadah" , [varargout{1:n_out}] = dramadah (varargin{:}); + case "fiedler" , [varargout{1:n_out}] = fiedler (varargin{:}); + case "forsythe" , [varargout{1:n_out}] = forsythe (varargin{:}); + case "frank" , [varargout{1:n_out}] = frank (varargin{:}); + case "gearmat" , [varargout{1:n_out}] = gearmat (varargin{:}); + case "gcdmat" , [varargout{1:n_out}] = gcdmat (varargin{:}); + case "grcar" , [varargout{1:n_out}] = grcar (varargin{:}); + case "hanowa" , [varargout{1:n_out}] = hanowa (varargin{:}); + case "house" , [varargout{1:n_out}] = house (varargin{:}); + case "integerdata" , [varargout{1:n_out}] = integerdata (varargin{:}); + case "invhess" , [varargout{1:n_out}] = invhess (varargin{:}); + case "invol" , [varargout{1:n_out}] = invol (varargin{:}); + case "ipjfact" , [varargout{1:n_out}] = ipjfact (varargin{:}); + case "jordbloc" , [varargout{1:n_out}] = jordbloc (varargin{:}); + case "kahan" , [varargout{1:n_out}] = kahan (varargin{:}); + case "kms" , [varargout{1:n_out}] = kms (varargin{:}); + case "krylov" , [varargout{1:n_out}] = krylov (varargin{:}); + case "lauchli" , [varargout{1:n_out}] = lauchli (varargin{:}); + case "lehmer" , [varargout{1:n_out}] = lehmer (varargin{:}); case "leslie" error ("gallery: matrix %s not implemented", name); - case "lesp" , [varargout{1:n_out}] = lesp (varargin{:}); - case "lotkin" , [varargout{1:n_out}] = lotkin (varargin{:}); - case "minij" , [varargout{1:n_out}] = minij (varargin{:}); - case "moler" , [varargout{1:n_out}] = moler (varargin{:}); - case "neumann" , [varargout{1:n_out}] = neumann (varargin{:}); - case "normaldata" , [varargout{1:n_out}] = normaldata (varargin{:}); - case "orthog" , [varargout{1:n_out}] = orthog (varargin{:}); - case "parter" , [varargout{1:n_out}] = parter (varargin{:}); - case "pei" , [varargout{1:n_out}] = pei (varargin{:}); - case "poisson" , [varargout{1:n_out}] = poisson (varargin{:}); - case "prolate" , [varargout{1:n_out}] = prolate (varargin{:}); + case "lesp" , [varargout{1:n_out}] = lesp (varargin{:}); + case "lotkin" , [varargout{1:n_out}] = lotkin (varargin{:}); + case "minij" , [varargout{1:n_out}] = minij (varargin{:}); + case "moler" , [varargout{1:n_out}] = moler (varargin{:}); + case "neumann" , [varargout{1:n_out}] = neumann (varargin{:}); + case "normaldata" , [varargout{1:n_out}] = normaldata (varargin{:}); + case "orthog" , [varargout{1:n_out}] = orthog (varargin{:}); + case "parter" , [varargout{1:n_out}] = parter (varargin{:}); + case "pei" , [varargout{1:n_out}] = pei (varargin{:}); + case "poisson" , [varargout{1:n_out}] = poisson (varargin{:}); + case "prolate" , [varargout{1:n_out}] = prolate (varargin{:}); case "randcolu" error ("gallery: matrix %s not implemented", name); case "randcorr" @@ -598,8 +598,8 @@ ## k = 1 case obtained from k = 0 case with one bigger n. switch (k) - case (0), # do nothing - case (1), n = n + 1; + case 0, # do nothing + case 1, n = n + 1; otherwise error ("gallery: K should be either 0 or 1 for chebspec matrix"); endswitch @@ -1204,8 +1204,8 @@ F = triu (p(ones (n, 1), :) - diag (ones (n-1, 1), -1), -1); switch (k) - case (0), # do nothing - case (1), F = F(p,p)'; + case 0, # do nothing + case 1, F = F(p,p)'; otherwise error ("gallery: K must have a value of 0 or 1 for frank matrix"); endswitch @@ -1525,8 +1525,8 @@ A = hankel (c, d); switch (k) - case (0), # do nothing - case (1), A = ones (n) ./ A; + case 0, # do nothing + case 1, A = ones (n) ./ A; otherwise error ("gallery: K must have a value of 0 or 1 for ipjfact matrix"); endswitch @@ -2487,8 +2487,8 @@ A = diag ( [w.^(1:n-1) 1] ) + diag (ones (n-1,1), 1); switch (k) - case (0), A(n,1) = 1; - case (1), # do nothing + case 0, A(n,1) = 1; + case 1, # do nothing otherwise, error ("gallery: K must have a value of 0 or 1 for smoke matrix"); endswitch diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/statistics/normalize.m --- a/scripts/statistics/normalize.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/statistics/normalize.m Sat Nov 26 06:32:08 2022 -0800 @@ -593,11 +593,11 @@ %! [z, c, s] = normalize (magic (3), "norm", 1); %! assert ({z, c, s}, {magic(3)/15 , 0, [15 15 15]}); %! [z, c, s] = normalize ([2,0,-2;0,2,0;-2,-2,2],"norm",2); -%! assert ({z, c, s}, {[1,0,-1;0,1,0;-1,-1,1]*(sqrt(2)/2), 0, [1 1 1]*2*sqrt(2)}, eps) +%! assert ({z, c, s}, {[1,0,-1;0,1,0;-1,-1,1]*(sqrt(2)/2), 0, [1 1 1]*2*sqrt(2)}, eps); %! [z, c, s] = normalize ([1 2 3], "norm", Inf); %! assert ({z, c, s}, {[1 2 3]/3, 0, 3}, eps); %! [z, c, s] = normalize (magic (3),"range",[-1 1]); -%! assert ({z, c, s}, {[1 -1 0.6; -1 0 1; -0.6 1 -1], [5.5 5 4.5], [2.5 4 2.5]}, eps) +%! assert ({z, c, s}, {[1 -1 0.6; -1 0 1; -0.6 1 -1], [5.5 5 4.5], [2.5 4 2.5]}, eps); %! [z, c, s] = normalize (magic (3),"scale","mad"); %! assert ({z, c, s}, {[8 0.25 6; 3 1.25 7; 4 2.25 2], 0, [1 4 1]}); %! [z, c, s] = normalize (magic (3),"scale","first"); @@ -607,11 +607,11 @@ %! [z, c, s] = normalize ([1,2,3], "center", 10); %! assert ({z, c, s}, {[-9 -8 -7], 10, 1}); %! [z, c, s] = normalize ([1 2 3 10], "center", "mean"); -%! assert ({z, c, s}, {[-3 -2 -1 6], 4, 1}) +%! assert ({z, c, s}, {[-3 -2 -1 6], 4, 1}); %! [z, c, s] = normalize ([1 2 3 10], "center", "median"); %! assert ({z, c, s}, {[-1.5 -0.5 0.5 7.5], 2.5, 1}); %! [z, c, s] = normalize (magic (3), "medianiqr"); -%! assert ({z, c, s}, {[8/5 -1 0; -2/5 0 2/5; 0 1 -8/5]*2/3, [4 5 6], [3.75 6 3.75]}, eps) +%! assert ({z, c, s}, {[8/5 -1 0; -2/5 0 2/5; 0 1 -8/5]*2/3, [4 5 6], [3.75 6 3.75]}, eps); %! [z, c, s] = normalize ([1 2 Inf], 2); %! assert ({z, c, s}, {[NaN, NaN, NaN], Inf, NaN}); %! [z, c, s] = normalize (Inf); diff -r ed7b17c7ddf3 -r fd29c7a50a78 scripts/statistics/ranks.m --- a/scripts/statistics/ranks.m Fri Nov 25 21:38:22 2022 -0800 +++ b/scripts/statistics/ranks.m Sat Nov 26 06:32:08 2022 -0800 @@ -92,15 +92,15 @@ lin = repmat ((1:rows (x))', [1, sz(2:end)]); # linearly increasing array. switch (rtype) - case {0, "fractional"}; + case {0, "fractional"} lin = (_competition (lin, sx, sz) + _modified (lin, sx, sz)) / 2; - case {1, "competition"}; + case {1, "competition"} lin = _competition (lin, sx, sz); - case {2, "modified"}; + case {2, "modified"} lin = _modified (lin, sx, sz); - case {3, "ordinal"}; + case {3, "ordinal"} ## no processing needed here. - case {4, "dense"}; + case {4, "dense"} lin = _dense (lin, sx, sz); otherwise if (! ischar (rtype))