Mercurial > hg > octave-max
changeset 10549:95c3e38098bf
Untabify .m scripts
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Rik <octave@nomad.inbox5.com> + + * scripts/*.m: Untabify scripts + 2010-04-23 Rik <octave@nomad.inbox5.com> * scripts/geometry/griddata.m, scripts/geometry/griddatan.m,
--- a/scripts/audio/loadaudio.m +++ b/scripts/audio/loadaudio.m @@ -64,7 +64,7 @@ [X, c] = fread (num, inf, "short"); endif elseif (strcmp (ext, "mu") || strcmp (ext, "au") - || strcmp (ext, "snd") || strcmp(ext, "ul")) + || strcmp (ext, "snd") || strcmp(ext, "ul")) [Y, c] = fread (num, inf, "uchar"); ## remove file header m = find (Y(1:64) == 0, 1, "last");
--- a/scripts/audio/mu2lin.m +++ b/scripts/audio/mu2lin.m @@ -44,21 +44,21 @@ endif ulaw = [32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956, \ - 23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764, \ - 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412, \ - 11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316, \ - 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140, \ - 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092, \ - 3900, 3772, 3644, 3516, 3388, 3260, 3132, 3004, \ - 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980, \ - 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436, \ - 1372, 1308, 1244, 1180, 1116, 1052, 988, 924, \ - 876, 844, 812, 780, 748, 716, 684, 652, \ - 620, 588, 556, 524, 492, 460, 428, 396, \ - 372, 356, 340, 324, 308, 292, 276, 260, \ - 244, 228, 212, 196, 180, 164, 148, 132, \ - 120, 112, 104, 96, 88, 80, 72, 64, \ - 56, 48, 40, 32, 24, 16, 8, 0 ]; + 23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764, \ + 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412, \ + 11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316, \ + 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140, \ + 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092, \ + 3900, 3772, 3644, 3516, 3388, 3260, 3132, 3004, \ + 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980, \ + 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436, \ + 1372, 1308, 1244, 1180, 1116, 1052, 988, 924, \ + 876, 844, 812, 780, 748, 716, 684, 652, \ + 620, 588, 556, 524, 492, 460, 428, 396, \ + 372, 356, 340, 324, 308, 292, 276, 260, \ + 244, 228, 212, 196, 180, 164, 148, 132, \ + 120, 112, 104, 96, 88, 80, 72, 64, \ + 56, 48, 40, 32, 24, 16, 8, 0 ]; ulaw = [ -ulaw, ulaw ];
--- a/scripts/audio/playaudio.m +++ b/scripts/audio/playaudio.m @@ -64,7 +64,7 @@ if (strcmp (ext, "lin") || strcmp (ext, "raw")) system (sprintf ("cat \"%s\" > /dev/dsp", name)); elseif (strcmp (ext, "mu") || strcmp (ext, "au") - || strcmp (ext, "snd") || strcmp (ext, "ul")) + || strcmp (ext, "snd") || strcmp (ext, "ul")) system (sprintf ("cat \"%s\" > /dev/audio", name)); else error ("playaudio does not support given extension");
--- a/scripts/audio/saveaudio.m +++ b/scripts/audio/saveaudio.m @@ -76,7 +76,7 @@ c = fwrite (num, X, "short"); endif elseif (strcmp (ext, "mu") || strcmp (ext, "au") - || strcmp (ext, "snd") || strcmp (ext, "ul")) + || strcmp (ext, "snd") || strcmp (ext, "ul")) Y = lin2mu (X); c = fwrite (num, Y, "uchar"); else
--- a/scripts/audio/wavread.m +++ b/scripts/audio/wavread.m @@ -132,13 +132,13 @@ case 16 format = "int16"; case 24 - format = "uint8"; + format = "uint8"; case 32 format = "int32"; otherwise fclose (fid); error ("wavread: %d bits sample resolution is not supported with PCM", - bits_per_sample); + bits_per_sample); endswitch else switch (bits_per_sample) @@ -149,7 +149,7 @@ otherwise fclose (fid); error ("wavread: %d bits sample resolution is not supported with IEEE float", - bits_per_sample); + bits_per_sample); endswitch endif @@ -187,7 +187,7 @@ ## Check data. if (mod (numel (yi), channels) != 0) error ("wavread: data in %s doesn't match the number of channels", - filename); + filename); endif if (bits_per_sample == 24) @@ -204,7 +204,7 @@ case 16 yi /= 32767; case 24 - yi /= 8388607; + yi /= 8388607; case 32 yi /= 2147483647; endswitch
--- a/scripts/audio/wavwrite.m +++ b/scripts/audio/wavwrite.m @@ -55,7 +55,7 @@ if (nargin > 2) samples_per_sec = varargin{2}; if (nargin > 3) - bits_per_sample = varargin{3}; + bits_per_sample = varargin{3}; endif endif else @@ -63,7 +63,7 @@ if (nargin > 2) samples_per_sec = varargin{1}; if (nargin > 3) - bits_per_sample = varargin{2}; + bits_per_sample = varargin{2}; endif endif endif
--- a/scripts/deprecated/cellidx.m +++ b/scripts/deprecated/cellidx.m @@ -88,20 +88,20 @@ signame = strlist{idx}; for jdx = 1:nsigs if (strcmp (signame, listvar{jdx})) - if (idxvec(idx) != 0) - warning ("Duplicate signal name %s (%d,%d)\n", - listvar{jdx}, jdx, idxvec(idx)); - else - idxvec(idx) = jdx; - endif + if (idxvec(idx) != 0) + warning ("Duplicate signal name %s (%d,%d)\n", + listvar{jdx}, jdx, idxvec(idx)); + else + idxvec(idx) = jdx; + endif endif endfor if (idxvec(idx) == 0) errmsg = sprintf ("Did not find %s", signame); if (nargout == 1) - error (errmsg); + error (errmsg); else - break; + break; endif endif endfor
--- a/scripts/deprecated/intwarning.m +++ b/scripts/deprecated/intwarning.m @@ -86,40 +86,40 @@ endif if (ischar (x)) if (strcmpi (x, "query")) - if (nargout == 0) - __print_int_warn_state__ ("Octave:int-convert-nan"); - __print_int_warn_state__ ("Octave:int-convert-non-int-val"); - __print_int_warn_state__ ("Octave:int-convert-overflow"); - __print_int_warn_state__ ("Octave:int-math-overflow"); - printf("\n"); - endif + if (nargout == 0) + __print_int_warn_state__ ("Octave:int-convert-nan"); + __print_int_warn_state__ ("Octave:int-convert-non-int-val"); + __print_int_warn_state__ ("Octave:int-convert-overflow"); + __print_int_warn_state__ ("Octave:int-math-overflow"); + printf("\n"); + endif elseif (strcmpi (x, "on")) - warning ("on", "Octave:int-convert-nan"); - warning ("on", "Octave:int-convert-non-int-val"); - warning ("on", "Octave:int-convert-overflow"); - warning ("on", "Octave:int-math-overflow"); + warning ("on", "Octave:int-convert-nan"); + warning ("on", "Octave:int-convert-non-int-val"); + warning ("on", "Octave:int-convert-overflow"); + warning ("on", "Octave:int-math-overflow"); elseif (strcmpi (x, "off")) - warning ("off", "Octave:int-convert-nan"); - warning ("off", "Octave:int-convert-non-int-val"); - warning ("off", "Octave:int-convert-overflow"); - warning ("off", "Octave:int-math-overflow"); + warning ("off", "Octave:int-convert-nan"); + warning ("off", "Octave:int-convert-non-int-val"); + warning ("off", "Octave:int-convert-overflow"); + warning ("off", "Octave:int-math-overflow"); else - error ("intwarning: unrecognized argument"); + error ("intwarning: unrecognized argument"); endif elseif (isstruct(x)) for fld = fieldnames (x) - if (strcmp ("Octave:int-convert-nan") || - strcmp ("Octave:int-convert-non-int-val") || - strcmp ("Octave:int-convert-overflow") || - strcmp ("Octave:int-cmath-overflow")) - s = getfield (x, fld); - if (! ischar (s) || !(strcmpi("s","on") || strcmpi("s","off"))) - error ("intwarning: unexpected warning state"); - endif - warning (s, fld); - else - error ("intwarning: unrecognized integer warning %s", fld); - endif + if (strcmp ("Octave:int-convert-nan") || + strcmp ("Octave:int-convert-non-int-val") || + strcmp ("Octave:int-convert-overflow") || + strcmp ("Octave:int-cmath-overflow")) + s = getfield (x, fld); + if (! ischar (s) || !(strcmpi("s","on") || strcmpi("s","off"))) + error ("intwarning: unexpected warning state"); + endif + warning (s, fld); + else + error ("intwarning: unrecognized integer warning %s", fld); + endif endfor else error ("intwarning: unexpected input"); @@ -129,5 +129,5 @@ function __print_int_warn_state__ (s) fprintf ("The state of warning \"%s\" is \"%s\"\n", - s, warning ("query", s).state); + s, warning ("query", s).state); endfunction
--- a/scripts/deprecated/lchol.m +++ b/scripts/deprecated/lchol.m @@ -30,7 +30,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spfind is obsolete and will be removed from a future version of Octave; please use find instead"); + "spfind is obsolete and will be removed from a future version of Octave; please use find instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spatan2.m +++ b/scripts/deprecated/spatan2.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spatan2 is obsolete and will be removed from a future version of Octave; please use atan2 instead"); + "spatan2 is obsolete and will be removed from a future version of Octave; please use atan2 instead"); endif retval = atan2 (varargin{:});
--- a/scripts/deprecated/spchol.m +++ b/scripts/deprecated/spchol.m @@ -30,7 +30,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spchol is obsolete and will be removed from a future version of Octave; please use chol instead"); + "spchol is obsolete and will be removed from a future version of Octave; please use chol instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spchol2inv.m +++ b/scripts/deprecated/spchol2inv.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spchol2inv is obsolete and will be removed from a future version of Octave; please use chol2inv instead"); + "spchol2inv is obsolete and will be removed from a future version of Octave; please use chol2inv instead"); endif retval = chol2inv (varargin{:});
--- a/scripts/deprecated/spcholinv.m +++ b/scripts/deprecated/spcholinv.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spcholinv is obsolete and will be removed from a future version of Octave; please use cholinv instead"); + "spcholinv is obsolete and will be removed from a future version of Octave; please use cholinv instead"); endif retval = cholinv (varargin{:});
--- a/scripts/deprecated/spcumprod.m +++ b/scripts/deprecated/spcumprod.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spcumprod is obsolete and will be removed from a future version of Octave; please use cumprod instead"); + "spcumprod is obsolete and will be removed from a future version of Octave; please use cumprod instead"); endif retval = cumprod (varargin{:});
--- a/scripts/deprecated/spcumsum.m +++ b/scripts/deprecated/spcumsum.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spcumsum is obsolete and will be removed from a future version of Octave; please use cumsum instead"); + "spcumsum is obsolete and will be removed from a future version of Octave; please use cumsum instead"); endif retval = cumsum (varargin{:});
--- a/scripts/deprecated/spdet.m +++ b/scripts/deprecated/spdet.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spdet is obsolete and will be removed from a future version of Octave; please use det instead"); + "spdet is obsolete and will be removed from a future version of Octave; please use det instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spdiag.m +++ b/scripts/deprecated/spdiag.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spdiag is obsolete and will be removed from a future version of Octave; please use sparse (diag (...)) instead"); + "spdiag is obsolete and will be removed from a future version of Octave; please use sparse (diag (...)) instead"); endif retval = sparse (diag (varargin{:}));
--- a/scripts/deprecated/spfind.m +++ b/scripts/deprecated/spfind.m @@ -31,7 +31,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spfind is obsolete and will be removed from a future version of Octave; please use find instead"); + "spfind is obsolete and will be removed from a future version of Octave; please use find instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spinv.m +++ b/scripts/deprecated/spinv.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spinv is obsolete and will be removed from a future version of Octave; please use inv instead"); + "spinv is obsolete and will be removed from a future version of Octave; please use inv instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spkron.m +++ b/scripts/deprecated/spkron.m @@ -30,7 +30,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spkron is obsolete and will be removed from a future version of Octave; please use kron instead"); + "spkron is obsolete and will be removed from a future version of Octave; please use kron instead"); endif retval = kron (varargin{:});
--- a/scripts/deprecated/splchol.m +++ b/scripts/deprecated/splchol.m @@ -31,7 +31,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "splchol is obsolete and will be removed from a future version of Octave; please use chol instead"); + "splchol is obsolete and will be removed from a future version of Octave; please use chol instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/split.m +++ b/scripts/deprecated/split.m @@ -71,25 +71,25 @@ l_t = length (t); if (l_s == 0) - m = ""; - return; + m = ""; + return; elseif (l_t == 0) - m = s'; - return; + 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) - error("split: multi-line strings are not supported"); + error("split: multi-line strings are not supported"); endif ind = findstr (s, t, 0); if (length (ind) == 0) - m = s; - return; + m = s; + return; elseif (n - 1 < length(ind)) - ind = ind(1:n-1); + ind = ind(1:n-1); endif ind2 = [1, ind+l_t]; ind = [ind, l_s+1]; @@ -103,8 +103,8 @@ ## Copy the strings to the matrix. for i = 1:length (ind) - tmp = ind2(i):(ind(i)-1); - m(i,1:length(tmp)) = s(tmp); + tmp = ind2(i):(ind(i)-1); + m(i,1:length(tmp)) = s(tmp); endfor else error ("split: both s and t must be strings");
--- a/scripts/deprecated/splu.m +++ b/scripts/deprecated/splu.m @@ -32,7 +32,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "splu is obsolete and will be removed from a future version of Octave; please use lu instead"); + "splu is obsolete and will be removed from a future version of Octave; please use lu instead"); endif for i = 2 : nargin
--- a/scripts/deprecated/spmax.m +++ b/scripts/deprecated/spmax.m @@ -29,7 +29,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spmax is obsolete and will be removed from a future version of Octave; please use max instead"); + "spmax is obsolete and will be removed from a future version of Octave; please use max instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spmin.m +++ b/scripts/deprecated/spmin.m @@ -29,7 +29,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spmin is obsolete and will be removed from a future version of Octave; please use min instead"); + "spmin is obsolete and will be removed from a future version of Octave; please use min instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spprod.m +++ b/scripts/deprecated/spprod.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spprod is obsolete and will be removed from a future version of Octave; please use prod instead"); + "spprod is obsolete and will be removed from a future version of Octave; please use prod instead"); endif retval = prod (varargin{:});
--- a/scripts/deprecated/spqr.m +++ b/scripts/deprecated/spqr.m @@ -31,7 +31,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spqr is obsolete and will be removed from a future version of Octave; please use qr instead"); + "spqr is obsolete and will be removed from a future version of Octave; please use qr instead"); endif varargout = cell (nargout, 1);
--- a/scripts/deprecated/spsum.m +++ b/scripts/deprecated/spsum.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spsum is obsolete and will be removed from a future version of Octave; please use sum instead"); + "spsum is obsolete and will be removed from a future version of Octave; please use sum instead"); endif retval = sum (varargin{:});
--- a/scripts/deprecated/spsumsq.m +++ b/scripts/deprecated/spsumsq.m @@ -28,7 +28,7 @@ if (! warned) warned = true; warning ("Octave:deprecated-function", - "spsumsq is obsolete and will be removed from a future version of Octave; please use sumsq instead"); + "spsumsq is obsolete and will be removed from a future version of Octave; please use sumsq instead"); endif retval = sumsq (varargin{:});
--- a/scripts/elfun/lcm.m +++ b/scripts/elfun/lcm.m @@ -61,7 +61,7 @@ a = abs (a); l = a (1); for k = 1:(length (a) - 1) - l = l * a(k+1) / gcd (l, a(k+1)); + l = l * a(k+1) / gcd (l, a(k+1)); endfor endif else @@ -74,16 +74,16 @@ a = varargin{i}; if (size (a) != sz) - if (nel == 1) - sz = size (a); - nel = numel (a); - elseif (numel (a) != 1) - error ("lcm: all arguments must be the same size or scalar"); - endif + if (nel == 1) + sz = size (a); + nel = numel (a); + elseif (numel (a) != 1) + error ("lcm: all arguments must be the same size or scalar"); + endif endif if (round (a) != a) - error ("lcm: all arguments must be integer"); + error ("lcm: all arguments must be integer"); endif idx = find (l == 0 || a == 0);
--- a/scripts/general/bicubic.m +++ b/scripts/general/bicubic.m @@ -79,7 +79,7 @@ [rz, cz] = size (Z) ; if (isvector (X) && isvector (Y)) if (rz != length (Y) || cz != length (X)) - error ("length of X and Y must match the size of Z"); + error ("length of X and Y must match the size of Z"); endif elseif (size_equal (X, Y) && size_equal (X, Z)) X = X(1,:); @@ -184,8 +184,8 @@ it = indt(i); int = [it, it+1, it+2, it+3]; F(i,:) = ([ct0(i),ct1(i),ct2(i),ct3(i)] - * (p(int,inds) .* cs0 + p(int,inds+1) .* cs1 - + p(int,inds+2) .* cs2 + p(int,inds+3) .* cs3)); + * (p(int,inds) .* cs0 + p(int,inds+1) .* cs1 + + p(int,inds+2) .* cs2 + p(int,inds+3) .* cs3)); endfor ## Set points outside the table to extrapval.
--- a/scripts/general/cell2mat.m +++ b/scripts/general/cell2mat.m @@ -55,13 +55,13 @@ if (nc > nr) c1 = cell (nr, 1); for i = 1 : nr - c1{i} = [c{i,:}]; + c1{i} = [c{i,:}]; endfor m = vertcat (c1 {:}); else c1 = cell (nc, 1); for i = 1 : nc - c1{i} = vertcat (c{:,i}); + c1{i} = vertcat (c{:,i}); endfor m = [c1{:}]; endif
--- a/scripts/general/circshift.m +++ b/scripts/general/circshift.m @@ -55,30 +55,30 @@ 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 (); for i = 1:length (n); - nn = n(i); - if (nn < 0) - while (sz(i) <= -nn) - nn = nn + sz(i); - endwhile - idx{i} = [(1-nn):sz(i), 1:-nn]; - else - while (sz(i) <= nn) - nn = nn - sz(i); - endwhile - idx{i} = [(sz(i)-nn+1):sz(i), 1:(sz(i)-nn)]; - endif + nn = n(i); + if (nn < 0) + while (sz(i) <= -nn) + nn = nn + sz(i); + endwhile + idx{i} = [(1-nn):sz(i), 1:-nn]; + else + while (sz(i) <= nn) + nn = nn - sz(i); + endwhile + idx{i} = [(sz(i)-nn+1):sz(i), 1:(sz(i)-nn)]; + endif endfor for i = (length(n) + 1) : nd - idx{i} = 1:sz(i); + idx{i} = 1:sz(i); endfor y = x(idx{:}); endif
--- a/scripts/general/cplxpair.m +++ b/scripts/general/cplxpair.m @@ -119,16 +119,16 @@ p = n - nr(j); for i = 1:2:p if (i+1 > p) - error ("cplxpair could not pair all complex numbers"); + error ("cplxpair could not pair all complex numbers"); endif [v, idx] = min (abs (z(i+1:p) - conj (z(i)))); if (v > tol) - error ("cplxpair could not pair all complex numbers"); + error ("cplxpair could not pair all complex numbers"); endif if (imag (z(i)) < 0) - y([i, i+1]) = z([i, idx+i]); + y([i, i+1]) = z([i, idx+i]); else - y([i, i+1]) = z([idx+i, i]); + y([i, i+1]) = z([idx+i, i]); endif z(idx+i) = z(i+1); endfor @@ -146,9 +146,9 @@ %!assert (cplxpair(1), 1) %!assert (cplxpair([1+1i, 1-1i]), [1-1i, 1+1i]) %!assert (cplxpair([1+1i, 1+1i, 1, 1-1i, 1-1i, 2]), \ -%! [1-1i, 1+1i, 1-1i, 1+1i, 1, 2]) +%! [1-1i, 1+1i, 1-1i, 1+1i, 1, 2]) %!assert (cplxpair([1+1i; 1+1i; 1; 1-1i; 1-1i; 2]), \ -%! [1-1i; 1+1i; 1-1i; 1+1i; 1; 2]) +%! [1-1i; 1+1i; 1-1i; 1+1i; 1; 2]) %!assert (cplxpair([0, 1, 2]), [0, 1, 2]); %!shared z
--- a/scripts/general/cumtrapz.m +++ b/scripts/general/cumtrapz.m @@ -31,12 +31,12 @@ ## @seealso{trapz,cumsum} ## @end deftypefn -## Author: Kai Habel <kai.habel@gmx.de> +## Author: Kai Habel <kai.habel@gmx.de> ## ## also: June 2000 Paul Kienzle (fixes,suggestions) ## 2006-05-12 David Bateman - Modified for NDArrays -function z = cumtrapz (x, y, dim) +function z = cumtrapz (x, y, dim) if (nargin < 1) || (nargin > 3) print_usage (); @@ -83,7 +83,7 @@ idx1{i} = 1:sz(i); endfor idx2 = idx1; - idx1{dim} = 2 : n; + idx1{dim} = 2 : n; idx2{dim} = 1 : (n - 1); if (! have_x) @@ -93,7 +93,7 @@ error ("cumtrapz: x and y must have same shape"); endif z = 0.5 * cumsum ((x(idx1{:}) - x(idx2{:})) .* - (y(idx1{:}) + y(idx2{:})), dim); + (y(idx1{:}) + y(idx2{:})), dim); endif sz(dim) = 1;
--- a/scripts/general/dblquad.m +++ b/scripts/general/dblquad.m @@ -50,7 +50,7 @@ endif q = feval (quadf, @(y) inner (y, f, xa, xb, tol, quadf, - varargin{:}), ya, yb, tol); + varargin{:}), ya, yb, tol); endfunction function q = __dblquad_inner__ (y, f, xa, xb, tol, quadf, varargin)
--- a/scripts/general/del2.m +++ b/scripts/general/del2.m @@ -80,13 +80,13 @@ endif for i = 1 : nd if (isscalar (h)) - dx{i} = h * ones (sz (i), 1); + dx{i} = h * ones (sz (i), 1); else - if (length (h) == sz (i)) - dx{i} = diff (h)(:); - else - error ("dimensionality mismatch in %d-th spacing vector", i); - endif + if (length (h) == sz (i)) + dx{i} = diff (h)(:); + else + error ("dimensionality mismatch in %d-th spacing vector", i); + endif endif endfor elseif (nargin - 1 == nd) @@ -97,13 +97,13 @@ for i = 1 : nd if (isscalar (varargin{i})) - dx{i} = varargin{i} * ones (sz (i), 1); + dx{i} = varargin{i} * ones (sz (i), 1); else - if (length (varargin{i}) == sz (i)) - dx{i} = diff (varargin{i})(:); - else - error ("dimensionality mismatch in %d-th spacing vector", i); - endif + if (length (varargin{i}) == sz (i)) + dx{i} = diff (varargin{i})(:); + else + error ("dimensionality mismatch in %d-th spacing vector", i); + endif endif endfor else @@ -131,24 +131,24 @@ h1 = repmat (shiftdim (dx{i}(1 : sz(i) - 2), 1 - i), szi); h2 = repmat (shiftdim (dx{i}(2 : sz(i) - 1), 1 - i), szi); DD(idx2{:}) = ((M(idx1{:}) - M(idx2{:})) ./ h1 + ... - (M(idx3{:}) - M(idx2{:})) ./ h2) ./ (h1 + h2); + (M(idx3{:}) - M(idx2{:})) ./ h2) ./ (h1 + h2); ## left and right boundary if (sz(i) == 3) - DD(idx1{:}) = DD(idx3{:}) = DD(idx2{:}); + DD(idx1{:}) = DD(idx3{:}) = DD(idx2{:}); else - idx1{i} = 1; - idx2{i} = 2; - idx3{i} = 3; - DD(idx1{:}) = (dx{i}(1) + dx{i}(2)) / dx{i}(2) * DD (idx2{:}) - ... - dx{i}(1) / dx{i}(2) * DD (idx3{:}); + idx1{i} = 1; + idx2{i} = 2; + idx3{i} = 3; + DD(idx1{:}) = (dx{i}(1) + dx{i}(2)) / dx{i}(2) * DD (idx2{:}) - ... + dx{i}(1) / dx{i}(2) * DD (idx3{:}); - idx1{i} = sz(i); - idx2{i} = sz(i) - 1; - idx3{i} = sz(i) - 2; - DD(idx1{:}) = (dx{i}(sz(i) - 1) + dx{i}(sz(i) - 2)) / ... - dx{i}(sz(i) - 2) * DD (idx2{:}) - ... - dx{i}(sz(i) - 1) / dx{i}(sz(i) - 2) * DD (idx3{:}); + idx1{i} = sz(i); + idx2{i} = sz(i) - 1; + idx3{i} = sz(i) - 2; + DD(idx1{:}) = (dx{i}(sz(i) - 1) + dx{i}(sz(i) - 2)) / ... + dx{i}(sz(i) - 2) * DD (idx2{:}) - ... + dx{i}(sz(i) - 1) / dx{i}(sz(i) - 2) * DD (idx3{:}); endif D += DD;
--- a/scripts/general/gradient.m +++ b/scripts/general/gradient.m @@ -135,7 +135,7 @@ mr = rows (m); mc = numel (m) / mr; Y = zeros (size (m), class (m)); - + if (mr > 1) ## Top and bottom boundary. Y(1,:) = diff (m(1:2, :)) / d{i}(1);
--- a/scripts/general/idivide.m +++ b/scripts/general/idivide.m @@ -80,7 +80,7 @@ else typ = class (x); if (!strcmp (class (x), class (y))) - error ("idivide: incompatible types"); + error ("idivide: incompatible types"); endif endif
--- a/scripts/general/int2str.m +++ b/scripts/general/int2str.m @@ -58,7 +58,7 @@ if (nc > 1) idx = cell (); for i = 1:nd - idx{i} = 1:sz(i); + idx{i} = 1:sz(i); endfor idx(2) = 1; ifmt = get_fmt (x(idx{:}), 0); @@ -89,9 +89,9 @@ nan_inf = isinf (t) | isnan (t); if (any (nan_inf)) if (any (t(nan_inf) < 0)) - min_fw = 4 + sep; + min_fw = 4 + sep; else - min_fw = 3 + sep; + min_fw = 3 + sep; endif else min_fw = 1 + sep; @@ -105,7 +105,7 @@ tfw = floor (log10 (double (abs (t)))) + 1 + sep; fw = max (tfw); if (any (t(tfw == fw) < 0)) - fw++; + fw++; endif fmt = sprintf ("%%%dd", max (fw, min_fw)); endif
--- a/scripts/general/interp1.m +++ b/scripts/general/interp1.m @@ -113,21 +113,21 @@ for i = 1:length (varargin) arg = varargin{i}; if (ischar (arg)) - arg = tolower (arg); - if (strcmp ("extrap", arg)) - extrap = "extrap"; - elseif (strcmp ("pp", arg)) - pp = true; - else - method = arg; - endif + arg = tolower (arg); + if (strcmp ("extrap", arg)) + extrap = "extrap"; + elseif (strcmp ("pp", arg)) + pp = true; + else + method = arg; + endif else - if (firstnumeric) - xi = arg; - firstnumeric = false; - else - extrap = arg; - endif + if (firstnumeric) + xi = arg; + firstnumeric = false; + else + extrap = arg; + endif endif endfor endif @@ -411,14 +411,14 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); %!assert (interp1(xp,[yp',yp'],xi,style), -%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); +%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); %!test style=['*',style]; %!assert (interp1(xp, yp, [min(xp)-1, max(xp)+1],style), [NA, NA]); %!assert (interp1(xp,yp,xp,style), yp, 100*eps); @@ -428,11 +428,11 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); ## ENDBLOCK %!test style='linear'; @@ -445,14 +445,14 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); %!assert (interp1(xp,[yp',yp'],xi,style), -%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); +%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); %!test style=['*',style]; %!assert (interp1(xp, yp, [min(xp)-1, max(xp)+1],style), [NA, NA]); %!assert (interp1(xp,yp,xp,style), yp, 100*eps); @@ -462,11 +462,11 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); ## ENDBLOCK %!test style='cubic'; @@ -479,14 +479,14 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),100*eps); +%! interp1(xp,yp,xi,style,"extrap"),100*eps); %!error interp1(1,1,1, style); %!assert (interp1(xp,[yp',yp'],xi,style), -%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); +%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); %!test style=['*',style]; %!assert (interp1(xp, yp, [min(xp)-1, max(xp)+1],style), [NA, NA]); %!assert (interp1(xp,yp,xp,style), yp, 100*eps); @@ -496,11 +496,11 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),100*eps); +%! interp1(xp,yp,xi,style,"extrap"),100*eps); %!error interp1(1,1,1, style); ## ENDBLOCK %!test style='pchip'; @@ -513,14 +513,14 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); %!assert (interp1(xp,[yp',yp'],xi,style), -%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); +%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); %!test style=['*',style]; %!assert (interp1(xp, yp, [min(xp)-1, max(xp)+1],style), [NA, NA]); %!assert (interp1(xp,yp,xp,style), yp, 100*eps); @@ -530,11 +530,11 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); ## ENDBLOCK %!test style='spline'; @@ -547,14 +547,14 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); %!assert (interp1(xp,[yp',yp'],xi,style), -%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); +%! interp1(xp,[yp',yp'],xi,["*",style]),100*eps); %!test style=['*',style]; %!assert (interp1(xp, yp, [min(xp)-1, max(xp)+1],style), [NA, NA]); %!assert (interp1(xp,yp,xp,style), yp, 100*eps); @@ -564,11 +564,11 @@ %!assert (isempty(interp1(xp',yp',[],style))); %!assert (isempty(interp1(xp,yp,[],style))); %!assert (interp1(xp,[yp',yp'],xi(:),style),... -%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); +%! [interp1(xp,yp,xi(:),style),interp1(xp,yp,xi(:),style)]); %!assert (interp1(xp,yp,xi,style),... -%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); +%! interp1(fliplr(xp),fliplr(yp),xi,style),100*eps); %!assert (ppval(interp1(xp,yp,style,"pp"),xi), -%! interp1(xp,yp,xi,style,"extrap"),10*eps); +%! interp1(xp,yp,xi,style,"extrap"),10*eps); %!error interp1(1,1,1, style); ## ENDBLOCK ## ENDBLOCKTEST
--- a/scripts/general/interp2.m +++ b/scripts/general/interp2.m @@ -73,7 +73,7 @@ ## @seealso{interp1} ## @end deftypefn -## Author: Kai Habel <kai.habel@gmx.de> +## Author: Kai Habel <kai.habel@gmx.de> ## 2005-03-02 Thomas Weber <weber@num.uni-sb.de> ## * Add test cases ## 2005-03-02 Paul Kienzle <pkienzle@users.sf.net> @@ -99,32 +99,32 @@ Z = varargin{1}; case 2 if (ischar (varargin{2})) - [Z, method] = deal (varargin{:}); + [Z, method] = deal (varargin{:}); else - [Z, n] = deal (varargin{:}); + [Z, n] = deal (varargin{:}); endif case 3 if (ischar (varargin{3})) - [Z, n, method] = deal (varargin{:}); + [Z, n, method] = deal (varargin{:}); else - [Z, XI, YI] = deal (varargin{:}); + [Z, XI, YI] = deal (varargin{:}); endif case 4 if (ischar (varargin{4})) - [Z, XI, YI, method] = deal (varargin{:}); + [Z, XI, YI, method] = deal (varargin{:}); else - [Z, n, method, extrapval] = deal (varargin{:}); + [Z, n, method, extrapval] = deal (varargin{:}); endif case 5 if (ischar (varargin{4})) - [Z, XI, YI, method, extrapval] = deal (varargin{:}); + [Z, XI, YI, method, extrapval] = deal (varargin{:}); else - [X, Y, Z, XI, YI] = deal (varargin{:}); + [X, Y, Z, XI, YI] = deal (varargin{:}); endif case 6 - [X, Y, Z, XI, YI, method] = deal (varargin{:}); + [X, Y, Z, XI, YI, method] = deal (varargin{:}); case 7 - [X, Y, Z, XI, YI, method, extrapval] = deal (varargin{:}); + [X, Y, Z, XI, YI, method, extrapval] = deal (varargin{:}); otherwise print_usage (); endswitch @@ -181,7 +181,7 @@ ## If Xi and Yi are vectors of different orientation build a grid if ((rows (XI) == 1 && columns (YI) == 1) - || (columns (XI) == 1 && rows (YI) == 1)) + || (columns (XI) == 1 && rows (YI) == 1)) [XI, YI] = meshgrid (XI, YI); elseif (! size_equal (XI, YI)) error ("XI and YI must be matrices of same size"); @@ -239,7 +239,7 @@ elseif (strcmp (method, "pchip")) if (length (X) < 2 || length (Y) < 2) - error ("interp2: pchip2 requires at least 2 points in each dimension") + error ("interp2: pchip2 requires at least 2 points in each dimension") endif ## first order derivatives @@ -284,13 +284,13 @@ ZI = zeros (size (XI)); for i = 1:2 - for j = 1:2 - zidx = sub2ind (size (Z), yidx+(j-1), xidx+(i-1)); - ZI += xb{1,i} .* yb{1,j} .* Z(zidx); - ZI += xb{2,i} .* yb{1,j} .* DX(zidx); - ZI += xb{1,i} .* yb{2,j} .* DY(zidx); - ZI += xb{2,i} .* yb{2,j} .* DXY(zidx); - endfor + for j = 1:2 + zidx = sub2ind (size (Z), yidx+(j-1), xidx+(i-1)); + ZI += xb{1,i} .* yb{1,j} .* Z(zidx); + ZI += xb{2,i} .* yb{1,j} .* DX(zidx); + ZI += xb{1,i} .* yb{2,j} .* DY(zidx); + ZI += xb{2,i} .* yb{2,j} .* DXY(zidx); + endfor endfor endif @@ -298,21 +298,21 @@ if (! isempty (extrapval)) ## set points outside the table to 'extrapval' if (X (1) < X (end)) - if (Y (1) < Y (end)) - ZI (XI < X(1,1) | XI > X(end) | YI < Y(1,1) | YI > Y(end)) = ... - extrapval; - else - ZI (XI < X(1) | XI > X(end) | YI < Y(end) | YI > Y(1)) = ... - extrapval; - endif + if (Y (1) < Y (end)) + ZI (XI < X(1,1) | XI > X(end) | YI < Y(1,1) | YI > Y(end)) = ... + extrapval; + else + ZI (XI < X(1) | XI > X(end) | YI < Y(end) | YI > Y(1)) = ... + extrapval; + endif else - if (Y (1) < Y (end)) - ZI (XI < X(end) | XI > X(1) | YI < Y(1) | YI > Y(end)) = ... - extrapval; - else - ZI (XI < X(1,end) | XI > X(1) | YI < Y(end) | YI > Y(1)) = ... - extrapval; - endif + if (Y (1) < Y (end)) + ZI (XI < X(end) | XI > X(1) | YI < Y(1) | YI > Y(end)) = ... + extrapval; + else + ZI (XI < X(1,end) | XI > X(1) | YI < Y(end) | YI > Y(1)) = ... + extrapval; + endif endif endif @@ -323,18 +323,18 @@ X = X(:).'; Y = Y(:); if (!isequal ([length(X), length(Y)], size(Z))) - error ("X and Y size must match Z dimensions"); + error ("X and Y size must match Z dimensions"); endif elseif (!size_equal (X, Y)) error ("X and Y must be matrices of same size"); if (! size_equal (X, Z)) - error ("X and Y size must match Z dimensions"); + error ("X and Y size must match Z dimensions"); endif endif ## If Xi and Yi are vectors of different orientation build a grid if ((rows (XI) == 1 && columns (YI) == 1) - || (columns (XI) == 1 && rows (YI) == 1)) + || (columns (XI) == 1 && rows (YI) == 1)) ## Do nothing elseif (! size_equal (XI, YI)) error ("XI and YI must be matrices of same size"); @@ -396,7 +396,7 @@ elseif (strcmp (method, "spline")) if (isgriddata (XI) && isgriddata (YI')) ZI = __splinen__ ({Y(:,1).', X(1,:)}, Z, {YI(:,1), XI(1,:)}, extrapval, - "spline"); + "spline"); else error ("interp2: input data must have `meshgrid' format"); endif
--- a/scripts/general/interp3.m +++ b/scripts/general/interp3.m @@ -83,7 +83,7 @@ endif if (nargs < 3 || (nargs == 4 && ! isvector (varargin{1}) - && nargs == (ndims (varargin{1}) + 1))) + && nargs == (ndims (varargin{1}) + 1))) v = varargin{1}; if (ndims (v) != 3) error ("expect 3-dimensional array of values"); @@ -91,10 +91,10 @@ x = varargin (2:4); if (any (! cellfun (@isvector, x))) for i = 2 : 3 - if (! size_equal (x{1}, x{i})) - error ("dimensional mismatch"); - endif - x{i} = permute (x{i}, [2, 1, 3]); + if (! size_equal (x{1}, x{i})) + error ("dimensional mismatch"); + endif + x{i} = permute (x{i}, [2, 1, 3]); endfor x{1} = permute (x{1}, [2, 1, 3]); endif @@ -108,20 +108,20 @@ x = varargin (1:3); if (any (! cellfun (@isvector, x))) for i = 2 : 3 - if (! size_equal (x{1}, x{i}) || ! size_equal (x{i}, v)) - error ("dimensional mismatch"); - endif - x{i} = permute (x{i}, [2, 1, 3]); + if (! size_equal (x{1}, x{i}) || ! size_equal (x{i}, v)) + error ("dimensional mismatch"); + endif + x{i} = permute (x{i}, [2, 1, 3]); endfor x{1} = permute (x{1}, [2, 1, 3]); endif y = varargin (5:7); if (any (! cellfun (@isvector, y))) for i = 2 : 3 - if (! size_equal (y{1}, y{i})) - error ("dimensional mismatch"); - endif - y{i} = permute (y{i}, [2, 1, 3]); + if (! size_equal (y{1}, y{i})) + error ("dimensional mismatch"); + endif + y{i} = permute (y{i}, [2, 1, 3]); endfor y{1} = permute (y{1}, [2, 1, 3]); endif
--- a/scripts/general/interpn.m +++ b/scripts/general/interpn.m @@ -89,7 +89,7 @@ if (nargs == 2) m = varargin{2}; if (! isnumeric (m) || ! isscalar (m) || floor (m) != m) - error ("m is expected to be a integer scalar"); + error ("m is expected to be a integer scalar"); endif endif sz = size (v); @@ -110,7 +110,7 @@ x{i} = 1 : sz(i); endfor elseif (rem (nargs, 2) == 1 && nargs == - (2 * ndims (varargin{ceil (nargs / 2)})) + 1) + (2 * ndims (varargin{ceil (nargs / 2)})) + 1) nv = ceil (nargs / 2); v = varargin{nv}; sz = size (v); @@ -124,7 +124,7 @@ if (any (! cellfun (@isvector, x))) for i = 2 : nd if (! size_equal (x{1}, x{i}) || ! size_equal (x{i}, v)) - error ("dimensional mismatch"); + error ("dimensional mismatch"); endif idx (1 : nd) = {1}; idx (i) = ":"; @@ -161,12 +161,12 @@ elseif (strcmp (method, "spline")) if (any (! cellfun (@isvector, y))) for i = 2 : nd - if (! size_equal (y{1}, y{i})) - error ("dimensional mismatch"); - endif - idx (1 : nd) = {1}; - idx (i) = ":"; - y{i} = y{i}(idx{:}); + if (! size_equal (y{1}, y{i})) + error ("dimensional mismatch"); + endif + idx (1 : nd) = {1}; + idx (i) = ":"; + y{i} = y{i}(idx{:}); endfor idx (1 : nd) = {1}; idx (1) = ":"; @@ -180,8 +180,8 @@ idx = cell (1, ly); q = cell (1, nd); for i = 1 : ly - q(:) = i; - idx {i} = q; + q(:) = i; + idx {i} = q; endfor vi = vi (cellfun (@(x) sub2ind (size(vi), x{:}), idx)); vi = reshape (vi, size(y{1}));
--- a/scripts/general/isa.m +++ b/scripts/general/isa.m @@ -33,8 +33,8 @@ persistent float_classes = {"double", "single"}; persistent fnum_classes = {"double", "single", ... - "uint8", "uint16", "uint32", "uint64", ... - "int8", "int16", "int32", "int64"}; + "uint8", "uint16", "uint32", "uint64", ... + "int8", "int16", "int32", "int64"}; if (strcmp (cname, "float")) retval = any (strcmp (class (x), float_classes));
--- a/scripts/general/num2str.m +++ b/scripts/general/num2str.m @@ -74,34 +74,34 @@ elseif (iscomplex (x)) if (nargin == 2) if (ischar (arg)) - fmt = cstrcat (arg, "%-+", arg(2:end), "i"); + fmt = cstrcat (arg, "%-+", arg(2:end), "i"); else - if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg)) - fmt = sprintf ("%%%dd%%-+%ddi ", arg, arg); - else - fmt = sprintf ("%%%d.%dg%%-+%d.%dgi", arg+7, arg, arg+7, arg); - endif + if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg)) + fmt = sprintf ("%%%dd%%-+%ddi ", arg, arg); + else + fmt = sprintf ("%%%d.%dg%%-+%d.%dgi", arg+7, arg, arg+7, arg); + endif endif else ## Setup a suitable format string if (isnumeric (x) && round (x) == x && abs (x) < 1e10) - if (max (abs (real (x(:)))) == 0) - dgt1 = 2; - else - dgt1 = ceil (log10 (max (max (abs (real (x(:)))), - max (abs (imag (x(:))))))) + 2; - endif - dgt2 = dgt1 - (min (real (x(:))) >= 0); - - if (length (abs (x) == x) > 0) - fmt = sprintf("%%%dg%%+-%dgi ", dgt2, dgt1); - else - fmt = sprintf("%%%dd%%+-%ddi ", dgt2, dgt1); - endif + if (max (abs (real (x(:)))) == 0) + dgt1 = 2; + else + dgt1 = ceil (log10 (max (max (abs (real (x(:)))), + max (abs (imag (x(:))))))) + 2; + endif + dgt2 = dgt1 - (min (real (x(:))) >= 0); + + if (length (abs (x) == x) > 0) + fmt = sprintf("%%%dg%%+-%dgi ", dgt2, dgt1); + else + fmt = sprintf("%%%dd%%+-%ddi ", dgt2, dgt1); + endif elseif (isscalar (x)) - fmt = "%.6g%-+.6gi"; + fmt = "%.6g%-+.6gi"; else - fmt = "%11.6g%-+11.6gi"; + fmt = "%11.6g%-+11.6gi"; endif endif @@ -127,17 +127,17 @@ while (true) tmp2 = strrep (tmp, " i\n", "i\n"); if (length (tmp) == length (tmp2)) - break; + break; else - tmp = tmp2; + tmp = tmp2; endif endwhile while (true) tmp2 = strrep (tmp, " i", "i "); if (tmp == tmp2) - break; + break; else - tmp = tmp2; + tmp = tmp2; endif endwhile @@ -146,30 +146,30 @@ else if (nargin == 2) if (ischar (arg)) - fmt = arg; + fmt = arg; else - if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg)) - fmt = sprintf ("%%%dd ", arg); - else - fmt = sprintf ("%%%d.%dg", arg+7, arg); - endif + if (isnumeric (x) && round (x) == x && abs (x) < (10 .^ arg)) + fmt = sprintf ("%%%dd ", arg); + else + fmt = sprintf ("%%%d.%dg", arg+7, arg); + endif endif else if (isnumeric (x) && round (x) == x && abs (x) < 1e10) - if (max (abs (x(:))) == 0) - dgt = 2; - else - dgt = floor (log10 (max (abs(x(:))))) + (min (real (x(:))) < 0) + 2; - endif - if (length (abs (x) == x) > 0) - fmt = sprintf ("%%%dg ", dgt); - else - fmt = sprintf ("%%%dd ", dgt); - endif + if (max (abs (x(:))) == 0) + dgt = 2; + else + dgt = floor (log10 (max (abs(x(:))))) + (min (real (x(:))) < 0) + 2; + endif + if (length (abs (x) == x) > 0) + fmt = sprintf ("%%%dg ", dgt); + else + fmt = sprintf ("%%%dd ", dgt); + endif elseif (isscalar (x)) - fmt = "%11.5g"; + fmt = "%11.5g"; else - fmt = "%11.5g"; + fmt = "%11.5g"; endif endif fmt = cstrcat (deblank (repmat (fmt, 1, columns (x))), "\n");
--- a/scripts/general/postpad.m +++ b/scripts/general/postpad.m @@ -53,7 +53,7 @@ endif else if (! (isscalar (dim) && dim == round (dim)) && dim > 0 && - dim < (nd + 1)) + dim < (nd + 1)) error ("postpad: dim must be an integer and valid dimension"); endif endif
--- a/scripts/general/prepad.m +++ b/scripts/general/prepad.m @@ -64,7 +64,7 @@ endif else if (! (isscalar (dim) && dim == round (dim)) && dim > 0 && - dim < (nd + 1)) + dim < (nd + 1)) error ("prepad: dim must be an integer and valid dimension"); endif endif
--- a/scripts/general/private/__isequal__.m +++ b/scripts/general/private/__isequal__.m @@ -59,9 +59,9 @@ ## All arguments must either be of the same class or they must be ## numeric values. t = (all (strcmp (class(x), - cellfun (@class, varargin, "UniformOutput", false))) + cellfun (@class, varargin, "UniformOutput", false))) || ((isnumeric (x) || islogical (x)) - && all ((cellfun (@isnumeric, varargin) | cellfun (@islogical, varargin))))); + && all ((cellfun (@isnumeric, varargin) | cellfun (@islogical, varargin))))); if (t) ## Test that everything has the same number of dimensions. @@ -95,21 +95,21 @@ idx = 0; s_fn_x = sort (fn_x); while (t && idx < l_v) - idx++; - ## We'll allow the fieldnames to be in a different order. - t = all (strcmp (s_fn_x, sort (fn_v{idx}))); + idx++; + ## We'll allow the fieldnames to be in a different order. + t = all (strcmp (s_fn_x, sort (fn_v{idx}))); endwhile idx = 0; while (t && idx < l_fn_x) - ## Test that all field values are equal. - idx++; - args = {nans_compare_equal, {x.(fn_x{idx})}}; - for argn = 1:l_v - args{argn+2} = {varargin{argn}.(fn_x{idx})}; - endfor - ## Minimize function calls by calling for all the arguments at - ## once. + ## Test that all field values are equal. + idx++; + args = {nans_compare_equal, {x.(fn_x{idx})}}; + for argn = 1:l_v + args{argn+2} = {varargin{argn}.(fn_x{idx})}; + endfor + ## Minimize function calls by calling for all the arguments at + ## once. t = __isequal__ (args{:}); endwhile @@ -118,11 +118,11 @@ l_x = numel (x); idx = 0; while (t && idx < l_x) - idx++; - args = {nans_compare_equal, x{idx}}; - for p = 1:l_v - args{p+2} = varargin{p}{idx}; - endfor + idx++; + args = {nans_compare_equal, x{idx}}; + for p = 1:l_v + args{p+2} = varargin{p}{idx}; + endfor t = __isequal__ (args{:}); endwhile @@ -131,7 +131,7 @@ ## Sizes are equal already, so we can just make everything into a ## row and test the rows. for i = 1:l_v - strings{i} = reshape (varargin{i}, 1, []); + strings{i} = reshape (varargin{i}, 1, []); endfor t = all (strcmp (reshape (x, 1, []), strings)); @@ -144,36 +144,36 @@ ## Check the numeric types. if (issparse (x)) - f_x = spfind (x); + f_x = spfind (x); else - f_x = find (x); + f_x = find (x); endif l_f_x = length (f_x); x = x(f_x); for argn = 1:l_v - y = varargin{argn}; - if (issparse (y)) + y = varargin{argn}; + if (issparse (y)) f_y = spfind (y); - else + else f_y = find (y); - endif + endif - t = (l_f_x == length (f_y)) && all (f_x == f_y); - if (!t) + t = (l_f_x == length (f_y)) && all (f_x == f_y); + if (!t) return; - endif + endif - y = y(f_y); - m = (x == y); - t = all (m); + y = y(f_y); + m = (x == y); + t = all (m); - if (!t) + if (!t) if (nans_compare_equal) t = isnan (x(!m)) && isnan (y(!m)); else return; endif - endif + endif endfor endif
--- a/scripts/general/quadgk.m +++ b/scripts/general/quadgk.m @@ -132,44 +132,44 @@ if (nargin > 3) if (! ischar (varargin{1})) - if (!isempty (varargin{1})) - abstol = varargin{1}; - reltol = 0; - endif - if (nargin > 4) - trace = varargin{2}; - endif - if (nargin > 5) - error ("quadgk: can not pass additional arguments to user function"); + if (!isempty (varargin{1})) + abstol = varargin{1}; + reltol = 0; + endif + if (nargin > 4) + trace = varargin{2}; + endif + if (nargin > 5) + error ("quadgk: can not pass additional arguments to user function"); endif else - idx = 1; - while (idx < nargin - 3) - if (ischar (varargin{idx})) - str = varargin{idx++}; - if (strcmpi (str, "reltol")) - reltol = varargin{idx++}; - elseif (strcmpi (str, "abstol")) - abstol = varargin{idx++}; - elseif (strcmpi (str, "waypoints")) - waypoints = varargin{idx++} (:); - if (isreal(waypoints)) - waypoints (waypoints < a | waypoints > b) = []; - endif - elseif (strcmpi (str, "maxintervalcount")) - maxint = varargin{idx++}; - elseif (strcmpi (str, "trace")) - trace = varargin{idx++}; - else - error ("quadgk: unknown property %s", str); - endif - else - error ("quadgk: expecting property to be a string"); - endif - endwhile - if (idx != nargin - 2) - error ("quadgk: expecting properties in pairs"); - endif + idx = 1; + while (idx < nargin - 3) + if (ischar (varargin{idx})) + str = varargin{idx++}; + if (strcmpi (str, "reltol")) + reltol = varargin{idx++}; + elseif (strcmpi (str, "abstol")) + abstol = varargin{idx++}; + elseif (strcmpi (str, "waypoints")) + waypoints = varargin{idx++} (:); + if (isreal(waypoints)) + waypoints (waypoints < a | waypoints > b) = []; + endif + elseif (strcmpi (str, "maxintervalcount")) + maxint = varargin{idx++}; + elseif (strcmpi (str, "trace")) + trace = varargin{idx++}; + else + error ("quadgk: unknown property %s", str); + endif + else + error ("quadgk: expecting property to be a string"); + endif + endwhile + if (idx != nargin - 2) + error ("quadgk: expecting properties in pairs"); + endif endif endif @@ -196,10 +196,10 @@ ## waypoint transform is then ## t = (2 * g(t)) ./ (1 + sqrt(1 + 4 * g(t) .^ 2)) if (!isempty (waypoints)) - trans = @(x) (2 * x) ./ (1 + sqrt(1 + 4 * x .^ 2)); - subs = [-1; trans(waypoints); 1]; + trans = @(x) (2 * x) ./ (1 + sqrt(1 + 4 * x .^ 2)); + subs = [-1; trans(waypoints); 1]; else - subs = linspace (-1, 1, 11)'; + subs = linspace (-1, 1, 11)'; endif h = 2; h0 = b - a; @@ -221,11 +221,11 @@ ## t = sqrt (b - x) ## s = - t / (t + 1) if (!isempty (waypoints)) - tmp = sqrt (b - waypoints); - trans = @(x) - x ./ (x + 1); - subs = [0; trans(tmp); 1]; + tmp = sqrt (b - waypoints); + trans = @(x) - x ./ (x + 1); + subs = [0; trans(tmp); 1]; else - subs = linspace (0, 1, 11)'; + subs = linspace (0, 1, 11)'; endif h = 1; h0 = b - a; @@ -246,11 +246,11 @@ ## t = sqrt (x - a) ## s = t / (t + 1) if (!isempty (waypoints)) - tmp = sqrt (waypoints - a); - trans = @(x) x ./ (x + 1); - subs = [0; trans(tmp); 1]; + tmp = sqrt (waypoints - a); + trans = @(x) x ./ (x + 1); + subs = [0; trans(tmp); 1]; else - subs = linspace (0, 1, 11)'; + subs = linspace (0, 1, 11)'; endif h = 1; h0 = b - a; @@ -269,10 +269,10 @@ ## k = ((sqrt(c^2 - 4) + c)/2)^(1/3); ## t = (sqrt(3)* 1i * (1 - k^2) - (1 + k^2)) / 2 / k; if (! isempty (waypoints)) - trans = @__quadgk_finite_waypoint__; - subs = [-1; trans(waypoints, a, b); 1]; + trans = @__quadgk_finite_waypoint__; + subs = [-1; trans(waypoints, a, b); 1]; else - subs = linspace(-1, 1, 11)'; + subs = linspace(-1, 1, 11)'; endif h = 2; h0 = b - a; @@ -300,85 +300,85 @@ err0 = sum (q_errs); if (isa (a, "single") || isa (b, "single") || isa (waypoints, "single")) - myeps = eps ("single"); + myeps = eps ("single"); else - myeps = eps; + myeps = eps; endif first = true; while (true) - ## Check for sub-intervals that are too small. Test must be - ## performed in untransformed sub-intervals. What is a good - ## value for this test. Shampine suggests 100*eps - if (any (abs (diff (trans (subs), [], 2) / h0) < 100 * myeps)) - q = q0; - err = err0; - break; - endif + ## Check for sub-intervals that are too small. Test must be + ## performed in untransformed sub-intervals. What is a good + ## value for this test. Shampine suggests 100*eps + if (any (abs (diff (trans (subs), [], 2) / h0) < 100 * myeps)) + q = q0; + err = err0; + break; + endif - ## Quit if any evaluations are not finite (Inf or NaN) - if (any (! isfinite (q_subs))) - warning ("quadgk: non finite integrand encountered"); - q = q0; - err = err0; - break; - endif + ## Quit if any evaluations are not finite (Inf or NaN) + if (any (! isfinite (q_subs))) + warning ("quadgk: non finite integrand encountered"); + q = q0; + err = err0; + break; + endif - tol = max (abstol, reltol .* abs (q0)); + tol = max (abstol, reltol .* abs (q0)); - ## If the global error estimate is meet exit - if (err0 < tol) - q = q0; - err = err0; - break; - endif + ## If the global error estimate is meet exit + if (err0 < tol) + q = q0; + err = err0; + break; + endif - ## Accept the sub-intervals that meet the convergence criteria - idx = find (abs (q_errs) < tol .* abs(diff (subs, [], 2)) ./ h); - if (first) - q = sum (q_subs (idx)); - err = sum (q_errs(idx)); - first = false; - else - q0 = q + sum (q_subs); - err0 = err + sum (q_errs); - q += sum (q_subs (idx)); - err += sum (q_errs(idx)); - endif - subs(idx,:) = []; + ## Accept the sub-intervals that meet the convergence criteria + idx = find (abs (q_errs) < tol .* abs(diff (subs, [], 2)) ./ h); + if (first) + q = sum (q_subs (idx)); + err = sum (q_errs(idx)); + first = false; + else + q0 = q + sum (q_subs); + err0 = err + sum (q_errs); + q += sum (q_subs (idx)); + err += sum (q_errs(idx)); + endif + subs(idx,:) = []; - ## If no remaining sub-intervals exit - if (rows (subs) == 0) - break; - endif + ## If no remaining sub-intervals exit + if (rows (subs) == 0) + break; + endif - if (trace) - disp([rows(subs), err, q0]); - endif + if (trace) + disp([rows(subs), err, q0]); + endif - ## Split remaining sub-intervals in two - mid = (subs(:,2) + subs(:,1)) ./ 2; - subs = [subs(:,1), mid; mid, subs(:,2)]; + ## Split remaining sub-intervals in two + mid = (subs(:,2) + subs(:,1)) ./ 2; + subs = [subs(:,1), mid; mid, subs(:,2)]; - ## If the maximum sub-interval count is met accept remaining - ## sub-interval and exit - if (rows (subs) > maxint) - warning ("quadgk: maximum interval count (%d) met", maxint); - q += sum (q_subs); - err += sum (q_errs); - break; - endif + ## If the maximum sub-interval count is met accept remaining + ## sub-interval and exit + if (rows (subs) > maxint) + warning ("quadgk: maximum interval count (%d) met", maxint); + q += sum (q_subs); + err += sum (q_errs); + break; + endif - ## Evaluation of the integrand on the remaining sub-intervals - [q_subs, q_errs] = __quadgk_eval__ (f, subs); + ## Evaluation of the integrand on the remaining sub-intervals + [q_subs, q_errs] = __quadgk_eval__ (f, subs); endwhile if (err > max (abstol, reltol * abs(q))) - warning ("quadgk: Error tolerance not met. Estimated error %g", err); + warning ("quadgk: Error tolerance not met. Estimated error %g", err); endif unwind_protect_cleanup if (strcmp (warn_state.state, "on")) - warning ("on", "Octave:divide-by-zero"); + warning ("on", "Octave:divide-by-zero"); endif end_unwind_protect endif @@ -389,29 +389,29 @@ ## and weights are copied directly from dqk15w.f from quadpack persistent abscissa = [-0.9914553711208126e+00, -0.9491079123427585e+00, ... - -0.8648644233597691e+00, -0.7415311855993944e+00, ... - -0.5860872354676911e+00, -0.4058451513773972e+00, ... - -0.2077849550078985e+00, 0.0000000000000000e+00, ... - 0.2077849550078985e+00, 0.4058451513773972e+00, ... - 0.5860872354676911e+00, 0.7415311855993944e+00, ... - 0.8648644233597691e+00, 0.9491079123427585e+00, ... - 0.9914553711208126e+00]; + -0.8648644233597691e+00, -0.7415311855993944e+00, ... + -0.5860872354676911e+00, -0.4058451513773972e+00, ... + -0.2077849550078985e+00, 0.0000000000000000e+00, ... + 0.2077849550078985e+00, 0.4058451513773972e+00, ... + 0.5860872354676911e+00, 0.7415311855993944e+00, ... + 0.8648644233597691e+00, 0.9491079123427585e+00, ... + 0.9914553711208126e+00]; persistent weights15 = ... diag ([0.2293532201052922e-01, 0.6309209262997855e-01, ... - 0.1047900103222502e+00, 0.1406532597155259e+00, ... - 0.1690047266392679e+00, 0.1903505780647854e+00, ... - 0.2044329400752989e+00, 0.2094821410847278e+00, ... - 0.2044329400752989e+00, 0.1903505780647854e+00, ... - 0.1690047266392679e+00, 0.1406532597155259e+00, ... - 0.1047900103222502e+00, 0.6309209262997855e-01, ... - 0.2293532201052922e-01]); + 0.1047900103222502e+00, 0.1406532597155259e+00, ... + 0.1690047266392679e+00, 0.1903505780647854e+00, ... + 0.2044329400752989e+00, 0.2094821410847278e+00, ... + 0.2044329400752989e+00, 0.1903505780647854e+00, ... + 0.1690047266392679e+00, 0.1406532597155259e+00, ... + 0.1047900103222502e+00, 0.6309209262997855e-01, ... + 0.2293532201052922e-01]); persistent weights7 = ... diag ([0.1294849661688697e+00, 0.2797053914892767e+00, ... - 0.3818300505051889e+00, 0.4179591836734694e+00, ... - 0.3818300505051889e+00, 0.2797053914892767e+00, ... - 0.1294849661688697e+00]); + 0.3818300505051889e+00, 0.4179591836734694e+00, ... + 0.3818300505051889e+00, 0.2797053914892767e+00, ... + 0.1294849661688697e+00]); halfwidth = diff (subs, [], 2) ./ 2; center = sum (subs, 2) ./ 2;;
--- a/scripts/general/quadl.m +++ b/scripts/general/quadl.m @@ -98,17 +98,17 @@ i2 = (h/6)*(y(1) + y(13) + 5*(y(5)+y(9))); i1 = (h/1470)*(77*(y(1)+y(13)) - + 432*(y(3)+y(11)) - + 625*(y(5)+y(9)) - + 672*y(7)); + + 432*(y(3)+y(11)) + + 625*(y(5)+y(9)) + + 672*y(7)); is = h*(.0158271919734802*(y(1)+y(13)) - +.0942738402188500*(y(2)+y(12)) - + .155071987336585*(y(3)+y(11)) - + .188821573960182*(y(4)+y(10)) - + .199773405226859*(y(5)+y(9)) - + .224926465333340*(y(6)+y(8)) - + .242611071901408*y(7)); + +.0942738402188500*(y(2)+y(12)) + + .155071987336585*(y(3)+y(11)) + + .188821573960182*(y(4)+y(10)) + + .199773405226859*(y(5)+y(9)) + + .224926465333340*(y(6)+y(8)) + + .242611071901408*y(7)); s = sign(is); @@ -171,11 +171,11 @@ endif else Q = (adaptlobstp (f, a, mll, fa, fmll, is, trace, varargin{:}) - + adaptlobstp (f, mll, ml, fmll, fml, is, trace, varargin{:}) - + adaptlobstp (f, ml, m, fml, fm, is, trace, varargin{:}) - + adaptlobstp (f, m, mr, fm, fmr, is, trace, varargin{:}) - + adaptlobstp (f, mr, mrr, fmr, fmrr, is, trace, varargin{:}) - + adaptlobstp (f, mrr, b, fmrr, fb, is, trace, varargin{:})); + + adaptlobstp (f, mll, ml, fmll, fml, is, trace, varargin{:}) + + adaptlobstp (f, ml, m, fml, fm, is, trace, varargin{:}) + + adaptlobstp (f, m, mr, fm, fmr, is, trace, varargin{:}) + + adaptlobstp (f, mr, mrr, fmr, fmrr, is, trace, varargin{:}) + + adaptlobstp (f, mrr, b, fmrr, fb, is, trace, varargin{:})); endif endfunction
--- a/scripts/general/quadv.m +++ b/scripts/general/quadv.m @@ -84,7 +84,7 @@ q = (b - a) / 6 * (fa + 4 * fc + fb); [q, fcnt, hmin] = simpsonstp (f, a, b, c, fa, fb, fc, q, fcnt, abs (b - a), - tol, trace, varargin{:}); + tol, trace, varargin{:}); if (fcnt > 10000) warning ("maximum iteration count reached"); @@ -96,7 +96,7 @@ endfunction function [q, fcnt, hmin] = simpsonstp (f, a, b, c, fa, fb, fc, q0, - fcnt, hmin, tol, trace, varargin) + fcnt, hmin, tol, trace, varargin) if (fcnt > 10000) q = q0; else @@ -120,9 +120,9 @@ ## Force at least one adpative step. if (fcnt == 5 || abs (q - q0) > tol) [q1, fcnt, hmin] = simpsonstp (f, a, c, d, fa, fc, fd, q1, fcnt, hmin, - tol, trace, varargin{:}); + tol, trace, varargin{:}); [q2, fcnt, hmin] = simpsonstp (f, c, b, e, fc, fb, fe, q2, fcnt, hmin, - tol, trace, varargin{:}); + tol, trace, varargin{:}); q = q1 + q2; endif endif
--- a/scripts/general/rat.m +++ b/scripts/general/rat.m @@ -71,7 +71,7 @@ idx = find(abs (y-n./d) >= tol); if (isempty(idx)) if (isempty (steps)) - steps = NaN (nsz, 1); + steps = NaN (nsz, 1); endif break; endif @@ -122,28 +122,28 @@ j = 1; while (true) - step = steps(i, j++); - if (isnan (step)) - break; - endif - if (j > nsteps || isnan (steps(i, j))) - if (step < 0) - s = [s(1:end-1), " + 1/(", int2str(step), ")"]; - else - s = [s(1:end-1), " + 1/", int2str(step)]; - endif - break; - else - s = [s(1:end-1), " + 1/(", int2str(step), ")"]; + step = steps(i, j++); + if (isnan (step)) + break; + endif + if (j > nsteps || isnan (steps(i, j))) + if (step < 0) + s = [s(1:end-1), " + 1/(", int2str(step), ")"]; + else + s = [s(1:end-1), " + 1/", int2str(step)]; + endif + break; + else + s = [s(1:end-1), " + 1/(", int2str(step), ")"]; endif endwhile s = [s, repmat(")", 1, j-2)]; n_nc = columns (n); s_nc = columns (s); if (n_nc > s_nc) - s(:,s_nc+1:n_nc) = " " + s(:,s_nc+1:n_nc) = " " elseif (s_nc > n_nc) - n(:,n_nc+1:s_nc) = " "; + n(:,n_nc+1:s_nc) = " "; endif n = cat (1, n, s); endfor
--- a/scripts/general/rotdim.m +++ b/scripts/general/rotdim.m @@ -74,10 +74,10 @@ while (dim < nd) dim = dim + 1; if (sz (dim) != 1) - plane = [plane, dim]; - if (length (plane) == 2) - break; - endif + plane = [plane, dim]; + if (length (plane) == 2) + break; + endif endif endwhile if (length (plane) < 1) @@ -87,8 +87,8 @@ endif else if (! (isvector (plane) && length (plane) == 2 - && all (plane == round (plane)) && all (plane > 0) - && all (plane < (nd + 1)) && plane(1) != 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"); endif endif
--- a/scripts/general/shift.m +++ b/scripts/general/shift.m @@ -47,7 +47,7 @@ if (nargin == 3) if (! (isscalar (dim) && dim == round (dim)) && dim > 0 && - dim < (nd + 1)) + dim < (nd + 1)) error ("shift: dim must be an integer and valid dimension"); endif else
--- a/scripts/general/sortrows.m +++ b/scripts/general/sortrows.m @@ -65,9 +65,9 @@ else for ii = 1:length (c); if (c(ii) < 0) - mode{ii} = other_mode; + mode{ii} = other_mode; else - mode{ii} = default_mode; + mode{ii} = default_mode; endif endfor indices = abs(c(:));
--- a/scripts/general/structfun.m +++ b/scripts/general/structfun.m @@ -114,7 +114,7 @@ %! l.name1 = "Smith"; %! l.name2 = "Jones"; %! o = structfun (@(x) regexp (x, '(\w+)$', "matches"){1}, s, -%! "UniformOutput", false); +%! "UniformOutput", false); %! assert (o, l); %!function [a, b] = twoouts (x)
--- a/scripts/general/trapz.m +++ b/scripts/general/trapz.m @@ -30,13 +30,13 @@ ## @seealso{cumtrapz} ## @end deftypefn -## Author: Kai Habel <kai.habel@gmx.de> +## Author: Kai Habel <kai.habel@gmx.de> ## ## also: June 2000 - Paul Kienzle (fixes,suggestions) ## 2006-05-12 David Bateman - Modified for NDArrays function z = trapz (x, y, dim) - + if (nargin < 1) || (nargin > 3) print_usage (); @@ -83,7 +83,7 @@ idx1{i} = 1:sz(i); endfor idx2 = idx1; - idx1{dim} = 2 : n; + idx1{dim} = 2 : n; idx2{dim} = 1 : (n - 1); if (! have_x) @@ -93,7 +93,7 @@ error ("trapz: x and y must have same shape"); endif z = 0.5 * sum ((x(idx1{:}) - x(idx2{:})) .* - (y(idx1{:}) + y(idx2{:})), dim); + (y(idx1{:}) + y(idx2{:})), dim); endif endfunction
--- a/scripts/geometry/griddata.m +++ b/scripts/geometry/griddata.m @@ -30,13 +30,13 @@ ## @seealso{delaunay} ## @end deftypefn -## Author: Kai Habel <kai.habel@gmx.de> +## Author: Kai Habel <kai.habel@gmx.de> ## Adapted-by: Alexander Barth <barth.alexander@gmail.com> ## xi and yi are not "meshgridded" if both are vectors ## of the same size (for compatibility) function [rx, ry, rz] = griddata (x, y, z, xi, yi, method) - + if (nargin == 5) method = "linear"; endif
--- a/scripts/geometry/griddata3.m +++ b/scripts/geometry/griddata3.m @@ -31,7 +31,7 @@ ## Author: David Bateman <dbateman@free.fr> function vi = griddata3 (x, y, z, v, xi, yi, zi, method, varargin) - + if (nargin < 7) print_usage (); endif
--- a/scripts/geometry/inpolygon.m +++ b/scripts/geometry/inpolygon.m @@ -44,10 +44,10 @@ endif if (! (isreal (X) && isreal (Y) && ismatrix (Y) && ismatrix (Y) - && size_equal (X, Y))) + && size_equal (X, Y))) error ("inpolygon: first two arguments must be real matrices of same size"); elseif (! (isreal (xv) && isreal (yv) && isvector (xv) && isvector (yv) - && size_equal (xv, yv))) + && size_equal (xv, yv))) error ("inpolygon: last two arguments must be real vectors of same size"); endif @@ -69,14 +69,14 @@ ## is Y between the y-values of edge i,j ## AND (X,Y) on the left of the edge ? idx1 = (((yv(i) <= Y & Y < yv(j)) | (yv(j) <= Y & Y < yv(i))) - & 0 < distance.*delta_yv); + & 0 < distance.*delta_yv); IN (idx1) = !IN (idx1); ## Check if (X,Y) are actually ON the boundary of the polygon. if (do_boundary) idx2 = (((yv(i) <= Y & Y <= yv(j)) | (yv(j) <= Y & Y <= yv(i))) - & ((xv(i) <= X & X <= xv(j)) | (xv(j) <= X & X <= xv(i))) - & (0 == distance | !delta_xv)); + & ((xv(i) <= X & X <= xv(j)) | (xv(j) <= X & X <= xv(i))) + & (0 == distance | !delta_xv)); ON (idx2) = true; endif j = i;
--- a/scripts/geometry/rectint.m +++ b/scripts/geometry/rectint.m @@ -34,7 +34,7 @@ ## Author: Bill Denney <bill@denney.ws> function area = rectint (a, b) - + if (nargin != 2) print_usage (); elseif (ndims (a) != 2 || ndims (b) != 2)
--- a/scripts/geometry/trimesh.m +++ b/scripts/geometry/trimesh.m @@ -41,17 +41,17 @@ newplot (); if (nargout > 0) h = patch ("Vertices", [x(:), y(:), z(:)], "Faces", tri, - "FaceColor", "none", "EdgeColor", __next_line_color__(), - varargin{:}); + "FaceColor", "none", "EdgeColor", __next_line_color__(), + varargin{:}); else patch ("Vertices", [x(:), y(:), z(:)], "Faces", tri, - "FaceColor", "none", "EdgeColor", __next_line_color__(), - varargin{:}); + "FaceColor", "none", "EdgeColor", __next_line_color__(), + varargin{:}); endif if (! ishold ()) set (gca(), "view", [-37.5, 30], - "xgrid", "on", "ygrid", "on", "zgrid", "on"); + "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif endif endfunction
--- a/scripts/geometry/triplot.m +++ b/scripts/geometry/triplot.m @@ -38,10 +38,10 @@ nt = size (tri, 1); if (nargout > 0) h = plot ([x(idx); NaN(1, nt)](:), - [y(idx); NaN(1, nt)](:), varargin{:}); + [y(idx); NaN(1, nt)](:), varargin{:}); else plot ([x(idx); NaN(1, nt)](:), - [y(idx); NaN(1, nt)](:), varargin{:}); + [y(idx); NaN(1, nt)](:), varargin{:}); endif endfunction
--- a/scripts/geometry/trisurf.m +++ b/scripts/geometry/trisurf.m @@ -48,19 +48,19 @@ newplot (); if (nargout > 0) h = patch ("Faces", tri, "Vertices", [x(:), y(:), z(:)], - "FaceVertexCData", reshape (c, numel (c), 1), - "FaceColor", "flat", "EdgeColor", "none", - varargin{:}); + "FaceVertexCData", reshape (c, numel (c), 1), + "FaceColor", "flat", "EdgeColor", "none", + varargin{:}); else patch ("Faces", tri, "Vertices", [x(:), y(:), z(:)], - "FaceVertexCData", reshape (c, numel (c), 1), - "FaceColor", "flat", "EdgeColor", "none", - varargin{:}); + "FaceVertexCData", reshape (c, numel (c), 1), + "FaceColor", "flat", "EdgeColor", "none", + varargin{:}); endif if (! ishold ()) set (gca(), "view", [-37.5, 30], - "xgrid", "on", "ygrid", "on", "zgrid", "on"); + "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif endif endfunction
--- a/scripts/geometry/voronoi.m +++ b/scripts/geometry/voronoi.m @@ -119,9 +119,9 @@ scale = 2; xbox = [xmin - scale * xdelta; xmin - scale * xdelta; ... - xmax + scale * xdelta; xmax + scale * xdelta]; + xmax + scale * xdelta; xmax + scale * xdelta]; ybox = [xmin - scale * xdelta; xmax + scale * xdelta; ... - xmax + scale * xdelta; xmin - scale * xdelta]; + xmax + scale * xdelta; xmin - scale * xdelta]; [p, c, infi] = __voronoi__ ([[x(:) ; xbox(:)], [y(:); ybox(:)]], opts{:}); @@ -130,12 +130,12 @@ c = c(idx).'; k = sum (cellfun ('length', c)); edges = cell2mat(cellfun (@(x) [x ; [x(end), x(1:end-1)]], c, - "UniformOutput", false)); + "UniformOutput", false)); ## Identify the unique edges of the Voronoi diagram edges = sortrows (sort (edges).').'; edges = edges (:, [(edges(1, 1: end - 1) != edges(1, 2 : end) | ... - edges(2, 1 :end - 1) != edges(2, 2 : end)), true]); + edges(2, 1 :end - 1) != edges(2, 2 : end)), true]); ## Eliminate the edges of the diagram representing the box poutside = (1 : rows(p)) ... @@ -153,7 +153,7 @@ lim = [xmin, xmax, ymin, ymax]; h = plot (handl, vx, vy, linespec{:}, x, y, '+'); axis (lim + 0.1 * [[-1, 1] * (lim (2) - lim (1)), ... - [-1, 1] * (lim (4) - lim (3))]); + [-1, 1] * (lim (4) - lim (3))]); if (nargout == 1) vxx = h; endif
--- a/scripts/help/doc.m +++ b/scripts/help/doc.m @@ -45,9 +45,9 @@ ## FIXME -- maybe we should have a better way of doing this. if (ischar (fname)) - ftype = exist (fname); + ftype = exist (fname); else - error ("doc: expecting argument to be a character string"); + error ("doc: expecting argument to be a character string"); endif else fname = ""; @@ -81,7 +81,7 @@ ## the third and fourth arguments. Someone should fix that. cmd = sprintf ("\"%s\" --file \"%s\" --directory \"%s\"", - info_program (), info_file_name, info_dir); + info_program (), info_file_name, info_dir); have_fname = ! isempty (fname); @@ -92,7 +92,7 @@ if (! (have_fname && status == 0)) status = system (cmd); if (status == 127) - warning ("unable to find info program `%s'", info_program ()); + warning ("unable to find info program `%s'", info_program ()); endif endif
--- a/scripts/help/help.m +++ b/scripts/help/help.m @@ -66,7 +66,7 @@ error ("help: `%s' is not documented\n", name); case "not found" do_contents (name); - return; + return; otherwise error ("help: internal error: unsupported help text format: '%s'\n", format); endswitch @@ -99,18 +99,18 @@ ## Take action depending on help text format switch (lower (format)) case "plain text" - status = 0; + status = 0; case "texinfo" - [text, status] = __makeinfo__ (text, "plain text"); + [text, status] = __makeinfo__ (text, "plain text"); case "html" - [text, status] = strip_html_tags (text); + [text, status] = strip_html_tags (text); endswitch if (! isempty (text)) found = true; ## Print text. if (status != 0) - warning ("help: Texinfo formatting filter exited abnormally; raw Texinfo source of help text follows...\n"); + warning ("help: Texinfo formatting filter exited abnormally; raw Texinfo source of help text follows...\n"); endif printf ("%s:\n\n%s\n", fname, text); endif
--- a/scripts/help/which.m +++ b/scripts/help/which.m @@ -28,20 +28,20 @@ if (nargout == 0) for i = 1:nargin - if (isempty (m(i).file)) - if (! isempty (m(i).type)) - printf ("`%s' is a %s\n", - m(i).name, m(i).type); - endif - else - if (isempty (m(i).type)) - printf ("`%s' is the file %s\n", - m(i).name, m(i).file); - else - printf ("`%s' is a %s from the file %s\n", - m(i).name, m(i).type, m(i).file); - endif - endif + if (isempty (m(i).file)) + if (! isempty (m(i).type)) + printf ("`%s' is a %s\n", + m(i).name, m(i).type); + endif + else + if (isempty (m(i).type)) + printf ("`%s' is the file %s\n", + m(i).name, m(i).file); + else + printf ("`%s' is a %s from the file %s\n", + m(i).name, m(i).type, m(i).file); + endif + endif endfor else varargout = {m.file};
--- a/scripts/io/dlmwrite.m +++ b/scripts/io/dlmwrite.m @@ -111,11 +111,11 @@ i = i + 1; newline = varargin{i}; if (strcmpi (newline, "unix")) - newline = "\n"; + newline = "\n"; elseif (strcmpi (newline, "pc")) - newline = "\r\n"; + newline = "\r\n"; elseif (strcmpi (newline, "mac")) - newline = "\r"; + newline = "\r"; endif elseif (strcmpi (varargin{i}, "roffset")) i = i + 1; @@ -127,28 +127,28 @@ i = i + 1; precision = varargin{i}; if (! strcmpi (class (precision), "char")) - precision = sprintf ("%.%gg", precision); + precision = sprintf ("%.%gg", precision); endif elseif (strcmpi (varargin{i}, "-append")) opentype = "at"; elseif (strcmpi (varargin{i}, "append")) i = i + 1; if (strcmpi (varargin{i}, "on")) - opentype = "at"; + opentype = "at"; elseif (strcmpi (varargin{i}, "off")) - opentype = "wt"; + opentype = "wt"; else - error ("dlmwrite: append must be \"on\" or \"off\"."); + error ("dlmwrite: append must be \"on\" or \"off\"."); endif else if (i == 1) - delim = varargin{i}; + delim = varargin{i}; elseif (i == 2) - r = varargin{i}; + r = varargin{i}; elseif (i == 3) - c = varargin{i}; + c = varargin{i}; else - print_usage(); + print_usage(); endif endif endwhile @@ -159,16 +159,16 @@ else if (r > 0) fprintf (fid, "%s", - repmat ([repmat(delim, 1, c + columns(a)-1), newline], 1, r)); + repmat ([repmat(delim, 1, c + columns(a)-1), newline], 1, r)); endif if (iscomplex (a)) cprecision = regexprep (precision, '^%([-\d.])','%+$1'); template = [precision, cprecision, "i", ... - repmat([delim, precision, cprecision, "i"], 1, ... - columns(a) - 1), newline ]; + repmat([delim, precision, cprecision, "i"], 1, ... + columns(a) - 1), newline ]; else template = [precision, repmat([delim, precision], 1, columns(a)-1),... - newline]; + newline]; endif if (c > 0) template = [repmat(delim, 1, c), template];
--- a/scripts/io/strread.m +++ b/scripts/io/strread.m @@ -115,16 +115,16 @@ warning ("strread: unknown comment style '%s'", val); endswitch case "delimiter" - delimiter_str = varargin {n+1}; + delimiter_str = varargin {n+1}; case "emptyvalue" - numeric_fill_value = varargin {n+1}; + numeric_fill_value = varargin {n+1}; case "bufsize" ## XXX: We could synthesize this, but that just seems weird... - warning ("strread: property \"bufsize\" is not implemented"); + warning ("strread: property \"bufsize\" is not implemented"); case "whitespace" - white_spaces = varargin {n+1}; + white_spaces = varargin {n+1}; case "expchars" - warning ("strread: property \"expchars\" is not implemented"); + warning ("strread: property \"expchars\" is not implemented"); otherwise warning ("strread: unknown property \"%s\"", varargin {n}); endswitch
--- a/scripts/linear-algebra/condest.m +++ b/scripts/linear-algebra/condest.m @@ -125,18 +125,18 @@ if (nargin > 1) if (isscalar (varargin{2})) - t = varargin{2}; - have_t = true; + t = varargin{2}; + have_t = true; elseif (nargin > 2) - solve = varargin{2}; - solve_t = varargin{3}; - have_solve = true; - if (nargin > 3) - t = varargin{4}; - have_t = true; - endif + solve = varargin{2}; + solve_t = varargin{3}; + have_solve = true; + if (nargin > 3) + t = varargin{4}; + 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 @@ -42,7 +42,7 @@ ## Adapted-By: jwe function z = cross (x, y, dim) - + if (nargin != 2 && nargin != 3) print_usage (); endif
--- a/scripts/linear-algebra/krylov.m +++ b/scripts/linear-algebra/krylov.m @@ -89,7 +89,7 @@ [m, kb] = size (V); if (m != na) error("A(%d x %d), V(%d x %d): argument dimensions do not match", - na, na, m, kb) + na, na, m, kb) endif if (! isscalar (k)) @@ -130,18 +130,18 @@ short_q = q(short_pv); if (norm (short_q) < eps1) - ## Insignificant column; delete. + ## Insignificant column; delete. nv = columns (V); if (jj != nv) [V(:,jj), V(:,nv)] = swap (V(:,jj), V(:,nv)); - ## FIXME -- H columns should be swapped too. Not done - ## since Block Hessenberg structure is lost anyway. + ## FIXME -- H columns should be swapped too. Not done + ## since Block Hessenberg structure is lost anyway. endif V = V(:,1:(nv-1)); - ## One less reflection. + ## One less reflection. nu--; else - ## New householder reflection. + ## New householder reflection. if (pflg) ## Locate max magnitude element in short_q. asq = abs (short_q); @@ -149,15 +149,15 @@ maxidx = find (asq == maxv, 1); pivot_idx = short_pv(maxidx); - ## See if need to change the pivot list. + ## See if need to change the pivot list. if (pivot_idx != pivot_vec(nu)) swapidx = maxidx + (nu-1); [pivot_vec(nu), pivot_vec(swapidx)] = ... - swap (pivot_vec(nu), pivot_vec(swapidx)); + swap (pivot_vec(nu), pivot_vec(swapidx)); endif endif - ## Isolate portion of vector for reflection. + ## Isolate portion of vector for reflection. idx = pivot_vec(nu:na); jdx = pivot_vec(1:nu); @@ -168,7 +168,7 @@ ## Reduce V per the reflection. V(idx,:) = V(idx,:) - av*hv*(hv' * V(idx,:)); if(iter > 1) - ## FIXME -- not done correctly for block case. + ## FIXME -- not done correctly for block case. H(nu,nu-1) = V(pivot_vec(nu),jj); endif @@ -233,7 +233,7 @@ Uret = U; if (max (max (abs (Uret(zidx,:)))) > 0) warning ("krylov: trivial null space corrupted; set pflg = 1 or eps1 > %e", - eps1); + eps1); endif endfunction
--- a/scripts/linear-algebra/null.m +++ b/scripts/linear-algebra/null.m @@ -53,9 +53,9 @@ if (nargin == 1) if (isa (A, "single")) - tol = max (size (A)) * s (1) * eps ("single"); + tol = max (size (A)) * s (1) * eps ("single"); else - tol = max (size (A)) * s (1) * eps; + tol = max (size (A)) * s (1) * eps; endif elseif (nargin != 2) print_usage (); @@ -66,9 +66,9 @@ if (rank < cols) retval = V (:, rank+1:cols); if (isa (A, "single")) - retval(abs (retval) < eps ("single")) = 0; + retval(abs (retval) < eps ("single")) = 0; else - retval(abs (retval) < eps) = 0; + retval(abs (retval) < eps) = 0; endif else retval = zeros (cols, 0);
--- a/scripts/linear-algebra/onenormest.m +++ b/scripts/linear-algebra/onenormest.m @@ -210,14 +210,14 @@ if (t > 1) firstind = ind(1:t); if (all (been_there(firstind))) - ## Visited all these before, so stop. - break; + ## Visited all these before, so stop. + break; endif ind = ind (!been_there (ind)); if (length (ind) < t) - ## There aren't enough new vectors, so we're practically - ## in a cycle. Stop. - break; + ## There aren't enough new vectors, so we're practically + ## in a cycle. Stop. + break; endif endif
--- a/scripts/linear-algebra/orth.m +++ b/scripts/linear-algebra/orth.m @@ -52,9 +52,9 @@ if (nargin == 1) if (isa (A, "single")) - tol = max (size (A)) * s (1) * eps ("single"); + tol = max (size (A)) * s (1) * eps ("single"); else - tol = max (size (A)) * s (1) * eps; + tol = max (size (A)) * s (1) * eps; endif endif
--- a/scripts/linear-algebra/rank.m +++ b/scripts/linear-algebra/rank.m @@ -43,9 +43,9 @@ tolerance = 0; else if (isa (A, "single")) - tolerance = max (size (A)) * sigma (1) * eps ("single"); + tolerance = max (size (A)) * sigma (1) * eps ("single"); else - tolerance = max (size (A)) * sigma (1) * eps; + tolerance = max (size (A)) * sigma (1) * eps; endif endif elseif (nargin == 2)
--- a/scripts/linear-algebra/rref.m +++ b/scripts/linear-algebra/rref.m @@ -78,7 +78,7 @@ ## Check if done if (r++ == rows) - break; + break; endif endif endfor
--- a/scripts/miscellaneous/bincoeff.m +++ b/scripts/miscellaneous/bincoeff.m @@ -80,19 +80,19 @@ ind = ((k > 0) & ((n == real (round (n))) & (n < 0))); b(ind) = (-1) .^ k(ind) .* exp (gammaln (abs (n(ind)) + k(ind)) - - gammaln (k(ind) + 1) - - gammaln (abs (n(ind)))); + - gammaln (k(ind) + 1) + - gammaln (abs (n(ind)))); ind = ((k > 0) & (n >= k)); b(ind) = exp (gammaln (n(ind) + 1) - - gammaln (k(ind) + 1) - - gammaln (n(ind) - k(ind) + 1)); + - gammaln (k(ind) + 1) + - gammaln (n(ind) - k(ind) + 1)); ind = ((k > 0) & ((n != real (round (n))) & (n < k))); b(ind) = (1/pi) * exp (gammaln (n(ind) + 1) - - gammaln (k(ind) + 1) - + gammaln (k(ind) - n(ind)) - + log (sin (pi * (n(ind) - k(ind) + 1)))); + - gammaln (k(ind) + 1) + + gammaln (k(ind) - n(ind)) + + log (sin (pi * (n(ind) - k(ind) + 1)))); ## Clean up rounding errors. ind = (n == round (n));
--- a/scripts/miscellaneous/cast.m +++ b/scripts/miscellaneous/cast.m @@ -29,11 +29,11 @@ if (nargin == 2) if (ischar (typ)) if (any (strcmp (typ, {"int8"; "uint8"; "int16"; "uint16"; - "int32"; "uint32"; "int64"; "uint64"; - "double"; "single"; "logical"; "char"}))) - retval = feval (typ, val); + "int32"; "uint32"; "int64"; "uint64"; + "double"; "single"; "logical"; "char"}))) + retval = feval (typ, val); else - error ("cast: type name `%s' is not a built-in type", typ); + error ("cast: type name `%s' is not a built-in type", typ); endif else error ("cast: expecting type name as second argument");
--- a/scripts/miscellaneous/compare_versions.m +++ b/scripts/miscellaneous/compare_versions.m @@ -113,7 +113,7 @@ v2n = str2num (char (strsplit (v2nochar, "."))); if ((isempty (v1n) && isempty (v1c)) || (isempty (v2n) && isempty(v2c))) error ("compare_versions: given version strings are not valid: %s %s", - v1, v2); + v1, v2); endif ## Assume that any additional elements would be 0 if one is longer
--- a/scripts/miscellaneous/copyfile.m +++ b/scripts/miscellaneous/copyfile.m @@ -85,38 +85,38 @@ if (isdir && length(p1) > max_cmd_line) l2 = length(p2) + length (cmd) + 6; while (! isempty(f1)) - p1 = sprintf ("\"%s\" ", f1{1}); - f1(1) = []; - while (!isempty (f1) && (length(p1) + length(f1{1}) + l2 < - max_cmd_line)) - p1 = sprintf ("%s\"%s\" ", p1, f1{1}); - f1(1) = []; - endwhile + p1 = sprintf ("\"%s\" ", f1{1}); + f1(1) = []; + while (!isempty (f1) && (length(p1) + length(f1{1}) + l2 < + max_cmd_line)) + p1 = sprintf ("%s\"%s\" ", p1, f1{1}); + f1(1) = []; + endwhile - if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) - p1 = strrep (p1, "\\", "/"); - p2 = strrep (p2, "\\", "/"); - endif + if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) + p1 = strrep (p1, "\\", "/"); + p2 = strrep (p2, "\\", "/"); + endif - ## Copy the files. - [err, msg] = system (sprintf ("%s %s\"%s\"", cmd, p1, p2)); - if (err < 0) - status = false; - msgid = "copyfile"; - break; - endif + ## Copy the files. + [err, msg] = system (sprintf ("%s %s\"%s\"", cmd, p1, p2)); + if (err < 0) + status = false; + msgid = "copyfile"; + break; + endif endwhile else if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) - p1 = strrep (p1, "\\", "/"); - p2 = strrep (p2, "\\", "/"); + p1 = strrep (p1, "\\", "/"); + p2 = strrep (p2, "\\", "/"); endif ## Copy the files. [err, msg] = system (sprintf ("%s %s\"%s\"", cmd, p1, p2)); if (err < 0) - status = false; - msgid = "copyfile"; + status = false; + msgid = "copyfile"; endif endif else
--- a/scripts/miscellaneous/dir.m +++ b/scripts/miscellaneous/dir.m @@ -62,7 +62,7 @@ ## Prep the retval. info = struct (zeros (0, 1), - {"name", "date", "bytes", "isdir", "datenum", "statinfo"}); + {"name", "date", "bytes", "isdir", "datenum", "statinfo"}); if (ischar (file)) if (strcmp (file, "*")) @@ -82,45 +82,45 @@ fn = flst{1}; [st, err, msg] = stat (fn); if (err < 0) - warning ("dir: `stat (%s)' failed: %s", fn, msg); - nf = 0; + warning ("dir: `stat (%s)' failed: %s", fn, msg); + nf = 0; elseif (S_ISDIR (st.mode)) - flst = readdir (flst{1}); - nf = length (flst); - for i = 1:nf - flst{i} = fullfile (fn, flst{i}); - endfor + flst = readdir (flst{1}); + nf = length (flst); + for i = 1:nf + flst{i} = fullfile (fn, flst{i}); + endfor endif endif if (length (flst) > 0) ## Collect results. for i = nf:-1:1 - fn = flst{i}; - [st, err, msg] = lstat (fn); - if (err < 0) - warning ("dir: `lstat (%s)' failed: %s", fn, msg); - else - ## If we are looking at a link that points to something, - ## return info about the target of the link, otherwise, return - ## info about the link itself. - if (S_ISLNK (st.mode)) - [xst, err, msg] = stat (fn); - if (! err) - st = xst; - endif - endif - [dummy, fn, ext] = fileparts (fn); - fn = cstrcat (fn, ext); - info(i,1).name = fn; - lt = localtime (st.mtime); - info(i,1).date = strftime ("%d-%b-%Y %T", lt); - info(i,1).bytes = st.size; - info(i,1).isdir = S_ISDIR (st.mode); - info(i,1).datenum = datenum (lt.year + 1900, lt.mon + 1, lt.mday, - lt.hour, lt.min, lt.sec); - info(i,1).statinfo = st; - endif + fn = flst{i}; + [st, err, msg] = lstat (fn); + if (err < 0) + warning ("dir: `lstat (%s)' failed: %s", fn, msg); + else + ## If we are looking at a link that points to something, + ## return info about the target of the link, otherwise, return + ## info about the link itself. + if (S_ISLNK (st.mode)) + [xst, err, msg] = stat (fn); + if (! err) + st = xst; + endif + endif + [dummy, fn, ext] = fileparts (fn); + fn = cstrcat (fn, ext); + info(i,1).name = fn; + lt = localtime (st.mtime); + info(i,1).date = strftime ("%d-%b-%Y %T", lt); + info(i,1).bytes = st.size; + info(i,1).isdir = S_ISDIR (st.mode); + info(i,1).datenum = datenum (lt.year + 1900, lt.mon + 1, lt.mday, + lt.hour, lt.min, lt.sec); + info(i,1).statinfo = st; + endif endfor endif
--- a/scripts/miscellaneous/dump_prefs.m +++ b/scripts/miscellaneous/dump_prefs.m @@ -87,7 +87,7 @@ try val = feval (sym); if (isnumeric (val)) - val = sprintf ("%g", val); + val = sprintf ("%g", val); endif fprintf (file, " %s = %s\n", sym, val); catch
--- a/scripts/miscellaneous/edit.m +++ b/scripts/miscellaneous/edit.m @@ -143,12 +143,12 @@ ## Pick up globals or default them. persistent FUNCTION = struct ("EDITOR", cstrcat (EDITOR (), " %s"), - "HOME", fullfile (default_home, "octave"), - "AUTHOR", default_user(1), - "EMAIL", [], - "LICENSE", "GPL", - "MODE", "sync", - "EDITINPLACE", false); + "HOME", fullfile (default_home, "octave"), + "AUTHOR", default_user(1), + "EMAIL", [], + "LICENSE", "GPL", + "MODE", "sync", + "EDITINPLACE", false); ## Make sure the state variables survive "clear functions". mlock; @@ -159,7 +159,7 @@ FUNCTION.EDITOR = state; case "HOME" if (! isempty (state) && state(1) == "~") - state = [ default_home, state(2:end) ]; + state = [ default_home, state(2:end) ]; endif FUNCTION.HOME = state; case "AUTHOR" @@ -172,7 +172,7 @@ if (strcmp (state, "sync") || strcmp (state, "async")) FUNCTION.MODE = state; else - error('expected "edit MODE sync|async"'); + error('expected "edit MODE sync|async"'); endif case "EDITINPLACE" if (ischar (state)) @@ -201,8 +201,8 @@ if (nargin < 1) if (exist (FUNCTION.HOME, "dir") == 7 && (isunix () || ! ispc ())) system (cstrcat ("cd \"", FUNCTION.HOME, "\" ; ", - sprintf (FUNCTION.EDITOR, "")), - [], FUNCTION.MODE); + sprintf (FUNCTION.EDITOR, "")), + [], FUNCTION.MODE); else system (sprintf (FUNCTION.EDITOR,""), [], FUNCTION.MODE); endif @@ -308,7 +308,7 @@ 0; otherwise system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); + [], FUNCTION.MODE); return; endswitch @@ -325,7 +325,7 @@ [status, host] = system ("uname -n"); ## trim newline from end of hostname if (! isempty (host)) - host = host(1:end-1); + host = host(1:end-1); endif endif if (isempty (host)) @@ -395,12 +395,12 @@ case "PD" head = ""; tail = cstrcat (author, "\n", revs, "\n\n", - "This program is granted to the public domain."); + "This program is granted to the public domain."); otherwise head = ""; tail = cstrcat (copyright, "\n\n", FUNCTION.LICENSE, "\n", - author, "\n", revs); + author, "\n", revs); endswitch ## Generate the function template. @@ -408,39 +408,39 @@ switch (ext) case {"cc", "C", "cpp"} if (isempty (head)) - comment = cstrcat ("/*\n", tail, "\n\n*/\n\n"); + comment = cstrcat ("/*\n", tail, "\n\n*/\n\n"); else - comment = cstrcat ("/*\n", head, "\n\n", tail, "\n\n*/\n\n"); + comment = cstrcat ("/*\n", head, "\n\n", tail, "\n\n*/\n\n"); endif ## If we are shadowing an m-file, paste the code for the m-file. if (any (exists == [2, 103])) - code = cstrcat ("\\ ", strrep (type (name), "\n", "\n// ")); + code = cstrcat ("\\ ", strrep (type (name), "\n", "\n// ")); else - code = " "; + code = " "; endif body = cstrcat ("#include <octave/oct.h>\n\n", "DEFUN_DLD(", name, ",args,nargout,\"\\\n", - name, "\\n\\\n\")\n{\n", - " octave_value_list retval;\n", - " int nargin = args.length();\n\n", - code, "\n return retval;\n}\n"); + name, "\\n\\\n\")\n{\n", + " octave_value_list retval;\n", + " int nargin = args.length();\n\n", + code, "\n return retval;\n}\n"); text = cstrcat (comment, body); case "m" ## If we are editing a function defined on the fly, paste the ## code. if (any (exists == [2, 103])) - body = type (name); + body = type (name); else - body = cstrcat ("function [ ret ] = ", name, " ()\n\nendfunction\n"); + body = cstrcat ("function [ ret ] = ", name, " ()\n\nendfunction\n"); endif if (isempty (head)) - comment = cstrcat ("## ", name, "\n\n", - "## ", strrep (tail, "\n", "\n## "), "\n\n"); + comment = cstrcat ("## ", name, "\n\n", + "## ", strrep (tail, "\n", "\n## "), "\n\n"); else - comment = cstrcat ("## ", strrep(head,"\n","\n## "), "\n\n", ... - "## ", name, "\n\n", ... - "## ", strrep (tail, "\n", "\n## "), "\n\n"); + comment = cstrcat ("## ", strrep(head,"\n","\n## "), "\n\n", ... + "## ", name, "\n\n", ... + "## ", strrep (tail, "\n", "\n## "), "\n\n"); endif text = cstrcat (comment, body); endswitch @@ -455,7 +455,7 @@ ## Finally we are ready to edit it! system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")), - [], FUNCTION.MODE); + [], FUNCTION.MODE); endfunction
--- a/scripts/miscellaneous/fileattrib.m +++ b/scripts/miscellaneous/fileattrib.m @@ -86,48 +86,48 @@ if (nargin == 0 || nargin == 1) r_n = r_a = r_s = r_h = r_d ... - = r_u_r = r_u_w = r_u_x ... - = r_g_r = r_g_w = r_g_x ... - = r_o_r = r_o_w = r_o_x = cell (nfiles, 1); + = r_u_r = r_u_w = r_u_x ... + = r_g_r = r_g_w = r_g_x ... + = r_o_r = r_o_w = r_o_x = cell (nfiles, 1); curr_dir = pwd (); for i = 1:nfiles [info, err, msg] = stat (files{i}); if (! err) - r_n{i} = canonicalize_file_name (files{i}); - r_a{i} = NaN; - r_s{i} = NaN; - r_h{i} = NaN; - r_d{i} = S_ISDIR (info.mode); - ## FIXME -- maybe we should have S_IRUSR etc. masks? - modestr = info.modestr; - r_u_r{i} = modestr(2) == "r"; - r_u_w{i} = modestr(3) == "w"; - r_u_x{i} = modestr(4) == "x"; - r_g_r{i} = modestr(5) == "r"; - r_g_w{i} = modestr(6) == "w"; - r_g_x{i} = modestr(7) == "x"; - r_o_r{i} = modestr(8) == "r"; - r_o_w{i} = modestr(9) == "w"; - r_o_x{i} = modestr(10) == "x"; + r_n{i} = canonicalize_file_name (files{i}); + r_a{i} = NaN; + r_s{i} = NaN; + r_h{i} = NaN; + r_d{i} = S_ISDIR (info.mode); + ## FIXME -- maybe we should have S_IRUSR etc. masks? + modestr = info.modestr; + r_u_r{i} = modestr(2) == "r"; + r_u_w{i} = modestr(3) == "w"; + r_u_x{i} = modestr(4) == "x"; + r_g_r{i} = modestr(5) == "r"; + r_g_w{i} = modestr(6) == "w"; + r_g_x{i} = modestr(7) == "x"; + r_o_r{i} = modestr(8) == "r"; + r_o_w{i} = modestr(9) == "w"; + r_o_x{i} = modestr(10) == "x"; else - status = false; - msgid = "fileattrib"; - break; + status = false; + msgid = "fileattrib"; + break; endif endfor if (status) r = struct ("Name", r_n, "archive", r_a, "system", r_s, - "hidden", r_s, "directory", r_d, "UserRead", r_u_r, - "UserWrite", r_u_w, "UserExecute", r_u_x, - "GroupRead", r_g_r, "GroupWrite", r_g_w, - "GroupExecute", r_g_x, "OtherRead", r_o_r, - "OtherWrite", r_o_w, "OtherExecute", r_o_x); + "hidden", r_s, "directory", r_d, "UserRead", r_u_r, + "UserWrite", r_u_w, "UserExecute", r_u_x, + "GroupRead", r_g_r, "GroupWrite", r_g_w, + "GroupExecute", r_g_x, "OtherRead", r_o_r, + "OtherWrite", r_o_w, "OtherExecute", r_o_x); if (nargout == 0) - status = r; + status = r; else - msg = r; + msg = r; endif endif else
--- a/scripts/miscellaneous/fileparts.m +++ b/scripts/miscellaneous/fileparts.m @@ -29,25 +29,25 @@ if (ischar (filename)) ds = strchr (filename, filesep ("all"), 1, "last"); if (isempty (ds)) - ds = 0; + ds = 0; endif es = rindex (filename, "."); ## These can be the same if they are both 0 (no dir or ext). if (es <= ds) - es = length(filename)+1; + es = length(filename)+1; endif if (ds == 0) - directory = ""; + directory = ""; elseif (ds == 1) - directory = filename(1); + directory = filename(1); else - directory = filename(1:ds-1); + directory = filename(1:ds-1); endif name = filename(ds+1:es-1); if (es > 0 && es <= length (filename)) - extension = filename(es:end); + extension = filename(es:end); else - extension = ""; + extension = ""; endif version = ""; else
--- a/scripts/miscellaneous/fullfile.m +++ b/scripts/miscellaneous/fullfile.m @@ -31,16 +31,16 @@ if (nargs > 1) filename = varargin{1}; if (strcmp (filename(end), filesep)) - filename(end) = ""; + filename(end) = ""; endif for i = 2:nargs - tmp = varargin{i}; - if (i < nargs && strcmp (tmp(end), filesep)) - tmp(end) = ""; - elseif (i == nargs && strcmp (tmp, filesep)) - tmp = ""; - endif - filename = cstrcat (filename, filesep, tmp); + tmp = varargin{i}; + if (i < nargs && strcmp (tmp(end), filesep)) + tmp(end) = ""; + elseif (i == nargs && strcmp (tmp, filesep)) + tmp = ""; + endif + filename = cstrcat (filename, filesep, tmp); endfor elseif (nargs == 1) filename = varargin{1};
--- a/scripts/miscellaneous/license.m +++ b/scripts/miscellaneous/license.m @@ -119,9 +119,9 @@ pw = getpwuid (getuid ()); if (isstruct (pw)) - username = pw.name; + username = pw.name; else - username = "octave_user"; + username = "octave_user"; endif retval(1:nr_licenses) = struct ("feature", "", "user", "");
--- a/scripts/miscellaneous/ls.m +++ b/scripts/miscellaneous/ls.m @@ -57,13 +57,13 @@ [status, output] = system (cmd); if (status == 0) - if (nargout == 0) - puts (output); - else - retval = strvcat (regexp (output, '[^\s]+', 'match'){:}); - endif + if (nargout == 0) + puts (output); + else + retval = strvcat (regexp (output, '[^\s]+', 'match'){:}); + endif else - error ("ls: command exited abnormally with status %d", status); + error ("ls: command exited abnormally with status %d", status); endif else
--- a/scripts/miscellaneous/ls_command.m +++ b/scripts/miscellaneous/ls_command.m @@ -45,9 +45,9 @@ if (nargin == 1) if (ischar (cmd)) - __ls_command__ = cmd; + __ls_command__ = cmd; else - error ("ls_command: expecting argument to be a character string"); + error ("ls_command: expecting argument to be a character string"); endif endif
--- a/scripts/miscellaneous/mkoctfile.m +++ b/scripts/miscellaneous/mkoctfile.m @@ -134,7 +134,7 @@ if (status == 127) warning ("unable to find mkoctfile in expected location: `%s'", - shell_script); + shell_script); warning ("mkoctfile exited with failure status"); endif
--- a/scripts/miscellaneous/movefile.m +++ b/scripts/miscellaneous/movefile.m @@ -84,37 +84,37 @@ if (isdir && length(p1) > max_cmd_line) l2 = length(p2) + length (cmd) + 6; while (! isempty(f1)) - p1 = sprintf ("\"%s\" ", f1{1}); - f1(1) = []; - while (!isempty (f1) && (length(p1) + length(f1{1}) + l2 < - max_cmd_line)) - p1 = sprintf ("%s\"%s\" ", p1, f1{1}); - f1(1) = []; - endwhile + p1 = sprintf ("\"%s\" ", f1{1}); + f1(1) = []; + while (!isempty (f1) && (length(p1) + length(f1{1}) + l2 < + max_cmd_line)) + p1 = sprintf ("%s\"%s\" ", p1, f1{1}); + f1(1) = []; + endwhile - if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) - p1 = strrep (p1, "\\", "/"); - p2 = strrep (p2, "\\", "/"); - endif + if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) + p1 = strrep (p1, "\\", "/"); + p2 = strrep (p2, "\\", "/"); + endif - ## Move the file(s). - [err, msg] = system (sprintf ("%s %s \"%s\"", cmd, p1, p2)); - if (err < 0) - status = false; - msgid = "movefile"; - endif + ## Move the file(s). + [err, msg] = system (sprintf ("%s %s \"%s\"", cmd, p1, p2)); + if (err < 0) + status = false; + msgid = "movefile"; + endif endwhile else if (ispc () && ! isunix () && ! isempty (file_in_path (EXEC_PATH, "cp.exe"))) - p1 = strrep (p1, "\\", "/"); - p2 = strrep (p2, "\\", "/"); + p1 = strrep (p1, "\\", "/"); + p2 = strrep (p2, "\\", "/"); endif ## Move the file(s). [err, msg] = system (sprintf ("%s %s \"%s\"", cmd, p1, p2)); if (err < 0) - status = false; - msgid = "movefile"; + status = false; + msgid = "movefile"; endif endif else
--- a/scripts/miscellaneous/orderfields.m +++ b/scripts/miscellaneous/orderfields.m @@ -108,14 +108,14 @@ ## Two structures: return the fields in the order of s2. names = fieldnames (s2); if (! isequal (sort (fieldnames (s1)), sort (names))) - error ("orderfields: structures do not have same fields"); + error ("orderfields: structures do not have same fields"); endif elseif (iscellstr (s2)) ## A structure and a list of fields: order by the list of fields. t1 = sort (fieldnames (s1)); t2 = sort (s2(:)); if (! isequal (t1, t2)) - error ("orderfields: name list does not match structure fields"); + error ("orderfields: name list does not match structure fields"); endif names = s2; elseif (isvector (s2)) @@ -125,7 +125,7 @@ t1 = t1(:)'; t2 = 1:numel (names); if (! isequal (t1, t2)) - error ("orderfields: invalid permutation vector"); + error ("orderfields: invalid permutation vector"); endif names = names (s2); endif
--- a/scripts/miscellaneous/perl.m +++ b/scripts/miscellaneous/perl.m @@ -34,9 +34,9 @@ if (ischar (script) && ((nargin != 1 && iscellstr (varargin)) - || (nargin == 1 && ! isempty (script)))) + || (nargin == 1 && ! isempty (script)))) [status, output] = system (cstrcat ("perl ", script, - sprintf (" %s", varargin{:}))); + sprintf (" %s", varargin{:}))); else error ("perl: invalid arguments"); endif
--- a/scripts/miscellaneous/run.m +++ b/scripts/miscellaneous/run.m @@ -37,13 +37,13 @@ if (exist (d, "dir")) wd = pwd (); unwind_protect - cd (d); - if (! exist (f, "file") || ! strcmp (ext, ".m")) - error ("run: file must exist and be a valid Octave script file"); - endif - evalin ("caller", [f, ";"], "rethrow (lasterror ())"); + cd (d); + if (! exist (f, "file") || ! strcmp (ext, ".m")) + error ("run: file must exist and be a valid Octave script file"); + endif + evalin ("caller", [f, ";"], "rethrow (lasterror ())"); unwind_protect_cleanup - cd (wd); + cd (wd); end_unwind_protect else error ("run: the path %s doesn't exist", d);
--- a/scripts/miscellaneous/substruct.m +++ b/scripts/miscellaneous/substruct.m @@ -59,7 +59,7 @@ 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"); endif
--- a/scripts/miscellaneous/swapbytes.m +++ b/scripts/miscellaneous/swapbytes.m @@ -45,12 +45,12 @@ elseif (strcmp (clx, "int32") || strcmp (clx, "uint32")) nb = 4; elseif (strcmp (clx, "int64") || strcmp (clx, "uint64") || - strcmp (clx, "double")) + strcmp (clx, "double")) nb = 8; else error ("swapbytes: invalid class of object"); endif y = reshape (typecast (reshape (typecast (x(:), "uint8"), nb, numel (x)) - ([nb : -1 : 1], :) (:), clx), size(x)); + ([nb : -1 : 1], :) (:), clx), size(x)); endif endfunction
--- a/scripts/miscellaneous/tar.m +++ b/scripts/miscellaneous/tar.m @@ -47,20 +47,20 @@ if (ischar (tarfile) && iscellstr (files) && ischar (root)) cmd = sprintf ("tar cvf %s -C %s %s", tarfile, root, - sprintf (" %s", files{:})); + sprintf (" %s", files{:})); [status, output] = system (cmd); if (status == 0) - if (nargout > 0) - if (output(end) == "\n") - output(end) = []; - endif + if (nargout > 0) + if (output(end) == "\n") + output(end) = []; + endif entries = strsplit (output, "\n"); - entries = entries'; - endif + entries = entries'; + endif else - error ("tar: tar exited with status = %d", status); + error ("tar: tar exited with status = %d", status); endif else
--- a/scripts/miscellaneous/unpack.m +++ b/scripts/miscellaneous/unpack.m @@ -48,34 +48,34 @@ 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); ## Check to see if it's .tar.gz, .tar.Z, etc. if (any (strcmpi ({".gz" ".Z" ".bz2" ".bz"}, ext))) - [tmppathstr, tmpname, tmpext] = fileparts (name); - if (strcmpi (tmpext, ".tar")) - name = tmpname; - ext = cstrcat (tmpext, ext); - endif + [tmppathstr, tmpname, tmpext] = fileparts (name); + if (strcmpi (tmpext, ".tar")) + name = tmpname; + ext = cstrcat (tmpext, ext); + endif endif ## If the file is a url, download it and then work with that ## file. if (! isempty (strfind (file, "://"))) - ## FIXME -- the above is not a perfect test for a url - urlfile = file; - ## FIXME -- should we name the file that we download with the - ## same file name as the url requests? - tmpfile = cstrcat (tmpnam (), ext); - [file, success, msg] = urlwrite (urlfile, tmpfile); - if (! success) - error ("unpack: could not get \"%s\": %s", urlfile, msg); - endif + ## FIXME -- the above is not a perfect test for a url + urlfile = file; + ## FIXME -- should we name the file that we download with the + ## same file name as the url requests? + tmpfile = cstrcat (tmpnam (), ext); + [file, success, msg] = urlwrite (urlfile, tmpfile); + if (! success) + error ("unpack: could not get \"%s\": %s", urlfile, msg); + endif endif endif @@ -120,29 +120,29 @@ persistent commandlist; if (isempty (commandlist)) commandlist.gz = {"gzip -d -v -r \"%s\"", ... - "gzip -d -r \"%s\"", ... - @__parse_gzip__, true}; + "gzip -d -r \"%s\"", ... + @__parse_gzip__, true}; commandlist.z = commandlist.gz; commandlist.bz2 = {"bzip2 -d -v \"%s\"", ... - "bzip2 -d \"%s\"", ... - @__parse_bzip2__, true}; + "bzip2 -d \"%s\"", ... + @__parse_bzip2__, true}; commandlist.bz = commandlist.bz2; commandlist.tar = {"tar xvf \"%s\"", ... - "tar xf \"%s\"", ... - @__parse_tar__, false}; + "tar xf \"%s\"", ... + @__parse_tar__, false}; commandlist.targz = {"gzip -d -c \"%s\" | tar xvf -", ... - "gzip -d -c \"%s\" | tar xf -", ... - @__parse_tar__, false}; + "gzip -d -c \"%s\" | tar xf -", ... + @__parse_tar__, false}; commandlist.tgz = commandlist.targz; commandlist.tarbz2 = {"bzip2 -d -c \"%s\" | tar xvf -", ... - "bzip2 -d -c \"%s\" | tar xf -", ... - @__parse_tar__, false}; + "bzip2 -d -c \"%s\" | tar xf -", ... + @__parse_tar__, false}; commandlist.tarbz = commandlist.tarbz2; commandlist.tbz2 = commandlist.tarbz2; commandlist.tbz = commandlist.tarbz2; commandlist.zip = {"unzip \"%s\"", ... - "unzip -q \"%s\"", ... - @__parse_zip__, false}; + "unzip -q \"%s\"", ... + @__parse_zip__, false}; endif nodotext = ext(! ismember (ext, ".")); @@ -185,7 +185,7 @@ if (status) error ("unpack: unarchiving program exited with status: %d\n%s", - status, output); + status, output); endif if (nargout > 0 || needmove) @@ -200,13 +200,13 @@ if (needmove) [st, msg, msgid] = movefile (files, directory); if (! st) - error ("unpack: unable to move files to \"%s\": %s", - directory, msg); + error ("unpack: unable to move files to \"%s\": %s", + directory, msg); endif ## Fix the names for the files since they were moved. for i = 1:numel (files) - files{i} = strrep (files{i}, cstartdir, cenddir); + files{i} = strrep (files{i}, cstartdir, cenddir); endfor endif @@ -241,16 +241,16 @@ colons = strfind (output{i}, ":"); if (isempty (colons)) warning ("unpack:parsing", - "Unable to parse line (gzip missing colon):\n%s", output{i}); + "Unable to parse line (gzip missing colon):\n%s", output{i}); else midcolon = colons(ceil (length (colons)/2)); thisstr = output{i}(midcolon+2:length(output{i})); idx = index (thisstr, "with") + 5; if (isempty (idx)) - warning ("unpack:parsing", - "Unable to parse line (gzip missing with):\n%s", output{i}); + warning ("unpack:parsing", + "Unable to parse line (gzip missing with):\n%s", output{i}); else - files{i} = thisstr(idx:length (thisstr)); + files{i} = thisstr(idx:length (thisstr)); endif endif endfor
--- a/scripts/miscellaneous/what.m +++ b/scripts/miscellaneous/what.m @@ -63,15 +63,15 @@ ## Ignore mdl and p files [dummy, f, e] = fileparts (n); if (strcmp (e, ".m")) - w.m{end+1} = n; + w.m{end+1} = n; elseif (strcmp (e, mexext ())) - w.mex{end+1} = n; + w.mex{end+1} = n; elseif (strcmp (e, ".oct")) - w.oct{end+1} = n; + w.oct{end+1} = n; elseif (strcmp (e, ".mat")) - w.mat{end+1} = n; + w.mat{end+1} = n; elseif(strcmp (n(1), "@")) - w.classes{end+1} = n; + w.classes{end+1} = n; endif endif endfor
--- a/scripts/miscellaneous/zip.m +++ b/scripts/miscellaneous/zip.m @@ -44,25 +44,25 @@ if (ischar (zipfile) && iscellstr (files)) cmd = sprintf ("cd %s; zip -r %s/%s %s", rootdir, pwd (), zipfile, - sprintf (" %s", files{:})); + sprintf (" %s", files{:})); [status, output] = system (cmd); if (status == 0) - if (nargout > 0) - cmd = sprintf ("unzip -Z -1 %s", zipfile); - [status, entries] = system (cmd); - if (status == 0) - if (entries(end) == "\n") - entries(end) = []; - endif + if (nargout > 0) + cmd = sprintf ("unzip -Z -1 %s", zipfile); + [status, entries] = system (cmd); + if (status == 0) + if (entries(end) == "\n") + entries(end) = []; + endif entries = strsplit (entries, "\n"); - else - error ("zip: zipinfo failed with exit status = %d", status); - endif - endif + else + error ("zip: zipinfo failed with exit status = %d", status); + endif + endif else - error ("zip: zip failed with exit status = %d", status); + error ("zip: zip failed with exit status = %d", status); endif else
--- a/scripts/optimization/fminunc.m +++ b/scripts/optimization/fminunc.m @@ -390,7 +390,7 @@ tn = norm (r*s); snm = (sn / tn) / tn; if (snm < delta) - ## Get the dogleg path minimizer. + ## Get the dogleg path minimizer. bn = norm (b); dxn = delta/xn; snmd = snm/delta; t = (bn/sn) * (bn/xn) * snmd;
--- a/scripts/optimization/fsolve.m +++ b/scripts/optimization/fsolve.m @@ -384,15 +384,15 @@ ## tolf ~ eps we demand as much accuracy as we can expect. if (fn <= tolf*n*xn) info = 1; - ## The following tests done only after successful step. + ## The following tests done only after successful step. elseif (ratio >= 1e-4) ## This one is classic. Note that we use scaled variables again, - ## but compare to scaled step, so nothing bad. + ## but compare to scaled step, so nothing bad. if (sn <= tolx*xn) info = 2; ## Again a classic one. It seems weird to use the same tolf - ## for two different tests, but that's what M*b manual appears - ## to say. + ## for two different tests, but that's what M*b manual appears + ## to say. elseif (actred < tolf) info = 3; endif @@ -581,7 +581,7 @@ tn = norm (r*s); snm = (sn / tn) / tn; if (snm < delta) - ## Get the dogleg path minimizer. + ## Get the dogleg path minimizer. bn = norm (b); dxn = delta/xn; snmd = snm/delta; t = (bn/sn) * (bn/xn) * snmd;
--- a/scripts/optimization/glpk.m +++ b/scripts/optimization/glpk.m @@ -165,7 +165,7 @@ ## Geometric mean scaling, then equilibration scaling. ## @end table ## -## @item dual (@w{@code{LPX_K_DUAL}}, default: 0) +## @item dual (@w{@code{LPX_K_DUAL}}, default: 0) ## Dual simplex option: ## @table @asis ## @item 0 @@ -174,7 +174,7 @@ ## If initial basic solution is dual feasible, use the dual simplex. ## @end table ## -## @item price (@w{@code{LPX_K_PRICE}}, default: 1) +## @item price (@w{@code{LPX_K_PRICE}}, default: 1) ## Pricing option (for both primal and dual simplex): ## @table @asis ## @item 0 @@ -183,7 +183,7 @@ ## Steepest edge pricing. ## @end table ## -## @item round (@w{@code{LPX_K_ROUND}}, default: 0) +## @item round (@w{@code{LPX_K_ROUND}}, default: 0) ## Solution rounding option: ## @table @asis ## @item 0 @@ -192,7 +192,7 @@ ## Replace tiny primal and dual values by exact zero. ## @end table ## -## @item itlim (@w{@code{LPX_K_ITLIM}}, default: -1) +## @item itlim (@w{@code{LPX_K_ITLIM}}, default: -1) ## Simplex iterations limit. If this value is positive, it is decreased by ## one each time when one simplex iteration has been performed, and ## reaching zero value signals the solver to stop the search. Negative @@ -493,7 +493,7 @@ error ("CTYPE must be a char valued vector of length %d", nc); return; elseif (! all (ctype == "F" | ctype == "U" | ctype == "S" - | ctype == "L" | ctype == "D")) + | ctype == "L" | ctype == "D")) error ("CTYPE must contain only F, U, S, L, or D"); return; endif @@ -507,7 +507,7 @@ if (isempty (vartype)) vartype = repmat ("C", nx, 1); elseif (! ischar (vartype) || all (size (vartype) > 1) - || length (vartype) != nx) + || length (vartype) != nx) error ("VARTYPE must be a char valued vector of length %d", nx); return; elseif (! all (vartype == "C" | vartype == "I"))
--- a/scripts/optimization/qp.m +++ b/scripts/optimization/qp.m @@ -184,10 +184,10 @@ else [n_eq, n1] = size (A); if (n1 != n) - error ("qp: equality constraint matrix has incorrect column dimension"); + error ("qp: equality constraint matrix has incorrect column dimension"); endif if (numel (b) != n_eq) - error ("qp: equality constraint matrix and vector have inconsistent dimension"); + error ("qp: equality constraint matrix and vector have inconsistent dimension"); endif endif @@ -197,41 +197,41 @@ n_in = 0; if (nargs > 5) if (! isempty (lb)) - if (numel (lb) != n) - error ("qp: lower bound has incorrect length"); - elseif (isempty (ub)) - Ain = [Ain; eye(n)]; - bin = [bin; lb]; - endif + if (numel (lb) != n) + error ("qp: lower bound has incorrect length"); + elseif (isempty (ub)) + Ain = [Ain; eye(n)]; + bin = [bin; lb]; + endif endif if (! isempty (ub)) - if (numel (ub) != n) - error ("qp: upper bound has incorrect length"); - elseif (isempty (lb)) - Ain = [Ain; -eye(n)]; - bin = [bin; -ub]; - endif + if (numel (ub) != n) + error ("qp: upper bound has incorrect length"); + elseif (isempty (lb)) + Ain = [Ain; -eye(n)]; + bin = [bin; -ub]; + endif endif if (! isempty (lb) && ! isempty (ub)) - rtol = sqrt (eps); - for i = 1:n - if (abs(lb (i) - ub(i)) < rtol*(1 + max (abs (lb(i) + ub(i))))) + rtol = sqrt (eps); + for i = 1:n + if (abs(lb (i) - ub(i)) < rtol*(1 + max (abs (lb(i) + ub(i))))) ## These are actually an equality constraint - tmprow = zeros(1,n); - tmprow(i) = 1; + tmprow = zeros(1,n); + tmprow(i) = 1; A = [A;tmprow]; b = [b; 0.5*(lb(i) + ub(i))]; - n_eq = n_eq + 1; - else - tmprow = zeros(1,n); - tmprow(i) = 1; - Ain = [Ain; tmprow; -tmprow]; - bin = [bin; lb(i); -ub(i)]; - n_in = n_in + 2; - endif - endfor + n_eq = n_eq + 1; + else + tmprow = zeros(1,n); + tmprow(i) = 1; + Ain = [Ain; tmprow; -tmprow]; + bin = [bin; lb(i); -ub(i)]; + n_in = n_in + 2; + endif + endfor endif endif @@ -239,42 +239,42 @@ if (nargs > 7) [dimA_in, n1] = size (A_in); if (n1 != n) - error ("qp: inequality constraint matrix has incorrect column dimension"); + error ("qp: inequality constraint matrix has incorrect column dimension"); else - if (! isempty (A_lb)) - if (numel (A_lb) != dimA_in) - error ("qp: inequality constraint matrix and lower bound vector inconsistent"); - elseif (isempty (A_ub)) - Ain = [Ain; A_in]; - bin = [bin; A_lb]; - endif - endif - if (! isempty (A_ub)) - if (numel (A_ub) != dimA_in) - error ("qp: inequality constraint matrix and upper bound vector inconsistent"); - elseif (isempty (A_lb)) - Ain = [Ain; -A_in]; - bin = [bin; -A_ub]; - endif - endif - - if (! isempty (A_lb) && ! isempty (A_ub)) - rtol = sqrt (eps); - for i = 1:dimA_in - if (abs (A_lb(i) - A_ub(i)) < rtol*(1 + max (abs (A_lb(i) + A_ub(i))))) + if (! isempty (A_lb)) + if (numel (A_lb) != dimA_in) + error ("qp: inequality constraint matrix and lower bound vector inconsistent"); + elseif (isempty (A_ub)) + Ain = [Ain; A_in]; + bin = [bin; A_lb]; + endif + endif + if (! isempty (A_ub)) + if (numel (A_ub) != dimA_in) + error ("qp: inequality constraint matrix and upper bound vector inconsistent"); + elseif (isempty (A_lb)) + Ain = [Ain; -A_in]; + bin = [bin; -A_ub]; + endif + endif + + if (! isempty (A_lb) && ! isempty (A_ub)) + rtol = sqrt (eps); + for i = 1:dimA_in + if (abs (A_lb(i) - A_ub(i)) < rtol*(1 + max (abs (A_lb(i) + A_ub(i))))) ## These are actually an equality constraint - tmprow = A_in(i,:); + tmprow = A_in(i,:); A = [A;tmprow]; b = [b; 0.5*(A_lb(i) + A_ub(i))]; - n_eq = n_eq + 1; - else - tmprow = A_in(i,:); - Ain = [Ain; tmprow; -tmprow]; - bin = [bin; A_lb(i); -A_ub(i)]; - n_in = n_in + 2; - endif - endfor - endif + n_eq = n_eq + 1; + else + tmprow = A_in(i,:); + Ain = [Ain; tmprow; -tmprow]; + bin = [bin; A_lb(i); -A_ub(i)]; + n_in = n_in + 2; + endif + endfor + endif endif endif @@ -295,7 +295,7 @@ ## Check if the initial guess is feasible. if (isa (x0, "single") || isa (H, "single") || isa (q, "single") || isa (A, "single") - || isa (b, "single")) + || isa (b, "single")) rtol = sqrt (eps ("single")); else rtol = sqrt (eps); @@ -310,69 +310,69 @@ ## First define xbar that is feasible with respect to the equality ## constraints. if (eq_infeasible) - if (rank (A) < n_eq) - error ("qp: equality constraint matrix must be full row rank") - endif - xbar = pinv (A) * b; + if (rank (A) < n_eq) + error ("qp: equality constraint matrix must be full row rank") + endif + xbar = pinv (A) * b; else - xbar = x0; + xbar = x0; endif ## Check if xbar is feasible with respect to the inequality ## constraints also. if (n_in > 0) - res = Ain * xbar - bin; - if (any (res < -rtol * (1 + abs (bin)))) - ## xbar is not feasible with respect to the inequality - ## constraints. Compute a step in the null space of the - ## equality constraints, by solving a QP. If the slack is - ## small, we have a feasible initial guess. Otherwise, the - ## problem is infeasible. - if (n_eq > 0) - Z = null (A); - if (isempty (Z)) - ## The problem is infeasible because A is square and full - ## rank, but xbar is not feasible. - info = 6; - endif - endif + res = Ain * xbar - bin; + if (any (res < -rtol * (1 + abs (bin)))) + ## xbar is not feasible with respect to the inequality + ## constraints. Compute a step in the null space of the + ## equality constraints, by solving a QP. If the slack is + ## small, we have a feasible initial guess. Otherwise, the + ## problem is infeasible. + if (n_eq > 0) + Z = null (A); + if (isempty (Z)) + ## The problem is infeasible because A is square and full + ## rank, but xbar is not feasible. + info = 6; + endif + endif - if (info != 6) + if (info != 6) ## Solve an LP with additional slack variables to find - ## a feasible starting point. - gamma = eye (n_in); - if (n_eq > 0) - Atmp = [Ain*Z, gamma]; - btmp = -res; - else - Atmp = [Ain, gamma]; - btmp = bin; - endif - ctmp = [zeros(n-n_eq, 1); ones(n_in, 1)]; - lb = [-Inf(n-n_eq,1); zeros(n_in,1)]; - ub = []; - ctype = repmat ("L", n_in, 1); - [P, dummy, status] = glpk (ctmp, Atmp, btmp, lb, ub, ctype); - if ((status == 180 || status == 181 || status == 151) - && all (abs (P(n-n_eq+1:end)) < rtol * (1 + norm (btmp)))) - ## We found a feasible starting point - if (n_eq > 0) - x0 = xbar + Z*P(1:n-n_eq); - else - x0 = P(1:n); + ## a feasible starting point. + gamma = eye (n_in); + if (n_eq > 0) + Atmp = [Ain*Z, gamma]; + btmp = -res; + else + Atmp = [Ain, gamma]; + btmp = bin; + endif + ctmp = [zeros(n-n_eq, 1); ones(n_in, 1)]; + lb = [-Inf(n-n_eq,1); zeros(n_in,1)]; + ub = []; + ctype = repmat ("L", n_in, 1); + [P, dummy, status] = glpk (ctmp, Atmp, btmp, lb, ub, ctype); + if ((status == 180 || status == 181 || status == 151) + && all (abs (P(n-n_eq+1:end)) < rtol * (1 + norm (btmp)))) + ## We found a feasible starting point + if (n_eq > 0) + x0 = xbar + Z*P(1:n-n_eq); + else + x0 = P(1:n); endif - else - ## The problem is infeasible - info = 6; - endif - endif - else - ## xbar is feasible. We use it a starting point. - x0 = xbar; - endif + else + ## The problem is infeasible + info = 6; + endif + endif + else + ## xbar is feasible. We use it a starting point. + x0 = xbar; + endif else - ## xbar is feasible. We use it a starting point. - x0 = xbar; + ## xbar is feasible. We use it a starting point. + x0 = xbar; endif endif
--- a/scripts/optimization/sqp.m +++ b/scripts/optimization/sqp.m @@ -224,16 +224,16 @@ have_hess = 0; if (iscell (objf)) if (length (objf) > 0) - __sqp_obj_fun__ = obj_fun = objf{1}; - if (length (objf) > 1) - obj_grd = objf{2}; - if (length (objf) > 2) - obj_hess = objf{3}; - have_hess = 1; - endif - endif + __sqp_obj_fun__ = obj_fun = objf{1}; + if (length (objf) > 1) + obj_grd = objf{2}; + if (length (objf) > 2) + obj_hess = objf{3}; + have_hess = 1; + endif + endif else - error ("sqp: invalid objective function"); + error ("sqp: invalid objective function"); endif else __sqp_obj_fun__ = obj_fun = objf; @@ -244,82 +244,82 @@ if (nargin > 2) ce_grd = @fd_ce_jac; if (iscell (cef)) - if (length (cef) > 0) - __sqp_ce_fun__ = ce_fun = cef{1}; - if (length (cef) > 1) - ce_grd = cef{2}; - endif - else - error ("sqp: invalid equality constraint function"); - endif + if (length (cef) > 0) + __sqp_ce_fun__ = ce_fun = cef{1}; + if (length (cef) > 1) + ce_grd = cef{2}; + endif + else + error ("sqp: invalid equality constraint function"); + endif elseif (! isempty (cef)) - ce_fun = cef; + ce_fun = cef; endif endif __sqp_ce_fun__ = ce_fun; ci_fun = @empty_cf; ci_grd = @empty_jac; - + if (nargin > 3) ## constraint function given by user with possibly gradient __sqp_cif__ = cif; ## constraint function given by user without gradient __sqp_cifcn__ = @empty_cf; if (iscell (__sqp_cif__)) - if (length (__sqp_cif__) > 0) - __sqp_cifcn__ = __sqp_cif__{1}; - endif + if (length (__sqp_cif__) > 0) + __sqp_cifcn__ = __sqp_cif__{1}; + endif elseif (! isempty (__sqp_cif__)) - __sqp_cifcn__ = __sqp_cif__; + __sqp_cifcn__ = __sqp_cif__; endif if (nargin < 5) - ci_grd = @fd_ci_jac; - if (iscell (cif)) - if (length (cif) > 0) - __sqp_ci_fun__ = ci_fun = cif{1}; - if (length (cif) > 1) - ci_grd = cif{2}; - endif - else - error ("sqp: invalid equality constraint function"); - endif - elseif (! isempty (cif)) - ci_fun = cif; - endif + ci_grd = @fd_ci_jac; + if (iscell (cif)) + if (length (cif) > 0) + __sqp_ci_fun__ = ci_fun = cif{1}; + if (length (cif) > 1) + ci_grd = cif{2}; + endif + else + error ("sqp: invalid equality constraint function"); + endif + elseif (! isempty (cif)) + ci_fun = cif; + endif else - global __sqp_lb__; - if (isvector (lb)) - __sqp_lb__ = lb; - elseif (isempty (lb)) - if (isa (x, "single")) - __sqp_lb__ = -realmax ("single"); - else - __sqp_lb__ = -realmax; - endif - else - error ("sqp: invalid lower bound"); - endif + global __sqp_lb__; + if (isvector (lb)) + __sqp_lb__ = lb; + elseif (isempty (lb)) + if (isa (x, "single")) + __sqp_lb__ = -realmax ("single"); + else + __sqp_lb__ = -realmax; + endif + else + error ("sqp: invalid lower bound"); + endif - global __sqp_ub__; - if (isvector (ub)) - __sqp_ub__ = ub; - elseif (isempty (lb)) - if (isa (x, "single")) - __sqp_ub__ = realmax ("single"); - else - __sqp_ub__ = realmax; - endif - else - error ("sqp: invalid upper bound"); - endif + global __sqp_ub__; + if (isvector (ub)) + __sqp_ub__ = ub; + elseif (isempty (lb)) + if (isa (x, "single")) + __sqp_ub__ = realmax ("single"); + else + __sqp_ub__ = realmax; + endif + else + error ("sqp: invalid upper bound"); + endif - if (lb > ub) - error ("sqp: upper bound smaller than lower bound"); - endif - __sqp_ci_fun__ = ci_fun = @cf_ub_lb; - ci_grd = @cigrad_ub_lb; + if (lb > ub) + error ("sqp: upper bound smaller than lower bound"); + endif + __sqp_ci_fun__ = ci_fun = @cf_ub_lb; + ci_grd = @cigrad_ub_lb; endif __sqp_ci_fun__ = ci_fun; endif @@ -327,18 +327,18 @@ iter_max = 100; if (nargin > 6 && ! isempty (maxiter)) if (isscalar (maxiter) && maxiter > 0 && round (maxiter) == maxiter) - iter_max = maxiter; + iter_max = maxiter; else - error ("sqp: invalid number of maximum iterations"); + error ("sqp: invalid number of maximum iterations"); endif endif tol = sqrt (eps); if (nargin > 7 && ! isempty (tolerance)) if (isscalar (tolerance) && tolerance > 0) - tol = tolerance; + tol = tolerance; else - error ("sqp: invalid value for tolerance"); + error ("sqp: invalid value for tolerance"); endif endif @@ -398,7 +398,7 @@ if (t2 && t3 && max ([t0; t1; t4]) < tol) info = 101; - break; + break; endif ## Compute search direction p by solving QP. @@ -413,7 +413,7 @@ C(idx,:) = []; [p, obj_qp, INFO, lambda] = qp (x, B, c, F, g, [], [], d, C, - Inf (size (d))); + Inf (size (d))); info = INFO.info; @@ -423,7 +423,7 @@ ## merit function phi. [x_new, alpha, obj_new] = linesearch_L1 (x, p, obj_fun, obj_grd, - ce_fun, ci_fun, lambda, obj); + ce_fun, ci_fun, lambda, obj); ## Evaluate objective function, constraints, and gradients at ## x_new. @@ -446,51 +446,51 @@ y = c_new - c; if (! isempty (A)) - t = ((A_new - A)'*lambda); - y -= t; + t = ((A_new - A)'*lambda); + y -= t; endif delx = x_new - x; if (norm (delx) < tol * norm (x)) - info = 101; - break; + info = 101; + break; endif if (have_hess) - B = feval (obj_hess, x); + B = feval (obj_hess, x); else - ## Update B using a quasi-Newton formula. + ## Update B using a quasi-Newton formula. - delxt = delx'; + delxt = delx'; - ## Damped BFGS. Or maybe we would actually want to use the Hessian - ## of the Lagrangian, computed directly. + ## Damped BFGS. Or maybe we would actually want to use the Hessian + ## of the Lagrangian, computed directly. - d1 = delxt*B*delx; + d1 = delxt*B*delx; - t1 = 0.2 * d1; - t2 = delxt*y; + t1 = 0.2 * d1; + t2 = delxt*y; - if (t2 < t1) - theta = 0.8*d1/(d1 - t2); - else - theta = 1; - endif + if (t2 < t1) + theta = 0.8*d1/(d1 - t2); + else + theta = 1; + endif - r = theta*y + (1-theta)*B*delx; + r = theta*y + (1-theta)*B*delx; - d2 = delxt*r; + d2 = delxt*r; - if (d1 == 0 || d2 == 0) - info = 102; - break; - endif + if (d1 == 0 || d2 == 0) + info = 102; + break; + endif - B = B - B*delx*delxt*B/d1 + r*r'/d2; + B = B - B*delx*delxt*B/d1 + r*r'/d2; endif @@ -554,7 +554,7 @@ function [x_new, alpha, obj] = linesearch_L1 (x, p, obj_fun, obj_grd, - ce_fun, ci_fun, lambda, obj) + ce_fun, ci_fun, lambda, obj) ## Choose parameters ## @@ -727,7 +727,7 @@ if (iscell (__sqp_cif__) && length (__sqp_cif__) > 1) cigradfcn = __sqp_cif__{2}; endif - + if (! isempty (cigradfcn)) res = [feval(cigradfcn,x); eye(numel(x)); -eye(numel(x))]; endif
--- a/scripts/path/pathdef.m +++ b/scripts/path/pathdef.m @@ -95,26 +95,26 @@ unwind_protect linenum = 0; while (linenum >= 0) - result = fgetl (fid); - if (isnumeric (result)) - ## End at the end of file. - linenum = -1; - else - linenum++; - filelines{linenum} = result; - ## Find the first and last lines if they exist in the file. - if (strcmp (result, beginstring)) - startline = linenum + 1; - elseif (strcmp (result, endstring)) - endline = linenum - 1; - endif - endif + result = fgetl (fid); + if (isnumeric (result)) + ## End at the end of file. + linenum = -1; + else + linenum++; + filelines{linenum} = result; + ## Find the first and last lines if they exist in the file. + if (strcmp (result, beginstring)) + startline = linenum + 1; + elseif (strcmp (result, endstring)) + endline = linenum - 1; + endif + endif endwhile unwind_protect_cleanup closeread = fclose (fid); if (closeread < 0) - error ("savepath: could not close savefile after reading, %s", - savefile); + error ("savepath: could not close savefile after reading, %s", + savefile); endif end_unwind_protect endif @@ -125,8 +125,8 @@ elseif (startline > 0) ## Undo doubling of single quote characters performed by savepath. specifiedpath = strrep (regexprep (cstrcat (filelines(startline:endline){:}), - " *path *\\('(.*)'\\); *", "$1"), - "''", "'"); + " *path *\\('(.*)'\\); *", "$1"), + "''", "'"); else specifiedpath = ""; endif
--- a/scripts/path/savepath.m +++ b/scripts/path/savepath.m @@ -52,26 +52,26 @@ unwind_protect linenum = 0; while (linenum >= 0) - result = fgetl (fid); - if (isnumeric (result)) - ## end at the end of file - linenum = -1; - else - linenum = linenum + 1; - filelines{linenum} = result; - ## find the first and last lines if they exist in the file - if (strcmp (result, beginstring)) - startline = linenum; - elseif (strcmp (result, endstring)) - endline = linenum; - endif - endif + result = fgetl (fid); + if (isnumeric (result)) + ## end at the end of file + linenum = -1; + else + linenum = linenum + 1; + filelines{linenum} = result; + ## find the first and last lines if they exist in the file + if (strcmp (result, beginstring)) + startline = linenum; + elseif (strcmp (result, endstring)) + endline = linenum; + endif + endif endwhile unwind_protect_cleanup closeread = fclose (fid); if (closeread < 0) - error ("savepath: could not close savefile after reading, %s", - savefile); + error ("savepath: could not close savefile after reading, %s", + savefile); endif end_unwind_protect endif @@ -157,7 +157,7 @@ path_to_save = path_to_preserve (sort (n)); ## Remove pwd path_to_save = path_to_save (! strcmpi (path_to_save, - strcat (".", pathsep))); + strcat (".", pathsep))); n = ones (size (path_to_save)); for m = 1:numel(path_to_save) n(m) = strmatch (path_to_save{m}, path_to_preserve);
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -202,7 +202,7 @@ persistent archprefix = -1; persistent local_list = tilde_expand (fullfile ("~", ".octave_packages")); persistent global_list = fullfile (OCTAVE_HOME (), "share", "octave", - "octave_packages"); + "octave_packages"); mlock (); global_install = issuperuser (); @@ -211,7 +211,7 @@ if (global_install) prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); archprefix = fullfile (octave_config_info ("libexecdir"), - "octave", "packages"); + "octave", "packages"); else prefix = fullfile ("~", "octave"); archprefix = prefix; @@ -221,8 +221,8 @@ endif available_actions = {"list", "install", "uninstall", "load", ... - "unload", "prefix", "local_list", ... - "global_list", "rebuild", "build","describe"}; + "unload", "prefix", "local_list", ... + "global_list", "rebuild", "build","describe"}; ## Handle input if (length (varargin) == 0 || ! iscellstr (varargin)) print_usage (); @@ -235,34 +235,34 @@ for i = 1:length (varargin) switch (varargin{i}) case "-nodeps" - deps = false; + deps = false; case "-noauto" - auto = -1; + auto = -1; case "-auto" - auto = 1; + auto = 1; case "-verbose" - verbose = true; + verbose = true; case "-local" - global_install = false; - if (! user_prefix) - prefix = tilde_expand (fullfile ("~", "octave")); - archprefix = prefix; - endif + global_install = false; + if (! user_prefix) + prefix = tilde_expand (fullfile ("~", "octave")); + archprefix = prefix; + endif case "-global" - global_install = true; - if (! user_prefix) - prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); - archprefix = fullfile (octave_config_info ("libexecdir"), - "octave", "packages"); - endif + global_install = true; + if (! user_prefix) + prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages"); + archprefix = fullfile (octave_config_info ("libexecdir"), + "octave", "packages"); + endif case available_actions - if (strcmp (action, "none")) - action = varargin{i}; - else - error ("more than one action specified"); - endif + if (strcmp (action, "none")) + action = varargin{i}; + else + error ("more than one action specified"); + endif otherwise - files{end+1} = varargin{i}; + files{end+1} = varargin{i}; endswitch endfor @@ -270,150 +270,150 @@ switch (action) case "list" if (nargout == 0) - installed_packages (local_list, global_list); + installed_packages (local_list, global_list); elseif (nargout == 1) - local_packages = installed_packages (local_list, global_list); + local_packages = installed_packages (local_list, global_list); elseif (nargout == 2) - [local_packages, global_packages] = installed_packages (local_list, - global_list); + [local_packages, global_packages] = installed_packages (local_list, + global_list); else - error ("too many output arguments requested"); + error ("too many output arguments requested"); endif case "install" if (length (files) == 0) - error ("you must specify at least one filename when calling 'pkg install'"); + error ("you must specify at least one filename when calling 'pkg install'"); endif install (files, deps, auto, prefix, archprefix, verbose, local_list, - global_list, global_install); + global_list, global_install); case "uninstall" if (length (files) == 0) - error ("you must specify at least one package when calling 'pkg uninstall'"); + error ("you must specify at least one package when calling 'pkg uninstall'"); endif uninstall (files, deps, verbose, local_list, - global_list, global_install); + global_list, global_install); case "load" if (length (files) == 0) - error ("you must specify at least one package, 'all' or 'auto' when calling 'pkg load'"); + error ("you must specify at least one package, 'all' or 'auto' when calling 'pkg load'"); endif load_packages (files, deps, local_list, global_list); case "unload" if (length (files) == 0) - error ("you must specify at least one package or 'all' when calling 'pkg unload'"); + error ("you must specify at least one package or 'all' when calling 'pkg unload'"); endif unload_packages (files, deps, local_list, global_list); case "prefix" if (length (files) == 0 && nargout == 0) - printf ("Installation prefix: %s\n", prefix); - printf ("Architecture dependent prefix: %s\n", archprefix); + printf ("Installation prefix: %s\n", prefix); + printf ("Architecture dependent prefix: %s\n", archprefix); elseif (length (files) == 0 && nargout >= 1) - local_packages = prefix; - global_packages = archprefix; + local_packages = prefix; + global_packages = archprefix; elseif (length (files) >= 1 && nargout <= 2 && ischar (files{1})) - prefix = files{1}; - prefix = absolute_pathname (prefix); - local_packages = prefix; - user_prefix = true; - if (length (files) >= 2 && ischar (files{2})) - archprefix = files{2}; - try - archprefix = absolute_pathname (archprefix); + prefix = files{1}; + prefix = absolute_pathname (prefix); + local_packages = prefix; + user_prefix = true; + if (length (files) >= 2 && ischar (files{2})) + archprefix = files{2}; + try + archprefix = absolute_pathname (archprefix); catch - mkdir (archprefix); - warning ("creating the directory %s\n", archprefix); - archprefix = absolute_pathname (archprefix); - end_try_catch - global_packages = archprefix; - endif + mkdir (archprefix); + warning ("creating the directory %s\n", archprefix); + archprefix = absolute_pathname (archprefix); + end_try_catch + global_packages = archprefix; + endif else - error ("you must specify a prefix directory, or request an output argument"); + error ("you must specify a prefix directory, or request an output argument"); endif case "local_list" if (length (files) == 0 && nargout == 0) - disp (local_list); + disp (local_list); elseif (length (files) == 0 && nargout == 1) - local_packages = local_list; + local_packages = local_list; elseif (length (files) == 1 && nargout == 0 && ischar (files{1})) - try - local_list = absolute_pathname (files{1}); - catch - ## Force file to be created - fclose (fopen (files{1}, "wt")); - local_list = absolute_pathname (files{1}); - end_try_catch + try + local_list = absolute_pathname (files{1}); + catch + ## Force file to be created + fclose (fopen (files{1}, "wt")); + local_list = absolute_pathname (files{1}); + end_try_catch else - error ("you must specify a local_list file, or request an output argument"); + error ("you must specify a local_list file, or request an output argument"); endif case "global_list" if (length (files) == 0 && nargout == 0) - disp(global_list); + disp(global_list); elseif (length (files) == 0 && nargout == 1) - local_packages = global_list; + local_packages = global_list; elseif (length (files) == 1 && nargout == 0 && ischar (files{1})) - try - global_list = absolute_pathname (files{1}); - catch - ## Force file to be created - fclose (fopen (files{1}, "wt")); - global_list = absolute_pathname (files{1}); - end_try_catch + try + global_list = absolute_pathname (files{1}); + catch + ## Force file to be created + fclose (fopen (files{1}, "wt")); + global_list = absolute_pathname (files{1}); + end_try_catch else - error ("you must specify a global_list file, or request an output argument"); + error ("you must specify a global_list file, or request an output argument"); endif case "rebuild" if (global_install) - global_packages = rebuild (prefix, archprefix, global_list, files, - auto, verbose); - global_packages = save_order (global_packages); - save (global_list, "global_packages"); - if (nargout > 0) - local_packages = global_packages; - endif + global_packages = rebuild (prefix, archprefix, global_list, files, + auto, verbose); + global_packages = save_order (global_packages); + save (global_list, "global_packages"); + if (nargout > 0) + local_packages = global_packages; + endif else - local_packages = rebuild (prefix, archprefix, local_list, files, auto, - verbose); - local_packages = save_order (local_packages); - save (local_list, "local_packages"); - if (nargout == 0) - clear ("local_packages"); - endif + local_packages = rebuild (prefix, archprefix, local_list, files, auto, + verbose); + local_packages = save_order (local_packages); + save (local_list, "local_packages"); + if (nargout == 0) + clear ("local_packages"); + endif endif case "build" if (length (files) < 2) - error ("you must specify at least the build directory and one filename\nwhen calling 'pkg build'"); + error ("you must specify at least the build directory and one filename\nwhen calling 'pkg build'"); endif build (files, deps, auto, verbose); case "describe" if (length (files) == 0) - error ("you must specify at least one package or 'all' when calling 'pkg describe'"); + error ("you must specify at least one package or 'all' when calling 'pkg describe'"); endif ## FIXME: the name of the output variables is inconsistent ## with their content switch (nargout) - case 0 - describe (files, verbose, local_list, global_list); - case 1 - pkg_desc_list = describe (files, verbose, local_list, ... - global_list); - local_packages = pkg_desc_list; - case 2 - [pkg_desc_list, flag] = describe (files, verbose, local_list, ... - global_list); - local_packages = pkg_desc_list; - global_packages = flag; - otherwise - error ("you can request at most two outputs when calling 'pkg describe'"); + case 0 + describe (files, verbose, local_list, global_list); + case 1 + pkg_desc_list = describe (files, verbose, local_list, ... + global_list); + local_packages = pkg_desc_list; + case 2 + [pkg_desc_list, flag] = describe (files, verbose, local_list, ... + global_list); + local_packages = pkg_desc_list; + global_packages = flag; + otherwise + error ("you can request at most two outputs when calling 'pkg describe'"); endswitch - + otherwise error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); endswitch @@ -447,23 +447,23 @@ desc = get_description (descfile); desc.dir = fullfile (prefix, dirlist{k}); desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", - desc.version)); + desc.version)); if (auto != 0) - if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file")) - unlink (fullfile (desc.dir, "packinfo", ".autoload")); - endif + if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file")) + unlink (fullfile (desc.dir, "packinfo", ".autoload")); + endif if (auto < 0) - desc.autoload = 0; - elseif (auto > 0) - desc.autoload = 1; - fclose (fopen (fullfile (desc.dir, "packinfo", ".autoload"), "wt")); - endif + desc.autoload = 0; + elseif (auto > 0) + desc.autoload = 1; + fclose (fopen (fullfile (desc.dir, "packinfo", ".autoload"), "wt")); + endif else - if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file")) - desc.autoload = 1; - else - desc.autoload = 0; - endif + if (exist (fullfile (desc.dir, "packinfo", ".autoload"), "file")) + desc.autoload = 1; + else + desc.autoload = 0; + endif endif descriptions{end + 1} = desc; elseif (verbose) @@ -479,15 +479,15 @@ dup = []; for i = 1:length (descriptions) if (find (dup, i)) - continue; + continue; endif for j = (i+1):length (descriptions) - if (find (dup, j)) - continue; - endif - if (strcmp (descriptions{i}.name, descriptions{j}.name)) - dup = [dup, j]; - endif + if (find (dup, j)) + continue; + endif + if (strcmp (descriptions{i}.name, descriptions{j}.name)) + dup = [dup, j]; + endif endfor endfor if (! isempty (dup)) @@ -519,7 +519,7 @@ files(1) = []; buildlist = fullfile (builddir, "octave_packages"); install (files, handle_deps, autoload, installdir, installdir, verbose, - buildlist, "", false); + buildlist, "", false); unwind_protect repackage (builddir, buildlist); unwind_protect_cleanup @@ -534,7 +534,7 @@ endfunction function install (files, handle_deps, autoload, prefix, archprefix, verbose, - local_list, global_list, global_install) + local_list, global_list, global_install) ## Check that the directory in prefix exist. If it doesn't: create it! if (! exist (prefix, "dir")) @@ -547,7 +547,7 @@ ## Get the list of installed packages. [local_packages, global_packages] = installed_packages (local_list, - global_list); + global_list); installed_pkgs_lst = {local_packages{:}, global_packages{:}}; @@ -563,7 +563,7 @@ ## Warn about non existent files. for i = 1:length (files) if (isempty (glob(files{i}))) - warning ("file %s does not exist", files{i}); + warning ("file %s does not exist", files{i}); endif endfor @@ -574,80 +574,80 @@ tgz = files{i}; if (exist (tgz, "file")) - ## Create a temporary directory. - tmpdir = tmpnam (); - tmpdirs{end+1} = tmpdir; + ## Create a temporary directory. + tmpdir = tmpnam (); + tmpdirs{end+1} = tmpdir; if (verbose) - printf ("mkdir (%s)\n", tmpdir); - endif - [status, msg] = mkdir (tmpdir); - if (status != 1) - error ("couldn't create temporary directory: %s", msg); - endif + printf ("mkdir (%s)\n", tmpdir); + endif + [status, msg] = mkdir (tmpdir); + if (status != 1) + error ("couldn't create temporary directory: %s", msg); + endif - ## Uncompress the package. - if (verbose) - printf ("untar (%s, %s)\n", tgz, tmpdir); - endif - untar (tgz, tmpdir); + ## Uncompress the package. + if (verbose) + printf ("untar (%s, %s)\n", tgz, tmpdir); + endif + untar (tgz, tmpdir); - ## Get the name of the directories produced by tar. - [dirlist, err, msg] = readdir (tmpdir); - if (err) - error ("couldn't read directory produced by tar: %s", msg); - endif + ## Get the name of the directories produced by tar. + [dirlist, err, msg] = readdir (tmpdir); + if (err) + error ("couldn't read directory produced by tar: %s", msg); + endif - if (length (dirlist) > 3) - error ("bundles of packages are not allowed") - endif + if (length (dirlist) > 3) + error ("bundles of packages are not allowed") + endif endif ## The filename pointed to an uncompressed package to begin with. if (exist (tgz, "dir")) - dirlist = {".", "..", tgz}; + dirlist = {".", "..", tgz}; endif if (exist (tgz, "file") || exist (tgz, "dir")) - ## The two first entries of dirlist are "." and "..". - if (exist (tgz, "file")) - packdir = fullfile (tmpdir, dirlist{3}); - else - packdir = fullfile (pwd(), dirlist{3}); - endif - packdirs{end+1} = packdir; - - ## Make sure the package contains necessary files. - verify_directory (packdir); - - ## Read the DESCRIPTION file. - filename = fullfile (packdir, "DESCRIPTION"); - desc = get_description (filename); - - ## Verify that package name corresponds with filename. - [dummy, nm] = fileparts (tgz); - if ((length (nm) >= length (desc.name)) - && ! strcmp (desc.name, nm(1:length(desc.name)))) - error ("package name '%s' doesn't correspond to its filename '%s'", - desc.name, nm); - endif - - ## Set default installation directory. - desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); - - ## Set default architectire dependent installation directory. - desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", - desc.version)); - - ## Save desc. - descriptions{end+1} = desc; - - ## Are any of the new packages already installed? - ## If so we'll remove the old version. - for j = 1:length (packages) - if (strcmp (packages{j}.name, desc.name)) - packages_to_uninstall(end+1) = j; - endif - endfor + ## The two first entries of dirlist are "." and "..". + if (exist (tgz, "file")) + packdir = fullfile (tmpdir, dirlist{3}); + else + packdir = fullfile (pwd(), dirlist{3}); + endif + packdirs{end+1} = packdir; + + ## Make sure the package contains necessary files. + verify_directory (packdir); + + ## Read the DESCRIPTION file. + filename = fullfile (packdir, "DESCRIPTION"); + desc = get_description (filename); + + ## Verify that package name corresponds with filename. + [dummy, nm] = fileparts (tgz); + if ((length (nm) >= length (desc.name)) + && ! strcmp (desc.name, nm(1:length(desc.name)))) + error ("package name '%s' doesn't correspond to its filename '%s'", + desc.name, nm); + endif + + ## Set default installation directory. + desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); + + ## Set default architectire dependent installation directory. + desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", + desc.version)); + + ## Save desc. + descriptions{end+1} = desc; + + ## Are any of the new packages already installed? + ## If so we'll remove the old version. + for j = 1:length (packages) + if (strcmp (packages{j}.name, desc.name)) + packages_to_uninstall(end+1) = j; + endif + endfor endif endfor catch @@ -666,27 +666,27 @@ desc = descriptions{i}; idx2 = setdiff (1:length(descriptions), i); if (global_install) - ## Global installation is not allowed to have dependencies on locally - ## installed packages. - idx1 = setdiff (1:length(global_packages), packages_to_uninstall); - pseudo_installed_packages = {global_packages{idx1}, ... - descriptions{idx2}}; + ## Global installation is not allowed to have dependencies on locally + ## installed packages. + idx1 = setdiff (1:length(global_packages), packages_to_uninstall); + pseudo_installed_packages = {global_packages{idx1}, ... + descriptions{idx2}}; else - idx1 = setdiff (1:length(local_packages), packages_to_uninstall); - pseudo_installed_packages = {local_packages{idx1}, ... - global_packages{:}, ... - descriptions{idx2}}; + idx1 = setdiff (1:length(local_packages), packages_to_uninstall); + pseudo_installed_packages = {local_packages{idx1}, ... + global_packages{:}, ... + descriptions{idx2}}; endif bad_deps = get_unsatisfied_deps (desc, pseudo_installed_packages); ## Are there any unsatisfied dependencies? if (! isempty (bad_deps)) - ok = false; - for i = 1:length (bad_deps) - dep = bad_deps{i}; - error_text = cstrcat (error_text, " ", desc.name, " needs ", - dep.package, " ", dep.operator, " ", - dep.version, "\n"); - endfor + ok = false; + for i = 1:length (bad_deps) + dep = bad_deps{i}; + error_text = cstrcat (error_text, " ", desc.name, " needs ", + dep.package, " ", dep.operator, " ", + dep.version, "\n"); + endfor endif endfor @@ -716,11 +716,11 @@ try for i = packages_to_uninstall if (global_install) - uninstall ({global_packages{i}.name}, false, verbose, local_list, - global_list, global_install); + uninstall ({global_packages{i}.name}, false, verbose, local_list, + global_list, global_install); else - uninstall ({local_packages{i}.name}, false, verbose, local_list, - global_list, global_install); + uninstall ({local_packages{i}.name}, false, verbose, local_list, + global_list, global_install); endif endfor catch @@ -758,7 +758,7 @@ ## from the list. for i = length (descriptions):-1:1 if (dirempty (descriptions{i}.dir, {"packinfo", "doc"}) && - dirempty (getarchdir (descriptions{i}))) + dirempty (getarchdir (descriptions{i}))) warning ("package %s is empty\n", descriptions{i}.name); rm_rf (descriptions{i}.dir); rm_rf (getarchdir (descriptions{i})); @@ -771,7 +771,7 @@ for i = length (descriptions):-1:1 if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", - ".autoload"), "wt")); + ".autoload"), "wt")); descriptions{i}.autoload = 1; endif endfor @@ -819,25 +819,25 @@ idx = []; for i = 1:length (descriptions) if (isautoload (descriptions(i))) - nm = descriptions{i}.name; - for j = 1:length (installed_pkgs_lst) - if (strcmp (nm, installed_pkgs_lst{j}.name)) - idx (end + 1) = j; - break; - endif - endfor + nm = descriptions{i}.name; + for j = 1:length (installed_pkgs_lst) + if (strcmp (nm, installed_pkgs_lst{j}.name)) + idx (end + 1) = j; + break; + endif + endfor endif endfor load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst, - global_install); + global_install); endif endfunction function uninstall (pkgnames, handle_deps, verbose, local_list, - global_list, global_install) + global_list, global_install) ## Get the list of installed packages. [local_packages, global_packages] = installed_packages(local_list, - global_list); + global_list); if (global_install) installed_pkgs_lst = {local_packages{:}, global_packages{:}}; else @@ -862,14 +862,14 @@ num_packages = length (installed_pkgs_lst); delete_idx = []; for i = 1:num_packages - cur_name = installed_pkgs_lst{i}.name; - if (any (strcmp (cur_name, pkgnames))) - delete_idx(end+1) = i; - endif + cur_name = installed_pkgs_lst{i}.name; + if (any (strcmp (cur_name, pkgnames))) + delete_idx(end+1) = i; + endif endfor if (length (delete_idx) != length (pkgnames)) - ## FIXME: We should have a better error message. - warning ("some of the packages you want to uninstall are not installed"); + ## FIXME: We should have a better error message. + warning ("some of the packages you want to uninstall are not installed"); endif else ## FIXME: We should have a better error message. @@ -890,12 +890,12 @@ ## Will the uninstallation break any dependencies? if (! isempty (bad_deps)) - for i = 1:length (bad_deps) - dep = bad_deps{i}; - error_text = cstrcat (error_text, " ", desc.name, " needs ", - dep.package, " ", dep.operator, " ", - dep.version, "\n"); - endfor + for i = 1:length (bad_deps) + dep = bad_deps{i}; + error_text = cstrcat (error_text, " ", desc.name, " needs ", + dep.package, " ", dep.operator, " ", + dep.version, "\n"); + endfor endif endfor @@ -918,20 +918,20 @@ if (desc.loaded) rmpath (desc.dir); if (exist (getarchdir (desc))) - rmpath (getarchdir (desc)); + rmpath (getarchdir (desc)); endif endif if (exist (desc.dir, "dir")) [status, msg] = rm_rf (desc.dir); if (status != 1) - error ("couldn't delete directory %s: %s", desc.dir, msg); + error ("couldn't delete directory %s: %s", desc.dir, msg); endif [status, msg] = rm_rf (getarchdir (desc)); if (status != 1) - error ("couldn't delete directory %s: %s", getarchdir (desc), msg); + error ("couldn't delete directory %s: %s", getarchdir (desc), msg); endif if (dirempty (desc.archprefix)) - rm_rf (desc.archprefix); + rm_rf (desc.archprefix); endif else warning ("directory %s previously lost", desc.dir); @@ -958,7 +958,7 @@ endfunction function [pkg_desc_list, flag] = describe (pkgnames, verbose, - local_list, global_list) + local_list, global_list) ## Get the list of installed packages. installed_pkgs_lst = installed_packages(local_list, global_list); @@ -985,9 +985,9 @@ if (! isempty (name_pos)) if (installed_pkgs_lst{i}.loaded) - flag{name_pos} = "Loaded"; + flag{name_pos} = "Loaded"; else - flag{name_pos} = "Not loaded"; + flag{name_pos} = "Not loaded"; endif pkg_desc_list{name_pos}.name = installed_pkgs_lst{i}.name; @@ -1005,17 +1005,17 @@ error ("some packages are not installed: %s", non_inst_str); else pkg_desc_list{non_inst} = struct ("name", {}, "description", - {}, "provides", {}); + {}, "provides", {}); endif endif if (nargout == 0) for i = 1:num_pkgnames print_package_description (pkg_desc_list{i}.name, - pkg_desc_list{i}.version, - pkg_desc_list{i}.provides, - pkg_desc_list{i}.description, - flag{i}, verbose); + pkg_desc_list{i}.version, + pkg_desc_list{i}.provides, + pkg_desc_list{i}.description, + flag{i}, verbose); endfor endif @@ -1036,7 +1036,7 @@ [fid, msg] = fopen (index_file, "r"); if (fid == -1) error ("the INDEX file %s could not be read: %s", - index_file, msg); + index_file, msg); endif cat_num = 1; @@ -1060,14 +1060,14 @@ elseif (! isspace (line(1))) ## Category. if (! isempty (pkg_idx_struct{cat_num}.functions)) - pkg_idx_struct{++cat_num}.functions = {}; + pkg_idx_struct{++cat_num}.functions = {}; endif pkg_idx_struct{cat_num}.category = deblank (line); else ## Function names. while (any (! isspace (line))) - [fun_name, line] = strtok (line); - pkg_idx_struct{cat_num}.functions{end+1} = deblank (fun_name); + [fun_name, line] = strtok (line); + pkg_idx_struct{cat_num}.functions{end+1} = deblank (fun_name); endwhile endif line = fgetl (fid); @@ -1076,7 +1076,7 @@ endfunction function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, - pkg_desc, status, verbose) + pkg_desc, status, verbose) printf ("---\nPackage name:\n\t%s\n", pkg_name); printf ("Version:\n\t%s\n", pkg_ver); @@ -1086,10 +1086,10 @@ printf ("---\nProvides:\n"); for i = 1:length(pkg_idx_struct) if (! isempty (pkg_idx_struct{i}.functions)) - printf ("%s\n", pkg_idx_struct{i}.category); - for j = 1:length(pkg_idx_struct{i}.functions) - printf ("\t%s\n", pkg_idx_struct{i}.functions{j}); - endfor + printf ("%s\n", pkg_idx_struct{i}.category); + for j = 1:length(pkg_idx_struct{i}.functions) + printf ("\t%s\n", pkg_idx_struct{i}.functions{j}); + endfor endif endfor endif @@ -1119,53 +1119,53 @@ copyfile (fullfile (pack.dir, "*"), fullfile (pack.name, "inst")); movefile (fullfile (pack.name, "inst","packinfo", "*"), pack.name); if (exist (fullfile (pack.name, "inst","packinfo", ".autoload"), "file")) - unlink (fullfile (pack.name, "inst","packinfo", ".autoload")); + unlink (fullfile (pack.name, "inst","packinfo", ".autoload")); endif rmdir (fullfile (pack.name, "inst", "packinfo")); if (exist (fullfile (pack.name, "inst", "doc"), "dir")) - movefile (fullfile (pack.name, "inst", "doc"), pack.name); + movefile (fullfile (pack.name, "inst", "doc"), pack.name); endif if (exist (fullfile (pack.name, "inst", "bin"), "dir")) - movefile (fullfile (pack.name, "inst", "bin"), pack.name); + movefile (fullfile (pack.name, "inst", "bin"), pack.name); endif archdir = fullfile (pack.archprefix, cstrcat (pack.name, "-", - pack.version), getarch ()); + pack.version), getarch ()); if (exist (archdir, "dir")) - if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) - unlink (fullfile (pack.name, "inst", "PKG_ADD")); - endif - if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) - unlink (fullfile (pack.name, "inst", "PKG_DEL")); - endif - if (exist (fullfile (archdir, "PKG_ADD"), "file")) - movefile (fullfile (archdir, "PKG_ADD"), - fullfile (pack.name, "PKG_ADD")); - endif - if (exist (fullfile (archdir, "PKG_DEL"), "file")) - movefile (fullfile (archdir, "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); - endif + if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) + unlink (fullfile (pack.name, "inst", "PKG_ADD")); + endif + if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) + unlink (fullfile (pack.name, "inst", "PKG_DEL")); + endif + if (exist (fullfile (archdir, "PKG_ADD"), "file")) + movefile (fullfile (archdir, "PKG_ADD"), + fullfile (pack.name, "PKG_ADD")); + endif + if (exist (fullfile (archdir, "PKG_DEL"), "file")) + movefile (fullfile (archdir, "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); + endif else - if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_ADD"), - fullfile (pack.name, "PKG_ADD")); - endif - if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); - endif - endif + if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) + movefile (fullfile (pack.name, "inst", "PKG_ADD"), + fullfile (pack.name, "PKG_ADD")); + endif + if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) + movefile (fullfile (pack.name, "inst", "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); + endif + endif tfile = cstrcat (pack.name, "-", pack.version, ".tar"); tar (tfile, pack.name); try - gzip (tfile); - unlink (tfile); + gzip (tfile); + unlink (tfile); catch - warning ("failed to compress %s", tfile); + warning ("failed to compress %s", tfile); end_try_catch unwind_protect_cleanup if (exist (pack.name, "dir")) - rm_rf (pack.name); + rm_rf (pack.name); endif cd (wd); end_unwind_protect @@ -1178,9 +1178,9 @@ a = desc{1}.autoload; if ((isnumeric (a) && a > 0) || (ischar (a) && (strcmpi (a, "true") - || strcmpi (a, "on") - || strcmpi (a, "yes") - || strcmpi (a, "1")))) + || strcmpi (a, "on") + || strcmpi (a, "yes") + || strcmpi (a, "1")))) auto = true; endif endif @@ -1207,7 +1207,7 @@ if (status != 1) rm_rf (desc.dir); error ("the 'inst' directory did not exist and could not be created: %s", - msg); + msg); endif endif endfunction @@ -1234,10 +1234,10 @@ [status, output] = shell (strcat ("cd '", src, "'; ./configure --prefix=\"", desc.dir, "\"", flags)); if (status != 0) - rm_rf (desc.dir); - error ("the configure script returned the following error: %s", output); + rm_rf (desc.dir); + error ("the configure script returned the following error: %s", output); elseif (verbose) - printf("%s", output); + printf("%s", output); endif endif @@ -1245,12 +1245,12 @@ ## Make. if (exist (fullfile (src, "Makefile"), "file")) [status, output] = shell (cstrcat ("export INSTALLDIR=\"", desc.dir, - "\"; make -C '", src, "'")); + "\"; make -C '", src, "'")); if (status != 0) - rm_rf (desc.dir); - error ("'make' returned the following error: %s", output); + rm_rf (desc.dir); + error ("'make' returned the following error: %s", output); elseif (verbose) - printf("%s", output); + printf("%s", output); endif endif @@ -1264,21 +1264,21 @@ if (exist (files, "file")) [fid, msg] = fopen (files, "r"); if (fid < 0) - error ("couldn't open %s: %s", files, msg); + error ("couldn't open %s: %s", files, msg); endif filenames = char (fread (fid))'; fclose (fid); if (filenames(end) == "\n") - filenames(end) = []; + filenames(end) = []; endif filenames = split_by (filenames, "\n"); delete_idx = []; for i = 1:length (filenames) - if (! all (isspace (filenames{i}))) - filenames{i} = fullfile (src, filenames{i}); - else - delete_idx(end+1) = i; - endif + if (! all (isspace (filenames{i}))) + filenames{i} = fullfile (src, filenames{i}); + else + delete_idx(end+1) = i; + endif endfor filenames(delete_idx) = []; else @@ -1287,8 +1287,8 @@ mex = dir (fullfile (src, "*.mex")); filenames = cellfun (@(x) fullfile (src, x), - {m.name, oct.name, mex.name}, - "UniformOutput", false); + {m.name, oct.name, mex.name}, + "UniformOutput", false); endif ## Split into architecture dependent and independent files. @@ -1302,35 +1302,35 @@ ## Copy the files. if (! all (isspace ([filenames{:}]))) - if (! exist (instdir, "dir")) - mkdir (instdir); - endif - if (! all (isspace ([archindependent{:}]))) - if (verbose) - printf ("copyfile"); - printf (" %s", archindependent{:}); - printf ("%s\n", instdir); - endif - [status, output] = copyfile (archindependent, instdir); - if (status != 1) - rm_rf (desc.dir); - error ("Couldn't copy files from 'src' to 'inst': %s", output); - endif + if (! exist (instdir, "dir")) + mkdir (instdir); + endif + if (! all (isspace ([archindependent{:}]))) + if (verbose) + printf ("copyfile"); + printf (" %s", archindependent{:}); + printf ("%s\n", instdir); + endif + [status, output] = copyfile (archindependent, instdir); + if (status != 1) + rm_rf (desc.dir); + error ("Couldn't copy files from 'src' to 'inst': %s", output); + endif endif - if (! all (isspace ([archdependent{:}]))) - if (verbose) - printf ("copyfile"); - printf (" %s", archdependent{:}); - printf (" %s\n", archdir); - endif - if (! exist (archdir, "dir")) - mkdir (archdir); - endif - [status, output] = copyfile (archdependent, archdir); - if (status != 1) - rm_rf (desc.dir); - error ("Couldn't copy files from 'src' to 'inst': %s", output); - endif + if (! all (isspace ([archdependent{:}]))) + if (verbose) + printf ("copyfile"); + printf (" %s", archdependent{:}); + printf (" %s\n", archdir); + endif + if (! exist (archdir, "dir")) + mkdir (archdir); + endif + [status, output] = copyfile (archdependent, archdir); + if (status != 1) + rm_rf (desc.dir); + error ("Couldn't copy files from 'src' to 'inst': %s", output); + endif endif endif endif @@ -1343,10 +1343,10 @@ while (! feof (fid)) ln = fgetl (fid); if (ln > 0) - t = regexp (ln, pat, "tokens"); - if (! isempty (t)) + t = regexp (ln, pat, "tokens"); + if (! isempty (t)) pkg = cstrcat (pkg, "\n", t{1}{1}); - endif + endif endif endwhile if (! isempty (pkg)) @@ -1364,7 +1364,7 @@ ## commands work as expected. The only part that doesn't is the ## part in the main directory. archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", - desc.version), getarch ()); + desc.version), getarch ()); if (exist (getarchdir (desc, global_install), "dir")) archpkg = fullfile (getarchdir (desc, global_install), nm); archfid = fopen (archpkg, "at"); @@ -1442,7 +1442,7 @@ error ("couldn't copy files to the installation directory"); endif if (exist (fullfile (desc.dir, getarch ()), "dir") && - ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) + ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) if (! exist (octfiledir, "dir")) ## Can be required to create upto three levels of dirs. octm1 = fileparts (octfiledir); @@ -1480,7 +1480,7 @@ endif endif [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), - octfiledir); + octfiledir); rm_rf (fullfile (desc.dir, getarch ())); if (status != 1) @@ -1540,7 +1540,7 @@ else try write_index (desc, fullfile (packdir, "inst"), - fullfile (packinfo, "INDEX"), global_install); + fullfile (packinfo, "INDEX"), global_install); catch rm_rf (desc.dir); rm_rf (octfiledir); @@ -1623,22 +1623,22 @@ elseif (isspace(line(1))) ## Continuation lines if (exist ("keyword", "var") && isfield (desc, keyword)) - desc.(keyword) = cstrcat (desc.(keyword), " ", rstrip(line)); + desc.(keyword) = cstrcat (desc.(keyword), " ", rstrip(line)); endif else ## Keyword/value pair colon = find (line == ":"); if (length (colon) == 0) - disp ("skipping line"); + disp ("skipping line"); else - colon = colon(1); - keyword = tolower (strip (line(1:colon-1))); - value = strip (line (colon+1:end)); - if (length (value) == 0) - fclose (fid); - error ("the keyword %s has an empty value", desc.keywords{end}); - endif - desc.(keyword) = value; + colon = colon(1); + keyword = tolower (strip (line(1:colon-1))); + value = strip (line (colon+1:end)); + if (length (value) == 0) + fclose (fid); + error ("the keyword %s has an empty value", desc.keywords{end}); + endif + desc.(keyword) = value; endif endif line = fgetl (fid); @@ -1647,7 +1647,7 @@ ## Make sure all is okay. needed_fields = {"name", "version", "date", "title", ... - "author", "maintainer", "description"}; + "author", "maintainer", "description"}; for f = needed_fields if (! isfield (desc, f{1})) error ("description is missing needed field %s", f{1}); @@ -1704,12 +1704,12 @@ sub = dep(lpar(1)+1:rpar(1)-1); parts = strsplit (sub, " ", true); if (length (parts) != 2) - error ("incorrect syntax for dependency `%s' in the DESCRIPTION file\n", - dep); + error ("incorrect syntax for dependency `%s' in the DESCRIPTION file\n", + dep); endif operator = parts{1}; if (! any (strcmp (operator, {">", ">=", "<=", "<", "=="}))) - error ("unsupported operator: %s", operator); + error ("unsupported operator: %s", operator); endif version = fix_version (parts{2}); @@ -1722,7 +1722,7 @@ version = "0.0.0"; endif deps_cell{i} = struct ("package", package, "operator", operator, - "version", version); + "version", version); endfor endfunction @@ -1839,13 +1839,13 @@ else ok = false; for i = 1:length (installed_pkgs_lst) - cur_name = installed_pkgs_lst{i}.name; - cur_version = installed_pkgs_lst{i}.version; - if (strcmp (dep.package, cur_name) - && compare_versions (cur_version, dep.version, dep.operator)) - ok = true; - break; - endif + cur_name = installed_pkgs_lst{i}.name; + cur_version = installed_pkgs_lst{i}.version; + if (strcmp (dep.package, cur_name) + && compare_versions (cur_version, dep.version, dep.operator)) + ok = true; + break; + endif endfor if (! ok) bad_deps{end+1} = dep; @@ -1877,10 +1877,10 @@ endif for j = (i+1):length (installed_pkgs_lst) if (find (dup, j)) - continue; + continue; endif if (strcmp (installed_pkgs_lst{i}.name, installed_pkgs_lst{j}.name)) - dup = [dup, j]; + dup = [dup, j]; endif endfor endfor @@ -1938,13 +1938,13 @@ names = cell (num_packages, 1); for i = 1:num_packages max_name_length = max (max_name_length, - length (installed_pkgs_lst{i}.name)); + length (installed_pkgs_lst{i}.name)); max_version_length = max (max_version_length, - length (installed_pkgs_lst{i}.version)); + length (installed_pkgs_lst{i}.version)); names{i} = installed_pkgs_lst{i}.name; endfor max_dir_length = terminal_size()(2) - max_name_length - ... - max_version_length - 7; + max_version_length - 7; if (max_dir_length < 20) max_dir_length = Inf; endif @@ -1962,7 +1962,7 @@ ## Print the packages. format = sprintf ("%%%ds %%1s| %%%ds | %%s\n", max_name_length, - max_version_length); + max_version_length); [dummy, idx] = sort (names); for i = 1:num_packages cur_name = installed_pkgs_lst{idx(i)}.name; @@ -1973,7 +1973,7 @@ first_filesep = strfind (cur_dir(first_char:end), filesep()); if (! isempty (first_filesep)) cur_dir = cstrcat ("...", - cur_dir((first_char + first_filesep(1) - 1):end)); + cur_dir((first_char + first_filesep(1) - 1):end)); else cur_dir = cstrcat ("...", cur_dir(first_char:end)); endif @@ -2006,7 +2006,7 @@ idx = []; for i = 1:length (installed_pkgs_lst) if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) - idx (end + 1) = i; + idx (end + 1) = i; endif endfor ## Load package_name1 ... @@ -2015,7 +2015,7 @@ for i = 1:length (files) idx2 = find (strcmp (pnames, files{i})); if (! any (idx2)) - error ("package %s is not installed", files{i}); + error ("package %s is not installed", files{i}); endif idx (end + 1) = idx2; endfor @@ -2051,9 +2051,9 @@ for i = 1:length (files) idx = strcmp (pnames, files{i}); if (! any (idx)) - error ("package %s is not installed", files{i}); + error ("package %s is not installed", files{i}); endif - dirs{end+1} = pdirs{idx}; + dirs{end+1} = pdirs{idx}; desc{end+1} = installed_pkgs_lst{idx}; endfor endif @@ -2132,14 +2132,14 @@ function arch = getarch () persistent _arch = cstrcat (octave_config_info("canonical_host_type"), ... - "-", octave_config_info("api_version")); + "-", octave_config_info("api_version")); arch = _arch; endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) archprefix = fullfile (octave_config_info ("libexecdir"), "octave", - "packages", cstrcat(desc.name, "-", desc.version)); + "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir; endif @@ -2184,7 +2184,7 @@ for i = 1 : length(desc) deps = desc{i}.depends; if (isempty (deps) || (length (deps) == 1 && - strcmp(deps{1}.package, "octave"))) + strcmp(deps{1}.package, "octave"))) newdesc {end + 1} = desc{i}; else tmpdesc = {}; @@ -2192,11 +2192,11 @@ for j = 1 : length (desc) if (strcmp (desc{j}.name, deps{k}.package)) tmpdesc{end+1} = desc{j}; - break; + break; endif endfor endfor - if (! isempty (tmpdesc)) + if (! isempty (tmpdesc)) newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; else newdesc{end+1} = desc{i}; @@ -2216,7 +2216,7 @@ endfunction function load_packages_and_dependencies (idx, handle_deps, installed_pkgs_lst, - global_install) + global_install) idx = load_package_dirs (idx, [], handle_deps, installed_pkgs_lst); dirs = {}; execpath = EXEC_PATH (); @@ -2249,24 +2249,24 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) for i = lidx if (isfield (installed_pkgs_lst{i}, "loaded") && - installed_pkgs_lst{i}.loaded) + installed_pkgs_lst{i}.loaded) continue; else if (handle_deps) deps = installed_pkgs_lst{i}.depends; if ((length (deps) > 1) || (length (deps) == 1 && - ! strcmp(deps{1}.package, "octave"))) + ! strcmp(deps{1}.package, "octave"))) tmplidx = []; for k = 1 : length (deps) for j = 1 : length (installed_pkgs_lst) if (strcmp (installed_pkgs_lst{j}.name, deps{k}.package)) tmplidx (end + 1) = j; - break; + break; endif endfor endfor idx = load_package_dirs (tmplidx, idx, handle_deps, - installed_pkgs_lst); + installed_pkgs_lst); endif endif if (isempty (find(idx == i))) @@ -2291,7 +2291,7 @@ pos = findstr (nm, ext); if (pos) if (! isglob && (length(nm) - pos(end) != length(ext) - 1)) - continue; + continue; endif dep = true; break;
--- a/scripts/plot/__gnuplot_get_var__.m +++ b/scripts/plot/__gnuplot_get_var__.m @@ -128,8 +128,8 @@ while (isempty (str)) str = char (fread (istream)'); if (isempty (str)) - sleep (0.05); - else + sleep (0.05); + else str = regexp (str, "OCTAVE:.*", "match"); str = str{end}(8:end); endif
--- a/scripts/plot/__gnuplot_ginput__.m +++ b/scripts/plot/__gnuplot_ginput__.m @@ -81,66 +81,66 @@ ## or Alt-F4. Further, this abrupt close also requires the leading ## "\n" on the next line. if (use_mkfifo) - fprintf (ostream, "set print \"%s\";\n", gpin_name); - fflush (ostream); - [gpin, err] = fopen (gpin_name, "r"); - if (err != 0) - error ("ginput: Can not open fifo (%s)", msg); - endif - fputs (ostream, "pause mouse any;\n\n"); - fputs (ostream, "\nif (exists(\"MOUSE_KEY\") && exists(\"MOUSE_X\")) print MOUSE_X, MOUSE_Y, MOUSE_KEY; else print \"0 0 -1\"\n"); + fprintf (ostream, "set print \"%s\";\n", gpin_name); + fflush (ostream); + [gpin, err] = fopen (gpin_name, "r"); + if (err != 0) + error ("ginput: Can not open fifo (%s)", msg); + endif + fputs (ostream, "pause mouse any;\n\n"); + fputs (ostream, "\nif (exists(\"MOUSE_KEY\") && exists(\"MOUSE_X\")) print MOUSE_X, MOUSE_Y, MOUSE_KEY; else print \"0 0 -1\"\n"); - ## Close output file, to force it to be flushed - fputs (ostream, "set print;\n"); - fflush (ostream); + ## Close output file, to force it to be flushed + fputs (ostream, "set print;\n"); + fflush (ostream); - ## Now read from fifo. - [x(k), y(k), button(k), count] = fscanf (gpin, "%f %f %d", "C"); - fclose (gpin); + ## Now read from fifo. + [x(k), y(k), button(k), count] = fscanf (gpin, "%f %f %d", "C"); + fclose (gpin); else - fprintf (ostream, "set print \"-\";\n"); - fflush (ostream); - fputs (ostream, "pause mouse any;\n\n"); - fputs (ostream, "\nif (exists(\"MOUSE_KEY\") && exists(\"MOUSE_X\")) print \"OCTAVE: \", MOUSE_X, MOUSE_Y, MOUSE_KEY; else print \"0 0 -1\"\n"); + fprintf (ostream, "set print \"-\";\n"); + fflush (ostream); + fputs (ostream, "pause mouse any;\n\n"); + fputs (ostream, "\nif (exists(\"MOUSE_KEY\") && exists(\"MOUSE_X\")) print \"OCTAVE: \", MOUSE_X, MOUSE_Y, MOUSE_KEY; else print \"0 0 -1\"\n"); - ## Close output file, to force it to be flushed - fputs (ostream, "set print;\n"); - fflush (ostream); + ## Close output file, to force it to be flushed + fputs (ostream, "set print;\n"); + fflush (ostream); - str = {}; - while (isempty (str)) - str = char (fread (istream)'); - if (isempty (str)) - sleep (0.05); - else - str = regexp (str, 'OCTAVE:\s+[\d.\+-]+\s+[\d.\+-]+\s+\d*', 'match'); - endif - fclear (istream); - endwhile + str = {}; + while (isempty (str)) + str = char (fread (istream)'); + if (isempty (str)) + sleep (0.05); + else + str = regexp (str, 'OCTAVE:\s+[\d.\+-]+\s+[\d.\+-]+\s+\d*', 'match'); + endif + fclear (istream); + endwhile [x(k), y(k), button(k), count] = sscanf (str{end}(8:end), "%f %f %d", "C"); endif if ([x(k), y(k), button(k)] == [0, 0, -1]) - ## Mousing not active (no plot yet). - break; + ## Mousing not active (no plot yet). + break; endif if (nargin > 1) - ## Input argument n was given => stop when k == n. - if (k == n) - break; - endif + ## Input argument n was given => stop when k == n. + if (k == n) + break; + endif else - ## Input argument n not given => stop when hitting a return key. - ## if (button(k) == 0x0D || button(k) == 0x0A) - ## ## hit Return or Enter - if (button(k) == 0x0D) - ## hit Return - x(k:end) = []; - y(k:end) = []; - button(k:end) = []; - break; - endif + ## Input argument n not given => stop when hitting a return key. + ## if (button(k) == 0x0D || button(k) == 0x0A) + ## ## hit Return or Enter + if (button(k) == 0x0D) + ## hit Return + x(k:end) = []; + y(k:end) = []; + button(k:end) = []; + break; + endif endif endwhile
--- a/scripts/plot/__go_draw_axes__.m +++ b/scripts/plot/__go_draw_axes__.m @@ -54,10 +54,10 @@ endif if (__gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) if (nd == 2) - x = [1, 1]; + x = [1, 1]; else - ## 3D plots need to be sized down to fit in the window. - x = 1.0 ./ sqrt([2, 2.5]); + ## 3D plots need to be sized down to fit in the window. + x = 1.0 ./ sqrt([2, 2.5]); endif fprintf (plot_stream, "set tmargin screen %.15g;\n", pos(2)+pos(4)/2+x(2)*pos(4)/2); fprintf (plot_stream, "set bmargin screen %.15g;\n", pos(2)+pos(4)/2-x(2)*pos(4)/2); @@ -94,18 +94,18 @@ if (! isempty (axis_obj.title)) t = get (axis_obj.title); if (isempty (t.string)) - fputs (plot_stream, "unset title;\n"); + fputs (plot_stream, "unset title;\n"); else - [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); - fontspec = create_fontspec (f, s, gnuplot_term); - fprintf (plot_stream, "set title \"%s\" %s %s", - undo_string_escapes (tt), fontspec, - __do_enhanced_option__ (enhanced, t)); - if (nd == 3 && __gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) - fprintf (plot_stream, " offset screen 0, screen %.3f;\n", pos(4)/5); - else - fprintf (plot_stream, ";\n"); - endif + [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); + fontspec = create_fontspec (f, s, gnuplot_term); + fprintf (plot_stream, "set title \"%s\" %s %s", + undo_string_escapes (tt), fontspec, + __do_enhanced_option__ (enhanced, t)); + if (nd == 3 && __gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) + fprintf (plot_stream, " offset screen 0, screen %.3f;\n", pos(4)/5); + else + fprintf (plot_stream, ";\n"); + endif endif endif @@ -114,26 +114,26 @@ angle = t.rotation; colorspec = get_text_colorspec (axis_obj.xcolor, mono); if (isempty (t.string)) - fprintf (plot_stream, "unset xlabel;\n"); - fprintf (plot_stream, "unset x2label;\n"); + fprintf (plot_stream, "unset xlabel;\n"); + fprintf (plot_stream, "unset x2label;\n"); else - [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); - fontspec = create_fontspec (f, s, gnuplot_term); - if (strcmpi (axis_obj.xaxislocation, "top")) - fprintf (plot_stream, "set x2label \"%s\" %s %s %s", - undo_string_escapes (tt), colorspec, fontspec, - __do_enhanced_option__ (enhanced, t)); - else - fprintf (plot_stream, "set xlabel \"%s\" %s %s %s", - undo_string_escapes (tt), colorspec, fontspec, - __do_enhanced_option__ (enhanced, t)); - endif - fprintf (plot_stream, " rotate by %f;\n", angle); - if (strcmpi (axis_obj.xaxislocation, "top")) - fprintf (plot_stream, "unset xlabel;\n"); - else - fprintf (plot_stream, "unset x2label;\n"); - endif + [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); + fontspec = create_fontspec (f, s, gnuplot_term); + if (strcmpi (axis_obj.xaxislocation, "top")) + fprintf (plot_stream, "set x2label \"%s\" %s %s %s", + undo_string_escapes (tt), colorspec, fontspec, + __do_enhanced_option__ (enhanced, t)); + else + fprintf (plot_stream, "set xlabel \"%s\" %s %s %s", + undo_string_escapes (tt), colorspec, fontspec, + __do_enhanced_option__ (enhanced, t)); + endif + fprintf (plot_stream, " rotate by %f;\n", angle); + if (strcmpi (axis_obj.xaxislocation, "top")) + fprintf (plot_stream, "unset xlabel;\n"); + else + fprintf (plot_stream, "unset x2label;\n"); + endif endif endif @@ -142,26 +142,26 @@ angle = t.rotation; colorspec = get_text_colorspec (axis_obj.ycolor, mono); if (isempty (t.string)) - fprintf (plot_stream, "unset ylabel;\n"); - fprintf (plot_stream, "unset y2label;\n"); + fprintf (plot_stream, "unset ylabel;\n"); + fprintf (plot_stream, "unset y2label;\n"); else - [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); - fontspec = create_fontspec (f, s, gnuplot_term); - if (strcmpi (axis_obj.yaxislocation, "right")) - fprintf (plot_stream, "set y2label \"%s\" %s %s %s", - undo_string_escapes (tt), colorspec, fontspec, - __do_enhanced_option__ (enhanced, t)); - else - fprintf (plot_stream, "set ylabel \"%s\" %s %s %s", - undo_string_escapes (tt), colorspec, fontspec, - __do_enhanced_option__ (enhanced, t)); - endif - fprintf (plot_stream, " rotate by %f;\n", angle); - if (strcmpi (axis_obj.yaxislocation, "right")) - fprintf (plot_stream, "unset ylabel;\n"); - else - fprintf (plot_stream, "unset y2label;\n"); - endif + [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); + fontspec = create_fontspec (f, s, gnuplot_term); + if (strcmpi (axis_obj.yaxislocation, "right")) + fprintf (plot_stream, "set y2label \"%s\" %s %s %s", + undo_string_escapes (tt), colorspec, fontspec, + __do_enhanced_option__ (enhanced, t)); + else + fprintf (plot_stream, "set ylabel \"%s\" %s %s %s", + undo_string_escapes (tt), colorspec, fontspec, + __do_enhanced_option__ (enhanced, t)); + endif + fprintf (plot_stream, " rotate by %f;\n", angle); + if (strcmpi (axis_obj.yaxislocation, "right")) + fprintf (plot_stream, "unset ylabel;\n"); + else + fprintf (plot_stream, "unset y2label;\n"); + endif endif endif @@ -170,14 +170,14 @@ angle = t.rotation; colorspec = get_text_colorspec (axis_obj.zcolor, mono); if (isempty (t.string)) - fputs (plot_stream, "unset zlabel;\n"); + fputs (plot_stream, "unset zlabel;\n"); else - [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); - fontspec = create_fontspec (f, s, gnuplot_term); - fprintf (plot_stream, "set zlabel \"%s\" %s %s %s", - undo_string_escapes (tt), colorspec, fontspec, - __do_enhanced_option__ (enhanced, t)); - fprintf (plot_stream, " rotate by %f;\n", angle); + [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); + fontspec = create_fontspec (f, s, gnuplot_term); + fprintf (plot_stream, "set zlabel \"%s\" %s %s %s", + undo_string_escapes (tt), colorspec, fontspec, + __do_enhanced_option__ (enhanced, t)); + fprintf (plot_stream, " rotate by %f;\n", angle); endif endif @@ -188,7 +188,7 @@ xaxisloc = "x"; xaxisloc_using = "x1"; if (strcmpi (axis_obj.xaxislocation, "zero")) - fputs (plot_stream, "set xzeroaxis;\n"); + fputs (plot_stream, "set xzeroaxis;\n"); endif endif if (strcmpi (axis_obj.yaxislocation, "right")) @@ -198,7 +198,7 @@ yaxisloc = "y"; yaxisloc_using = "y1"; if (strcmpi (axis_obj.yaxislocation, "zero")) - fputs (plot_stream, "set yzeroaxis;\n"); + fputs (plot_stream, "set yzeroaxis;\n"); endif endif @@ -228,9 +228,9 @@ if (strcmpi (axis_obj.xminorgrid, "on")) have_grid = true; if (strcmp (axis_obj.xscale, "log")) - m = 10; + m = 10; else - m = 5; + m = 5; endif fprintf (plot_stream, "set m%stics %d;\n", xaxisloc, m); fprintf (plot_stream, "set grid m%stics;\n", xaxisloc); @@ -241,9 +241,9 @@ if (strcmpi (axis_obj.yminorgrid, "on")) have_grid = true; if (strcmp (axis_obj.yscale, "log")) - m = 10; + m = 10; else - m = 5; + m = 5; endif fprintf (plot_stream, "set m%stics %d;\n", yaxisloc, m); fprintf (plot_stream, "set grid m%stics;\n", yaxisloc); @@ -254,9 +254,9 @@ if (strcmpi (axis_obj.zminorgrid, "on")) have_grid = true; if (strcmp (axis_obj.zscale, "log")) - m = 10; + m = 10; else - m = 5; + m = 5; endif fprintf (plot_stream, "set mztics %d;\n", m); fputs (plot_stream, "set grid mztics;\n"); @@ -337,7 +337,7 @@ [view_cmd, view_fcn, view_zoom] = image_viewer (); use_gnuplot_for_images = (ischar (view_fcn) - && strcmpi (view_fcn, "gnuplot_internal")); + && strcmpi (view_fcn, "gnuplot_internal")); ximg_data = {}; ximg_data_idx = 0; @@ -348,7 +348,7 @@ kids = kids(1:(end-1)); if (strcmpi (obj.visible, "off")) - continue; + continue; endif ## Check for facecolor interpolation for surfaces. @@ -356,366 +356,366 @@ isfield (obj, "facecolor") && strncmp (obj.facecolor, "interp", 6); switch (obj.type) - case "image" - img_data = obj.cdata; - img_xdata = obj.xdata; - img_ydata = obj.ydata; + case "image" + img_data = obj.cdata; + img_xdata = obj.xdata; + img_ydata = obj.ydata; - if (use_gnuplot_for_images) + if (use_gnuplot_for_images) - if (ndims (img_data) == 3) - truecolor = true; - elseif (strcmpi (obj.cdatamapping, "direct")) - cdatadirect = true; - endif - data_idx++; - is_image_data(data_idx) = true; - parametric(data_idx) = false; - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = false; + if (ndims (img_data) == 3) + truecolor = true; + elseif (strcmpi (obj.cdatamapping, "direct")) + cdatadirect = true; + endif + data_idx++; + is_image_data(data_idx) = true; + parametric(data_idx) = false; + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = false; - [y_dim, x_dim] = size (img_data(:,:,1)); - if (x_dim > 1) - dx = abs (img_xdata(2)-img_xdata(1))/(x_dim-1); - else - x_dim = 2; - img_data = [img_data, img_data]; - dx = abs (img_xdata(2)-img_xdata(1)); - endif - if (y_dim > 1) - dy = abs (img_ydata(2)-img_ydata(1))/(y_dim-1); - else - y_dim = 2; - img_data = [img_data; img_data]; - dy = abs (img_ydata(2)-img_ydata(1)); - endif - x_origin = min (img_xdata); - y_origin = min (img_ydata); + [y_dim, x_dim] = size (img_data(:,:,1)); + if (x_dim > 1) + dx = abs (img_xdata(2)-img_xdata(1))/(x_dim-1); + else + x_dim = 2; + img_data = [img_data, img_data]; + dx = abs (img_xdata(2)-img_xdata(1)); + endif + if (y_dim > 1) + dy = abs (img_ydata(2)-img_ydata(1))/(y_dim-1); + else + y_dim = 2; + img_data = [img_data; img_data]; + dy = abs (img_ydata(2)-img_ydata(1)); + endif + x_origin = min (img_xdata); + y_origin = min (img_ydata); - if (ndims (img_data) == 3) - data{data_idx} = permute (img_data, [3, 1, 2])(:); - format = "1:2:3"; - imagetype = "rgbimage"; - else - data{data_idx} = img_data(:); - format = "1"; - imagetype = "image"; - endif + if (ndims (img_data) == 3) + data{data_idx} = permute (img_data, [3, 1, 2])(:); + format = "1:2:3"; + imagetype = "rgbimage"; + else + data{data_idx} = img_data(:); + format = "1"; + imagetype = "image"; + endif - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = sprintf ("binary array=%dx%d scan=yx origin=(%.15g,%.15g) dx=%.15g dy=%.15g using %s", - x_dim, y_dim, x_origin, y_origin, dx, dy, format); - withclause{data_idx} = sprintf ("with %s;", imagetype); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = sprintf ("binary array=%dx%d scan=yx origin=(%.15g,%.15g) dx=%.15g dy=%.15g using %s", + x_dim, y_dim, x_origin, y_origin, dx, dy, format); + withclause{data_idx} = sprintf ("with %s;", imagetype); - else - ximg_data{++ximg_data_idx} = img_data; - endif + else + ximg_data{++ximg_data_idx} = img_data; + endif - case "line" - if (strncmp (obj.linestyle, "none", 4) - && (! isfield (obj, "marker") - || (isfield (obj, "marker") - && strncmp (obj.marker, "none", 4)))) - continue; - endif - data_idx++; - is_image_data(data_idx) = false; - parametric(data_idx) = true; - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = false; + case "line" + if (strncmp (obj.linestyle, "none", 4) + && (! isfield (obj, "marker") + || (isfield (obj, "marker") + && strncmp (obj.marker, "none", 4)))) + continue; + endif + data_idx++; + is_image_data(data_idx) = false; + parametric(data_idx) = true; + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = false; - if (isempty (obj.keylabel)) - titlespec{data_idx} = "title \"\""; - else - tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); - titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); - endif - usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); - errbars = ""; - if (nd == 3) - xdat = obj.xdata(:); - ydat = obj.ydata(:); - if (! isempty (obj.zdata)) - zdat = obj.zdata(:); - else - zdat = zeros (size (xdat)); - endif - data{data_idx} = [xdat, ydat, zdat]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", numel (xdat)); - ## fputs (plot_stream, "set parametric;\n"); - else - xdat = obj.xdata(:); - ydat = obj.ydata(:); - ldat = obj.ldata; - yerr = xerr = false; - if (! isempty (ldat)) - yerr = true; - ldat = ldat(:); - endif - udat = obj.udata; - if (! isempty (udat)) - udat = udat(:); - endif - xldat = obj.xldata; - if (! isempty (xldat)) - xerr = true; - xldat = xldat(:); - endif - xudat = obj.xudata; - if (! isempty (xudat)) - xudat = xudat(:); - endif - if (yerr) - if (isempty (ldat)) - ylo = ydat; - else - ylo = ydat-ldat; - endif - if (isempty (udat)) - yhi = ydat; - else - yhi = ydat+udat; - endif - if (xerr) - if (isempty (xldat)) - xlo = xdat; - else - xlo = xdat-xldat; - endif - if (isempty (xudat)) - xhi = xdat; - else - xhi = xdat+xudat; - endif - data{data_idx} = [xdat, ydat, xlo, xhi, ylo, yhi]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4):($5):($6)", numel (xdat)); - errbars = "xyerrorbars"; - else - data{data_idx} = [xdat, ydat, ylo, yhi]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); - errbars = "yerrorbars"; - endif - elseif (xerr) - if (isempty (xldat)) - xlo = xdat; - else - xlo = xdat-xldat; - endif - if (isempty (xudat)) - xhi = xdat; - else - xhi = xdat+xudat; - endif - data{data_idx} = [xdat, ydat, xlo, xhi]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); - errbars = "xerrorbars"; - else - data{data_idx} = [xdat, ydat]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2) axes %s%s", - rows(xdat), xaxisloc_using, yaxisloc_using); - endif - endif + if (isempty (obj.keylabel)) + titlespec{data_idx} = "title \"\""; + else + tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); + titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); + endif + usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); + errbars = ""; + if (nd == 3) + xdat = obj.xdata(:); + ydat = obj.ydata(:); + if (! isempty (obj.zdata)) + zdat = obj.zdata(:); + else + zdat = zeros (size (xdat)); + endif + data{data_idx} = [xdat, ydat, zdat]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", numel (xdat)); + ## fputs (plot_stream, "set parametric;\n"); + else + xdat = obj.xdata(:); + ydat = obj.ydata(:); + ldat = obj.ldata; + yerr = xerr = false; + if (! isempty (ldat)) + yerr = true; + ldat = ldat(:); + endif + udat = obj.udata; + if (! isempty (udat)) + udat = udat(:); + endif + xldat = obj.xldata; + if (! isempty (xldat)) + xerr = true; + xldat = xldat(:); + endif + xudat = obj.xudata; + if (! isempty (xudat)) + xudat = xudat(:); + endif + if (yerr) + if (isempty (ldat)) + ylo = ydat; + else + ylo = ydat-ldat; + endif + if (isempty (udat)) + yhi = ydat; + else + yhi = ydat+udat; + endif + if (xerr) + if (isempty (xldat)) + xlo = xdat; + else + xlo = xdat-xldat; + endif + if (isempty (xudat)) + xhi = xdat; + else + xhi = xdat+xudat; + endif + data{data_idx} = [xdat, ydat, xlo, xhi, ylo, yhi]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4):($5):($6)", numel (xdat)); + errbars = "xyerrorbars"; + else + data{data_idx} = [xdat, ydat, ylo, yhi]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); + errbars = "yerrorbars"; + endif + elseif (xerr) + if (isempty (xldat)) + xlo = xdat; + else + xlo = xdat-xldat; + endif + if (isempty (xudat)) + xhi = xdat; + else + xhi = xdat+xudat; + endif + data{data_idx} = [xdat, ydat, xlo, xhi]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); + errbars = "xerrorbars"; + else + data{data_idx} = [xdat, ydat]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2) axes %s%s", + rows(xdat), xaxisloc_using, yaxisloc_using); + endif + endif - style = do_linestyle_command (obj, obj.color, data_idx, mono, - plot_stream, errbars); + style = do_linestyle_command (obj, obj.color, data_idx, mono, + plot_stream, errbars); withclause{data_idx} = sprintf ("with %s linestyle %d", - style{1}, data_idx); + style{1}, data_idx); - if (length (style) > 1) - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = have_cdata(data_idx - 1); - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = usingclause{data_idx - 1}; - data{data_idx} = data{data_idx - 1}; - withclause{data_idx} = sprintf ("with %s linestyle %d", - style{2}, data_idx); - endif - if (length (style) > 2) - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = have_cdata(data_idx - 1); - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = usingclause{data_idx - 1}; - data{data_idx} = data{data_idx - 1}; - withclause{data_idx} = sprintf ("with %s linestyle %d", - style{3}, data_idx); - endif + if (length (style) > 1) + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = have_cdata(data_idx - 1); + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = usingclause{data_idx - 1}; + data{data_idx} = data{data_idx - 1}; + withclause{data_idx} = sprintf ("with %s linestyle %d", + style{2}, data_idx); + endif + if (length (style) > 2) + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = have_cdata(data_idx - 1); + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = usingclause{data_idx - 1}; + data{data_idx} = data{data_idx - 1}; + withclause{data_idx} = sprintf ("with %s linestyle %d", + style{3}, data_idx); + endif case "patch" cmap = parent_figure_obj.colormap; - [nr, nc] = size (obj.xdata); - - if (! isempty (obj.cdata)) - cdat = obj.cdata; - if (strcmpi (obj.cdatamapping, "direct")) - cdatadirect = true; - endif - else - cdat = []; - endif + [nr, nc] = size (obj.xdata); - data_3d_idx = NaN; - for i = 1:nc - xcol = obj.xdata(:,i); - ycol = obj.ydata(:,i); - if (nd == 3) - if (! isempty (obj.zdata)) - zcol = obj.zdata(:,i); - else - zcol = zeros (size (xcol)); - endif - endif - - if (! isnan (xcol) && ! isnan (ycol)) - ## Is the patch closed or not - if (strncmp (obj.facecolor, "none", 4)) - hidden_removal = false; - else + if (! isempty (obj.cdata)) + cdat = obj.cdata; + if (strcmpi (obj.cdatamapping, "direct")) + cdatadirect = true; + endif + else + cdat = []; + endif - if (isnan (hidden_removal)) - hidden_removal = true; - endif - if (nd == 3) - if (numel (xcol) > 3) - error ("gnuplot (as of v4.2) only supports 3D filled triangular patches"); - else - if (isnan (data_3d_idx)) - data_idx++; - data_3d_idx = data_idx; - is_image_data(data_idx) = false; - parametric(data_idx) = false; - have_cdata(data_idx) = true; - have_3d_patch(data_idx) = true; - withclause{data_3d_idx} = sprintf ("with pm3d"); - usingclause{data_3d_idx} = "using 1:2:3:4"; - data{data_3d_idx} = []; - endif - local_idx = data_3d_idx; - ccdat = NaN; - endif - else - data_idx++; - local_idx = data_idx; - is_image_data(data_idx) = false; - parametric(data_idx) = false; - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = false; - endif + data_3d_idx = NaN; + for i = 1:nc + xcol = obj.xdata(:,i); + ycol = obj.ydata(:,i); + if (nd == 3) + if (! isempty (obj.zdata)) + zcol = obj.zdata(:,i); + else + zcol = zeros (size (xcol)); + endif + endif + + if (! isnan (xcol) && ! isnan (ycol)) + ## Is the patch closed or not + if (strncmp (obj.facecolor, "none", 4)) + hidden_removal = false; + else - if (i > 1 || isempty (obj.keylabel)) - titlespec{local_idx} = "title \"\""; - else - tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); - titlespec{local_idx} = cstrcat ("title \"", tmp, "\""); - endif - if (isfield (obj, "facecolor")) - if ((strncmp (obj.facecolor, "flat", 4) - || strncmp (obj.facecolor, "interp", 6)) - && isfield (obj, "cdata")) - if (ndims (obj.cdata) == 2 - && (size (obj.cdata, 2) == nc - && (size (obj.cdata, 1) == 1 - || size (obj.cdata, 1) == 3))) - ccol = cdat (:, i); - elseif (ndims (obj.cdata) == 2 - && (size (obj.cdata, 1) == nc - && (size (obj.cdata, 2) == 1 - || size (obj.cdata, 2) == 3))) - ccol = cdat (i, :); - elseif (ndims (obj.cdata) == 3) - ccol = permute (cdat (:, i, :), [1, 3, 2]); - else - ccol = cdat; - endif - if (strncmp (obj.facecolor, "flat", 4)) - if (numel(ccol) == 3) - color = ccol; - elseif (nd == 3 && numel (xcol) == 3) - ccdat = ccol * ones (3,1); - else - r = 1 + round ((size (cmap, 1) - 1) - * (ccol - clim(1))/(clim(2) - clim(1))); - r = max (1, min (r, size (cmap, 1))); - color = cmap(r, :); - endif - elseif (strncmp (obj.facecolor, "interp", 6)) - if (nd == 3 && numel (xcol) == 3) - ccdat = ccol; - if (! isvector (ccdat)) - tmp = rows(cmap) + rows(addedcmap) + ... - [1 : rows(ccdat)]; - addedcmap = [addedcmap; ccdat]; - ccdat = tmp(:); - else - ccdat = ccdat(:); - endif - else - warning ("\"interp\" not supported, using 1st entry of cdata"); - r = 1 + round ((size (cmap, 1) - 1) * ccol(1)); - r = max (1, min (r, size (cmap, 1))); - color = cmap(r,:); - endif - endif - elseif (isnumeric (obj.facecolor)) - color = obj.facecolor; - else - color = [0, 1, 0]; - endif + if (isnan (hidden_removal)) + hidden_removal = true; + endif + if (nd == 3) + if (numel (xcol) > 3) + error ("gnuplot (as of v4.2) only supports 3D filled triangular patches"); + else + if (isnan (data_3d_idx)) + data_idx++; + data_3d_idx = data_idx; + is_image_data(data_idx) = false; + parametric(data_idx) = false; + have_cdata(data_idx) = true; + have_3d_patch(data_idx) = true; + withclause{data_3d_idx} = sprintf ("with pm3d"); + usingclause{data_3d_idx} = "using 1:2:3:4"; + data{data_3d_idx} = []; + endif + local_idx = data_3d_idx; + ccdat = NaN; + endif else - color = [0, 1, 0]; + data_idx++; + local_idx = data_idx; + is_image_data(data_idx) = false; + parametric(data_idx) = false; + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = false; endif - if (nd == 3 && numel (xcol) == 3) - if (isnan (ccdat)) - ccdat = (rows (cmap) + rows(addedcmap) + 1) * ones(3, 1); - addedcmap = [addedcmap; reshape(color, 1, 3)]; - endif - data{data_3d_idx} = [data{data_3d_idx}, ... - [[xcol; xcol(end)], [ycol; ycol(end)], ... - [zcol; zcol(end)], [ccdat; ccdat(end)]]']; - else - if (mono) - colorspec = ""; - elseif (__gnuplot_has_feature__ ("transparent_patches") - && isscalar (obj.facealpha)) + if (i > 1 || isempty (obj.keylabel)) + titlespec{local_idx} = "title \"\""; + else + tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); + titlespec{local_idx} = cstrcat ("title \"", tmp, "\""); + endif + if (isfield (obj, "facecolor")) + if ((strncmp (obj.facecolor, "flat", 4) + || strncmp (obj.facecolor, "interp", 6)) + && isfield (obj, "cdata")) + if (ndims (obj.cdata) == 2 + && (size (obj.cdata, 2) == nc + && (size (obj.cdata, 1) == 1 + || size (obj.cdata, 1) == 3))) + ccol = cdat (:, i); + elseif (ndims (obj.cdata) == 2 + && (size (obj.cdata, 1) == nc + && (size (obj.cdata, 2) == 1 + || size (obj.cdata, 2) == 3))) + ccol = cdat (i, :); + elseif (ndims (obj.cdata) == 3) + ccol = permute (cdat (:, i, :), [1, 3, 2]); + else + ccol = cdat; + endif + if (strncmp (obj.facecolor, "flat", 4)) + if (numel(ccol) == 3) + color = ccol; + elseif (nd == 3 && numel (xcol) == 3) + ccdat = ccol * ones (3,1); + else + r = 1 + round ((size (cmap, 1) - 1) + * (ccol - clim(1))/(clim(2) - clim(1))); + r = max (1, min (r, size (cmap, 1))); + color = cmap(r, :); + endif + elseif (strncmp (obj.facecolor, "interp", 6)) + if (nd == 3 && numel (xcol) == 3) + ccdat = ccol; + if (! isvector (ccdat)) + tmp = rows(cmap) + rows(addedcmap) + ... + [1 : rows(ccdat)]; + addedcmap = [addedcmap; ccdat]; + ccdat = tmp(:); + else + ccdat = ccdat(:); + endif + else + warning ("\"interp\" not supported, using 1st entry of cdata"); + r = 1 + round ((size (cmap, 1) - 1) * ccol(1)); + r = max (1, min (r, size (cmap, 1))); + color = cmap(r,:); + endif + endif + elseif (isnumeric (obj.facecolor)) + color = obj.facecolor; + else + color = [0, 1, 0]; + endif + else + color = [0, 1, 0]; + endif + + if (nd == 3 && numel (xcol) == 3) + if (isnan (ccdat)) + ccdat = (rows (cmap) + rows(addedcmap) + 1) * ones(3, 1); + addedcmap = [addedcmap; reshape(color, 1, 3)]; + endif + data{data_3d_idx} = [data{data_3d_idx}, ... + [[xcol; xcol(end)], [ycol; ycol(end)], ... + [zcol; zcol(end)], [ccdat; ccdat(end)]]']; + else + if (mono) + colorspec = ""; + elseif (__gnuplot_has_feature__ ("transparent_patches") + && isscalar (obj.facealpha)) colorspec = sprintf ("lc rgb \"#%02x%02x%02x\" fillstyle transparent solid %f", - round (255*color), obj.facealpha); - else - colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", - round (255*color)); - endif + round (255*color), obj.facealpha); + else + colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", + round (255*color)); + endif - withclause{data_idx} = sprintf ("with filledcurve %s", - colorspec); - data{data_idx} = [xcol, ycol]'; - usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", - numel (xcol)); - endif - endif - endif + withclause{data_idx} = sprintf ("with filledcurve %s", + colorspec); + data{data_idx} = [xcol, ycol]'; + usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", + numel (xcol)); + endif + endif + endif ## patch outline - if (!(strncmp (obj.edgecolor, "none", 4) + if (!(strncmp (obj.edgecolor, "none", 4) && strncmp (obj.markeredgecolor, "none", 4) && strncmp (obj.markerfacecolor, "none", 4))) - data_idx++; + data_idx++; is_image_data(data_idx) = false; parametric(data_idx) = false; - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = false; + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = false; titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); + usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); - if (isfield (obj, "markersize")) - mdat = obj.markersize / 3; - endif + if (isfield (obj, "markersize")) + mdat = obj.markersize / 3; + endif if (isfield (obj, "edgecolor")) ## FIXME @@ -724,7 +724,7 @@ ## treat them seperately. However, the below allow the scatter ## functions to work as expected, where only one of these values ## is set - if (strncmp (obj.edgecolor, "none", 4)) + if (strncmp (obj.edgecolor, "none", 4)) if (strncmp (obj.markeredgecolor, "none", 4)) ec = obj.markerfacecolor; else @@ -734,139 +734,139 @@ ec = obj.edgecolor; endif - if ((strncmp (ec, "flat", 4) - || strncmp (ec, "interp", 6)) - && isfield (obj, "cdata")) - if (ndims (obj.cdata) == 2 - && (size (obj.cdata, 2) == nc - && (size (obj.cdata, 1) == 1 - || size (obj.cdata, 1) == 3))) - ccol = cdat (:, i); - elseif (ndims (obj.cdata) == 2 - && (size (obj.cdata, 1) == nc - && (size (obj.cdata, 2) == 1 - || size (obj.cdata, 2) == 3))) - ccol = cdat (i, :); - elseif (ndims (obj.cdata) == 3) - ccol = permute (cdat (:, i, :), [1, 3, 2]); - else - ccol = cdat; - endif - if (strncmp (ec, "flat", 4)) - if (numel(ccol) == 3) - color = ccol; - else + if ((strncmp (ec, "flat", 4) + || strncmp (ec, "interp", 6)) + && isfield (obj, "cdata")) + if (ndims (obj.cdata) == 2 + && (size (obj.cdata, 2) == nc + && (size (obj.cdata, 1) == 1 + || size (obj.cdata, 1) == 3))) + ccol = cdat (:, i); + elseif (ndims (obj.cdata) == 2 + && (size (obj.cdata, 1) == nc + && (size (obj.cdata, 2) == 1 + || size (obj.cdata, 2) == 3))) + ccol = cdat (i, :); + elseif (ndims (obj.cdata) == 3) + ccol = permute (cdat (:, i, :), [1, 3, 2]); + else + ccol = cdat; + endif + if (strncmp (ec, "flat", 4)) + if (numel(ccol) == 3) + color = ccol; + else if (isscalar (ccol)) ccol = repmat(ccol, numel (xcol), 1); endif color = "flat"; - have_cdata(data_idx) = true; - endif - elseif (strncmp (ec, "interp", 6)) - if (numel(ccol) == 3) - warning ("\"interp\" not supported, using 1st entry of cdata"); - color = ccol(1,:); - else + have_cdata(data_idx) = true; + endif + elseif (strncmp (ec, "interp", 6)) + if (numel(ccol) == 3) + warning ("\"interp\" not supported, using 1st entry of cdata"); + color = ccol(1,:); + else if (isscalar (ccol)) ccol = repmat(ccol, numel (xcol), 1); endif color = "interp"; - have_cdata(data_idx) = true; + have_cdata(data_idx) = true; endif - endif - elseif (isnumeric (ec)) - color = ec; - else - color = [0, 0, 0]; - endif + endif + elseif (isnumeric (ec)) + color = ec; + else + color = [0, 0, 0]; + endif else - color = [0, 0, 0]; + color = [0, 0, 0]; + endif + + if (isfield (obj, "linestyle")) + switch (obj.linestyle) + case "-" + lt = "lt 1"; + case "--" + lt = "lt 2"; + case ":" + lt = "lt 3"; + case "-." + lt = "lt 6"; + case "none" + lt = ""; + otherwise + lt = ""; + endswitch + else + lt = ""; + endif + + if (isfield (obj, "linewidth")) + lw = sprintf("linewidth %f", obj.linewidth); + else + lw = ""; endif - if (isfield (obj, "linestyle")) - switch (obj.linestyle) - case "-" - lt = "lt 1"; - case "--" - lt = "lt 2"; - case ":" - lt = "lt 3"; - case "-." - lt = "lt 6"; - case "none" - lt = ""; - otherwise - lt = ""; - endswitch - else - lt = ""; - endif - - if (isfield (obj, "linewidth")) - lw = sprintf("linewidth %f", obj.linewidth); - else - lw = ""; - endif - - if (isfield (obj, "marker")) - if (isfield (obj, "marker")) - switch (obj.marker) - case "+" - pt = pt2 = "pt 1"; - case "o" - pt = "pt 6"; + if (isfield (obj, "marker")) + if (isfield (obj, "marker")) + switch (obj.marker) + case "+" + pt = pt2 = "pt 1"; + case "o" + pt = "pt 6"; pt2 = "pt 7"; - case "*" - pt = pt2 = "pt 3"; - case "." - pt = pt2 = "pt 0"; - case "x" - pt = pt2 = "pt 2"; - case {"square", "s"} - pt = "pt 4"; - pt2 = "pt 5"; - case {"diamond", "d"} - pt = "pt 13"; - pt2 = "pt 14"; - case "^" - pt = "pt 8"; - pt2 = "pt 9"; - case "v" - pt = "pt 10"; - pt2 = "pt 11"; - case ">" - ## FIXME missing point type - pt = "pt 8"; - pt2 = "pt 9"; - case "<" - ## FIXME missing point type - pt = "pt 10"; - pt2 = "pt 11"; - case {"pentagram", "p"} - ## FIXME missing point type - pt = pt2 = "pt 3"; - case {"hexagram", "h"} - pt = pt2 = "pt 3"; - case "none" - pt = pt2 = ""; - otherwise - pt = pt2 = ""; - endswitch - endif - else - pt = pt2 = ""; - endif + case "*" + pt = pt2 = "pt 3"; + case "." + pt = pt2 = "pt 0"; + case "x" + pt = pt2 = "pt 2"; + case {"square", "s"} + pt = "pt 4"; + pt2 = "pt 5"; + case {"diamond", "d"} + pt = "pt 13"; + pt2 = "pt 14"; + case "^" + pt = "pt 8"; + pt2 = "pt 9"; + case "v" + pt = "pt 10"; + pt2 = "pt 11"; + case ">" + ## FIXME missing point type + pt = "pt 8"; + pt2 = "pt 9"; + case "<" + ## FIXME missing point type + pt = "pt 10"; + pt2 = "pt 11"; + case {"pentagram", "p"} + ## FIXME missing point type + pt = pt2 = "pt 3"; + case {"hexagram", "h"} + pt = pt2 = "pt 3"; + case "none" + pt = pt2 = ""; + otherwise + pt = pt2 = ""; + endswitch + endif + else + pt = pt2 = ""; + endif - if (mono) - colorspec = ""; - else + if (mono) + colorspec = ""; + else if (ischar (color)) colorspec = "palette"; else - colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", - round (255*color)); + colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", + round (255*color)); endif - endif + endif sidx = 1; if (isempty (lt)) @@ -878,114 +878,114 @@ facesame = true; if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") - && !strncmp (obj.markerfacecolor, "none", 4)) + && !strncmp (obj.markerfacecolor, "none", 4)) if (strncmp (obj.markerfacecolor, "auto", 4) - || ! isnumeric (obj.markerfacecolor) - || (isnumeric (obj.markerfacecolor) - && isequal (color, obj.markerfacecolor))) - style = strcat (style, "points"); - if (isfield (obj, "markersize")) - if (length (mdat) == nc) - m = mdat(i); - else - m = mdat; - endif - ps = sprintf("pointsize %f", m / 3); + || ! isnumeric (obj.markerfacecolor) + || (isnumeric (obj.markerfacecolor) + && isequal (color, obj.markerfacecolor))) + style = strcat (style, "points"); + if (isfield (obj, "markersize")) + if (length (mdat) == nc) + m = mdat(i); + else + m = mdat; + endif + ps = sprintf("pointsize %f", m / 3); else ps = ""; - endif + endif - tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", - style, lw, pt2, lt, ps, - colorspec); + tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", + style, lw, pt2, lt, ps, + colorspec); else - facesame = false; - if (! isempty (style)) - tmpwith{sidx} = sprintf ("with %s %s %s %s", - style, lw, lt, - colorspec); - sidx ++; - endif - if (isnumeric (obj.markerfacecolor) && ! mono) - colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", - round (255*obj.markerfacecolor)); - endif - style = "points"; - if (isfield (obj, "markersize")) - if (length (mdat) == nc) - m = mdat(i); - else - m = mdat; - endif - ps = sprintf("pointsize %f", m / 3); + facesame = false; + if (! isempty (style)) + tmpwith{sidx} = sprintf ("with %s %s %s %s", + style, lw, lt, + colorspec); + sidx ++; + endif + if (isnumeric (obj.markerfacecolor) && ! mono) + colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", + round (255*obj.markerfacecolor)); + endif + style = "points"; + if (isfield (obj, "markersize")) + if (length (mdat) == nc) + m = mdat(i); + else + m = mdat; + endif + ps = sprintf("pointsize %f", m / 3); else ps = ""; - endif - tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", - style, lw, pt2, lt, ps, - colorspec); + endif + tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", + style, lw, pt2, lt, ps, + colorspec); endif endif if (isfield (obj, "markeredgecolor") - && !strncmp (obj.markeredgecolor, "none", 4)) + && !strncmp (obj.markeredgecolor, "none", 4)) if (facesame && !isempty (pt) && (strncmp (obj.markeredgecolor, "auto", 4) - || ! isnumeric (obj.markeredgecolor) - || (isnumeric (obj.markeredgecolor) - && isequal (color, obj.markeredgecolor)))) - if (sidx == 1 && ((length (style) == 5 - && strncmp (style, "lines", 5)) + || ! isnumeric (obj.markeredgecolor) + || (isnumeric (obj.markeredgecolor) + && isequal (color, obj.markeredgecolor)))) + if (sidx == 1 && ((length (style) == 5 + && strncmp (style, "lines", 5)) || isempty (style))) - style = strcat (style, "points"); - if (isfield (obj, "markersize")) - if (length (mdat) == nc) - m = mdat(i); - else - m = mdat; - endif - ps = sprintf("pointsize %f", m / 3); + style = strcat (style, "points"); + if (isfield (obj, "markersize")) + if (length (mdat) == nc) + m = mdat(i); + else + m = mdat; + endif + ps = sprintf("pointsize %f", m / 3); else ps = ""; - endif - tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", - style, lw, pt, lt, ps, - colorspec); - endif + endif + tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", + style, lw, pt, lt, ps, + colorspec); + endif else - if (!isempty (style)) + if (!isempty (style)) if (length(tmpwith) < sidx || isempty (tmpwith{sidx})) - tmpwith{sidx} = sprintf ("with %s %s %s %s", - style, lw, lt, - colorspec); + tmpwith{sidx} = sprintf ("with %s %s %s %s", + style, lw, lt, + colorspec); endif - sidx ++; - endif + sidx ++; + endif if (!isempty (pt)) - if (! mono) - if (strncmp (obj.markeredgecolor, "auto", 4)) - colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", - round (255*color)); - elseif (isnumeric (obj.markeredgecolor) && ! mono) - colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", - round (255*obj.markeredgecolor)); - endif - endif - style = "points"; - if (isfield (obj, "markersize")) - if (length (mdat) == nc) - m = mdat(i); - else - m = mdat; - endif - ps = sprintf("pointsize %f", m / 3); + if (! mono) + if (strncmp (obj.markeredgecolor, "auto", 4)) + colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", + round (255*color)); + elseif (isnumeric (obj.markeredgecolor) && ! mono) + colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", + round (255*obj.markeredgecolor)); + endif + endif + style = "points"; + if (isfield (obj, "markersize")) + if (length (mdat) == nc) + m = mdat(i); + else + m = mdat; + endif + ps = sprintf("pointsize %f", m / 3); else ps = ""; - endif - tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", - style, lw, pt, lt, ps, - colorspec); + endif + tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", + style, lw, pt, lt, ps, + colorspec); endif endif endif @@ -995,183 +995,183 @@ style, lw, pt, lt, colorspec); else - withclause{data_idx} = tmpwith{1}; + withclause{data_idx} = tmpwith{1}; endif - if (nd == 3) + if (nd == 3) if (ischar (color)) - if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) - data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... - [zcol; zcol(1)], [ccol; ccol(1)]]'; - else - data{data_idx} = [xcol, ycol, zcol, ccol]'; - endif - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", columns (data{data_idx})); + if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) + data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... + [zcol; zcol(1)], [ccol; ccol(1)]]'; + else + data{data_idx} = [xcol, ycol, zcol, ccol]'; + endif + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", columns (data{data_idx})); else - if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) - data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... - [zcol; zcol(1)]]'; - else - data{data_idx} = [xcol, ycol, zcol]'; - endif - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); + if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) + data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... + [zcol; zcol(1)]]'; + else + data{data_idx} = [xcol, ycol, zcol]'; + endif + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); endif - else + else if (ischar (color)) - if (! isnan (xcol) && ! isnan (ycol)) - data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... + if (! isnan (xcol) && ! isnan (ycol)) + data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... [ccol; ccol(1)]]'; - else - data{data_idx} = [xcol, ycol, ccol]'; - endif - usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); + else + data{data_idx} = [xcol, ycol, ccol]'; + endif + usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); else - if (! isnan (xcol) && ! isnan (ycol)) - data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)]]'; - else - data{data_idx} = [xcol, ycol]'; - endif - usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", columns (data{data_idx})); + if (! isnan (xcol) && ! isnan (ycol)) + data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)]]'; + else + data{data_idx} = [xcol, ycol]'; + endif + usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", columns (data{data_idx})); endif - endif + endif - if (length (tmpwith) > 1) - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = have_cdata(data_idx - 1); - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = usingclause{data_idx - 1}; - data{data_idx} = data{data_idx - 1}; - withclause{data_idx} = tmpwith{2}; - endif - if (length (tmpwith) > 2) - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = have_cdata(data_idx - 1); - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = usingclause{data_idx - 1}; - data{data_idx} = data{data_idx - 1}; - withclause{data_idx} = tmpwith{3}; - endif - endif - endfor + if (length (tmpwith) > 1) + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = have_cdata(data_idx - 1); + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = usingclause{data_idx - 1}; + data{data_idx} = data{data_idx - 1}; + withclause{data_idx} = tmpwith{2}; + endif + if (length (tmpwith) > 2) + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = have_cdata(data_idx - 1); + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = usingclause{data_idx - 1}; + data{data_idx} = data{data_idx - 1}; + withclause{data_idx} = tmpwith{3}; + endif + endif + endfor - case "surface" - view_map = true; + case "surface" + view_map = true; if (! (strncmp (obj.edgecolor, "none", 4) - && strncmp (obj.facecolor, "none", 4))) - data_idx++; - is_image_data(data_idx) = false; - parametric(data_idx) = false; - have_cdata(data_idx) = true; - have_3d_patch(data_idx) = false; - style = do_linestyle_command (obj, obj.edgecolor, - data_idx, mono, - plot_stream); - if (isempty (obj.keylabel)) - titlespec{data_idx} = "title \"\""; - else - tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); - titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); - endif - withclause{data_idx} = sprintf ("with pm3d linestyle %d", - data_idx); - withpm3d = true; - pm3didx = data_idx; + && strncmp (obj.facecolor, "none", 4))) + data_idx++; + is_image_data(data_idx) = false; + parametric(data_idx) = false; + have_cdata(data_idx) = true; + have_3d_patch(data_idx) = false; + style = do_linestyle_command (obj, obj.edgecolor, + data_idx, mono, + plot_stream); + if (isempty (obj.keylabel)) + titlespec{data_idx} = "title \"\""; + else + tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); + titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); + endif + withclause{data_idx} = sprintf ("with pm3d linestyle %d", + data_idx); + withpm3d = true; + pm3didx = data_idx; - xdat = obj.xdata; - ydat = obj.ydata; - zdat = obj.zdata; - cdat = obj.cdata; + xdat = obj.xdata; + ydat = obj.ydata; + zdat = obj.zdata; + cdat = obj.cdata; - err = false; + err = false; if (! size_equal(zdat, cdat)) err = true; endif - if (isvector (xdat) && isvector (ydat) && ismatrix (zdat)) - if (rows (zdat) == length (ydat) - && columns (zdat) == length (xdat)) + if (isvector (xdat) && isvector (ydat) && ismatrix (zdat)) + if (rows (zdat) == length (ydat) + && columns (zdat) == length (xdat)) [xdat, ydat] = meshgrid (xdat, ydat); - else + else err = true; - endif - elseif (ismatrix (xdat) && ismatrix (ydat) && ismatrix (zdat)) - if (! size_equal (xdat, ydat, zdat)) + endif + elseif (ismatrix (xdat) && ismatrix (ydat) && ismatrix (zdat)) + if (! size_equal (xdat, ydat, zdat)) err = true; - endif - else - err = true; - endif - if (err) - error ("__go_draw_axes__: invalid grid data"); - endif - xlen = columns (zdat); - ylen = rows (zdat); - if (xlen == columns (xdat) && xlen == columns (ydat) - && ylen == rows (xdat) && ylen == rows (ydat)) - len = 4 * xlen; - zz = zeros (ylen, len); - k = 1; - for kk = 1:4:len - zz(:,kk) = xdat(:,k); - zz(:,kk+1) = ydat(:,k); - zz(:,kk+2) = zdat(:,k); - zz(:,kk+3) = cdat(:,k); - k++; - endfor - data{data_idx} = zz.'; - endif + endif + else + err = true; + endif + if (err) + error ("__go_draw_axes__: invalid grid data"); + endif + xlen = columns (zdat); + ylen = rows (zdat); + if (xlen == columns (xdat) && xlen == columns (ydat) + && ylen == rows (xdat) && ylen == rows (ydat)) + len = 4 * xlen; + zz = zeros (ylen, len); + k = 1; + for kk = 1:4:len + zz(:,kk) = xdat(:,k); + zz(:,kk+1) = ydat(:,k); + zz(:,kk+2) = zdat(:,k); + zz(:,kk+3) = cdat(:,k); + k++; + endfor + data{data_idx} = zz.'; + endif - if (doing_interp_color) - interp_str = "interpolate 0, 0"; - else - ## No interpolation of facecolors. - interp_str = ""; - endif - usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3):($4)", ylen, xlen); + if (doing_interp_color) + interp_str = "interpolate 0, 0"; + else + ## No interpolation of facecolors. + interp_str = ""; + endif + usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3):($4)", ylen, xlen); flat_interp_face = (strncmp (obj.facecolor, "flat", 4) - || strncmp (obj.facecolor, "interp", 6)); + || strncmp (obj.facecolor, "interp", 6)); flat_interp_edge = (strncmp (obj.edgecolor, "flat", 4) - || strncmp (obj.edgecolor, "interp", 6)); + || strncmp (obj.edgecolor, "interp", 6)); - facecolor_none_or_white = (strncmp (obj.facecolor, "none", 4) - || (isnumeric (obj.facecolor) - && all (obj.facecolor == 1))); - hidden_removal = false; + facecolor_none_or_white = (strncmp (obj.facecolor, "none", 4) + || (isnumeric (obj.facecolor) + && all (obj.facecolor == 1))); + hidden_removal = false; fputs (plot_stream, "set style increment default;\n"); if (flat_interp_edge && facecolor_none_or_white) - withpm3d = false; - withclause{data_idx} = sprintf ("with %s palette", style {1}); - fputs (plot_stream, "unset pm3d\n"); - if (all (obj.facecolor == 1)) + withpm3d = false; + withclause{data_idx} = sprintf ("with %s palette", style {1}); + fputs (plot_stream, "unset pm3d\n"); + if (all (obj.facecolor == 1)) hidden_removal = true; endif - elseif (facecolor_none_or_white) - if (all (obj.facecolor == 1)) + elseif (facecolor_none_or_white) + if (all (obj.facecolor == 1)) hidden_removal = true; endif - fputs(plot_stream,"unset pm3d;\n"); - fputs(plot_stream,"set style increment user;\n"); - withpm3d = false; - withclause{data_idx} = sprintf("with %s linestyle %d", - style{1}, data_idx); - fputs (plot_stream, "unset pm3d\n"); + fputs(plot_stream,"unset pm3d;\n"); + fputs(plot_stream,"set style increment user;\n"); + withpm3d = false; + withclause{data_idx} = sprintf("with %s linestyle %d", + style{1}, data_idx); + fputs (plot_stream, "unset pm3d\n"); endif - if (doing_interp_color) - ## "depthorder" interferes with interpolation of colors. - dord = "scansautomatic"; - else - dord = "depthorder"; - endif + if (doing_interp_color) + ## "depthorder" interferes with interpolation of colors. + dord = "scansautomatic"; + else + dord = "depthorder"; + endif - if (flat_interp_face && strncmp (obj.edgecolor, "flat", 4)) + if (flat_interp_face && strncmp (obj.edgecolor, "flat", 4)) fprintf (plot_stream, "set pm3d explicit at s %s %s corners2color c3;\n", - interp_str, dord); + interp_str, dord); elseif (!facecolor_none_or_white) if (strncmp (obj.edgecolor, "none", 4)) if (__gnuplot_has_feature__ ("transparent_surface") @@ -1181,10 +1181,10 @@ obj.facealpha); endif fprintf (plot_stream, "set pm3d explicit at s %s corners2color c3;\n", - interp_str, dord); + interp_str, dord); else fprintf (plot_stream, "set pm3d explicit at s hidden3d %d %s %s corners2color c3;\n", - data_idx, interp_str, dord); + data_idx, interp_str, dord); if (__gnuplot_has_feature__ ("transparent_surface") && isscalar (obj.facealpha)) @@ -1194,113 +1194,113 @@ endif endif endif - - zz = []; - if (length (style) > 1) - len = 3 * xlen; - zz = zeros (ylen, len); - k = 1; - for kk = 1:3:len - zz(:,kk) = xdat(:,k); - zz(:,kk+1) = ydat(:,k); - zz(:,kk+2) = zdat(:,k); - k++; - endfor - zz = zz.'; + + zz = []; + if (length (style) > 1) + len = 3 * xlen; + zz = zeros (ylen, len); + k = 1; + for kk = 1:3:len + zz(:,kk) = xdat(:,k); + zz(:,kk+1) = ydat(:,k); + zz(:,kk+2) = zdat(:,k); + k++; + endfor + zz = zz.'; - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); - data{data_idx} = zz; - withclause{data_idx} = sprintf ("with %s linestyle %d", - style{2}, data_idx); + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); + data{data_idx} = zz; + withclause{data_idx} = sprintf ("with %s linestyle %d", + style{2}, data_idx); - endif - if (length (style) > 2) - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); - data{data_idx} = zz; - withclause{data_idx} = sprintf ("with %s linestyle %d", - style{3}, data_idx); - endif - if (withpm3d && strncmp (style {1}, "linespoints", 11)) - if (isempty(zz)) - len = 3 * xlen; - zz = zeros (ylen, len); - k = 1; - for kk = 1:3:len - zz(:,kk) = xdat(:,k); - zz(:,kk+1) = ydat(:,k); - zz(:,kk+2) = zdat(:,k); - k++; - endfor - zz = zz.'; - endif - data_idx++; - is_image_data(data_idx) = is_image_data(data_idx - 1); - parametric(data_idx) = parametric(data_idx - 1); - have_cdata(data_idx) = false; - have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); - titlespec{data_idx} = "title \"\""; - usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); - data{data_idx} = zz; - withclause{data_idx} = sprintf ("with points linestyle %d", - pm3didx); - endif - endif + endif + if (length (style) > 2) + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); + data{data_idx} = zz; + withclause{data_idx} = sprintf ("with %s linestyle %d", + style{3}, data_idx); + endif + if (withpm3d && strncmp (style {1}, "linespoints", 11)) + if (isempty(zz)) + len = 3 * xlen; + zz = zeros (ylen, len); + k = 1; + for kk = 1:3:len + zz(:,kk) = xdat(:,k); + zz(:,kk+1) = ydat(:,k); + zz(:,kk+2) = zdat(:,k); + k++; + endfor + zz = zz.'; + endif + data_idx++; + is_image_data(data_idx) = is_image_data(data_idx - 1); + parametric(data_idx) = parametric(data_idx - 1); + have_cdata(data_idx) = false; + have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); + titlespec{data_idx} = "title \"\""; + usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); + data{data_idx} = zz; + withclause{data_idx} = sprintf ("with points linestyle %d", + pm3didx); + endif + endif - case "text" - [label, f, s] = __maybe_munge_text__ (enhanced, obj, "string"); - fontspec = create_fontspec (f, s, gnuplot_term); - lpos = obj.position; - halign = obj.horizontalalignment; - angle = obj.rotation; + case "text" + [label, f, s] = __maybe_munge_text__ (enhanced, obj, "string"); + fontspec = create_fontspec (f, s, gnuplot_term); + lpos = obj.position; + halign = obj.horizontalalignment; + angle = obj.rotation; units = obj.units; - color = obj.color; + color = obj.color; if (strcmpi (units, "normalized")) units = "graph"; else units = ""; endif - - if (isnumeric (color)) - colorspec = get_text_colorspec (color, mono); - endif + + if (isnumeric (color)) + colorspec = get_text_colorspec (color, mono); + endif - if (nd == 3) - fprintf (plot_stream, - "set label \"%s\" at %s %.15g,%.15g,%.15g %s rotate by %f %s %s front %s;\n", - undo_string_escapes (label), units, lpos(1), - lpos(2), lpos(3), halign, angle, fontspec, - __do_enhanced_option__ (enhanced, obj), colorspec); - else - fprintf (plot_stream, - "set label \"%s\" at %s %.15g,%.15g %s rotate by %f %s %s front %s;\n", - undo_string_escapes (label), units, - lpos(1), lpos(2), halign, angle, fontspec, - __do_enhanced_option__ (enhanced, obj), colorspec); - endif + if (nd == 3) + fprintf (plot_stream, + "set label \"%s\" at %s %.15g,%.15g,%.15g %s rotate by %f %s %s front %s;\n", + undo_string_escapes (label), units, lpos(1), + lpos(2), lpos(3), halign, angle, fontspec, + __do_enhanced_option__ (enhanced, obj), colorspec); + else + fprintf (plot_stream, + "set label \"%s\" at %s %.15g,%.15g %s rotate by %f %s %s front %s;\n", + undo_string_escapes (label), units, + lpos(1), lpos(2), halign, angle, fontspec, + __do_enhanced_option__ (enhanced, obj), colorspec); + endif case "hggroup" - ## Push group children into the kid list. - if (isempty (kids)) - kids = obj.children; - elseif (! isempty (obj.children)) - kids = [kids; obj.children]; - endif + ## Push group children into the kid list. + if (isempty (kids)) + kids = obj.children; + elseif (! isempty (obj.children)) + kids = [kids; obj.children]; + endif - otherwise - error ("__go_draw_axes__: unknown object class, %s", - obj.type); + otherwise + error ("__go_draw_axes__: unknown object class, %s", + obj.type); endswitch endwhile @@ -1351,12 +1351,12 @@ if (nd == 3) if (isempty (zlim)) - return; + return; endif if (strcmpi (axis_obj.zdir, "reverse")) - zdir = "reverse"; + zdir = "reverse"; else - zdir = "noreverse"; + zdir = "noreverse"; endif fprintf (plot_stream, "set zrange [%.15e:%.15e] %s;\n", zlim, zdir); endif @@ -1365,58 +1365,58 @@ cmap_sz = rows(cmap); if (! any (isinf (clim))) if (truecolor || ! cdatadirect) - if (rows(addedcmap) > 0) - for i = 1:data_idx - if (have_3d_patch(i)) - data{i}(end,:) = clim(2) * (data{i}(end, :) - 0.5) / cmap_sz; - endif - endfor - fprintf (plot_stream, "set cbrange [%g:%g];\n", clim(1), clim(2) * - (cmap_sz + rows(addedcmap)) / cmap_sz); - else - fprintf (plot_stream, "set cbrange [%g:%g];\n", clim); - endif + if (rows(addedcmap) > 0) + for i = 1:data_idx + if (have_3d_patch(i)) + data{i}(end,:) = clim(2) * (data{i}(end, :) - 0.5) / cmap_sz; + endif + endfor + fprintf (plot_stream, "set cbrange [%g:%g];\n", clim(1), clim(2) * + (cmap_sz + rows(addedcmap)) / cmap_sz); + else + fprintf (plot_stream, "set cbrange [%g:%g];\n", clim); + endif else - fprintf (plot_stream, "set cbrange [1:%d];\n", cmap_sz + - rows (addedcmap)); + fprintf (plot_stream, "set cbrange [1:%d];\n", cmap_sz + + rows (addedcmap)); endif endif if (strcmpi (axis_obj.box, "on")) if (nd == 3) - fputs (plot_stream, "set border 4095;\n"); + fputs (plot_stream, "set border 4095;\n"); else - fputs (plot_stream, "set border 431;\n"); + fputs (plot_stream, "set border 431;\n"); endif else if (nd == 3) - fputs (plot_stream, "set border 895;\n"); + fputs (plot_stream, "set border 895;\n"); else - if (strcmpi (axis_obj.yaxislocation, "right")) - fprintf (plot_stream, "unset ytics; set y2tics %s nomirror\n", - axis_obj.tickdir); - if (strcmpi (axis_obj.xaxislocation, "top")) - fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", - axis_obj.tickdir); - fputs (plot_stream, "set border 12;\n"); - else - fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", - axis_obj.tickdir); - fputs (plot_stream, "set border 9;\n"); - endif - else - fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", - axis_obj.tickdir); - if (strcmpi (axis_obj.xaxislocation, "top")) - fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", - axis_obj.tickdir); - fputs (plot_stream, "set border 6;\n"); - else - fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", - axis_obj.tickdir); - fputs (plot_stream, "set border 3;\n"); - endif - endif + if (strcmpi (axis_obj.yaxislocation, "right")) + fprintf (plot_stream, "unset ytics; set y2tics %s nomirror\n", + axis_obj.tickdir); + if (strcmpi (axis_obj.xaxislocation, "top")) + fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", + axis_obj.tickdir); + fputs (plot_stream, "set border 12;\n"); + else + fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", + axis_obj.tickdir); + fputs (plot_stream, "set border 9;\n"); + endif + else + fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", + axis_obj.tickdir); + if (strcmpi (axis_obj.xaxislocation, "top")) + fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", + axis_obj.tickdir); + fputs (plot_stream, "set border 6;\n"); + else + fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", + axis_obj.tickdir); + fputs (plot_stream, "set border 3;\n"); + endif + endif endif endif @@ -1428,65 +1428,65 @@ if (strcmpi (axis_obj.key, "on")) if (strcmpi (axis_obj.keybox, "on")) - box = "box"; + box = "box"; else - box = "nobox"; + box = "nobox"; endif if (strcmpi (axis_obj.keyreverse, "on")) - reverse = "reverse"; + reverse = "reverse"; else - reverse = "noreverse"; + reverse = "noreverse"; endif inout = "inside"; keypos = axis_obj.keypos; if (ischar (keypos)) - keypos = lower (keypos); - keyout = findstr (keypos, "outside"); - if (! isempty (keyout)) - inout = "outside"; - keypos = keypos(1:keyout-1); - endif + keypos = lower (keypos); + keyout = findstr (keypos, "outside"); + if (! isempty (keyout)) + inout = "outside"; + keypos = keypos(1:keyout-1); + endif endif switch (keypos) - case -1 - pos = "right top"; - inout = "outside"; - case 1 - pos = "right top"; - case 2 - pos = "left top"; - case 3 - pos = "left bottom"; - case {4, 0} - pos = "right bottom"; - case "north" - pos = "center top"; - case "south" - pos = "center bottom"; - case "east" - pos = "right center"; - case "west" - pos = "left center"; - case "northeast" - pos = "right top"; - case "northwest" - pos = "left top"; - case "southeast" - pos = "right bottom"; - case "southwest" - pos = "left bottom"; - case "best" - pos = ""; - warning ("legend: 'Best' not yet implemented for location specifier.\n"); - ## Least conflict with data in plot. - ## Least unused space outside plot. - otherwise - pos = ""; + case -1 + pos = "right top"; + inout = "outside"; + case 1 + pos = "right top"; + case 2 + pos = "left top"; + case 3 + pos = "left bottom"; + case {4, 0} + pos = "right bottom"; + case "north" + pos = "center top"; + case "south" + pos = "center bottom"; + case "east" + pos = "right center"; + case "west" + pos = "left center"; + case "northeast" + pos = "right top"; + case "northwest" + pos = "left top"; + case "southeast" + pos = "right bottom"; + case "southwest" + pos = "left bottom"; + case "best" + pos = ""; + warning ("legend: 'Best' not yet implemented for location specifier.\n"); + ## Least conflict with data in plot. + ## Least unused space outside plot. + otherwise + pos = ""; endswitch if (__gnuplot_has_feature__ ("key_has_font_properties")) fontspec = create_fontspec (axis_obj.fontname, axis_obj.fontsize, gnuplot_term); else - fontspec = ""; + fontspec = ""; endif fprintf (plot_stream, "set key %s %s %s %s %s;\n", inout, pos, box, reverse, fontspec); @@ -1498,7 +1498,7 @@ if (! use_gnuplot_for_images) for i = 1:ximg_data_idx - view_fcn (xlim, ylim, ximg_data{i}, view_zoom, view_cmd); + view_fcn (xlim, ylim, ximg_data{i}, view_zoom, view_cmd); endfor endif @@ -1506,11 +1506,11 @@ cmap_sz = cmap_sz + rows(addedcmap); if (length(cmap) > 0) fprintf (plot_stream, - "set palette positive color model RGB maxcolors %i;\n", - cmap_sz); + "set palette positive color model RGB maxcolors %i;\n", + cmap_sz); fprintf (plot_stream, - "set palette file \"-\" binary record=%d using 1:2:3:4;\n", - cmap_sz); + "set palette file \"-\" binary record=%d using 1:2:3:4;\n", + cmap_sz); fwrite (plot_stream, [1:cmap_sz; cmap.'], "float32"); fwrite (plot_stream, "\n"); endif @@ -1519,80 +1519,80 @@ if (have_data) if (nd == 2) - plot_cmd = "plot"; + plot_cmd = "plot"; else - plot_cmd = "splot"; - rot_x = 90 - axis_obj.view(2); - rot_z = axis_obj.view(1); - while (rot_z < 0) - rot_z += 360; - endwhile - fputs (plot_stream, "set ticslevel 0;\n"); - if (view_map && rot_x == 0 && rot_z == 0) - fputs (plot_stream, "set view map;\n"); - else - fprintf (plot_stream, "set view %.15g, %.15g;\n", rot_x, rot_z); - endif + plot_cmd = "splot"; + rot_x = 90 - axis_obj.view(2); + rot_z = axis_obj.view(1); + while (rot_z < 0) + rot_z += 360; + endwhile + fputs (plot_stream, "set ticslevel 0;\n"); + if (view_map && rot_x == 0 && rot_z == 0) + fputs (plot_stream, "set view map;\n"); + else + fprintf (plot_stream, "set view %.15g, %.15g;\n", rot_x, rot_z); + endif endif if (have_3d_patch (1)) - fputs (plot_stream, "set pm3d depthorder\n"); - fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, - usingclause{1}, titlespec{1}, withclause{1}); + fputs (plot_stream, "set pm3d depthorder\n"); + fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, + usingclause{1}, titlespec{1}, withclause{1}); elseif (is_image_data (1)) - fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, - usingclause{1}, titlespec{1}, withclause{1}); + fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, + usingclause{1}, titlespec{1}, withclause{1}); else - fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, - usingclause{1}, titlespec{1}, withclause{1}); + fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, + usingclause{1}, titlespec{1}, withclause{1}); endif for i = 2:data_idx - if (have_3d_patch (i)) - fprintf (plot_stream, ", \"-\" %s %s %s \\\n", - usingclause{i}, titlespec{i}, withclause{i}); - elseif (is_image_data (i)) - if (! is_image_data (i-1)) - fputs (plot_stream, "; "); + if (have_3d_patch (i)) + fprintf (plot_stream, ", \"-\" %s %s %s \\\n", + usingclause{i}, titlespec{i}, withclause{i}); + elseif (is_image_data (i)) + if (! is_image_data (i-1)) + fputs (plot_stream, "; "); if (bg_is_set) fputs (plot_stream, "unset obj 1; \\\n"); bg_is_set = false; endif - endif + endif fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, - usingclause{i}, titlespec{i}, withclause{i}); - elseif (is_image_data (i-1)) + usingclause{i}, titlespec{i}, withclause{i}); + elseif (is_image_data (i-1)) if (bg_is_set) fputs (plot_stream, "unset obj 1; \\\n"); bg_is_set = false; endif - fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, - usingclause{i}, titlespec{i}, withclause{i}); - else - fprintf (plot_stream, ", \"-\" binary format='%%float64' %s %s %s \\\n", - usingclause{i}, titlespec{i}, withclause{i}); - endif + fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, + usingclause{i}, titlespec{i}, withclause{i}); + else + fprintf (plot_stream, ", \"-\" binary format='%%float64' %s %s %s \\\n", + usingclause{i}, titlespec{i}, withclause{i}); + endif endfor fputs (plot_stream, ";\n"); for i = 1:data_idx - if (have_3d_patch (i)) - ## Can't write 3d patch data as binary as can't plot more than - ## a single patch at a time and have to plot all patches together - ## so that the gnuplot depth ordering is done correctly - for j = 1 : 4 : columns(data{i}) - if (j != 1) - fputs (plot_stream, "\n\n"); - endif - fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j).'); - fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n\n", data{i}(:,j+1).'); - fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+2).'); - fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+3).'); - endfor - fputs (plot_stream, "e\n"); - elseif (is_image_data(i)) - fwrite (plot_stream, data{i}, "float32"); - else - __gnuplot_write_data__ (plot_stream, data{i}, nd, parametric(i), - have_cdata(i)); - endif + if (have_3d_patch (i)) + ## Can't write 3d patch data as binary as can't plot more than + ## a single patch at a time and have to plot all patches together + ## so that the gnuplot depth ordering is done correctly + for j = 1 : 4 : columns(data{i}) + if (j != 1) + fputs (plot_stream, "\n\n"); + endif + fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j).'); + fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n\n", data{i}(:,j+1).'); + fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+2).'); + fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+3).'); + endfor + fputs (plot_stream, "e\n"); + elseif (is_image_data(i)) + fwrite (plot_stream, data{i}, "float32"); + else + __gnuplot_write_data__ (plot_stream, data{i}, nd, parametric(i), + have_cdata(i)); + endif endfor else fputs (plot_stream, "plot \"-\";\nInf Inf\ne\n"); @@ -1625,7 +1625,7 @@ endfunction function style = do_linestyle_command (obj, linecolor, idx, mono, - plot_stream, errbars = "") + plot_stream, errbars = "") style = {}; fprintf (plot_stream, "set style line %d default;\n", idx); @@ -1636,7 +1636,7 @@ color = linecolor; if (! mono) fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", - round (255*color)); + round (255*color)); endif else color = [0, 0, 0]; @@ -1645,17 +1645,17 @@ if (isfield (obj, "linestyle")) switch (obj.linestyle) case "-" - lt = "1"; + lt = "1"; case "--" - lt = "2"; + lt = "2"; case ":" - lt = "3"; + lt = "3"; case "-." - lt = "6"; + lt = "6"; case "none" - lt = ""; + lt = ""; otherwise - lt = ""; + lt = ""; endswitch ## FIXME -- linetype is currently broken, since it disables the @@ -1686,45 +1686,45 @@ if (isfield (obj, "marker")) switch (obj.marker) case "+" - pt = pt2 = "1"; + pt = pt2 = "1"; case "o" - pt = "6"; - pt2 = "7"; + pt = "6"; + pt2 = "7"; case "*" - pt = pt2 = "3"; + pt = pt2 = "3"; case "." - pt = pt2 = "0"; + pt = pt2 = "0"; case "x" - pt = pt2 = "2"; + pt = pt2 = "2"; case {"square", "s"} - pt = "4"; - pt2 = "5"; + pt = "4"; + pt2 = "5"; case {"diamond", "d"} - pt = "13"; - pt2 = "14"; + pt = "13"; + pt2 = "14"; case "^" - pt = "8"; - pt2 = "9"; + pt = "8"; + pt2 = "9"; case "v" - pt = "10"; - pt2 = "11"; + pt = "10"; + pt2 = "11"; case ">" - ## FIXME missing point type - pt = "8"; - pt2 = "9"; + ## FIXME missing point type + pt = "8"; + pt2 = "9"; case "<" - ## FIXME missing point type - pt = "10"; - pt2 = "11"; + ## FIXME missing point type + pt = "10"; + pt2 = "11"; case {"pentagram", "p"} - ## FIXME missing point type - pt = pt2 = "3"; + ## FIXME missing point type + pt = pt2 = "3"; case {"hexagram", "h"} - pt = pt2 = "3"; + pt = pt2 = "3"; case "none" - pt = pt2 = ""; + pt = pt2 = ""; otherwise - pt = pt2 = ""; + pt = pt2 = ""; endswitch else pt = pt2 = ""; @@ -1744,91 +1744,91 @@ facesame = true; if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") - && !strncmp (obj.markerfacecolor, "none", 4)) + && !strncmp (obj.markerfacecolor, "none", 4)) if (strncmp (obj.markerfacecolor, "auto", 4) - || ! isnumeric (obj.markerfacecolor) - || (isnumeric (obj.markerfacecolor) - && isequal (color, obj.markerfacecolor))) - if (! isempty (pt2)) - fprintf (plot_stream, " pointtype %s", pt2); - style {sidx} = strcat (style{sidx}, "points"); - endif - if (isfield (obj, "markersize")) - fprintf (plot_stream, " pointsize %f", obj.markersize / 3); - endif + || ! isnumeric (obj.markerfacecolor) + || (isnumeric (obj.markerfacecolor) + && isequal (color, obj.markerfacecolor))) + if (! isempty (pt2)) + fprintf (plot_stream, " pointtype %s", pt2); + style {sidx} = strcat (style{sidx}, "points"); + endif + if (isfield (obj, "markersize")) + fprintf (plot_stream, " pointsize %f", obj.markersize / 3); + endif else - facesame = false; - if (! found_style) - fputs (plot_stream, " default"); - endif - fputs (plot_stream, ";\n"); - if (! isempty (style {sidx})) - sidx ++; - idx ++; - else - fputs (plot_stream, ";\n"); - endif - fprintf (plot_stream, "set style line %d default;\n", idx); - fprintf (plot_stream, "set style line %d", idx); - if (isnumeric (obj.markerfacecolor) && ! mono) - fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", - round (255*obj.markerfacecolor)); - endif - if (! isempty (pt2)) - style {sidx} = "points"; - fprintf (plot_stream, " pointtype %s", pt2); - endif - if (isfield (obj, "markersize")) - fprintf (plot_stream, " pointsize %f", obj.markersize / 3); - endif + facesame = false; + if (! found_style) + fputs (plot_stream, " default"); + endif + fputs (plot_stream, ";\n"); + if (! isempty (style {sidx})) + sidx ++; + idx ++; + else + fputs (plot_stream, ";\n"); + endif + fprintf (plot_stream, "set style line %d default;\n", idx); + fprintf (plot_stream, "set style line %d", idx); + if (isnumeric (obj.markerfacecolor) && ! mono) + fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", + round (255*obj.markerfacecolor)); + endif + if (! isempty (pt2)) + style {sidx} = "points"; + fprintf (plot_stream, " pointtype %s", pt2); + endif + if (isfield (obj, "markersize")) + fprintf (plot_stream, " pointsize %f", obj.markersize / 3); + endif endif endif if (isfield (obj, "markeredgecolor") - && !strncmp (obj.markeredgecolor, "none", 4)) + && !strncmp (obj.markeredgecolor, "none", 4)) if (facesame && !isempty (pt) && (strncmp (obj.markeredgecolor, "auto", 4) - || ! isnumeric (obj.markeredgecolor) - || (isnumeric (obj.markeredgecolor) - && isequal (color, obj.markeredgecolor)))) - if (sidx == 1 && ((length (style {sidx}) == 5 - && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx}))) - if (! isempty (pt)) - style {sidx} = strcat (style{sidx}, "points"); - fprintf (plot_stream, " pointtype %s", pt); - endif - if (isfield (obj, "markersize")) - fprintf (plot_stream, " pointsize %f", obj.markersize / 3); - endif - endif + || ! isnumeric (obj.markeredgecolor) + || (isnumeric (obj.markeredgecolor) + && isequal (color, obj.markeredgecolor)))) + if (sidx == 1 && ((length (style {sidx}) == 5 + && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx}))) + if (! isempty (pt)) + style {sidx} = strcat (style{sidx}, "points"); + fprintf (plot_stream, " pointtype %s", pt); + endif + if (isfield (obj, "markersize")) + fprintf (plot_stream, " pointsize %f", obj.markersize / 3); + endif + endif else - if (! found_style) - fputs (plot_stream, " default"); - endif - fputs (plot_stream, ";\n"); - if (!isempty (style {sidx})) - sidx ++; - idx ++; - else - fputs (plot_stream, ";\n"); - endif - fprintf (plot_stream, "set style line %d default;\n", idx); - fprintf (plot_stream, "set style line %d", idx); - if (! mono) - if (strncmp (obj.markeredgecolor, "auto", 4)) - fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", - round (255*color)); - elseif (isnumeric (obj.markeredgecolor) && ! mono) - fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", - round (255*obj.markeredgecolor)); - endif - endif - if (! isempty (pt)) - style {sidx} = "points"; - fprintf (plot_stream, " pointtype %s", pt); - endif - if (isfield (obj, "markersize")) - fprintf (plot_stream, " pointsize %f", obj.markersize / 3); - endif + if (! found_style) + fputs (plot_stream, " default"); + endif + fputs (plot_stream, ";\n"); + if (!isempty (style {sidx})) + sidx ++; + idx ++; + else + fputs (plot_stream, ";\n"); + endif + fprintf (plot_stream, "set style line %d default;\n", idx); + fprintf (plot_stream, "set style line %d", idx); + if (! mono) + if (strncmp (obj.markeredgecolor, "auto", 4)) + fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", + round (255*color)); + elseif (isnumeric (obj.markeredgecolor) && ! mono) + fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", + round (255*obj.markeredgecolor)); + endif + endif + if (! isempty (pt)) + style {sidx} = "points"; + fprintf (plot_stream, " pointtype %s", pt); + endif + if (isfield (obj, "markersize")) + fprintf (plot_stream, " pointsize %f", obj.markersize / 3); + endif endif endif else @@ -1850,13 +1850,13 @@ obj = get (kids(i)); switch (obj.type) case {"image", "text"} - ## ignore as they + ## ignore as they case {"line", "patch"} - if (! isempty (obj.zdata)) - nd = 3; - endif + if (! isempty (obj.zdata)) + nd = 3; + endif case "surface" - nd = 3; + nd = 3; case "hggroup" obj_nd = __calc_dimensions__ (obj); if (obj_nd == 3) @@ -1887,13 +1887,13 @@ else nr = rows (data); if (cdata) - for j = 1:4:nr - fwrite (plot_stream, data(j:j+3,:), "float64"); - endfor + for j = 1:4:nr + fwrite (plot_stream, data(j:j+3,:), "float64"); + endfor else - for j = 1:3:nr - fwrite (plot_stream, data(j:j+2,:), "float64"); - endfor + for j = 1:3:nr + fwrite (plot_stream, data(j:j+2,:), "float64"); + endfor endif endif endif @@ -1924,63 +1924,63 @@ if (strcmpi (obj.xaxislocation, "top")) do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, - obj.xticklabel, obj.xcolor, "x2", plot_stream, true, mono, - "border", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.xscale); + obj.xticklabel, obj.xcolor, "x2", plot_stream, true, mono, + "border", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.xscale); do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, - obj.xcolor, "x", plot_stream, true, mono, "border", - "", "", fontname, fontspec, obj.interpreter, obj.xscale); + obj.xcolor, "x", plot_stream, true, mono, "border", + "", "", fontname, fontspec, obj.interpreter, obj.xscale); elseif (strcmpi (obj.xaxislocation, "zero")) do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, - obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, - "axis", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.xscale); + obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, + "axis", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.xscale); do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, - obj.xcolor, "x2", plot_stream, true, mono, "axis", - "", "", fontname, fontspec, obj.interpreter, obj.xscale); + obj.xcolor, "x2", plot_stream, true, mono, "axis", + "", "", fontname, fontspec, obj.interpreter, obj.xscale); else do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, - obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, - "border", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.xscale); + obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, + "border", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.xscale); do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, - obj.xcolor, "x2", plot_stream, true, mono, "border", - "", "", fontname, fontspec, obj.interpreter, obj.xscale); + obj.xcolor, "x2", plot_stream, true, mono, "border", + "", "", fontname, fontspec, obj.interpreter, obj.xscale); endif if (strcmpi (obj.yaxislocation, "right")) do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, - obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, mono, - "border", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.yscale); + obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, mono, + "border", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.yscale); do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, - obj.ycolor, "y", plot_stream, ymirror, mono, "border", - "", "", fontname, fontspec, obj.interpreter, obj.yscale); + obj.ycolor, "y", plot_stream, ymirror, mono, "border", + "", "", fontname, fontspec, obj.interpreter, obj.yscale); elseif (strcmpi (obj.yaxislocation, "zero")) do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, - obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, - "axis", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.yscale); + obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, + "axis", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.yscale); do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, - obj.ycolor, "y2", plot_stream, ymirror, mono, "axis", - "", "", fontname, fontspec, obj.interpreter, obj.yscale); + obj.ycolor, "y2", plot_stream, ymirror, mono, "axis", + "", "", fontname, fontspec, obj.interpreter, obj.yscale); else do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, - obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, - "border", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.yscale); + obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, + "border", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.yscale); do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, - obj.ycolor, "y2", plot_stream, ymirror, mono, "border", - "", "", fontname, fontspec, obj.interpreter, obj.yscale); + obj.ycolor, "y2", plot_stream, ymirror, mono, "border", + "", "", fontname, fontspec, obj.interpreter, obj.yscale); endif do_tics_1 (obj.ztickmode, obj.ztick, obj.zminortick, obj.zticklabelmode, - obj.zticklabel, obj.zcolor, "z", plot_stream, true, mono, - "border", obj.tickdir, ticklength, fontname, fontspec, - obj.interpreter, obj.yscale); + obj.zticklabel, obj.zcolor, "z", plot_stream, true, mono, + "border", obj.tickdir, ticklength, fontname, fontspec, + obj.interpreter, obj.yscale); endfunction function do_tics_1 (ticmode, tics, mtics, labelmode, labels, color, ax, - plot_stream, mirror, mono, axispos, tickdir, ticklength, - fontname, fontspec, interpreter, scale) + plot_stream, mirror, mono, axispos, tickdir, ticklength, + fontname, fontspec, interpreter, scale) persistent warned_latex = false; if (strcmpi (interpreter, "tex")) for n = 1 : numel(labels) @@ -2005,71 +2005,71 @@ fprintf (plot_stream, "unset %stics;\nunset m%stics;\n", ax, ax); elseif (strcmpi (labelmode, "manual")) if (ischar (labels)) - labels = cellstr (labels); + labels = cellstr (labels); endif if (isnumeric (labels)) - labels = num2str (real (labels(:))); + labels = num2str (real (labels(:))); endif if (ischar (labels)) - labels = permute (cellstr (labels), [2, 1]); + labels = permute (cellstr (labels), [2, 1]); endif if (iscellstr (labels)) - k = 1; - ntics = numel (tics); - nlabels = numel (labels); - fprintf (plot_stream, "set format %s \"%%s\";\n", ax); - if (mirror) - fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, - tickdir, ticklength, axispos); - else - fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, - tickdir, ticklength, axispos); - endif + k = 1; + ntics = numel (tics); + nlabels = numel (labels); + fprintf (plot_stream, "set format %s \"%%s\";\n", ax); + if (mirror) + fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, + tickdir, ticklength, axispos); + else + fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, + tickdir, ticklength, axispos); + endif - labels = regexprep(labels, "%", "%%"); - for i = 1:ntics - fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); - if (i < ntics) - fputs (plot_stream, ", "); - endif - if (k > nlabels) - k = 1; - endif - endfor - fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); - if (strcmp (mtics, "on")) - fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); - else - fprintf (plot_stream, "unset m%stics;\n", ax); - endif + labels = regexprep(labels, "%", "%%"); + for i = 1:ntics + fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); + if (i < ntics) + fputs (plot_stream, ", "); + endif + if (k > nlabels) + k = 1; + endif + endfor + fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); + if (strcmp (mtics, "on")) + fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); + else + fprintf (plot_stream, "unset m%stics;\n", ax); + endif else - error ("unsupported type of ticklabel"); + error ("unsupported type of ticklabel"); endif else fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); if (mirror) - fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, tickdir, - ticklength, axispos); + fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, tickdir, + ticklength, axispos); else - fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, tickdir, - ticklength, axispos); + fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, tickdir, + ticklength, axispos); endif fprintf (plot_stream, " %.15g,", tics(1:end-1)); fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec); if (strcmp (mtics, "on")) fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); else - fprintf (plot_stream, "unset m%stics;\n", ax); + fprintf (plot_stream, "unset m%stics;\n", ax); endif endif else fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); if (mirror) fprintf (plot_stream, "set %stics %s %s %s mirror %s %s;\n", ax, - axispos, tickdir, ticklength, colorspec, fontspec); + axispos, tickdir, ticklength, colorspec, fontspec); else fprintf (plot_stream, "set %stics %s %s %s nomirror %s %s;\n", ax, - tickdir, ticklength, axispos, colorspec, fontspec); + tickdir, ticklength, axispos, colorspec, fontspec); endif if (strcmp (mtics, "on")) fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); @@ -2103,7 +2103,7 @@ colorspec = ""; else colorspec = sprintf ("textcolor rgb \"#%02x%02x%02x\"", - round (255*color)); + round (255*color)); endif endfunction @@ -2118,8 +2118,8 @@ bld = false; if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold")) if (! isempty(t.fontangle) - && (strcmpi (t.fontangle, "italic") - || strcmpi (t.fontangle, "oblique"))) + && (strcmpi (t.fontangle, "italic") + || strcmpi (t.fontangle, "oblique"))) f = cstrcat (f, "-bolditalic"); it = true; bld = true; @@ -2128,8 +2128,8 @@ bld = true; endif elseif (! isempty(t.fontangle) - && (strcmpi (t.fontangle, "italic") - || strcmpi (t.fontangle, "oblique"))) + && (strcmpi (t.fontangle, "italic") + || strcmpi (t.fontangle, "oblique"))) f = cstrcat (f, "-italic"); it = true; endif @@ -2160,8 +2160,8 @@ str = __tex2enhanced__ (str, fnt, it, bld); elseif (strcmpi (obj.interpreter, "latex")) if (! warned_latex) - warning ("latex markup not supported for text objects"); - warned_latex = true; + warning ("latex markup not supported for text objects"); + warned_latex = true; endif endif endif @@ -2180,89 +2180,89 @@ else f = m{i}(2:end); if (isfield (sym, f)) - g = getfield(sym, f); - ## FIXME The symbol font doesn't seem to support bold or italic - ##if (bld) - ## if (it) - ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); - ## else - ## g = regexprep (g, '/Symbol', '/Symbol-bold'); - ## endif - ##elseif (it) - ## g = regexprep (g, '/Symbol', '/Symbol-italic'); - ##endif + g = getfield(sym, f); + ## FIXME The symbol font doesn't seem to support bold or italic + ##if (bld) + ## if (it) + ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); + ## else + ## g = regexprep (g, '/Symbol', '/Symbol-bold'); + ## endif + ##elseif (it) + ## g = regexprep (g, '/Symbol', '/Symbol-italic'); + ##endif str = cstrcat (str(1:s(i) - 1), g, str(e(i) + 1:end)); elseif (strncmp (f, "rm", 2)) - bld = false; - it = false; + bld = false; + it = false; str = cstrcat (str(1:s(i) - 1), '/', fnt, ' ', str(s(i) + 3:end)); elseif (strncmp (f, "it", 2) || strncmp (f, "sl", 2)) - it = true; - if (bld) + it = true; + if (bld) str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bolditalic ', - str(s(i) + 3:end)); + str(s(i) + 3:end)); else str = cstrcat (str(1:s(i) - 1), '/', fnt, '-italic ', - str(s(i) + 3:end)); + str(s(i) + 3:end)); endif elseif (strncmp (f, "bf", 2)) - bld = true; - if (it) + bld = true; + if (it) str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bolditalic ', - str(2(i) + 3:end)); + str(2(i) + 3:end)); else str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bold ', - str(s(i) + 3:end)); + str(s(i) + 3:end)); endif elseif (strcmpi (f, "color")) - ## FIXME Ignore \color but remove trailing {} block as well - d = strfind(str(e(i) + 1:end),'}'); + ## FIXME Ignore \color but remove trailing {} block as well + d = strfind(str(e(i) + 1:end),'}'); if (isempty (d)) - warning ('syntax error in \color argument'); - else - str = cstrcat (str(1:s(i) - 1), str(e(i) + d + 1:end)); + warning ('syntax error in \color argument'); + else + str = cstrcat (str(1:s(i) - 1), str(e(i) + d + 1:end)); endif elseif(strcmpi (f, "fontname")) - b1 = strfind(str(e(i) + 1:end),'{'); - b2 = strfind(str(e(i) + 1:end),'}'); + b1 = strfind(str(e(i) + 1:end),'{'); + b2 = strfind(str(e(i) + 1:end),'}'); if (isempty(b1) || isempty(b2)) - warning ('syntax error in \fontname argument'); - else + warning ('syntax error in \fontname argument'); + else str = cstrcat (str(1:s(i) - 1), '/', - str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', - str(e(i) + b2(1) + 1:end)); + str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', + str(e(i) + b2(1) + 1:end)); endif elseif(strcmpi (f, "fontsize")) - b1 = strfind(str(e(i) + 1:end),'{'); - b2 = strfind(str(e(i) + 1:end),'}'); + b1 = strfind(str(e(i) + 1:end),'{'); + b2 = strfind(str(e(i) + 1:end),'}'); if (isempty(b1) || isempty(b2)) - warning ('syntax error in \fontname argument'); - else + warning ('syntax error in \fontname argument'); + else str = cstrcat (str(1:s(i) - 1), '/=', - str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', - str(e(i) + b2(1) + 1:end)); + str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', + str(e(i) + b2(1) + 1:end)); endif else - ## Last desperate attempt to treat the symbol. Look for things - ## like \pix, that should be translated to the symbol Pi and x - for j = 1 : length (flds) - if (strncmp (flds{j}, f, length (flds{j}))) - g = getfield(sym, flds{j}); - ## FIXME The symbol font doesn't seem to support bold or italic - ##if (bld) - ## if (it) - ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); - ## else - ## g = regexprep (g, '/Symbol', '/Symbol-bold'); - ## endif - ##elseif (it) - ## g = regexprep (g, '/Symbol', '/Symbol-italic'); - ##endif + ## Last desperate attempt to treat the symbol. Look for things + ## like \pix, that should be translated to the symbol Pi and x + for j = 1 : length (flds) + if (strncmp (flds{j}, f, length (flds{j}))) + g = getfield(sym, flds{j}); + ## FIXME The symbol font doesn't seem to support bold or italic + ##if (bld) + ## if (it) + ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); + ## else + ## g = regexprep (g, '/Symbol', '/Symbol-bold'); + ## endif + ##elseif (it) + ## g = regexprep (g, '/Symbol', '/Symbol-italic'); + ##endif str = cstrcat (str(1:s(i) - 1), g, - str(s(i) + length (flds{j}) + 1:end)); - break; - endif - endfor + str(s(i) + length (flds{j}) + 1:end)); + break; + endif + endfor endif endif endfor @@ -2281,66 +2281,66 @@ while (i < length (s)) if (i < length(s)) if (str(s(i) + p + 1) == "{") - s1 = strfind(str(s(i) + p + 2:end),'{'); - si = 1; - l1 = strfind(str(s(i) + p + 1:end),'}'); + s1 = strfind(str(s(i) + p + 2:end),'{'); + si = 1; + l1 = strfind(str(s(i) + p + 1:end),'}'); li = 1; - while (li <= length (l1) && si <= length (s1)) + while (li <= length (l1) && si <= length (s1)) if (l1(li) < s1(si)) - if (li == si) - break; - endif - li++; - else - si++; - endif - endwhile - l1 = l1 (min (length(l1), si)); + if (li == si) + break; + endif + li++; + else + si++; + endif + endwhile + l1 = l1 (min (length(l1), si)); if (s(i) + l1 + 1 == s(i+1)) - if (str(s(i + 1) + p + 1) == "{") - s2 = strfind(str(s(i + 1) + p + 2:end),'{'); - si = 1; - l2 = strfind(str(s(i + 1) + p + 1:end),'}'); + if (str(s(i + 1) + p + 1) == "{") + s2 = strfind(str(s(i + 1) + p + 2:end),'{'); + si = 1; + l2 = strfind(str(s(i + 1) + p + 1:end),'}'); li = 1; - while (li <= length (l2) && si <= length (s2)) + while (li <= length (l2) && si <= length (s2)) if (l2(li) < s2(si)) - if (li == si) - break; - endif - li++; - else - si++; - endif - endwhile - l2 = l2 (min (length(l2), si)); - if (length_string (str(s(i)+p+2:s(i)+p+l1-1)) <= - length_string(str(s(i+1)+p+2:s(i+1)+p+l2-1))) - ## Shortest already first! - str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); - else - ## Have to swap sub/super-script to get shortest first. - str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+l2), - str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+l2+1:end)); - endif - else - ## Have to swap sub/super-script to get shortest first. - str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+1), - str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+2:end)); - endif + if (li == si) + break; + endif + li++; + else + si++; + endif + endwhile + l2 = l2 (min (length(l2), si)); + if (length_string (str(s(i)+p+2:s(i)+p+l1-1)) <= + length_string(str(s(i+1)+p+2:s(i+1)+p+l2-1))) + ## Shortest already first! + str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); + else + ## Have to swap sub/super-script to get shortest first. + str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+l2), + str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+l2+1:end)); + endif + else + ## Have to swap sub/super-script to get shortest first. + str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+1), + str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+2:end)); + endif i += 2; - p ++; - else - i++; - endif + p ++; + else + i++; + endif else - if (s(i+1) == s(i) + 2) - ## Shortest already first! - str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); - p ++; + if (s(i+1) == s(i) + 2) + ## Shortest already first! + str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); + p ++; i += 2; - else - i ++; - endif + else + i ++; + endif endif else i ++;
--- a/scripts/plot/__next_line_color__.m +++ b/scripts/plot/__next_line_color__.m @@ -39,7 +39,7 @@ elseif (! isempty (color_rotation)) rgb = color_rotation(color_index,:); if (++color_index > num_colors) - color_index = 1; + color_index = 1; __next_line_style__ ("incr"); endif else
--- a/scripts/plot/__next_line_style__.m +++ b/scripts/plot/__next_line_style__.m @@ -36,7 +36,7 @@ if (isempty (style_rotation)) error ("__next_line_style__: style_rotation not initialized"); elseif (++style_index > num_styles) - style_index = 1; + style_index = 1; endif elseif (reset) style_rotation = strsplit (get (gca (), "linestyleorder"), "|");
--- a/scripts/plot/__plt_get_axis_arg__.m +++ b/scripts/plot/__plt_get_axis_arg__.m @@ -44,7 +44,7 @@ h = ancestor (tmp, "axes"); varargin(1) = []; if (isempty (varargin)) - varargin = {}; + varargin = {}; endif else error ("%s: expecting first argument to be axes handle", caller); @@ -58,9 +58,9 @@ endif if (isempty (h)) if (nogca) - h = NaN; + h = NaN; else - h = gca (); + h = gca (); endif endif if (nargin < 2)
--- a/scripts/plot/ancestor.m +++ b/scripts/plot/ancestor.m @@ -58,7 +58,7 @@ break; endif endif - h = get (h, "Parent"); + h = get (h, "Parent"); endwhile else error ("ancestor: second argument must be a string or cell array of strings");
--- a/scripts/plot/area.m +++ b/scripts/plot/area.m @@ -120,11 +120,11 @@ if (i == 1) h = patch (ax, [x1(1), x1, fliplr(x1)], [bv, y1, bv*ones(1, length(y1))], - __next_line_color__ (), "parent", hg); + __next_line_color__ (), "parent", hg); else y1 = y0 + y1; h = patch (ax, [x1(1), x1, fliplr(x1)], [y0(1), y1, fliplr(y0)], - __next_line_color__ (), "parent", hg); + __next_line_color__ (), "parent", hg); endif y0 = y1; @@ -171,12 +171,12 @@ b0 = get (h, "basevalue"); for hh = hlist(:)' - if (hh != h) - b1 = get (hh, "basevalue"); - if (b1 != b0) - set (hh, "basevalue", b0); - endif - endif + if (hh != h) + b1 = get (hh, "basevalue"); + if (b1 != b0) + set (hh, "basevalue", b0); + endif + endif endfor update_data (h, d); unwind_protect_cleanup
--- a/scripts/plot/axes.m +++ b/scripts/plot/axes.m @@ -44,7 +44,7 @@ ## figure. tmp = varargin{1}; if (length(tmp) == 1 && ishandle (tmp) - && strcmp (get (tmp, "type"), "axes")) + && strcmp (get (tmp, "type"), "axes")) parent = ancestor (tmp, "figure"); set (0, "currentfigure", parent); set (parent, "currentaxes", tmp);
--- a/scripts/plot/axis.m +++ b/scripts/plot/axis.m @@ -143,10 +143,10 @@ ylim = get (ca, "ylim"); view = get (ca, "view"); if (view(2) == 90) - curr_axis = [xlim, ylim]; + curr_axis = [xlim, ylim]; else - zlim = get (ca, "zlim"); - curr_axis = [xlim, ylim, zlim]; + zlim = get (ca, "zlim"); + curr_axis = [xlim, ylim, zlim]; endif endif @@ -175,17 +175,17 @@ ## axis limits elseif (len >= 4 && strcmpi (ax(1:4), "auto")) if (len > 4) - if (any (ax == "x")) - set (ca, "xlimmode", "auto"); - endif - if (any (ax == "y")) - set (ca, "ylimmode", "auto"); - endif - if (any (ax == "z")) - set (ca, "zlimmode", "auto"); - endif + if (any (ax == "x")) + set (ca, "xlimmode", "auto"); + endif + if (any (ax == "y")) + set (ca, "ylimmode", "auto"); + endif + if (any (ax == "z")) + set (ca, "zlimmode", "auto"); + endif else - set (ca, "xlimmode", "auto", "ylimmode", "auto", "zlimmode", "auto"); + set (ca, "xlimmode", "auto", "ylimmode", "auto", "zlimmode", "auto"); endif elseif (strcmpi (ax, "manual")) ## fixes the axis limits, like axis(axis) should; @@ -198,7 +198,7 @@ set (ca, "xtickmode", "auto", "ytickmode", "auto", "ztickmode", "auto"); if (strcmpi (ax, "on")) set (ca, "xticklabelmode", "auto", "yticklabelmode", "auto", - "zticklabelmode", "auto"); + "zticklabelmode", "auto"); endif set (ca, "visible", "on"); elseif (strcmpi (ax, "off")) @@ -206,40 +206,40 @@ set (ca, "visible", "off"); elseif (len > 3 && strcmpi (ax(1:3), "tic")) if (any (ax == "x")) - set (ca, "xtickmode", "auto"); + set (ca, "xtickmode", "auto"); else - set (ca, "xtick", []); + set (ca, "xtick", []); endif if (any (ax == "y")) - set (ca, "ytickmode", "auto"); + set (ca, "ytickmode", "auto"); else - set (ca, "ytick", []); + set (ca, "ytick", []); endif if (any (ax == "z")) - set (ca, "ztickmode", "auto"); + set (ca, "ztickmode", "auto"); else - set (ca, "ztick", []); + set (ca, "ztick", []); endif elseif (strcmpi (ax, "label")) set (ca, "xticklabelmode", "auto", "yticklabelmode", "auto", - "zticklabelmode", "auto"); + "zticklabelmode", "auto"); elseif (strcmpi (ax, "nolabel")) set (ca, "xticklabel", "", "yticklabel", "", "zticklabel", ""); elseif (len > 5 && strcmpi (ax(1:5), "label")) if (any (ax == "x")) - set (ca, "xticklabelmode", "auto"); + set (ca, "xticklabelmode", "auto"); else - set (ca, "xticklabel", ""); + set (ca, "xticklabel", ""); endif if (any (ax == "y")) - set (ca, "yticklabelmode", "auto"); + set (ca, "yticklabelmode", "auto"); else - set (ca, "yticklabel", ""); + set (ca, "yticklabel", ""); endif if (any (ax == "z")) - set (ca, "zticklabelmode", "auto"); + set (ca, "zticklabelmode", "auto"); else - set (ca, "zticklabel", ""); + set (ca, "zticklabel", ""); endif else @@ -256,7 +256,7 @@ for i = 1:2:len if (ax(i) == ax(i+1)) - error ("axis: limits(%d) cannot equal limits(%d)", i, i+1); + error ("axis: limits(%d) cannot equal limits(%d)", i, i+1); endif endfor
--- a/scripts/plot/box.m +++ b/scripts/plot/box.m @@ -45,11 +45,11 @@ state = varargin{1}; if (ischar (state)) if (strcmpi (state, "off")) - box_state = "off"; + box_state = "off"; elseif (strcmpi (state, "on")) - box_state = "on"; + box_state = "on"; else - print_usage (); + print_usage (); endif endif else
--- a/scripts/plot/cla.m +++ b/scripts/plot/cla.m @@ -35,8 +35,8 @@ print_usage (); elseif (nargin > 1) if (ishandle (varargin{1}) - && strcmp (get (varargin{1}, "type"), "axes") - && ischar (varargin{2}) && strcmpi (varargin{2}, "reset")) + && strcmp (get (varargin{1}, "type"), "axes") + && ischar (varargin{2}) && strcmpi (varargin{2}, "reset")) oldhax = gca; hax = varargin{1}; do_reset = true; @@ -45,7 +45,7 @@ endif elseif (nargin == 1) if (ishandle (varargin{1}) - && strcmp (get (varargin{1}, "type"), "axes")) + && strcmp (get (varargin{1}, "type"), "axes")) oldhax = gca; hax = varargin{1}; do_reset = false;
--- a/scripts/plot/clabel.m +++ b/scripts/plot/clabel.m @@ -67,10 +67,10 @@ else arg = varargin{1}; if (isscalar (arg) && ishandle(arg) && - strcmp (get (arg, "type"), "hggroup")) + strcmp (get (arg, "type"), "hggroup")) obj = get (arg); if (! isfield (obj, "contourmatrix")) - error ("clabel: expecting the handle to be a contour group"); + error ("clabel: expecting the handle to be a contour group"); endif hg = arg; have_hg = true; @@ -107,16 +107,16 @@ if (have_hg) if (! isempty (v)) if (have_labelspacing) - set (hg, "textlistmode", "manual", "textlist", v, - "labelspacing", label_spacing, "showtext", "on"); + set (hg, "textlistmode", "manual", "textlist", v, + "labelspacing", label_spacing, "showtext", "on"); else - set (hg, "textlistmode", "manual", "textlist", v, "showtext", "on"); + set (hg, "textlistmode", "manual", "textlist", v, "showtext", "on"); endif else if (have_labelspacing) - set (hg,"showtext", "on", "labelspacing", label_spacing); + set (hg,"showtext", "on", "labelspacing", label_spacing); else - set (hg,"showtext", "on"); + set (hg,"showtext", "on"); endif endif retval = findobj (hg, "type", "text");
--- a/scripts/plot/clf.m +++ b/scripts/plot/clf.m @@ -37,7 +37,7 @@ print_usage (); elseif (nargin > 1) if (isfigure (varargin{1}) && ischar (varargin{2}) - && strcmpi (varargin{2}, "reset")) + && strcmpi (varargin{2}, "reset")) oldfig = gcf; hfig = varargin{1}; do_reset = true;
--- a/scripts/plot/close.m +++ b/scripts/plot/close.m @@ -49,8 +49,8 @@ error ("close: expecting argument to be \"all\" or a figure handle"); endif elseif (nargin == 2 - && ischar (arg1) && strcmpi (arg1, "all") - && ischar (arg2) && strcmpi (arg2, "hidden")) + && ischar (arg1) && strcmpi (arg1, "all") + && ischar (arg2) && strcmpi (arg2, "hidden")) close_all_figures (true); else print_usage ();
--- a/scripts/plot/colorbar.m +++ b/scripts/plot/colorbar.m @@ -58,24 +58,24 @@ if (ischar(arg)) if (strcmpi (arg, "peer")) - if (i > nargin) - error ("colorbar: missing axes handle after \"peer\""); - else - ax = varargin{i++}; - if (!isscalar (ax) || ! ishandle (ax) - || ! strcmp (get (ax, "type"), "axes")) - error ("colorbar: expecting an axes handle following \"peer\""); - endif - endif + if (i > nargin) + error ("colorbar: missing axes handle after \"peer\""); + else + ax = varargin{i++}; + if (!isscalar (ax) || ! ishandle (ax) + || ! strcmp (get (ax, "type"), "axes")) + error ("colorbar: expecting an axes handle following \"peer\""); + endif + endif elseif (strcmpi (arg, "north") || strcmpi (arg, "south") - || strcmpi (arg, "east") || strcmpi (arg, "west") - || strcmpi (arg, "northoutside") || strcmpi (arg, "southoutside") - || strcmpi (arg, "eastoutside") || strcmpi (arg, "westoutside")) - loc = tolower (arg); + || strcmpi (arg, "east") || strcmpi (arg, "west") + || strcmpi (arg, "northoutside") || strcmpi (arg, "southoutside") + || strcmpi (arg, "eastoutside") || strcmpi (arg, "westoutside")) + loc = tolower (arg); elseif (strcmpi (arg, "off") || strcmpi (arg, "none")) - deleting = true; + deleting = true; else - args{end+1} = arg; + args{end+1} = arg; endif else args{end+1} = arg; @@ -109,46 +109,46 @@ orig_pos = obj.position; orig_opos = obj.outerposition; [pos, cpos, vertical, mirror] = ... - __position_colorbox__ (loc, obj, ancestor (ax, "figure")); + __position_colorbox__ (loc, obj, ancestor (ax, "figure")); set (ax, "activepositionproperty", "position", "position", pos); cax = __go_axes__ (get (ax, "parent"), "tag", "colorbar", - "handlevisibility", "on", - "activepositionproperty", "position", - "position", cpos); + "handlevisibility", "on", + "activepositionproperty", "position", + "position", cpos); addproperty ("location", cax, "radio", - "eastoutside|east|westoutside|west|northoutside|north|southoutside|south", - loc); + "eastoutside|east|westoutside|west|northoutside|north|southoutside|south", + loc); addproperty ("axes", cax, "handle", ax); if (vertical) hi = image (cax, [0,1], [cmin, cmax], [1 : clen]'); if (mirror) - set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", - "ylim", cext, "ylimmode", "manual", - "yaxislocation", "right", args{:}); + set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", + "ylim", cext, "ylimmode", "manual", + "yaxislocation", "right", args{:}); else - set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", - "ylim", cext, "ylimmode", "manual", - "yaxislocation", "left", args{:}); + set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", + "ylim", cext, "ylimmode", "manual", + "yaxislocation", "left", args{:}); endif else hi = image (cax, [cmin, cmax], [0,1], [1 : clen]); if (mirror) - set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", - "xlim", cext, "xlimmode", "manual", - "xaxislocation", "top", args{:}); + set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", + "xlim", cext, "xlimmode", "manual", + "xaxislocation", "top", args{:}); else - set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", - "xlim", cext, "xlimmode", "manual", - "xaxislocation", "bottom", args{:}); + set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", + "xlim", cext, "xlimmode", "manual", + "xaxislocation", "bottom", args{:}); endif endif ctext = text (0, 0, "", "tag", "colorbar","visible", "off", - "handlevisibility", "off", "xliminclude", "off", - "yliminclude", "off", "zliminclude", "off", - "deletefcn", {@deletecolorbar, cax, orig_pos, orig_opos}); + "handlevisibility", "off", "xliminclude", "off", + "yliminclude", "off", "zliminclude", "off", + "deletefcn", {@deletecolorbar, cax, orig_pos, orig_opos}); set (cax, "deletefcn", {@resetaxis, orig_pos, orig_opos}); @@ -173,7 +173,7 @@ delete (hc); endif if (!isempty (ancestor (h, "axes")) && - strcmp (get (ancestor (h, "axes"), "beingdeleted"), "off")) + strcmp (get (ancestor (h, "axes"), "beingdeleted"), "off")) set (ancestor (h, "axes"), "position", pos, "outerposition", opos); endif endif @@ -212,23 +212,23 @@ loc = get (cax, "location"); obj = get (h); [pos, cpos, vertical, mirror] = ... - __position_colorbox__ (loc, obj, ancestor (h, "figure")); + __position_colorbox__ (loc, obj, ancestor (h, "figure")); if (vertical) if (mirror) - set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", - "yaxislocation", "right", "position", cpos); + set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", + "yaxislocation", "right", "position", cpos); else - set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", - "yaxislocation", "left", "position", cpos); + set (cax, "xtick", [], "xdir", "normal", "ydir", "normal", + "yaxislocation", "left", "position", cpos); endif else if (mirror) - set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", - "xaxislocation", "top", "position", cpos); + set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", + "xaxislocation", "top", "position", cpos); else - set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", - "xaxislocation", "bottom", "position", cpos); + set (cax, "ytick", [], "xdir", "normal", "ydir", "normal", + "xaxislocation", "bottom", "position", cpos); endif endif @@ -245,23 +245,23 @@ r = obj.plotboxaspectratio; if (pos(3) > pos(4)) switch (cbox) - case {"east", "eastoutside", "west", "westoutside"} - off = [(pos(3) - pos(4)) ./ (r(2) / r(1)), 0]; + case {"east", "eastoutside", "west", "westoutside"} + off = [(pos(3) - pos(4)) ./ (r(2) / r(1)), 0]; endswitch else switch (cbox) - case {"north", "northoutside", "south", "southoutside"} - off = [0, (pos(4) - pos(3)) ./ (r(1) / r(2))]; - ## This shouldn't be here except that gnuplot doesn't have a - ## square window and so a square aspect ratio is not square. - ## The corrections are empirical. - if (strcmp (get (cf, "__backend__"), "gnuplot")) - if (length (cbox) > 7 && strcmp (cbox(end-6:end),"outside")) - off = off / 2; - else - off = off / 1.7; - endif - endif + case {"north", "northoutside", "south", "southoutside"} + off = [0, (pos(4) - pos(3)) ./ (r(1) / r(2))]; + ## This shouldn't be here except that gnuplot doesn't have a + ## square window and so a square aspect ratio is not square. + ## The corrections are empirical. + if (strcmp (get (cf, "__backend__"), "gnuplot")) + if (length (cbox) > 7 && strcmp (cbox(end-6:end),"outside")) + off = off / 2; + else + off = off / 1.7; + endif + endif endswitch endif off = off / 2;
--- a/scripts/plot/comet.m +++ b/scripts/plot/comet.m @@ -39,7 +39,7 @@ if (nargin == 0) print_usage (); elseif (numel (varargin{1}) == 1 && ishandle (varargin{1}) - && strcmpi (get (varargin{1}, "type"), "axes")) + && strcmpi (get (varargin{1}, "type"), "axes")) axes (varargin{1}); varargin = varargin(2:end); numargin = nargin - 1;
--- a/scripts/plot/compass.m +++ b/scripts/plot/compass.m @@ -70,11 +70,11 @@ if ((ischar (arg) || iscell (arg)) && ! have_line_spec) [linespec, valid] = __pltopt__ ("compass", arg, false); if (valid) - line_spec = arg; - have_line_spec = true; - break; + line_spec = arg; + have_line_spec = true; + break; else - error ("compass: invalid linespec"); + error ("compass: invalid linespec"); endif else error ("compass: unrecognized argument");
--- a/scripts/plot/contourf.m +++ b/scripts/plot/contourf.m @@ -68,7 +68,7 @@ axes (xh); newplot (); [ctmp, htmp] = __contour__ (xh, "none", "fill", "on", - "linecolor", "black", varargin{:}); + "linecolor", "black", varargin{:}); unwind_protect_cleanup axes (oldh); end_unwind_protect
--- a/scripts/plot/cylinder.m +++ b/scripts/plot/cylinder.m @@ -48,7 +48,7 @@ function [xx, yy, zz] = cylinder (varargin) [ax, args, nargs] = __plt_get_axis_arg__ ((nargout > 0), "cylinder", - varargin{:}); + varargin{:}); if (nargs == 0) n = 20;
--- a/scripts/plot/ellipsoid.m +++ b/scripts/plot/ellipsoid.m @@ -32,7 +32,7 @@ function [xx, yy, zz] = ellipsoid (varargin) [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 0), "ellipsoid", - varargin{:}); + varargin{:}); if (nargin != 6 && nargin != 7) print_usage ();
--- a/scripts/plot/feather.m +++ b/scripts/plot/feather.m @@ -70,11 +70,11 @@ if ((ischar (arg) || iscell (arg)) && ! have_line_spec) [linespec, valid] = __pltopt__ ("feather", arg, false); if (valid) - line_spec = arg; - have_line_spec = false; - break; + line_spec = arg; + have_line_spec = false; + break; else - error ("feather: invalid linespec"); + error ("feather: invalid linespec"); endif else error ("feather: unrecognized argument");
--- a/scripts/plot/fill.m +++ b/scripts/plot/fill.m @@ -38,14 +38,14 @@ for i = 1 : length (iargs) if (i == length (iargs)) - args = varargin (iargs(i):end); + args = varargin (iargs(i):end); else args = varargin (iargs(i):iargs(i+1)-1); endif newplot (); [tmp, fail] = __patch__ (h, args{:}); if (fail) - print_usage(); + print_usage(); endif htmp (end + 1) = tmp; endfor @@ -65,8 +65,8 @@ while (i < nargin) iargs (end + 1) = i; if (ischar (varargin{i}) - && (strcmpi (varargin{i}, "faces") - || strcmpi (varargin{i}, "vertices"))) + && (strcmpi (varargin{i}, "faces") + || strcmpi (varargin{i}, "vertices"))) i += 4; elseif (isnumeric (varargin{i})) i += 2; @@ -74,34 +74,34 @@ if (i <= nargin) while (true); - if (ischar (varargin{i}) && - (strcmpi (varargin{i}, "faces") - || strcmpi (varargin{i}, "vertices"))) - break; - elseif (isnumeric (varargin{i})) - ## Assume its the colorspec - i++; - break; - elseif (ischar (varargin{i})) - colspec = tolower (varargin{i}); - collen = length (colspec); + if (ischar (varargin{i}) && + (strcmpi (varargin{i}, "faces") + || strcmpi (varargin{i}, "vertices"))) + break; + elseif (isnumeric (varargin{i})) + ## Assume its the colorspec + i++; + break; + elseif (ischar (varargin{i})) + colspec = tolower (varargin{i}); + collen = length (colspec); - if (strncmp (colspec, "blue", collen) - || strncmp (colspec, "black", collen) - || strncmp (colspec, "k", collen) - || strncmp (colspec, "black", collen) - || strncmp (colspec, "red", collen) - || strncmp (colspec, "green", collen) - || strncmp (colspec, "yellow", collen) - || strncmp (colspec, "magenta", collen) - || strncmp (colspec, "cyan", collen) - || strncmp (colspec, "white", collen)) - i++; - break; - endif - else - i += 2; - endif + if (strncmp (colspec, "blue", collen) + || strncmp (colspec, "black", collen) + || strncmp (colspec, "k", collen) + || strncmp (colspec, "black", collen) + || strncmp (colspec, "red", collen) + || strncmp (colspec, "green", collen) + || strncmp (colspec, "yellow", collen) + || strncmp (colspec, "magenta", collen) + || strncmp (colspec, "cyan", collen) + || strncmp (colspec, "white", collen)) + i++; + break; + endif + else + i += 2; + endif endwhile endif endwhile
--- a/scripts/plot/findobj.m +++ b/scripts/plot/findobj.m @@ -84,15 +84,15 @@ endif if (n1 <= nargin) if (ischar (varargin{n1})) - if (strcmpi (varargin{n1}, "flat")) - depth = 0; - n1 = n1 + 1; - elseif (strcmpi (varargin{n1}, "-depth")) - depth = varargin{n1+1}; - n1 = n1 + 2; - endif + if (strcmpi (varargin{n1}, "flat")) + depth = 0; + n1 = n1 + 1; + elseif (strcmpi (varargin{n1}, "-depth")) + depth = varargin{n1+1}; + n1 = n1 + 2; + endif else - error ("findobj: properties and options must be strings"); + error ("findobj: properties and options must be strings"); endif endif endif @@ -117,67 +117,67 @@ logicaloperator{np} = "and"; if (ischar (args{na})) if (strcmpi (args{na}, "-regexp")) - if (na + 2 <= numel (args)) - regularexpression(np) = 1; - na = na + 1; - pname{np} = args{na}; - na = na + 1; - pvalue{np} = args{na}; - na = na + 1; - np = np + 1; - else - error ("findobj: inconsistent number of arguments"); - endif + if (na + 2 <= numel (args)) + regularexpression(np) = 1; + na = na + 1; + pname{np} = args{na}; + na = na + 1; + pvalue{np} = args{na}; + na = na + 1; + np = np + 1; + else + error ("findobj: inconsistent number of arguments"); + endif elseif (strcmpi (args{na}, "-property")) - if (na + 1 <= numel (args)) - na = na + 1; - property(np) = 1; - pname{np} = args{na}; - na = na + 1; - pvalue{np} = []; - np = np + 1; - else - error ("findobj: inconsistent number of arguments"); - endif + if (na + 1 <= numel (args)) + na = na + 1; + property(np) = 1; + pname{np} = args{na}; + na = na + 1; + pvalue{np} = []; + np = np + 1; + else + error ("findobj: inconsistent number of arguments"); + endif elseif (! strcmp (args{na}(1), "-")) - ## Parameter/value pairs. - if (na + 1 <= numel (args)) - pname{np} = args{na}; - na = na + 1; - pvalue{np} = args{na}; - na = na + 1; - if (na <= numel(args)) - if (ischar (args{na})) - if strcmpi(args{na}, "-and") - logicaloperator{np} = "and"; - na = na+1; - elseif strcmpi(args{na}, "-or") - logicaloperator{np} = "or"; - na = na+1; - elseif strcmpi(args{na}, "-xor") - logicaloperator{np} = "xor"; - na = na+1; - elseif strcmpi(args{na}, "-not") - logicaloperator{np} = "not"; - na = na+1; - endif - else - error ("findobj: properties and options must be strings"); - endif - else - logicaloperator{np} = "and"; - endif - np = np + 1; - else - error ("findobj: inconsistent number of arguments"); - endif + ## Parameter/value pairs. + if (na + 1 <= numel (args)) + pname{np} = args{na}; + na = na + 1; + pvalue{np} = args{na}; + na = na + 1; + if (na <= numel(args)) + if (ischar (args{na})) + if strcmpi(args{na}, "-and") + logicaloperator{np} = "and"; + na = na+1; + elseif strcmpi(args{na}, "-or") + logicaloperator{np} = "or"; + na = na+1; + elseif strcmpi(args{na}, "-xor") + logicaloperator{np} = "xor"; + na = na+1; + elseif strcmpi(args{na}, "-not") + logicaloperator{np} = "not"; + na = na+1; + endif + else + error ("findobj: properties and options must be strings"); + endif + else + logicaloperator{np} = "and"; + endif + np = np + 1; + else + error ("findobj: inconsistent number of arguments"); + endif else - ## This is sloppy ... but works like Matlab. - if strcmpi(args{na}, "-not") - h = []; - return - endif - na = na + 1; + ## This is sloppy ... but works like Matlab. + if strcmpi(args{na}, "-not") + h = []; + return + endif + na = na + 1; endif else error ("findobj: properties and options must be strings"); @@ -204,26 +204,26 @@ for nh = 1 : numel(h) p = get (h (nh)); for np = 1 : numpairs - fields = fieldnames (p); - fieldindex = find (strcmpi (fields, pname{np}), 1); - if (numel (fieldindex)) + fields = fieldnames (p); + fieldindex = find (strcmpi (fields, pname{np}), 1); + if (numel (fieldindex)) pname{np} = fields{fieldindex}; if (property(np)) match = 1; else if (regularexpression(np)) - match = regexp (p.(pname{np}), pvalue{np}); + match = regexp (p.(pname{np}), pvalue{np}); if isempty (match) match = 0; endif elseif (numel (p.(pname{np})) == numel (pvalue{np})) - if (ischar (pvalue{np})) - match = strcmpi (pvalue{np}, p.(pname{np})); - else - match = (pvalue{np} == p.(pname{np})); - endif + if (ischar (pvalue{np})) + match = strcmpi (pvalue{np}, p.(pname{np})); + else + match = (pvalue{np} == p.(pname{np})); + endif else - match = 0; + match = 0; endif match = all (match); endif @@ -232,9 +232,9 @@ else keepers(nh) = feval (logicaloperator{np}, keepers(nh), match); endif - else - keepers(nh) = 0; - endif + else + keepers(nh) = 0; + endif endfor endfor endif
--- a/scripts/plot/fplot.m +++ b/scripts/plot/fplot.m @@ -92,7 +92,7 @@ y00 = interp1 (x0, y0, x, "linear"); err = 0.5 * max (abs ((y00 - y) ./ (y00 + y))(:)); if (err == err0 || 0.5 * max (abs ((y00 - y) ./ (y00 + y))(:)) < tol) - break; + break; endif x0 = x; y0 = y;
--- a/scripts/plot/gnuplot_drawnow.m +++ b/scripts/plot/gnuplot_drawnow.m @@ -70,9 +70,9 @@ if (numel (plot_stream) > 1) pclose (plot_stream(2)); endif - if (numel (plot_stream) > 2) - waitpid (plot_stream(3)); - endif + if (numel (plot_stream) > 2) + waitpid (plot_stream(3)); + endif endif if (! isempty (fid)) fclose (fid); @@ -109,8 +109,8 @@ fclose (fid); if (count>0) if (a(1)==12) - ## avoid ^L at the beginning - a = a(2:end); + ## avoid ^L at the beginning + a = a(2:end); end puts (a); end @@ -190,43 +190,43 @@ title_str = ""; endif if (! (any (strfind (opts_str, " size ") > 0) - || any (strfind (opts_str, "size ") == 1))) + || any (strfind (opts_str, "size ") == 1))) ## Convert position to units used by gnuplot. if (output_to_screen (term)) ## Get figure size in pixels. Rely on listener - ## to handle coversion of position property. - units = get (h, "units"); - unwind_protect - set (h, "units", "pixels"); - position_in_pixesl = get (h, "position"); - unwind_protect_cleanup - set (h, "units", units); - end_unwind_protect - gnuplot_pos = position_in_pixesl(1:2); - gnuplot_size = position_in_pixesl(3:4); + ## to handle coversion of position property. + units = get (h, "units"); + unwind_protect + set (h, "units", "pixels"); + position_in_pixesl = get (h, "position"); + unwind_protect_cleanup + set (h, "units", units); + end_unwind_protect + gnuplot_pos = position_in_pixesl(1:2); + gnuplot_size = position_in_pixesl(3:4); else ## Get size of the printed plot in inches. Rely on listener - ## to handle coversion of papersize property. - paperunits = get (h, "paperunits"); - unwind_protect - set (h, "paperunits", "inches"); + ## to handle coversion of papersize property. + paperunits = get (h, "paperunits"); + unwind_protect + set (h, "paperunits", "inches"); gnuplot_size = get (h, "papersize"); - unwind_protect_cleanup - set (h, "paperunits", paperunits); - end_unwind_protect + unwind_protect_cleanup + set (h, "paperunits", paperunits); + end_unwind_protect if (term_units_are_pixels (term)) - ## Convert to inches using the property set by print(). - gnuplot_size = gnuplot_size * get (h, "__pixels_per_inch__"); - else - ## Implicit margins are in units of "inches" - gnuplot_size = gnuplot_size - implicit_margin; + ## Convert to inches using the property set by print(). + gnuplot_size = gnuplot_size * get (h, "__pixels_per_inch__"); + else + ## Implicit margins are in units of "inches" + gnuplot_size = gnuplot_size - implicit_margin; endif endif - [begin_match, end_match, te, match] = regexp (opts_str, "(\\s-r\\d+)|(^-r\\d+)"); - if (! isempty (begin_match)) - error ("gnuplot_drawnow.m: specifying resultion, '%s', not supported for terminal '%s'", - strtrim (match{1}), term) - endif + [begin_match, end_match, te, match] = regexp (opts_str, "(\\s-r\\d+)|(^-r\\d+)"); + if (! isempty (begin_match)) + error ("gnuplot_drawnow.m: specifying resultion, '%s', not supported for terminal '%s'", + strtrim (match{1}), term) + endif if (all (gnuplot_size > 0)) ## Set terminal size. terminals_with_size = {"emf", "gif", "jpeg", "latex", "pbm", ... @@ -239,22 +239,22 @@ terminals_with_size{end+1} = "wxt"; endif if (any (strncmpi (term, terminals_with_size, 3))) - if (term_units_are_pixels (term)) + if (term_units_are_pixels (term)) size_str = sprintf ("size %d,%d", gnuplot_size); - elseif (strcmp (term, "tikz")) + elseif (strcmp (term, "tikz")) size_str = sprintf ("size %.15gin,%.15gin", gnuplot_size); - else + else size_str = sprintf ("size %.15g,%.15g", gnuplot_size); - endif + endif if (strncmpi (term, "X11", 3) && __gnuplot_has_feature__ ("x11_figure_position")) - ## X11 allows the window to be positioned as well. - units = get (0, "units"); - unwind_protect - set (0, "units", "pixels"); - screen_size = get (0, "screensize")(3:4); - unwind_protect_cleanup - set (0, "units", units); - end_unwind_protect + ## X11 allows the window to be positioned as well. + units = get (0, "units"); + unwind_protect + set (0, "units", "pixels"); + screen_size = get (0, "screensize")(3:4); + unwind_protect_cleanup + set (0, "units", units); + end_unwind_protect if (all (screen_size > 0)) ## For X11, set the figure positon as well as the size ## gnuplot position is UL, Octave's is LL (same for screen/window) @@ -275,7 +275,7 @@ ## n = the number of times \n appears in PS1 size_str = ["size ", getenv("COLUMNS"), ",", getenv("LINES"), n]; else - ## Use the gnuplot default. + ## Use the gnuplot default. size_str = ""; end elseif (strncmpi (term, "fig", 3)) @@ -292,7 +292,7 @@ endif else size_str = ""; - warning ("gnuplot_set_term: size is zero") + warning ("gnuplot_set_term: size is zero") endif else ## A specified size take priority over the figure properies.
--- a/scripts/plot/grid.m +++ b/scripts/plot/grid.m @@ -57,28 +57,28 @@ x = varargin{1}; if (ischar (x)) if (strcmpi (x, "off")) - grid_on = false; + grid_on = false; elseif (strcmpi (x, "on")) - grid_on = true; + grid_on = true; elseif (strcmpi (x, "minor")) if (nargs == 2) - x2 = varargin{2}; - if (strcmpi (x2, "on")) - minor_on = true; - grid_on = true; - elseif (strcmpi (x2, "off")) - minor_on = false; - else - print_usage (); - endif - else - minor_on = ! minor_on; - if (minor_on) - grid_on = true; - endif - endif + x2 = varargin{2}; + if (strcmpi (x2, "on")) + minor_on = true; + grid_on = true; + elseif (strcmpi (x2, "off")) + minor_on = false; + else + print_usage (); + endif + else + minor_on = ! minor_on; + if (minor_on) + grid_on = true; + endif + endif else - print_usage (); + print_usage (); endif else error ("grid: argument must be a string");
--- a/scripts/plot/gtext.m +++ b/scripts/plot/gtext.m @@ -32,15 +32,15 @@ if (nargin > 0) if (iscellstr (s)) if (isempty (s)) - s = ""; + s = ""; else - s = sprintf ("%s\n", s{:}); + s = sprintf ("%s\n", s{:}); endif endif if (ischar (s)) if (! isempty (s)) - [x, y] = ginput (1); - text (x, y, s, varargin{:}); + [x, y] = ginput (1); + text (x, y, s, varargin{:}); endif else error ("gtext: expecting a string or cell array of strings");
--- a/scripts/plot/hidden.m +++ b/scripts/plot/hidden.m @@ -33,7 +33,7 @@ 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"); @@ -47,7 +47,7 @@ if (strcmp (htype, "surface")) fc = get (h, "facecolor"); if ((! ischar (fc) && is_white (fc)) - || (ischar (fc) && strcmpi (fc, "none"))) + || (ischar (fc) && strcmpi (fc, "none"))) switch (mode) case "on" set (h, "facecolor", "w"); @@ -56,10 +56,10 @@ case "swap" if (ischar (fc)) set (h, "facecolor", "w"); - mode = "on"; + mode = "on"; else set (h, "facecolor", "none"); - mode = "off"; + mode = "off"; endif endswitch endif
--- a/scripts/plot/hist.m +++ b/scripts/plot/hist.m @@ -80,7 +80,7 @@ x = x * (max_val - min_val) + ones (size (x)) * min_val; elseif (isreal (x)) if (isvector (x)) - x = x(:); + x = x(:); endif tmp = sort (x); if (any (tmp != x)) @@ -114,8 +114,8 @@ len = rows (y); chist = cumsum (idx <= len); chist = [(zeros (1, y_nc)); - (reshape (chist(idx > len), rows (cutoff), y_nc)); - (chist(end,:) - sum (isnan (y)))]; + (reshape (chist(idx > len), rows (cutoff), y_nc)); + (chist(end,:) - sum (isnan (y)))]; endif freq = diff (chist);
--- a/scripts/plot/hold.m +++ b/scripts/plot/hold.m @@ -63,11 +63,11 @@ state = varargin{1}; if (ischar (state)) if (strcmpi (state, "off")) - turn_hold_off = true; + turn_hold_off = true; elseif (strcmpi (state, "on")) - turn_hold_off = false; + turn_hold_off = false; else - error ("hold: invalid hold state"); + error ("hold: invalid hold state"); endif endif else
--- a/scripts/plot/ishold.m +++ b/scripts/plot/ishold.m @@ -30,17 +30,17 @@ elseif (nargin == 1) if (ishandle (h)) if (isfigure (h)) - ax = get (h, "currentaxes"); - if (isempty (ax)) - ax = __go_axes__ (h); - set (h, "currentaxes", ax); - endif - fig = h; + ax = get (h, "currentaxes"); + if (isempty (ax)) + ax = __go_axes__ (h); + set (h, "currentaxes", ax); + endif + fig = h; elseif (strcmpi (get (h, "type"), "axes")) - ax = h; - fig = get (h, "parent"); + ax = h; + fig = get (h, "parent"); else - error ("hold: expecting argument to be axes or figure graphics handle"); + error ("hold: expecting argument to be axes or figure graphics handle"); endif else error ("hold: expecting argument to be axes or figure graphics handle"); @@ -50,6 +50,6 @@ endif retval = (strcmpi (get (fig, "nextplot"), "add") - && strcmpi (get (ax, "nextplot"), "add")); + && strcmpi (get (ax, "nextplot"), "add")); endfunction
--- a/scripts/plot/isonormals.m +++ b/scripts/plot/isonormals.m @@ -61,25 +61,25 @@ ## subplot (2, 2, 1); view (-38, 20); ## [f, v, cdat] = isosurface (x, y, z, c, iso, y); ## p = patch ("Faces", f, "Vertices", v, "FaceVertexCData", cdat, \ -## "FaceColor", "interp", "EdgeColor", "none"); +## "FaceColor", "interp", "EdgeColor", "none"); ## isofinish (p); ## Call user function isofinish ## ## subplot (2, 2, 2); view (-38, 20); ## p = patch ("Faces", f, "Vertices", v, "FaceVertexCData", cdat, \ -## "FaceColor", "interp", "EdgeColor", "none"); +## "FaceColor", "interp", "EdgeColor", "none"); ## isonormals (x, y, z, c, p); ## Directly modify patch ## isofinish (p); ## ## subplot (2, 2, 3); view (-38, 20); ## p = patch ("Faces", f, "Vertices", v, "FaceVertexCData", cdat, \ -## "FaceColor", "interp", "EdgeColor", "none"); +## "FaceColor", "interp", "EdgeColor", "none"); ## n = isonormals (x, y, z, c, v); ## Compute normals of isosurface ## set (p, "VertexNormals", n); ## Manually set vertex normals ## isofinish (p); ## ## subplot (2, 2, 4); view (-38, 20); ## p = patch ("Faces", f, "Vertices", v, "FaceVertexCData", cdat, \ -## "FaceColor", "interp", "EdgeColor", "none"); +## "FaceColor", "interp", "EdgeColor", "none"); ## isonormals (x, y, z, c, v, "negate"); ## Use reverse directly ## isofinish (p); ## @end example
--- a/scripts/plot/isosurface.m +++ b/scripts/plot/isosurface.m @@ -159,15 +159,15 @@ newplot (); if (calc_colors) pa = patch ("Faces", fvc.faces, "Vertices", fvc.vertices, - "FaceVertexCData", fvc.facevertexcdata, - "FaceColor", "flat", "EdgeColor", "none"); + "FaceVertexCData", fvc.facevertexcdata, + "FaceColor", "flat", "EdgeColor", "none"); else pa = patch ("Faces", fvc.faces, "Vertices", fvc.vertices, - "FaceColor", "g", "EdgeColor", "k"); + "FaceColor", "g", "EdgeColor", "k"); endif if (! ishold ()) - set (gca(), "view", [-37.5, 30], - "xgrid", "on", "ygrid", "on", "zgrid", "on"); + set (gca(), "view", [-37.5, 30], + "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif case 1 varargout = {fvc};
--- a/scripts/plot/legend.m +++ b/scripts/plot/legend.m @@ -85,10 +85,10 @@ pos = varargin{nargs}; if (isnumeric (pos) && isscalar (pos) && round (pos) == pos) if (pos >= -1 && pos <= 4) - set (ca, "keypos", pos); - nargs--; + set (ca, "keypos", pos); + nargs--; else - error ("legend: invalid position specified"); + error ("legend: invalid position specified"); endif endif endif @@ -111,39 +111,39 @@ arg = varargin{1}; if (ischar (arg)) if (rows (arg) == 1) - str = tolower (deblank (arg)); - switch (str) - case {"off", "hide"} - set (ca, "key", "off"); - nargs--; - case "show" - set (ca, "key", "on"); - nargs--; - case "toggle" - val = get (ca, "key"); - if (strcmpi (val, "on")) - set (ca, "key", "off"); - else - set (ca, "key", "on"); - endif - nargs--; - case "boxon" - set (ca, "key", "on", "keybox", "on"); - nargs--; - case "boxoff" - set (ca, "keybox", "off"); - nargs--; - case "left" - set (ca, "keyreverse", "off") - nargs--; - case "right" - set (ca, "keyreverse", "on") - nargs--; - otherwise - endswitch + str = tolower (deblank (arg)); + switch (str) + case {"off", "hide"} + set (ca, "key", "off"); + nargs--; + case "show" + set (ca, "key", "on"); + nargs--; + case "toggle" + val = get (ca, "key"); + if (strcmpi (val, "on")) + set (ca, "key", "off"); + else + set (ca, "key", "on"); + endif + nargs--; + case "boxon" + set (ca, "key", "on", "keybox", "on"); + nargs--; + case "boxoff" + set (ca, "keybox", "off"); + nargs--; + case "left" + set (ca, "keyreverse", "off") + nargs--; + case "right" + set (ca, "keyreverse", "on") + nargs--; + otherwise + endswitch else - varargin = cellstr (arg); - nargs = numel (varargin); + varargin = cellstr (arg); + nargs = numel (varargin); endif elseif (iscellstr (arg)) varargin = arg; @@ -158,9 +158,9 @@ for k = 1:nkids typ = get (kids(k), "type"); if (strcmp (typ, "line") || strcmp (typ, "surface") - || strcmp (typ, "patch") || strcmp (typ, "hggroup")) - have_data = true; - break; + || strcmp (typ, "patch") || strcmp (typ, "hggroup")) + have_data = true; + break; endif endfor if (! have_data) @@ -175,30 +175,30 @@ if (ischar (arg)) typ = get (kids(k), "type"); while (k > 1 - && ! (strcmp (typ, "line") || strcmp (typ, "surface") - || strcmp (typ, "patch") || strcmp (typ, "hggroup"))) - typ = get (kids(--k), "type"); + && ! (strcmp (typ, "line") || strcmp (typ, "surface") + || strcmp (typ, "patch") || strcmp (typ, "hggroup"))) + typ = get (kids(--k), "type"); endwhile if (k > 0) - if (strcmp (get (kids(k), "type"), "hggroup")) - hgkids = get (kids(k), "children"); - for j = 1 : length (hgkids) - hgobj = get (hgkids (j)); - if (isfield (hgobj, "keylabel")) - set (hgkids(j), "keylabel", arg); - break; - endif - endfor - else - set (kids(k), "keylabel", arg); - endif - turn_on_legend = true; - if (--k == 0) - break; - endif + if (strcmp (get (kids(k), "type"), "hggroup")) + hgkids = get (kids(k), "children"); + for j = 1 : length (hgkids) + hgobj = get (hgkids (j)); + if (isfield (hgobj, "keylabel")) + set (hgkids(j), "keylabel", arg); + break; + endif + endfor + else + set (kids(k), "keylabel", arg); + endif + turn_on_legend = true; + if (--k == 0) + break; + endif elseif (! warned) - warned = true; - warning ("legend: ignoring extra labels"); + warned = true; + warning ("legend: ignoring extra labels"); endif else error ("legend: expecting argument to be a character string");
--- a/scripts/plot/linkprop.m +++ b/scripts/plot/linkprop.m @@ -69,12 +69,12 @@ recursion = true; val = get (h, prop); for hh = hlist(:)' - if (hh != h) - oldval = get (hh, prop); - if (! isequal (val, oldval)) - set (hh, prop, val); - endif - endif + if (hh != h) + oldval = get (hh, prop); + if (! isequal (val, oldval)) + set (hh, prop, val); + endif + endif endfor unwind_protect_cleanup recursion = false;
--- a/scripts/plot/meshz.m +++ b/scripts/plot/meshz.m @@ -61,11 +61,11 @@ y = [y(1); y(:); y(end)]; else x = [x(1, 1), x(1, :), x(1, end); - x(:, 1), x, x(:, end); - x(end, 1), x(end, :), x(end, end)]; + x(:, 1), x, x(:, end); + x(end, 1), x(end, :), x(end, end)]; y = [y(1, 1), y(1, :), y(1, end); - y(:, 1), y, y(:, end); - y(end, 1), y(end, :), y(end, end)]; + y(:, 1), y, y(:, end); + y(end, 1), y(end, :), y(end, end)]; endif zref = min(z(isfinite(z)));
--- a/scripts/plot/newplot.m +++ b/scripts/plot/newplot.m @@ -39,7 +39,7 @@ delete (get (cf, "children")) case "replace" otherwise - error ("newplot: unrecognized nextplot property for current figure"); + error ("newplot: unrecognized nextplot property for current figure"); endswitch ca = gca (); anp = get (ca, "nextplot"); @@ -49,10 +49,10 @@ case "replacechildren" delete (get (ca, "children")) case "replace" - __go_axes_init__ (ca, "replace"); - __request_drawnow__ (); + __go_axes_init__ (ca, "replace"); + __request_drawnow__ (); otherwise - error ("newplot: unrecognized nextplot property for current axes"); + error ("newplot: unrecognized nextplot property for current axes"); endswitch else print_usage ();
--- a/scripts/plot/pareto.m +++ b/scripts/plot/pareto.m @@ -64,14 +64,14 @@ y = varargin {2}(:).'; if (! iscell (y)) if (ischar (y)) - y = cellstr (y); + y = cellstr (y); else - y = cellfun (@(x) num2str (x), num2cell (y), "UniformOutput", false); + y = cellfun (@(x) num2str (x), num2cell (y), "UniformOutput", false); endif endif else y = cellfun (@(x) int2str (x), num2cell (1 : numel(x)), - "UniformOutput", false); + "UniformOutput", false); endif [x, idx] = sort (x, "descend"); @@ -83,8 +83,8 @@ idx95 = find(sign(cdf95(1:end-1)) != sign(cdf95(2:end)))(1); [ax, hbar, hline] = plotyy (1 : idx95, x (1 : idx95), - 1 : length(cdf), 100 .* cdf, - @bar, @plot); + 1 : length(cdf), 100 .* cdf, + @bar, @plot); axis (ax(1), [1 - 0.6, idx95 + 0.6, 0, maxcdf]); axis (ax(2), [1 - 0.6, idx95 + 0.6, 0, 100]);
--- a/scripts/plot/pie.m +++ b/scripts/plot/pie.m @@ -86,13 +86,13 @@ labels = arg; have_labels = true; if (numel (x) != numel (labels)) - error ("pie: mismatch in number of labels and data"); + error ("pie: mismatch in number of labels and data"); endif elseif (isnumeric (arg)) explode = arg; have_explode = true; if (! size_equal (x, explode)) - error ("pie: mismatch in number of elements in explode and data"); + error ("pie: mismatch in number of elements in explode and data"); endif endif endwhile @@ -140,7 +140,7 @@ endif hlist = [hlist; patch(xoff + [0, - sind(xn)], yoff + [0, cosd(xn)], i); - text(xt, yt, labels{i}, "horizontalalignment", align)]; + text(xt, yt, labels{i}, "horizontalalignment", align)]; endfor if (len == 1)
--- a/scripts/plot/plot3.m +++ b/scripts/plot/plot3.m @@ -112,84 +112,84 @@ if (ischar (new)) if (! z_set) - if (! y_set) - if (! x_set) - error ("plot3: needs x, [ y, [ z ] ]"); - else - z = imag (x); - y = real (x); - y_set = 1; - z_set = 1; - if (rows(x) > 1) - x = repmat ((1:rows(x))', 1, columns(x)); - else - x = 1:columns(x); - endif - endif - else - z = imag (y); - y = real (y); - z_set = 1; - endif + if (! y_set) + if (! x_set) + error ("plot3: needs x, [ y, [ z ] ]"); + else + z = imag (x); + y = real (x); + y_set = 1; + z_set = 1; + if (rows(x) > 1) + x = repmat ((1:rows(x))', 1, columns(x)); + else + x = 1:columns(x); + endif + endif + else + z = imag (y); + y = real (y); + z_set = 1; + endif endif if (! fmt_set) - [options, valid] = __pltopt__ ("plot3", new, false); - if (! valid) - properties = [properties, new_cell]; - property_set = 1; - continue; - else - fmt_set = 1; - while (arg < nargin && ischar (varargin{arg+1})) - if (nargin - arg < 2) - error ("plot3: properties must appear followed by a value"); - endif - properties = [properties, varargin(arg+1:arg+2)]; - arg += 2; - endwhile - endif + [options, valid] = __pltopt__ ("plot3", new, false); + if (! valid) + properties = [properties, new_cell]; + property_set = 1; + continue; + else + fmt_set = 1; + while (arg < nargin && ischar (varargin{arg+1})) + if (nargin - arg < 2) + error ("plot3: properties must appear followed by a value"); + endif + properties = [properties, varargin(arg+1:arg+2)]; + arg += 2; + endwhile + endif else - properties = [properties, new_cell]; - property_set = 1; - continue; + properties = [properties, new_cell]; + property_set = 1; + continue; endif if (isvector (x) && isvector (y)) - if (isvector (z)) - x = x(:); - y = y(:); - z = z(:); - elseif (length (x) == rows (z) && length (y) == columns (z)) - [x, y] = meshgrid (x, y); - else - error ("plot3: [length(x), length(y)] must match size(z)"); - endif + if (isvector (z)) + x = x(:); + y = y(:); + z = z(:); + elseif (length (x) == rows (z) && length (y) == columns (z)) + [x, y] = meshgrid (x, y); + else + error ("plot3: [length(x), length(y)] must match size(z)"); + endif endif if (! size_equal (x, y, z)) - error ("plot3: x, y, and z must have the same shape"); + error ("plot3: x, y, and z must have the same shape"); endif key = options.key; if (! isempty (key)) - set (gca (), "key", "on"); + set (gca (), "key", "on"); endif for i = 1 : columns (x) linestyle = options.linestyle; marker = options.marker; - if (isempty (marker) && isempty (linestyle)) - [linestyle, marker] = __next_line_style__ (); - endif - color = options.color; - if (isempty (options.color)) - color = __next_line_color__ (); - endif + if (isempty (marker) && isempty (linestyle)) + [linestyle, marker] = __next_line_style__ (); + endif + color = options.color; + if (isempty (options.color)) + color = __next_line_color__ (); + endif - tmp(++idx) = line (x(:, i), y(:, i), z(:, i), "keylabel", key, - "color", color, "linestyle", linestyle, - "marker", marker, properties{:}); + tmp(++idx) = line (x(:, i), y(:, i), z(:, i), "keylabel", key, + "color", color, "linestyle", linestyle, + "marker", marker, properties{:}); endfor x_set = 0; @@ -208,41 +208,41 @@ z_set = 1; else if (isvector (x) && isvector (y)) - if (isvector (z)) - x = x(:); - y = y(:); - z = z(:); - elseif (length (x) == rows (z) && length (y) == columns (z)) - [x, y] = meshgrid (x, y); - else - error ("plot3: [length(x), length(y)] must match size(z)"); - endif + if (isvector (z)) + x = x(:); + y = y(:); + z = z(:); + elseif (length (x) == rows (z) && length (y) == columns (z)) + [x, y] = meshgrid (x, y); + else + error ("plot3: [length(x), length(y)] must match size(z)"); + endif endif if (! size_equal (x, y, z)) - error ("plot3: x, y, and z must have the same shape"); + error ("plot3: x, y, and z must have the same shape"); endif options = __default_plot_options__ (); key = options.key; if (! isempty (key)) - set (gca (), "key", "on"); + set (gca (), "key", "on"); endif for i = 1 : columns (x) linestyle = options.linestyle; marker = options.marker; - if (isempty (marker) && isempty (linestyle)) - [linestyle, marker] = __next_line_style__ (); - endif - color = options.color; - if (isempty (color)) - color = __next_line_color__ (); - endif + if (isempty (marker) && isempty (linestyle)) + [linestyle, marker] = __next_line_style__ (); + endif + color = options.color; + if (isempty (color)) + color = __next_line_color__ (); + endif - tmp(++idx) = line (x(:, i), y(:, i), z(:, i), "keylabel", key, - "color", color, "linestyle", linestyle, - "marker", marker, properties{:}); + tmp(++idx) = line (x(:, i), y(:, i), z(:, i), "keylabel", key, + "color", color, "linestyle", linestyle, + "marker", marker, properties{:}); endfor x = new; @@ -263,9 +263,9 @@ if (x_set) if (y_set) if (! z_set) - z = imag (y); - y = real (y); - z_set = 1; + z = imag (y); + y = real (y); + z_set = 1; endif else z = imag (x); @@ -273,21 +273,21 @@ y_set = 1; z_set = 1; if (rows (x) > 1) - x = repmat ((1:rows (x))', 1, columns(x)); + x = repmat ((1:rows (x))', 1, columns(x)); else - x = 1:columns(x); + x = 1:columns(x); endif endif if (isvector (x) && isvector (y)) if (isvector (z)) - x = x(:); - y = y(:); - z = z(:); + x = x(:); + y = y(:); + z = z(:); elseif (length (x) == rows (z) && length (y) == columns (z)) - [x, y] = meshgrid (x, y); + [x, y] = meshgrid (x, y); else - error ("plot3: [length(x), length(y)] must match size(z)"); + error ("plot3: [length(x), length(y)] must match size(z)"); endif endif @@ -305,16 +305,16 @@ linestyle = options.linestyle; marker = options.marker; if (isempty (marker) && isempty (linestyle)) - [linestyle, marker] = __next_line_style__ (); + [linestyle, marker] = __next_line_style__ (); endif color = options.color; if (isempty (color)) - color = __next_line_color__ (); + color = __next_line_color__ (); endif tmp(++idx) = line (x(:, i), y(:, i), z(:, i), "keylabel", key, - "color", color, "linestyle", linestyle, - "marker", marker, properties{:}); + "color", color, "linestyle", linestyle, + "marker", marker, properties{:}); endfor endif
--- a/scripts/plot/plotmatrix.m +++ b/scripts/plot/plotmatrix.m @@ -74,20 +74,20 @@ newplot (); [h2, ax2, p2, pax2, need_usage] = __plotmatrix__ (bigax2, varargin{:}); if (need_usage) - print_usage (); + print_usage (); endif if (nargout > 0) - h = h2; - ax = ax2; - bigax = bigax2; - p = p2; - pax = pax2; + h = h2; + ax = ax2; + bigax = bigax2; + p = p2; + pax = pax2; endif axes (bigax2); ctext = text (0, 0, "", "visible", "off", - "handlevisibility", "off", "xliminclude", "off", - "yliminclude", "off", "zliminclude", "off", - "deletefcn", {@plotmatrixdelete, [ax2; pax2]}); + "handlevisibility", "off", "xliminclude", "off", + "yliminclude", "off", "zliminclude", "off", + "deletefcn", {@plotmatrixdelete, [ax2; pax2]}); set (bigax2, "visible", "off"); unwind_protect_cleanup axes (oldh); @@ -102,11 +102,11 @@ for i = 1 : numel (ax) hc = ax(i); if (ishandle (hc) && strcmp (get (hc, "type"), "axes") && - strcmpi (get (hc, "beingdeleted"), "off")) + strcmpi (get (hc, "beingdeleted"), "off")) parent = get (hc, "parent"); ## If the parent is invalid or being deleted, then do nothing if (ishandle (parent) && strcmpi (get (parent, "beingdeleted"), "off")) - delete (hc); + delete (hc); endif endif endfor @@ -122,14 +122,14 @@ if (ischar (arg) || iscell (arg)) [linespec, valid] = __pltopt__ ("plotmatrix", varargin{i}, false); if (valid) - have_line_spec = true; - linespec = varargin(i); - varargin(i) = []; - nargin = nargin - 1; - break; + have_line_spec = true; + linespec = varargin(i); + varargin(i) = []; + nargin = nargin - 1; + break; else - need_usage = true; - returm; + need_usage = true; + returm; endif endif endfor @@ -169,20 +169,20 @@ for j = 1 : m pos = [xsize * (j - 1) + xoff, ysize * (n - i) + yoff, xsize, ysize]; tmp = axes ("outerposition", pos, "position", pos + border, - "parent", parent); + "parent", parent); if (i == j && have_hist) - pax = [pax ; tmp]; - [nn, xx] = hist (X(:, i)); - tmp = bar (xx, nn, 1.0); - p = [p; tmp]; + pax = [pax ; tmp]; + [nn, xx] = hist (X(:, i)); + tmp = bar (xx, nn, 1.0); + p = [p; tmp]; else - ax = [ax ; tmp]; - if (have_line_spec) - tmp = plot (X (:, i), Y (:, j), linespec); - else - tmp = plot (X (:, i), Y (:, j), "."); - endif - h = [h ; tmp]; + ax = [ax ; tmp]; + if (have_line_spec) + tmp = plot (X (:, i), Y (:, j), linespec); + else + tmp = plot (X (:, i), Y (:, j), "."); + endif + h = [h ; tmp]; endif endfor endfor
--- a/scripts/plot/plotyy.m +++ b/scripts/plot/plotyy.m @@ -65,7 +65,7 @@ ax = [obj1, obj2]; varargin(1) = []; if (isempty (varargin)) - varargin = {}; + varargin = {}; endif else error ("plotyy: expecting first argument to be axes handle"); @@ -170,11 +170,11 @@ ## Add invisible text objects that when destroyed, ## also remove the other axis t1 = text (0, 0, "", "parent", ax(1), "tag", "plotyy", - "handlevisibility", "off", "visible", "off", - "xliminclude", "off", "yliminclude", "off"); + "handlevisibility", "off", "visible", "off", + "xliminclude", "off", "yliminclude", "off"); t2 = text (0, 0, "", "parent", ax(2), "tag", "plotyy", - "handlevisibility", "off", "visible", "off", - "xliminclude", "off", "yliminclude", "off"); + "handlevisibility", "off", "visible", "off", + "xliminclude", "off", "yliminclude", "off"); set (t1, "deletefcn", {@deleteplotyy, ax(2), t2}); set (t2, "deletefcn", {@deleteplotyy, ax(1), t1}); @@ -246,12 +246,12 @@ oldplotboxaspectratio = get (ax2, "plotboxaspectratio"); oldplotboxaspectratiomode = get (ax2, "plotboxaspectratiomode"); if (! (isequal (position, oldposition) && isequal (view, oldview))) - set (ax2, "position", position, "view", view) + set (ax2, "position", position, "view", view) endif if (! (isequal (plotboxaspectratio, oldplotboxaspectratio) - && isequal (plotboxaspectratiomode, oldplotboxaspectratiomode))) - set (ax2, "plotboxaspectratio", plotboxaspectratio); - set (ax2, "plotboxaspectratiomode", plotboxaspectratiomode); + && isequal (plotboxaspectratiomode, oldplotboxaspectratiomode))) + set (ax2, "plotboxaspectratio", plotboxaspectratio); + set (ax2, "plotboxaspectratiomode", plotboxaspectratiomode); endif unwind_protect_cleanup recursion = false;
--- a/scripts/plot/polar.m +++ b/scripts/plot/polar.m @@ -39,38 +39,38 @@ if (nargs == 3) if (! ischar (varargin{3})) - error ("polar: third argument must be a string"); + error ("polar: third argument must be a string"); endif tmp = __plr2__ (h, varargin{:}); maxr = max (varargin {2} (:)); elseif (nargs == 2) if (ischar (varargin{2})) - tmp = __plr1__ (h, varargin{:}); - if (iscomplex(varargin{1})) - maxr = max (imag(varargin{1})(:)); - else - maxr = max (varargin{1}(:)); - endif + tmp = __plr1__ (h, varargin{:}); + if (iscomplex(varargin{1})) + maxr = max (imag(varargin{1})(:)); + else + maxr = max (varargin{1}(:)); + endif else - fmt = ""; - tmp = __plr2__ (h, varargin{:}, fmt); - maxr = max (varargin {2} (:)); + fmt = ""; + tmp = __plr2__ (h, varargin{:}, fmt); + maxr = max (varargin {2} (:)); endif elseif (nargs == 1) fmt = ""; tmp = __plr1__ (h, varargin{:}, fmt); if (iscomplex(varargin{1})) - maxr = max (imag(varargin{1})(:)); + maxr = max (imag(varargin{1})(:)); else - maxr = max (varargin{1}(:)); + maxr = max (varargin{1}(:)); endif else print_usage (); endif set (h, "xlim", [-maxr, maxr], "ylim", [-maxr, maxr], - "xaxislocation", "zero", "yaxislocation", "zero", - "plotboxaspectratio", [1, 1, 1]); + "xaxislocation", "zero", "yaxislocation", "zero", + "plotboxaspectratio", [1, 1, 1]); if (nargout > 0) retval = tmp;
--- a/scripts/plot/private/__actual_axis_position__.m +++ b/scripts/plot/private/__actual_axis_position__.m @@ -35,7 +35,7 @@ ## FIXME -- this works for "axis square", but has not been ## thoroughly tested for other aspect ratios. aspect_ratio_2d = [max(axis_obj.plotboxaspectratio(1:2)), ... - axis_obj.plotboxaspectratio(3)/sqrt(2)]; + axis_obj.plotboxaspectratio(3)/sqrt(2)]; else aspect_ratio_2d = axis_obj.plotboxaspectratio(1:2); endif
--- a/scripts/plot/private/__add_datasource__.m +++ b/scripts/plot/private/__add_datasource__.m @@ -40,13 +40,13 @@ while (i < numel (varargin)) arg = varargin{++i}; if (i != numel(varargin) && ischar (arg) - && length (arg) > 9 && strcmpi (arg(end-9:end), "datasource")) + && length (arg) > 9 && strcmpi (arg(end-9:end), "datasource")) arg = tolower (arg); val = varargin{++i}; if (ischar (val)) - set (h, arg, val); + set (h, arg, val); else - error ("%s: expecting data source to be a string", fcn); + error ("%s: expecting data source to be a string", fcn); endif else newargs{end + 1} = arg;
--- a/scripts/plot/private/__axes_limits__.m +++ b/scripts/plot/private/__axes_limits__.m @@ -36,15 +36,15 @@ if (ischar (arg)) if (strcmpi (arg, "mode")) - retval = get (h, fcnmode); + retval = get (h, fcnmode); elseif (strcmpi (arg, "auto") || strcmpi (arg, "manual")) - set (h, fcnmode, arg); + set (h, fcnmode, arg); endif else if (!isnumeric (arg) && any (size(arg(:)) != [2, 1])) - error ("%s: argument must be a 2 element vector", fcn); + error ("%s: argument must be a 2 element vector", fcn); else - set (h, fcn, arg(:)); + set (h, fcn, arg(:)); endif endif endif
--- a/scripts/plot/private/__axis_label__.m +++ b/scripts/plot/private/__axis_label__.m @@ -37,7 +37,7 @@ "fontunits", get (ca, "fontunits"), "fontweight", get (ca, "fontweight"), "string", txt, - varargin{:}); + varargin{:}); if (nargout > 0) retval = h;
--- a/scripts/plot/private/__bar__.m +++ b/scripts/plot/private/__bar__.m @@ -48,13 +48,13 @@ if (size (x, 1) != size (y, 1)) y = varargin{1}; if (isvector (y)) - y = y(:); + y = y(:); endif x = [1:size(y,1)]'; idx = 2; else if (! isvector (x)) - error ("%s: x must be a vector", func); + error ("%s: x must be a vector", func); endif idx = 3; endif @@ -78,27 +78,27 @@ idx++; else if ((ischar (varargin{idx}) || iscell (varargin{idx})) - && ! have_line_spec) - [linespec, valid] = __pltopt__ (func, varargin{idx}, false); - if (valid) - have_line_spec = true; - newargs = [{linespec.color}, newargs]; - idx++; - continue; - endif + && ! have_line_spec) + [linespec, valid] = __pltopt__ (func, varargin{idx}, false); + if (valid) + have_line_spec = true; + newargs = [{linespec.color}, newargs]; + idx++; + continue; + endif endif if (isscalar(varargin{idx})) - width = varargin{idx++}; + width = varargin{idx++}; elseif (idx == nargin - 2) - newargs = [newargs,varargin(idx++)]; + newargs = [newargs,varargin(idx++)]; elseif (ischar (varargin{idx}) - && strcmpi (varargin{idx}, "basevalue") - && isscalar (varargin{idx+1})) + && strcmpi (varargin{idx}, "basevalue") + && isscalar (varargin{idx+1})) bv = varargin{idx+1}; idx += 2; else - newargs = [newargs,varargin(idx:idx+1)]; - idx += 2; + newargs = [newargs,varargin(idx:idx+1)]; + idx += 2; endif endif endwhile @@ -153,9 +153,9 @@ newplot (); tmp = bars (h, vertical, x, y, xb, yb, width, group, - have_line_spec, bv, newargs{:}); + have_line_spec, bv, newargs{:}); if (nargout == 1) - varargout{1} = tmp; + varargout{1} = tmp; endif unwind_protect_cleanup axes (oldh); @@ -185,27 +185,27 @@ if (vertical) if (! have_color_spec) - if (ycols == 1) - lev = clim(1); - else - lev = (i - 1) * (clim(2) - clim(1)) / (ycols - 1) - clim(1); - endif - h = patch(xb(:,:,i), yb(:,:,i), "FaceColor", "flat", - "cdata", lev, "parent", hg); + if (ycols == 1) + lev = clim(1); + else + lev = (i - 1) * (clim(2) - clim(1)) / (ycols - 1) - clim(1); + endif + h = patch(xb(:,:,i), yb(:,:,i), "FaceColor", "flat", + "cdata", lev, "parent", hg); else - h = patch(xb(:,:,i), yb(:,:,i), "parent", hg); + h = patch(xb(:,:,i), yb(:,:,i), "parent", hg); endif else if (! have_color_spec) - if (ycols == 1) - lev = clim(1) - else - lev = (i - 1) * (clim(2) - clim(1)) / (ycols - 1) - clim(1); - endif - h = patch(yb(:,:,i), xb(:,:,i), "FaceColor", "flat", - "cdata", lev, "parent", hg); + if (ycols == 1) + lev = clim(1) + else + lev = (i - 1) * (clim(2) - clim(1)) / (ycols - 1) - clim(1); + endif + h = patch(yb(:,:,i), xb(:,:,i), "FaceColor", "flat", + "cdata", lev, "parent", hg); else - h = patch(yb(:,:,i), xb(:,:,i), "parent", hg); + h = patch(yb(:,:,i), xb(:,:,i), "parent", hg); endif endif @@ -284,7 +284,7 @@ obj = get (kids (i)); if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline")) if (any (get (obj.baseline, "xdata") != xlim)) - set (obj.baseline, "xdata", xlim); + set (obj.baseline, "xdata", xlim); endif endif endfor @@ -298,13 +298,13 @@ for i = 1 : length (kids) obj = get (kids (i)); if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline") - && obj.baseline == h) + && obj.baseline == h) ## Only alter if changed to avoid recursion of the listener functions if (! strcmpi (get (kids(i), "showbaseline"), visible)) - set (kids (i), "showbaseline", visible); + set (kids (i), "showbaseline", visible); endif if (! strcmpi (get (kids(i), "basevalue"), visible)) - set (kids (i), "basevalue", ydata); + set (kids (i), "basevalue", ydata); endif endif endfor @@ -320,9 +320,9 @@ hlist = get (h, "bargroup"); showbaseline = get (h, "showbaseline"); for hh = hlist(:)' - if (hh != h) - set (hh, "showbaseline", showbaseline); - endif + if (hh != h) + set (hh, "showbaseline", showbaseline); + endif endfor set (get (h, "baseline"), "visible", showbaseline); unwind_protect_cleanup @@ -362,26 +362,26 @@ hlist = get (h, "bargroup"); x = get (h, "xdata"); if (!isvector (x)) - x = x(:); + x = x(:); endif y = []; for hh = hlist(:)' - ytmp = get (hh, "ydata"); - y = [y ytmp(:)]; + ytmp = get (hh, "ydata"); + y = [y ytmp(:)]; endfor [xb, yb] = bar (x, y, get (h, "barwidth"), get (h, "barlayout"), - "basevalue", get (h, "basevalue")); + "basevalue", get (h, "basevalue")); ny = columns (y); vert = strcmpi (get (h, "horizontal"), "off"); for i = 1:ny - hp = get (hlist(i), "children"); - if (vert) - set (hp, "xdata", xb(:,:,i), "ydata", yb(:,:,i)); - else - set (hp, "xdata", yb(:,:,i), "ydata", xb(:,:,i)); - endif + hp = get (hlist(i), "children"); + if (vert) + set (hp, "xdata", xb(:,:,i), "ydata", yb(:,:,i)); + else + set (hp, "xdata", yb(:,:,i), "ydata", xb(:,:,i)); + endif endfor unwind_protect_cleanup recursion = false; @@ -403,17 +403,17 @@ ## To prevent recursion, only change if modified for hh = hlist(:)' - if (hh != h) - if (get (hh, "barwidth") != barwidth) - set (hh, "barwidth", barwidth); - endif - if (! strcmpi (get (hh, "barlayout"), barlayout)) - set (hh, "barlayout", barlayout); - endif - if (! strcmpi (get (hh, "horizontal"), horizontal)) - set (hh, "horizontal", horizontal); - endif - endif + if (hh != h) + if (get (hh, "barwidth") != barwidth) + set (hh, "barwidth", barwidth); + endif + if (! strcmpi (get (hh, "barlayout"), barlayout)) + set (hh, "barlayout", barlayout); + endif + if (! strcmpi (get (hh, "horizontal"), horizontal)) + set (hh, "horizontal", horizontal); + endif + endif endfor update_data (h, d); unwind_protect_cleanup
--- a/scripts/plot/private/__clabel__.m +++ b/scripts/plot/private/__clabel__.m @@ -29,7 +29,7 @@ yspacing = 72 * 3 / abs(lims(3) - lims(4)); if (isscalar (hparent) && ishandle(hparent) && - strcmp (get (hparent, "type"), "hggroup")) + strcmp (get (hparent, "type"), "hggroup")) x = get (hparent, "xdata"); xmin = min (x(:)); xmax = max (x(:)); @@ -85,29 +85,29 @@ tagpos = pos(i); while (j1 < clen && cumd(j1) < tagpos) - j1++; + j1++; endwhile tpos = sum(c(:,i1+j1-1:i1+j1), 2) ./ 2; if (tpos(1) != xmin && tpos(1) != xmax && - tpos(2) != ymin && tpos(2) != ymax) - trot = 180 / pi * atan2 (diff (c(2,i1+j1-1:i1+j1)), - diff (c(1,i1+j1-1:i1+j1))); + tpos(2) != ymin && tpos(2) != ymax) + trot = 180 / pi * atan2 (diff (c(2,i1+j1-1:i1+j1)), + diff (c(1,i1+j1-1:i1+j1))); - if (ischar (z)) - ht = text (tpos(1), tpos(2), clev, tlabel, "rotation", trot, - "parent", hparent, "horizontalalignment", "center", - "userdata", clev, varargin{:}); - elseif (!isempty (z)) - ht = text (tpos(1), tpos(2), z, tlabel, "rotation", trot, - "parent", hparent, "horizontalalignment", "center", - "userdata", clev, varargin{:}); - else - ht = text (tpos(1), tpos(2), tlabel, "rotation", trot, - "parent", hparent, "horizontalalignment", "center", - "userdata", clev, varargin{:}); - endif - h = [h; ht]; + if (ischar (z)) + ht = text (tpos(1), tpos(2), clev, tlabel, "rotation", trot, + "parent", hparent, "horizontalalignment", "center", + "userdata", clev, varargin{:}); + elseif (!isempty (z)) + ht = text (tpos(1), tpos(2), z, tlabel, "rotation", trot, + "parent", hparent, "horizontalalignment", "center", + "userdata", clev, varargin{:}); + else + ht = text (tpos(1), tpos(2), tlabel, "rotation", trot, + "parent", hparent, "horizontalalignment", "center", + "userdata", clev, varargin{:}); + endif + h = [h; ht]; endif endfor i1 += clen+1;
--- a/scripts/plot/private/__contour__.m +++ b/scripts/plot/private/__contour__.m @@ -34,15 +34,15 @@ if ((ischar (arg) || iscell (arg))) [linespec, valid] = __pltopt__ ("__contour__", arg, false); if (isempty (linespec.color)) - linespec.color = "auto"; + linespec.color = "auto"; endif if (isempty (linespec.linestyle)) - linespec.linestyle = "-"; + linespec.linestyle = "-"; endif if (valid) - have_line_spec = true; - varargin(i) = []; - break; + have_line_spec = true; + varargin(i) = []; + break; endif endif endfor @@ -52,24 +52,24 @@ while (i < length (varargin)) if (ischar (varargin {i})) if (strcmpi (varargin{i}, "fill")) - filled = varargin {i + 1}; - varargin(i:i+1) = []; + filled = varargin {i + 1}; + varargin(i:i+1) = []; elseif (strcmpi (varargin{i}, "linecolor")) - linespec.color = varargin {i + 1}; - edgecolor = linespec.color; - if (ischar (edgecolor) && strcmpi (edgecolor, "auto")) - edgecolor = "flat"; - endif - varargin(i:i+1) = []; + linespec.color = varargin {i + 1}; + edgecolor = linespec.color; + if (ischar (edgecolor) && strcmpi (edgecolor, "auto")) + edgecolor = "flat"; + endif + varargin(i:i+1) = []; elseif (strcmpi (varargin{i}, "edgecolor")) - linespec.color = varargin {i + 1}; - edgecolor = linespec.color; - if (ischar (edgecolor) && strcmpi (edgecolor, "flat")) - linespec.color = "auto"; - endif - varargin(i:i+1) = []; + linespec.color = varargin {i + 1}; + edgecolor = linespec.color; + if (ischar (edgecolor) && strcmpi (edgecolor, "flat")) + linespec.color = "auto"; + endif + varargin(i:i+1) = []; else - opts{end+1} = varargin{i}; + opts{end+1} = varargin{i}; varargin(i) = []; opts{end+1} = varargin{i}; varargin(i) = []; @@ -98,7 +98,7 @@ if (isscalar (vn)) lvl = linspace (min (z1(!isinf(z1))), max (z1(!isinf(z1))), - vn + 2)(1:end-1); + vn + 2)(1:end-1); else lvl = vn; endif @@ -256,40 +256,40 @@ lvl_idx = find (abs (cont_lev - lev(k)) < lvl_eps); len = numel (lvl_idx); if (len > 1) - ## mark = logical(zeros(size(lvl_idx))); - mark = false (size (lvl_idx)); - a = 1; - while (a < len) - ## take 1st patch + ## mark = logical(zeros(size(lvl_idx))); + mark = false (size (lvl_idx)); + a = 1; + while (a < len) + ## take 1st patch b = a + 1; pa_idx = lvl_idx(a); ## get pointer to contour start, and contour length curr_ct_idx = cont_idx(pa_idx); curr_ct_len = cont_len(pa_idx); - ## get contour + ## get contour curr_ct = c(:, curr_ct_idx:curr_ct_idx+curr_ct_len-1); b_vec = (a+1):len; next_ct_pt_vec = c(:, cont_idx(lvl_idx(b_vec))); in = inpolygon (next_ct_pt_vec(1,:), next_ct_pt_vec(2,:), - curr_ct(1, :), curr_ct(2, :)); + curr_ct(1, :), curr_ct(2, :)); mark(b_vec(in)) = !mark(b_vec(in)); a++; - endwhile - if (numel (mark) > 0) - ## All marked contours describe a hole in a larger contour of - ## the same level and must be filled with colour of level below. + endwhile + if (numel (mark) > 0) + ## All marked contours describe a hole in a larger contour of + ## the same level and must be filled with colour of level below. ma_idx = lvl_idx(mark); if (k > 1) - ## Find color of level below. + ## Find color of level below. tmp = find(abs(cont_lev - lev(k - 1)) < lvl_eps); lvl_bel_idx = tmp(1); - ## Set color of patches found. - cont_lev(ma_idx) = cont_lev(lvl_bel_idx); + ## Set color of patches found. + cont_lev(ma_idx) = cont_lev(lvl_bel_idx); else - ## Set lowest level contour to NaN. - cont_lev(ma_idx) = NaN; + ## Set lowest level contour to NaN. + cont_lev(ma_idx) = NaN; endif - endif + endif endif endfor @@ -315,10 +315,10 @@ if (all (ctmp(:,1) == ctmp(:,end))) ctmp(:, end) = []; else - ## Special case unclosed contours + ## Special case unclosed contours endif h = [h; patch(ctmp(1, :), ctmp(2, :), cont_lev(idx), "edgecolor", lc, - "linestyle", ls, "linewidth", lw, "parent", hg)]; + "linestyle", ls, "linewidth", lw, "parent", hg)]; endfor if (min (lev) == max (lev)) @@ -337,26 +337,26 @@ clen = c(2,i1); if (all (c(:,i1+1) == c(:,i1+clen))) - p = c(:, i1+1:i1+clen-1); + p = c(:, i1+1:i1+clen-1); else - p = [c(:, i1+1:i1+clen), NaN(2, 1)]; + p = [c(:, i1+1:i1+clen), NaN(2, 1)]; endif switch (zmode) - case "none" - h = [h; patch(p(1,:), p(2,:), "facecolor", "none", - "edgecolor", lc, "linestyle", ls, "linewidth", lw, - "cdata", clev, "parent", hg)]; - case "auto" - h = [h; patch(p(1,:), p(2,:), clev * ones (1, columns (p)), - "facecolor", "none", "edgecolor", lc, - "linestyle", ls, "linewidth", lw, "cdata", clev, - "parent", hg)]; - otherwise - h = [h; patch(p(1,:), p(2,:), z * ones (1, columns (p)), - "facecolor", "none", "edgecolor", lc, - "linestyle", ls, "linewidth", lw, "cdata", clev, - "parent", hg)]; + case "none" + h = [h; patch(p(1,:), p(2,:), "facecolor", "none", + "edgecolor", lc, "linestyle", ls, "linewidth", lw, + "cdata", clev, "parent", hg)]; + case "auto" + h = [h; patch(p(1,:), p(2,:), clev * ones (1, columns (p)), + "facecolor", "none", "edgecolor", lc, + "linestyle", ls, "linewidth", lw, "cdata", clev, + "parent", hg)]; + otherwise + h = [h; patch(p(1,:), p(2,:), z * ones (1, columns (p)), + "facecolor", "none", "edgecolor", lc, + "linestyle", ls, "linewidth", lw, "cdata", clev, + "parent", hg)]; endswitch i1 += clen+1; endwhile @@ -374,12 +374,12 @@ set (kids, "zdata", []); case "auto" for i = 1 : length (kids) - set (kids(i), "zdata", get (kids (i), "cdata") .* - ones (size (get (kids (i), "xdata")))); + set (kids(i), "zdata", get (kids (i), "cdata") .* + ones (size (get (kids (i), "xdata")))); endfor otherwise for i = 1 : length (kids) - set (kids(i), "zdata", z .* ones (size (get (kids (i), "xdata")))); + set (kids(i), "zdata", z .* ones (size (get (kids (i), "xdata")))); endfor endswitch endfunction @@ -431,7 +431,7 @@ Y = get (h, "ydata"); Z = get (h, "zdata"); if (isvector (X) || isvector (Y)) - [X, Y] = meshgrid (X, Y); + [X, Y] = meshgrid (X, Y); endif [nr, nc] = size (Z); X0 = prepad(X, nc+1, 2 * X(1, 1) - X(1, 2), 2); @@ -445,7 +445,7 @@ [c, lev] = contourc (X0, Y0, Z0, lvl); else [c, lev] = contourc (get (h, "xdata"), get (h, "ydata"), - get (h, "zdata"), lvl); + get (h, "zdata"), lvl); endif set (h, "contourmatrix", c); @@ -493,15 +493,15 @@ if (strcmpi (get (h, "showtext"), "on")) switch (get (h, "zlevelmode")) - case "manual" - __clabel__ (get (h, "contourmatrix"), lvl, h, - get (h, "labelspacing"), get (h, "zlevel")); - case "auto" - __clabel__ (get (h, "contourmatrix"), lvl, h, - get (h, "labelspacing"), "auto"); - otherwise - __clabel__ (get (h, "contourmatrix"), lvl, h, - get (h, "labelspacing"), []); + case "manual" + __clabel__ (get (h, "contourmatrix"), lvl, h, + get (h, "labelspacing"), get (h, "zlevel")); + case "auto" + __clabel__ (get (h, "contourmatrix"), lvl, h, + get (h, "labelspacing"), "auto"); + otherwise + __clabel__ (get (h, "contourmatrix"), lvl, h, + get (h, "labelspacing"), []); endswitch endif endif
--- a/scripts/plot/private/__errcomm__.m +++ b/scripts/plot/private/__errcomm__.m @@ -51,21 +51,21 @@ while (k <= nargs) a = varargin{k++}; if (ischar (a) || iscellstr (a)) - retval(idx++) = __errplot__ (a, p, data{1:ndata}); - break; + retval(idx++) = __errplot__ (a, p, data{1:ndata}); + break; elseif (isvector (a)) - a = a(:); + a = a(:); elseif (ismatrix (a)) - ; + ; else - error ("wrong argument types"); + error ("wrong argument types"); endif if (size (a) != sz) - error ("argument sizes do not match"); + error ("argument sizes do not match"); endif data{++ndata} = a; if (ndata > 6) - error ("too many arguments to a plot"); + error ("too many arguments to a plot"); endif endwhile endwhile
--- a/scripts/plot/private/__errplot__.m +++ b/scripts/plot/private/__errplot__.m @@ -59,7 +59,7 @@ hg = hggroup ("parent", p); h = [h; hg]; args = __add_datasource__ ("__errplot__", hg, - {"x", "y", "l", "u", "xl", "xu"}); + {"x", "y", "l", "u", "xl", "xu"}); if (isempty (fmt.color)) hl = __line__ (hg, "color", __next_line_color__ ()); @@ -77,42 +77,42 @@ switch (nargin - 2) case 1 - error ("error plot requires 2, 3, 4 or 6 columns"); + error ("error plot requires 2, 3, 4 or 6 columns"); case 2 - set (hl, "xdata", (1:len)'); - set (hl, "ydata", a1(:,i)); - set (hl, "ldata", a2(:,i)); - set (hl, "udata", a2(:,i)); + set (hl, "xdata", (1:len)'); + set (hl, "ydata", a1(:,i)); + set (hl, "ldata", a2(:,i)); + set (hl, "udata", a2(:,i)); case 3 - set (hl, "xdata", a1(:,i)); - set (hl, "ydata", a2(:,i)); - set (hl, "ldata", a3(:,i)); - set (hl, "udata", a3(:,i)); + set (hl, "xdata", a1(:,i)); + set (hl, "ydata", a2(:,i)); + set (hl, "ldata", a3(:,i)); + set (hl, "udata", a3(:,i)); case 4 - set (hl, "xdata", a1(:,i)); - set (hl, "ydata", a2(:,i)); + set (hl, "xdata", a1(:,i)); + set (hl, "ydata", a2(:,i)); - if (index (ifmt, "boxxy") || index (ifmt, "xyerr")) - set (hl, "xldata", a3(:,i)); - set (hl, "xudata", a3(:,i)); - set (hl, "ldata", a4(:,i)); - set (hl, "udata", a4(:,i)); - elseif (index (ifmt, "xerr")) - set (hl, "xldata", a3(:,i)); - set (hl, "xudata", a4(:,i)); - else - set (hl, "ldata", a3(:,i)); - set (hl, "udata", a4(:,i)); - endif + if (index (ifmt, "boxxy") || index (ifmt, "xyerr")) + set (hl, "xldata", a3(:,i)); + set (hl, "xudata", a3(:,i)); + set (hl, "ldata", a4(:,i)); + set (hl, "udata", a4(:,i)); + elseif (index (ifmt, "xerr")) + set (hl, "xldata", a3(:,i)); + set (hl, "xudata", a4(:,i)); + else + set (hl, "ldata", a3(:,i)); + set (hl, "udata", a4(:,i)); + endif case 5 - error ("error plot requires 2, 3, 4 or 6 columns"); + error ("error plot requires 2, 3, 4 or 6 columns"); case 6 - set (hl, "xdata", a1(:,i)); - set (hl, "ydata", a2(:,i)); - set (hl, "xldata", a3(:,i)); - set (hl, "xudata", a4(:,i)); - set (hl, "ldata", a5(:,i)); - set (hl, "udata", a6(:,i)); + set (hl, "xdata", a1(:,i)); + set (hl, "ydata", a2(:,i)); + set (hl, "xldata", a3(:,i)); + set (hl, "xudata", a4(:,i)); + set (hl, "ldata", a5(:,i)); + set (hl, "udata", a6(:,i)); endswitch addproperty ("color", hg, "linecolor", get (hl, "color")); @@ -120,11 +120,11 @@ addproperty ("linestyle", hg, "linelinestyle", get (hl, "linestyle")); addproperty ("marker", hg, "linemarker", get (hl, "marker")); addproperty ("markerfacecolor", hg, "linemarkerfacecolor", - get (hl, "markerfacecolor")); + get (hl, "markerfacecolor")); addproperty ("markeredgecolor", hg, "linemarkerfacecolor", - get (hl, "markeredgecolor")); + get (hl, "markeredgecolor")); addproperty ("markersize", hg, "linemarkersize", - get (hl, "markersize")); + get (hl, "markersize")); addlistener (hg, "color", @update_props); addlistener (hg, "linewidth", @update_props); @@ -148,11 +148,11 @@ addlistener (hg, "xudata", @update_data); __line__ (hg, "xdata", get (hl, "xdata"), - "ydata", get (hl, "ydata"), - "color", get (hl, "color"), - "linewidth", get (hl, "linewidth"), - "linestyle", get (hl, "linestyle"), - "marker", "none", "parent", hg); + "ydata", get (hl, "ydata"), + "color", get (hl, "color"), + "linewidth", get (hl, "linewidth"), + "linestyle", get (hl, "linestyle"), + "marker", "none", "parent", hg); endfor endfunction
--- a/scripts/plot/private/__ezplot__.m +++ b/scripts/plot/private/__ezplot__.m @@ -76,9 +76,9 @@ if (isplot) xarg = argnames(fun){1}; if (nargs == 2) - yarg = argnames(fun){2}; + yarg = argnames(fun){2}; else - yarg = ""; + yarg = ""; endif elseif (isplot3) xarg = "x"; @@ -101,9 +101,9 @@ if (isplot) xarg = argnames(fun){1}; if (nargs == 2) - yarg = argnames(fun){2}; + yarg = argnames(fun){2}; else - yarg = ""; + yarg = ""; endif elseif (isplot3) xarg = "x"; @@ -119,7 +119,7 @@ fstr = func2str (fun); if (length (findstr (fstr, ")")) != 0) args = regexp (substr (fstr, 3, findstr (fstr, ")")(1) - 3), - '(\w[\w\d]*)', 'tokens'); + '(\w[\w\d]*)', 'tokens'); fstr = substr (fstr, findstr (fstr, ")")(1) + 1); else args = {{"x"}}; @@ -132,9 +132,9 @@ if (isplot) xarg = args{1}{1}; if (nargs == 2) - yarg = args{2}{1}; + yarg = args{2}{1}; else - yarg = ""; + yarg = ""; endif elseif (isplot3) xarg = "x"; @@ -157,18 +157,18 @@ if (ischar (funy) && ! strcmp (funy, "circ") && ! strcmp (funy, "animate")) parametric = true; if (exist (funy, "file") || exist (funy, "builtin")) - funy = vectorize (inline (cstrcat (funy, "(t)"))); + funy = vectorize (inline (cstrcat (funy, "(t)"))); else - funy = vectorize (inline (funy)); + funy = vectorize (inline (funy)); endif if (length (argnames (funy)) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); + error ("%s: excepting a function of %d arguments", func, nargs); endif fstry = formula (funy); elseif (strcmp (typeinfo (funy), "inline function")) parametric = true; if (length (argnames (funy)) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); + error ("%s: excepting a function of %d arguments", func, nargs); endif funy = vectorize (funy); fstry = formula (funy); @@ -176,14 +176,14 @@ parametric = true; fstry = func2str (funy); if (length (findstr (fstry, ")")) != 0) - args = regexp (substr (fstry, 3, findstr (fstry, ")")(1) - 3), - '(\w[\w\d]*)', 'tokens'); - fstry = substr (fstry, findstr (fstry, ")")(1) + 1); + args = regexp (substr (fstry, 3, findstr (fstry, ")")(1) - 3), + '(\w[\w\d]*)', 'tokens'); + fstry = substr (fstry, findstr (fstry, ")")(1) + 1); else - args = {{"y"}}; + args = {{"y"}}; endif if (length (args) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); + error ("%s: excepting a function of %d arguments", func, nargs); endif endif @@ -191,39 +191,39 @@ xarg = "x"; yarg = "y"; if (nargs == 2) - error ("%s: can not define a parametric function in this manner"); + error ("%s: can not define a parametric function in this manner"); endif endif if (!isplot && parametric) funz = varargin {3}; if (ischar (funz) && ! strcmp (funz, "circ") && - ! strcmp (funz, "animate")) - if (exist (funz, "file") || exist (funz, "builtin")) - funz = vectorize (inline (cstrcat (funz, "(t)"))); - else - funz = vectorize (inline (funz)); - endif - if (length (argnames (funz)) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); - endif - fstrz = formula (funz); + ! strcmp (funz, "animate")) + if (exist (funz, "file") || exist (funz, "builtin")) + funz = vectorize (inline (cstrcat (funz, "(t)"))); + else + funz = vectorize (inline (funz)); + endif + if (length (argnames (funz)) != nargs) + error ("%s: excepting a function of %d arguments", func, nargs); + endif + fstrz = formula (funz); elseif (strcmp (typeinfo (funz), "inline function")) - if (length (argnames (funz)) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); - endif - funz = vectorize (funz); - fstrz = formula (funz); + if (length (argnames (funz)) != nargs) + error ("%s: excepting a function of %d arguments", func, nargs); + endif + funz = vectorize (funz); + fstrz = formula (funz); elseif (isa (funz, "function_handle")) - fstrz = func2str (funz); - args = regexp (substr (fstrz, 3, findstr (fstrz, ")")(1) - 3), - '(\w[\w\d]*)', 'tokens'); - if (length (args) != nargs) - error ("%s: excepting a function of %d arguments", func, nargs); - endif - fstrz = substr (fstrz, findstr (fstrz, ")")(1) + 1); + fstrz = func2str (funz); + args = regexp (substr (fstrz, 3, findstr (fstrz, ")")(1) - 3), + '(\w[\w\d]*)', 'tokens'); + if (length (args) != nargs) + error ("%s: excepting a function of %d arguments", func, nargs); + endif + fstrz = substr (fstrz, findstr (fstrz, ")")(1) + 1); else - error ("%s: parametric plots expect 3 functions", func); + error ("%s: parametric plots expect 3 functions", func); endif endif endif @@ -277,13 +277,13 @@ endif if (parametric) error ("%s: can not have both circular domain and parametric function", - func); + func); endif cent = [domain(1) + domain(2), domain(3) + domain(4)] / 2; funx = @(r,t) r .* cos (t) + cent (1); funy = @(r,t) r .* sin (t) + cent (2); domain = [0, sqrt((domain(2) - cent(1))^2 + (domain(4) - cent(2))^2), ... - -pi, pi]; + -pi, pi]; funz = fun; parametric = true; endif @@ -331,14 +331,14 @@ endif fstrx = regexprep (regexprep (regexprep (fstrx,'\.\^\s*','^'), - '\./', '/'), '[\.]*\*', ''); + '\./', '/'), '[\.]*\*', ''); fstry = regexprep (regexprep (regexprep (fstry,'\.\^\s*','^'), - '\./', '/'), '[\.]*\*', ''); + '\./', '/'), '[\.]*\*', ''); if (isplot) fstr = cstrcat ("x = ",fstrx,", y = ",fstry); else fstrz = regexprep (regexprep (regexprep (fstrz,'\.\^\s*','^'), - '\./', '/'), '[\.]*\*', ''); + '\./', '/'), '[\.]*\*', ''); fstr = cstrcat ("x = ",fstrx,",y = ",fstry,", z = ",fstrz); endif else @@ -348,13 +348,13 @@ endif fstr = regexprep (regexprep (regexprep (fstr,'\.\^\s*','^'), '\./', '/'), - '[\.]*\*', ''); + '[\.]*\*', ''); if (isplot && nargs == 2) if (strcmp (typeinfo (fun), "inline function") && - !isempty (strfind (formula (fun) , "="))) - fun = inline (cstrcat (strrep (formula (fun), "=", "- ("), ")")); + !isempty (strfind (formula (fun) , "="))) + fun = inline (cstrcat (strrep (formula (fun), "=", "- ("), ")")); else - fstr = cstrcat (fstr, " = 0"); + fstr = cstrcat (fstr, " = 0"); endif Z = feval (fun, X, Y); @@ -369,40 +369,40 @@ XX = {}; YY = {}; while (i1 < length (c)) - clev = c(1,i1); - clen = c(2,i1); - XX = [XX, {c(1, i1+1:i1+clen)}]; - YY = [YY, {c(2, i1+1:i1+clen)}]; - i1 += clen+1; + clev = c(1,i1); + clen = c(2,i1); + XX = [XX, {c(1, i1+1:i1+clen)}]; + YY = [YY, {c(2, i1+1:i1+clen)}]; + i1 += clen+1; endwhile else if (ispolar) - Z = feval (fun, X); + Z = feval (fun, X); elseif (isplot) - Z = real (feval (fun, X)); + Z = real (feval (fun, X)); - ## Eliminate the singularities. This seems to be what matlab - ## does, but can't be sure. - XX = sort (Z (isfinite (Z))); - if (length (X) > 4) - d = XX(fix (7 * length (XX) / 8)) - XX(fix (length (XX) / 8)); - yrange = [max(XX(1) - d/8, XX(fix (length (XX) / 8)) - d), ... - min(XX(end) + d/8, XX(fix (7 * length (XX) / 8)) + d)]; - else - yrange = [XX(1), XX(end)]; + ## Eliminate the singularities. This seems to be what matlab + ## does, but can't be sure. + XX = sort (Z (isfinite (Z))); + if (length (X) > 4) + d = XX(fix (7 * length (XX) / 8)) - XX(fix (length (XX) / 8)); + yrange = [max(XX(1) - d/8, XX(fix (length (XX) / 8)) - d), ... + min(XX(end) + d/8, XX(fix (7 * length (XX) / 8)) + d)]; + else + yrange = [XX(1), XX(end)]; endif - idx = 2 : length(Z); - idx = find (((Z(idx) > yrange(2) / 2) & (Z(idx-1) < yrange(1) / 2)) | - ((Z(idx) < yrange(1) / 2) & (Z(idx-1) > yrange (2) / 2))); - if (any(idx)) - Z(idx) = NaN; - endif + idx = 2 : length(Z); + idx = find (((Z(idx) > yrange(2) / 2) & (Z(idx-1) < yrange(1) / 2)) | + ((Z(idx) < yrange(1) / 2) & (Z(idx-1) > yrange (2) / 2))); + if (any(idx)) + Z(idx) = NaN; + endif else - Z = feval (fun, X, Y); + Z = feval (fun, X, Y); - ## Eliminate the singularities - Z = __eliminate_sing__ (Z); + ## Eliminate the singularities + Z = __eliminate_sing__ (Z); endif endif endif @@ -416,16 +416,16 @@ h = []; hold_state = get (ax, "nextplot"); for i = 1 : length (XX) - h = [h; plot(XX{i}, YY{i})]; - if (i == 1) - set (ax, "nextplot", "add") - endif + h = [h; plot(XX{i}, YY{i})]; + if (i == 1) + set (ax, "nextplot", "add") + endif endfor set (ax, "nextplot", hold_state) elseif (ispolar || isplot) h = feval (pfunc, X, Z); if (isplot && !parametric) - axis ([X(1), X(end), yrange]); + axis ([X(1), X(end), yrange]); endif else h = feval (pfunc, X, Y, Z);
--- a/scripts/plot/private/__patch__.m +++ b/scripts/plot/private/__patch__.m @@ -39,9 +39,9 @@ args{4} = getfield(varargin{1}, "vertices"); args{5} = "facevertexcdata"; if (isfield (varargin{1}, "facevertexcdata")) - args{6} = getfield(varargin{1}, "facevertexcdata"); + args{6} = getfield(varargin{1}, "facevertexcdata"); else - args{6} = []; + args{6} = []; endif args = [args; varargin(2:end)]; args = setdata (args); @@ -57,17 +57,17 @@ iarg = 3; if (nargin > 3 && ndims (varargin{3}) == 2 && ndims (x) == 2 - && size_equal(x, varargin{3}) && !ischar(varargin{3})) - z = varargin{3}; - iarg++; + && size_equal(x, varargin{3}) && !ischar(varargin{3})) + z = varargin{3}; + iarg++; else - z = []; + z = []; endif if (isvector (x)) - x = x(:); - y = y(:); - z = z(:); + x = x(:); + y = y(:); + z = z(:); endif args{1} = "xdata"; args{2} = x; @@ -77,56 +77,56 @@ args{6} = z; if (isnumeric (varargin{iarg})) - c = varargin{iarg}; - iarg++; + c = varargin{iarg}; + iarg++; - if (ndims (c) == 3 && size (c, 2) == 1) - c = permute (c, [1, 3, 2]); - endif + if (ndims (c) == 3 && size (c, 2) == 1) + c = permute (c, [1, 3, 2]); + endif - if (isvector (c) && numel (c) == columns (x)) - if (isnan (c)) - args{7} = "facecolor"; - args{8} = [1, 1, 1]; - args{9} = "cdata"; - args{10} = c; - elseif (isnumeric (c)) - args{7} = "facecolor"; - args{8} = "flat"; - args{9} = "cdata"; - args{10} = c; - else - error ("patch: color value not valid"); - endif - elseif (size (c, ndims (c)) == 3) - args{7} = "facecolor"; - args{8} = "flat"; - args{9} = "cdata"; - args{10} = c; - else - ## Color Vectors - if (rows (c) != rows (x) || rows (c) != length (y)) - error ("patch: size of x, y, and c must be equal") - else - args{7} = "facecolor"; - args{8} = "interp"; - args{9} = "cdata"; - args{10} = []; - endif - endif + if (isvector (c) && numel (c) == columns (x)) + if (isnan (c)) + args{7} = "facecolor"; + args{8} = [1, 1, 1]; + args{9} = "cdata"; + args{10} = c; + elseif (isnumeric (c)) + args{7} = "facecolor"; + args{8} = "flat"; + args{9} = "cdata"; + args{10} = c; + else + error ("patch: color value not valid"); + endif + elseif (size (c, ndims (c)) == 3) + args{7} = "facecolor"; + args{8} = "flat"; + args{9} = "cdata"; + args{10} = c; + else + ## Color Vectors + if (rows (c) != rows (x) || rows (c) != length (y)) + error ("patch: size of x, y, and c must be equal") + else + args{7} = "facecolor"; + args{8} = "interp"; + args{9} = "cdata"; + args{10} = []; + endif + endif elseif (ischar (varargin{iarg}) && rem (nargin - iarg, 2) != 0) - ## Assume that any additional argument over an even number is - ## color string. - args{7} = "facecolor"; - args{8} = tolower (varargin{iarg}); - args{9} = "cdata"; - args{10} = []; - iarg++; + ## Assume that any additional argument over an even number is + ## color string. + args{7} = "facecolor"; + args{8} = tolower (varargin{iarg}); + args{9} = "cdata"; + args{10} = []; + iarg++; else - args{7} = "facecolor"; - args{8} = [0, 1, 0]; - args{9} = "cdata"; - args{10} = []; + args{7} = "facecolor"; + args{8} = [0, 1, 0]; + args{9} = "cdata"; + args{10} = []; endif args = [args, varargin(iarg:end)]; @@ -202,8 +202,8 @@ if (any (t1(:))) t2 = find (t1 != t1([2:end,end],:)); idx (t1) = idx (t2 (cell2mat (cellfun (@(x) x(1)*ones(1,x(2)), - mat2cell ([1 : nc; sum(t1)], 2, ones(1,nc)), - "UniformOutput", false)))); + mat2cell ([1 : nc; sum(t1)], 2, ones(1,nc)), + "UniformOutput", false)))); endif x = reshape (vert(:,1)(idx), size (idx)); y = reshape (vert(:,2)(idx), size (idx)); @@ -218,11 +218,11 @@ c = reshape (fvc, [1, size(fvc)]); else if (size(fvc, 2) == 3) - c = cat(3, reshape (fvc(idx, 1), size(idx)), - reshape (fvc(idx, 2), size(idx)), - reshape (fvc(idx, 3), size(idx))); + c = cat(3, reshape (fvc(idx, 1), size(idx)), + reshape (fvc(idx, 2), size(idx)), + reshape (fvc(idx, 3), size(idx))); else - c = reshape (fvc(idx), size(idx)); + c = reshape (fvc(idx), size(idx)); endif endif else
--- a/scripts/plot/private/__plt__.m +++ b/scripts/plot/private/__plt__.m @@ -44,66 +44,66 @@ while (nargs > 0 || x_set) if (nargs == 0) - ## Force the last plot when input variables run out. - next_cell = {}; - next_arg = {""}; + ## Force the last plot when input variables run out. + next_cell = {}; + next_arg = {""}; else - next_cell = varargin(k); - next_arg = varargin{k++}; + next_cell = varargin(k); + next_arg = varargin{k++}; endif nargs--; if (ischar (next_arg) || iscellstr (next_arg)) - if (x_set) - [options, valid] = __pltopt__ (caller, next_arg, false); - if (! valid) - if (nargs == 0) - error ("%s: properties must appear followed by a value", caller); - endif - properties = [properties, [next_cell, varargin(k++)]]; - nargs--; - continue; - else - while (nargs > 0 && ischar (varargin{k})) - if (nargs < 2) - error ("%s: properties must appear followed by a value", - caller); - endif - properties = [properties, varargin(k:k+1)]; - k += 2; - nargs -= 2; - endwhile - endif - if (y_set) - tmp = __plt2__ (h, x, y, options, properties); - properties = {}; - retval = [retval; tmp]; - else - tmp = __plt1__ (h, x, options, properties); - properties = {}; - retval = [retval; tmp]; - endif - x_set = false; - y_set = false; - else - error ("plot: no data to plot"); - endif + if (x_set) + [options, valid] = __pltopt__ (caller, next_arg, false); + if (! valid) + if (nargs == 0) + error ("%s: properties must appear followed by a value", caller); + endif + properties = [properties, [next_cell, varargin(k++)]]; + nargs--; + continue; + else + while (nargs > 0 && ischar (varargin{k})) + if (nargs < 2) + error ("%s: properties must appear followed by a value", + caller); + endif + properties = [properties, varargin(k:k+1)]; + k += 2; + nargs -= 2; + endwhile + endif + if (y_set) + tmp = __plt2__ (h, x, y, options, properties); + properties = {}; + retval = [retval; tmp]; + else + tmp = __plt1__ (h, x, options, properties); + properties = {}; + retval = [retval; tmp]; + endif + x_set = false; + y_set = false; + else + error ("plot: no data to plot"); + endif elseif (x_set) - if (y_set) - options = __pltopt__ (caller, {""}); - tmp = __plt2__ (h, x, y, options, properties); - retval = [retval; tmp]; - x = next_arg; - y_set = false; - properties = {}; - else - y = next_arg; - y_set = true; - endif + if (y_set) + options = __pltopt__ (caller, {""}); + tmp = __plt2__ (h, x, y, options, properties); + retval = [retval; tmp]; + x = next_arg; + y_set = false; + properties = {}; + else + y = next_arg; + y_set = true; + endif else - x = next_arg; - x_set = true; + x = next_arg; + x_set = true; endif endwhile @@ -238,27 +238,27 @@ if (x_nr == y_nr && x_nc == y_nc) if (x_nc > 0) if (numel (options) == 1) - options = repmat (options(:), x_nc, 1); + options = repmat (options(:), x_nc, 1); endif retval = zeros (x_nc, 1); for i = 1:x_nc - tkey = options(i).key; - if (! isempty (tkey)) - set (h, "key", "on"); - endif + tkey = options(i).key; + if (! isempty (tkey)) + set (h, "key", "on"); + endif linestyle = options(i).linestyle; marker = options(i).marker; - if (isempty (marker) && isempty (linestyle)) - [linestyle, marker] = __next_line_style__ (); - endif - color = options(i).color; - if (isempty (color)) - color = __next_line_color__ (); - endif + if (isempty (marker) && isempty (linestyle)) + [linestyle, marker] = __next_line_style__ (); + endif + color = options(i).color; + if (isempty (color)) + color = __next_line_color__ (); + endif - retval(i) = line (x(:,i), y(:,i), "keylabel", tkey, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + retval(i) = line (x(:,i), y(:,i), "keylabel", tkey, "color", color, + "linestyle", linestyle, + "marker", marker, properties{:}); endfor else error ("__plt2mm__: arguments must be a matrices"); @@ -312,21 +312,21 @@ for i = 1:x_nc tkey = options(i).key; if (! isempty (tkey)) - set (h, "key", "on"); + set (h, "key", "on"); endif linestyle = options(i).linestyle; marker = options(i).marker; if (isempty (marker) && isempty (linestyle)) - [linestyle, marker] = __next_line_style__ (); + [linestyle, marker] = __next_line_style__ (); endif color = options(i).color; if (isempty (color)) - color = __next_line_color__ (); + color = __next_line_color__ (); endif retval(i) = line (x(:,i), y, "keylabel", tkey, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); endfor else error ("__plt2mv__: arguments must be a matrices"); @@ -371,8 +371,8 @@ endif retval = line (x, y, "keylabel", key, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); else error ("__plt2ss__: arguments must be scalars"); endif @@ -402,7 +402,7 @@ for i = 1:len tkey = options(i).key; if (! isempty (tkey)) - set (h, "key", "on"); + set (h, "key", "on"); endif linestyle = options(i).linestyle; marker = options(i).marker; @@ -411,12 +411,12 @@ endif color = options(i).color; if (isempty (color)) - color = __next_line_color__ (); + color = __next_line_color__ (); endif retval(i) = line (x, y(i), "keylabel", tkey, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); endfor else error ("__plt2sv__: first arg must be scalar, second arg must be vector"); @@ -467,7 +467,7 @@ for i = 1:y_nc tkey = options(i).key; if (! isempty (tkey)) - set (h, "key", "on"); + set (h, "key", "on"); endif linestyle = options(i).linestyle; marker = options(i).marker; @@ -476,12 +476,12 @@ endif color = options(i).color; if (isempty (color)) - color = __next_line_color__ (); + color = __next_line_color__ (); endif retval(i) = line (x, y(:,i), "keylabel", tkey, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); endfor else error ("__plt2vm__: arguments must be a matrices"); @@ -512,7 +512,7 @@ for i = 1:len tkey = options(i).key; if (! isempty (tkey)) - set (h, "key", "on"); + set (h, "key", "on"); endif linestyle = options(i).linestyle; marker = options(i).marker; @@ -521,12 +521,12 @@ endif color = options(i).color; if (isempty (color)) - color = __next_line_color__ (); + color = __next_line_color__ (); endif retval(i) = line (x(i), y, "keylabel", tkey, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); endfor else error ("__plt2vs__: first arg must be vector, second arg must be scalar"); @@ -585,8 +585,8 @@ endif retval = line (x, y, "keylabel", key, "color", color, - "linestyle", linestyle, - "marker", marker, properties{:}); + "linestyle", linestyle, + "marker", marker, properties{:}); else error ("__plt2vv__: vector lengths must match"); endif
--- a/scripts/plot/private/__pltopt__.m +++ b/scripts/plot/private/__pltopt__.m @@ -112,7 +112,7 @@ for i = nel:-1:1 [options(i), valid] = __pltopt1__ (caller, opt{i}, err_on_invalid); if (! err_on_invalid && ! valid) - return; + return; endif endfor else @@ -152,7 +152,7 @@ elseif (strncmp (opt, "#~", 2) || strncmp (opt, "~>", 2)) n = 2; elseif (strncmp (opt, "~", 1) || strncmp (opt, ">", 1) - || strncmp (opt, "#", 1)) + || strncmp (opt, "#", 1)) n = 1; endif options.linestyle = opt(1:n); @@ -169,60 +169,60 @@ topt = opt(1); n = 1; if (topt == "-" || topt == ":") - have_linestyle = true; - options.linestyle = topt; + have_linestyle = true; + options.linestyle = topt; elseif (topt == "+" || topt == "o" || topt == "*" - || topt == "." || topt == "x" || topt == "s" - || topt == "d" || topt == "^" || topt == "v" - || topt == ">" || topt == "<" || topt == "p" - || topt == "h" || topt == "@") - have_marker = true; + || topt == "." || topt == "x" || topt == "s" + || topt == "d" || topt == "^" || topt == "v" + || topt == ">" || topt == "<" || topt == "p" + || topt == "h" || topt == "@") + have_marker = true; ## Backward compatibility. Leave undocumented. - if (topt == "@") - topt = "+"; - endif - options.marker = topt; + if (topt == "@") + topt = "+"; + endif + options.marker = topt; ### Numeric color specs for backward compatibility. Leave undocumented. elseif (topt == "k" || topt == "0") - options.color = [0, 0, 0]; + options.color = [0, 0, 0]; elseif (topt == "r" || topt == "1") - options.color = [1, 0, 0]; + options.color = [1, 0, 0]; elseif (topt == "g" || topt == "2") - options.color = [0, 1, 0]; + options.color = [0, 1, 0]; elseif (topt == "b" || topt == "3") - options.color = [0, 0, 1]; + options.color = [0, 0, 1]; elseif (topt == "y") - options.color = [1, 1, 0]; + options.color = [1, 1, 0]; elseif (topt == "m" || topt == "4") - options.color = [1, 0, 1]; + options.color = [1, 0, 1]; elseif (topt == "c" || topt == "5") - options.color = [0, 1, 1]; + options.color = [0, 1, 1]; elseif (topt == "w" || topt == "6") - options.color = [1, 1, 1]; + options.color = [1, 1, 1]; elseif (isspace (topt)) - ## Do nothing. + ## Do nothing. elseif (topt == ";") - t = index (opt(2:end), ";"); - if (t) - options.key = undo_string_escapes (opt(2:t)); - n = t+1; - else - if (err_on_invalid) + t = index (opt(2:end), ";"); + if (t) + options.key = undo_string_escapes (opt(2:t)); + n = t+1; + else + if (err_on_invalid) error ("%s: unfinished key label", caller); - else - valid = false; - options = __default_plot_options__ (); - return; - endif + else + valid = false; + options = __default_plot_options__ (); + return; + endif endif else - if (err_on_invalid) - error ("%s: unrecognized format character: `%s'", caller, topt); - else - valid = false; - options = __default_plot_options__ (); - return; - endif + if (err_on_invalid) + error ("%s: unrecognized format character: `%s'", caller, topt); + else + valid = false; + options = __default_plot_options__ (); + return; + endif endif endif opt(1:n) = [];
--- a/scripts/plot/private/__quiver__.m +++ b/scripts/plot/private/__quiver__.m @@ -48,7 +48,7 @@ [x, y] = meshgrid (1:size(u,2), 1:size(u,1)); endif if (nargin >= ioff && isnumeric (varargin{ioff}) - && isscalar (varargin{ioff})) + && isscalar (varargin{ioff})) autoscale = varargin{ioff++}; endif else @@ -62,16 +62,16 @@ if (is3d) w = varargin{ioff++}; if (isvector (x) && isvector (y) && isvector (z) - && (! isvector (u) || ! isvector (v) || ! isvector(w))) - [x, y, z] = meshgrid (x, y, z); + && (! isvector (u) || ! isvector (v) || ! isvector(w))) + [x, y, z] = meshgrid (x, y, z); endif else if (isvector (x) && isvector (y) && (! isvector (u) || ! isvector (v))) - [x, y] = meshgrid (x, y); + [x, y] = meshgrid (x, y); endif endif if (nargin >= ioff && isnumeric (varargin{ioff}) - && isscalar (varargin{ioff})) + && isscalar (varargin{ioff})) autoscale = varargin{ioff++}; endif endif @@ -84,15 +84,15 @@ if (ischar (arg) && strncmpi (arg, "filled", 6)) have_filled = true; elseif ((ischar (arg) || iscell (arg)) - && ! have_line_spec) + && ! have_line_spec) [linespec, valid] = __pltopt__ ("quiver", arg, false); if (valid) - have_line_spec = true; - if (strncmp (linespec.linestyle, "none", 4)) - linespec.linestyle = "-"; - endif + have_line_spec = true; + if (strncmp (linespec.linestyle, "none", 4)) + linespec.linestyle = "-"; + endif else - args {end + 1} = arg; + args {end + 1} = arg; if (ioff <= nargin) args {end + 1} = varargin{ioff++}; endif @@ -122,7 +122,7 @@ uu = s * u; vv = s * v; if (is3d) - ww = s*w; + ww = s*w; endif endif else @@ -138,10 +138,10 @@ hg = hggroup (); if (is3d) args = __add_datasource__ ("quiver3", hg, - {"x", "y", "z", "u", "v", "w"}, args{:}); + {"x", "y", "z", "u", "v", "w"}, args{:}); else args = __add_datasource__ ("quiver", hg, - {"x", "y", "z", "u", "v", "w"}, args{:}); + {"x", "y", "z", "u", "v", "w"}, args{:}); endif hold on; @@ -176,27 +176,27 @@ if (have_line_spec) if (is3d) - h1 = plot3 ([x.'; xend.'; NaN(1, length (x))](:), - [y.'; yend.'; NaN(1, length (y))](:), - [z.'; zend.'; NaN(1, length (z))](:), - "linestyle", linespec.linestyle, - "color", linespec.color, "parent", hg); + h1 = plot3 ([x.'; xend.'; NaN(1, length (x))](:), + [y.'; yend.'; NaN(1, length (y))](:), + [z.'; zend.'; NaN(1, length (z))](:), + "linestyle", linespec.linestyle, + "color", linespec.color, "parent", hg); else - h1 = plot ([x.'; xend.'; NaN(1, length (x))](:), - [y.'; yend.'; NaN(1, length (y))](:), - "linestyle", linespec.linestyle, - "color", linespec.color, "parent", hg); + h1 = plot ([x.'; xend.'; NaN(1, length (x))](:), + [y.'; yend.'; NaN(1, length (y))](:), + "linestyle", linespec.linestyle, + "color", linespec.color, "parent", hg); endif else if (is3d) - h1 = plot3 ([x.'; xend.'; NaN(1, length (x))](:), - [y.'; yend.'; NaN(1, length (y))](:), - [z.'; zend.'; NaN(1, length (z))](:), - "parent", hg); + h1 = plot3 ([x.'; xend.'; NaN(1, length (x))](:), + [y.'; yend.'; NaN(1, length (y))](:), + [z.'; zend.'; NaN(1, length (z))](:), + "parent", hg); else - h1 = plot ([x.'; xend.'; NaN(1, length (x))](:), - [y.'; yend.'; NaN(1, length (y))](:), - "parent", hg); + h1 = plot ([x.'; xend.'; NaN(1, length (x))](:), + [y.'; yend.'; NaN(1, length (y))](:), + "parent", hg); endif endif @@ -212,59 +212,59 @@ if (have_line_spec) if (isfield (linespec, "marker") && - ! strncmp (linespec.marker, "none", 4)) - if (is3d) - h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), - "linestyle", "none", "parent", hg); - else - h2 = plot ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - "linestyle", "none", "parent", hg); - endif + ! strncmp (linespec.marker, "none", 4)) + if (is3d) + h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), + "linestyle", "none", "parent", hg); + else + h2 = plot ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + "linestyle", "none", "parent", hg); + endif else - if (is3d) - h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), - "linestyle", linespec.linestyle, - "color", linespec.color, "parent", hg); - else - h2 = plot ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - "linestyle", linespec.linestyle, - "color", linespec.color, "parent", hg); - endif + if (is3d) + h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), + "linestyle", linespec.linestyle, + "color", linespec.color, "parent", hg); + else + h2 = plot ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + "linestyle", linespec.linestyle, + "color", linespec.color, "parent", hg); + endif endif elseif (is3d) h2 = plot3 ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), - "parent", hg); + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + [zarrw1.'; zend.'; zarrw2.'; NaN(1, length (z))](:), + "parent", hg); else h2 = plot ([xarrw1.'; xend.'; xarrw2.'; NaN(1, length (x))](:), - [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), - "parent", hg); + [yarrw1.'; yend.'; yarrw2.'; NaN(1, length (y))](:), + "parent", hg); endif if (! have_line_spec - || (isfield (linespec, "marker") - && strncmp (linespec.marker, "none", 4))) + || (isfield (linespec, "marker") + && strncmp (linespec.marker, "none", 4))) if (is3d) - h3 = plot3 (x, y, z, "linestyle", "none", "marker", "none", - "parent", hg); + h3 = plot3 (x, y, z, "linestyle", "none", "marker", "none", + "parent", hg); else - h3 = plot (x, y, "linestyle", "none", "marker", "none", "parent", hg); + h3 = plot (x, y, "linestyle", "none", "marker", "none", "parent", hg); endif else if (is3d) - h3 = plot3 (x, y, z, "linestyle", "none", "marker", linespec.marker, - "parent", hg); + h3 = plot3 (x, y, z, "linestyle", "none", "marker", linespec.marker, + "parent", hg); else - h3 = plot (x, y, "linestyle", "none", "marker", linespec.marker, - "parent", hg); + h3 = plot (x, y, "linestyle", "none", "marker", linespec.marker, + "parent", hg); endif endif if (have_filled) @@ -294,7 +294,7 @@ addproperty ("linestyle", hg, "linelinestyle", get (h1, "linestyle")); addproperty ("marker", hg, "linemarker", get (h3, "marker")); addproperty ("markerfacecolor", hg, "linemarkerfacecolor", - get (h3, "markerfacecolor")); + get (h3, "markerfacecolor")); addproperty ("markersize", hg, "linemarkersize", get (h3, "markersize")); addlistener (hg, "color", @update_props); @@ -350,7 +350,7 @@ u = s * u; v = s * v; if (is3d) - w = s*w; + w = s*w; endif endif endif
--- a/scripts/plot/private/__scatter__.m +++ b/scripts/plot/private/__scatter__.m @@ -65,7 +65,7 @@ c = varargin{istart + 1}; if (isvector (c)) if (columns (c) != 3) - c = c(:); + c = c(:); endif endif elseif (firstnonnumeric == istart + 1 && ischar (varargin{istart + 1})) @@ -87,20 +87,20 @@ elseif ((ischar (arg) || iscell (arg)) && ! have_marker) [linespec, valid] = __pltopt__ (fcn, arg, false); if (valid) - have_marker = true; - marker = linespec.marker; - if (strncmp (marker, "none", 4)) - marker = "o"; + have_marker = true; + marker = linespec.marker; + if (strncmp (marker, "none", 4)) + marker = "o"; elseif (isempty (marker)) [dummy, marker] = __next_line_style__ (); - endif + endif else - error ("%s: invalid linespec", fcn); + error ("%s: invalid linespec", fcn); endif else newargs{end+1} = arg; if (iarg <= nargin) - newargs{end+1} = varagin{iarg++}; + newargs{end+1} = varagin{iarg++}; endif endif endwhile @@ -111,7 +111,7 @@ hg = hggroup (); newargs = __add_datasource__ (fcn, hg, {"x", "y", "z", "c", "size"}, - newargs{:}); + newargs{:}); addproperty ("xdata", hg, "data", x); addproperty ("ydata", hg, "data", y); @@ -326,7 +326,7 @@ for i = 1 : numel (kids) set (kids (i), "linewidth", lw, "marker", m, "markerfacecolor", fc, - "edgecolor", ec) + "edgecolor", ec) endfor endfunction @@ -346,25 +346,25 @@ if (ischar (c1)) if (isempty (z1)) for i = 1 : length (hlist) - set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", c1, - "markersize", size1(i)); + set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", c1, + "markersize", size1(i)); endfor else for i = 1 : length (hlist) - set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", c1, - "markersize", size1(i)); + set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", c1, + "markersize", size1(i)); endfor endif else if (isempty (z1)) for i = 1 : length (hlist) - set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", - reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i)); + set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", + reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i)); endfor else for i = 1 : length (hlist) - set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", - reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i)); + set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", + reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i)); endfor endif endif
--- a/scripts/plot/private/__stem__.m +++ b/scripts/plot/private/__stem__.m @@ -47,17 +47,17 @@ nx = rows (x); for i = 1: columns (x) if (have_z) - xt = x(:)'; - xt = [xt; xt; NaN(1, nx)](:); - yt = y(:)'; - yt = [yt; yt; NaN(1, nx)](:); - zt = z(:)'; - zt = [zeros(1, nx); zt; NaN(1, nx)](:); + xt = x(:)'; + xt = [xt; xt; NaN(1, nx)](:); + yt = y(:)'; + yt = [yt; yt; NaN(1, nx)](:); + zt = z(:)'; + zt = [zeros(1, nx); zt; NaN(1, nx)](:); else - xt = x(:, i)'; - xt = [xt; xt; NaN(1, nx)](:); - yt = y(:, i)'; - yt = [zeros(1, nx); yt; NaN(1, nx)](:); + xt = x(:, i)'; + xt = [xt; xt; NaN(1, nx)](:); + yt = y(:, i)'; + yt = [zeros(1, nx); yt; NaN(1, nx)](:); endif hg = hggroup (); @@ -65,49 +65,49 @@ args = __add_datasource__ (caller, hg, {"x", "y", "z"}, varargin{:}); if (i == 1) - set (ax, "nextplot", "add"); + set (ax, "nextplot", "add"); endif if (isempty (llc)) - lc = __next_line_color__ (); + lc = __next_line_color__ (); else - lc = llc; + lc = llc; endif if (isempty (mmc)) - mc = lc; + mc = lc; else - mc = mmc; + mc = mmc; endif if (dofill) - fc = mc; + fc = mc; else - fc = "none"; + fc = "none"; endif if (have_z) - h_stems = plot3 (xt, yt, zt, "color", lc, "linestyle", ls, - "parent", hg, x, y, z, "color", mc, - "marker", ms, "linestyle", "none", - "markerfacecolor", fc, "parent", hg); + h_stems = plot3 (xt, yt, zt, "color", lc, "linestyle", ls, + "parent", hg, x, y, z, "color", mc, + "marker", ms, "linestyle", "none", + "markerfacecolor", fc, "parent", hg); - h_baseline = []; + h_baseline = []; else - h_stems = plot (xt, yt, "color", lc, "linestyle", ls, - "parent", hg, x(:,i), y(:, i), "color", mc, "marker", - ms, "linestyle", "none", "markerfacecolor", - fc, "parent", hg); + h_stems = plot (xt, yt, "color", lc, "linestyle", ls, + "parent", hg, x(:,i), y(:, i), "color", mc, "marker", + ms, "linestyle", "none", "markerfacecolor", + fc, "parent", hg); - if (i == 1) - x_axis_range = get (ax, "xlim"); - h_baseline = line (x_axis_range, [0, 0], "color", [0, 0, 0]); - set (h_baseline, "handlevisibility", "off"); - set (h_baseline, "xliminclude", "off"); - addlistener (ax, "xlim", @update_xlim); - addlistener (h_baseline, "ydata", @update_baseline); - addlistener (h_baseline, "visible", @update_baseline); - endif + if (i == 1) + x_axis_range = get (ax, "xlim"); + h_baseline = line (x_axis_range, [0, 0], "color", [0, 0, 0]); + set (h_baseline, "handlevisibility", "off"); + set (h_baseline, "xliminclude", "off"); + addlistener (ax, "xlim", @update_xlim); + addlistener (h_baseline, "ydata", @update_baseline); + addlistener (h_baseline, "visible", @update_baseline); + endif endif ## Setup the hggroup and listeners. @@ -116,8 +116,8 @@ addproperty ("baseline", hg, "data", h_baseline); if (!have_z) - addlistener (hg, "showbaseline", @show_baseline); - addlistener (hg, "basevalue", @move_baseline); + addlistener (hg, "showbaseline", @show_baseline); + addlistener (hg, "basevalue", @move_baseline); endif addproperty ("color", hg, "linecolor", lc); @@ -137,9 +137,9 @@ addproperty ("xdata", hg, "data", x(:, i)); addproperty ("ydata", hg, "data", y(:, i)); if (have_z) - addproperty ("zdata", hg, "data", z(:, i)); + addproperty ("zdata", hg, "data", z(:, i)); else - addproperty ("zdata", hg, "data", []); + addproperty ("zdata", hg, "data", []); endif addlistener (hg, "xdata", @update_data); @@ -147,10 +147,10 @@ addlistener (hg, "zdata", @update_data); if (! isempty (args)) - set (hg, args{:}); + set (hg, args{:}); endif if (i == 1 && !isempty(h_baseline)) - set (h_baseline, "parent", get (hg, "parent")); + set (h_baseline, "parent", get (hg, "parent")); endif endfor @@ -178,7 +178,7 @@ newargs = {}; while (i < length (varargin)) if (ischar (varargin{i}) && !(strcmpi ("fill", varargin{i}) - || strcmpi ("filled", varargin{i}))) + || strcmpi ("filled", varargin{i}))) newargs{end + 1} = varargin{i}; newargs{end + 1} = varargin{i + 1}; nargin = nargin - 2; @@ -204,11 +204,11 @@ else y = varargin{1}; if (isvector (y)) - x = 1:length (y); + x = 1:length (y); elseif (ismatrix (y)) - x = 1:rows (y); + x = 1:rows (y); else - error ("stem: Y must be a matrix"); + error ("stem: Y must be a matrix"); endif # in each case, x & y will be defined endif elseif (nargin == 3) @@ -220,35 +220,35 @@ if (ischar (varargin{2})) ## Only 2. or 3. possible. if (strcmpi ("fill", varargin{2}) || strcmpi ("filled", varargin{2})) - dofill = 1; + dofill = 1; else - ## Parse the linespec. - [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2}); + ## Parse the linespec. + [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2}); endif if (have_z) - z = varargin{1}; - x = 1:rows (z); - y = 1:columns (z); + z = varargin{1}; + x = 1:rows (z); + y = 1:columns (z); else - y = varargin{1}; - if (isvector (y)) - x = 1:length (y); - elseif (ismatrix (y)) - x = 1:rows (y); - else - error ("stem: Y must be a matrix"); - endif # in each case, x & y will be defined + y = varargin{1}; + if (isvector (y)) + x = 1:length (y); + elseif (ismatrix (y)) + x = 1:rows (y); + else + error ("stem: Y must be a matrix"); + endif # in each case, x & y will be defined endif else if (have_z) - error ("stem3: must define X, Y and Z"); + error ("stem3: must define X, Y and Z"); else - ## Must be the real y data. - x = varargin{1}; - y = varargin{2}; - if (! (ismatrix (x) && ismatrix (y))) - error ("stem: X and Y must be matrices"); - endif + ## Must be the real y data. + x = varargin{1}; + y = varargin{2}; + if (! (ismatrix (x) && ismatrix (y))) + error ("stem: X and Y must be matrices"); + endif endif endif elseif (nargin == 4) @@ -261,63 +261,63 @@ if (ischar (varargin{2})) ## Only arg2 2. / arg3 1. & arg3 3. are possible. if (strcmpi ("fill", varargin{2}) || strcmpi ("filled", varargin{2})) - dofill = 1; - fill_2 = 1; # Be sure, no second "fill" is in the arguments. + dofill = 1; + fill_2 = 1; # Be sure, no second "fill" is in the arguments. else - ## Must be a linespec. - [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2}); - linespec_2 = 1; + ## Must be a linespec. + [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2}); + linespec_2 = 1; endif if (have_z) - z = varargin{1}; - x = 1:rows (z); - y = 1:columns (z); + z = varargin{1}; + x = 1:rows (z); + y = 1:columns (z); else - y = varargin{1}; - if (isvector (y)) - x = 1:length (y); - elseif (ismatrix (y)) - x = 1:rows (y); - else - error ("stem: Y must be a matrix"); - endif # in each case, x & y will be defined + y = varargin{1}; + if (isvector (y)) + x = 1:length (y); + elseif (ismatrix (y)) + x = 1:rows (y); + else + error ("stem: Y must be a matrix"); + endif # in each case, x & y will be defined endif else if (have_z) - x = varargin{1}; - y = varargin{2}; - z = varargin{3}; - if (! (ismatrix (x) && ismatrix (y) && ismatrix (z))) - error ("stem3: X, Y and Z must be matrices"); - endif + x = varargin{1}; + y = varargin{2}; + z = varargin{3}; + if (! (ismatrix (x) && ismatrix (y) && ismatrix (z))) + error ("stem3: X, Y and Z must be matrices"); + endif else - ## must be the real y data. - x = varargin{1}; - y = varargin{2}; - if (! (ismatrix (x) && ismatrix (y))) - error ("stem: X and Y must be matrices"); - endif + ## must be the real y data. + x = varargin{1}; + y = varargin{2}; + if (! (ismatrix (x) && ismatrix (y))) + error ("stem: X and Y must be matrices"); + endif endif endif # if ischar(varargin{2}) if (! have_z) ## varargin{3} must be char. ## Check for "fill. if ((strcmpi (varargin{3}, "fill") || strcmpi (varargin{3}, "filled")) - && fill_2) - error ("stem: duplicate fill argument"); + && fill_2) + error ("stem: duplicate fill argument"); elseif (strcmpi ("fill", varargin{3}) && linespec_2) - ## Must be "fill". - dofill = 1; - fill_2 = 1; + ## Must be "fill". + dofill = 1; + fill_2 = 1; elseif ((strcmpi (varargin{3}, "fill") || strcmpi (varargin{3}, "filled")) - && !linespec_2) - ## Must be "fill". - dofill = 1; - fill_2 = 1; + && !linespec_2) + ## Must be "fill". + dofill = 1; + fill_2 = 1; elseif (! linespec_2) - ## Must be linespec. - [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3}); - linespec_2 = 1; + ## Must be linespec. + [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3}); + linespec_2 = 1; endif endif elseif (nargin == 5) @@ -326,38 +326,38 @@ y = varargin{2}; z = varargin{3}; if (! (ismatrix (x) && ismatrix (y) && ismatrix (z))) - error ("stem3: X, Y and Z must be matrices"); + error ("stem3: X, Y and Z must be matrices"); endif else x = varargin{1}; y = varargin{2}; if (! (ismatrix (x) && ismatrix (y))) - error ("stem: X and Y must be matrices"); + error ("stem: X and Y must be matrices"); endif endif if (! have_z) if (strcmpi (varargin{3}, "fill") || strcmpi (varargin{3}, "filled")) - dofill = 1; - fill_2 = 1; # Be sure, no second "fill" is in the arguments. + dofill = 1; + fill_2 = 1; # Be sure, no second "fill" is in the arguments. else - ## Must be a linespec. - [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3}); - linespec_2 = 1; + ## Must be a linespec. + [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3}); + linespec_2 = 1; endif endif ## Check for "fill". if ((strcmpi (varargin{4}, "fill") || strcmpi (varargin{4}, "filled")) - && fill_2) + && fill_2) error ("%s: duplicate fill argument", caller); elseif ((strcmpi (varargin{4}, "fill") || strcmpi (varargin{4}, "filled")) - && linespec_2) + && linespec_2) ## Must be "fill". dofill = 1; fill_2 = 1; elseif (!strcmpi (varargin{4}, "fill") && !strcmpi (varargin{4}, "filled") - && !linespec_2) + && !linespec_2) ## Must be linespec. [lc, ls, mc, ms] = stem_line_spec (caller, varargin{4}); linespec_2 = 1; @@ -381,15 +381,15 @@ ## check for "fill" .. if ((strcmpi (varargin{5}, "fill") || strcmpi (varargin{5}, "filled")) - && fill_2) + && fill_2) error ("stem3: duplicate fill argument"); elseif ((strcmpi (varargin{5}, "fill") || strcmpi (varargin{5}, "filled")) - && linespec_2) + && linespec_2) ## Must be "fill". dofill = 1; fill_2 = 1; elseif (!strcmpi (varargin{5}, "fill") && !strcmpi (varargin{5}, "filled") - && !linespec_2) + && !linespec_2) ## Must be linespec. [lc, ls, mc, ms] = stem_line_spec (caller, varargin{5}); linespec_2 = 1; @@ -411,17 +411,17 @@ if (isvector (x)) x = x(:); if (isvector (y)) - if (length (x) != length (y)) - error ("stem: inconsistent size of x and y"); - else - y = y(:); - endif + if (length (x) != length (y)) + error ("stem: inconsistent size of x and y"); + else + y = y(:); + endif else - if (length (x) == rows (y)) - x = repmat (x(:), 1, columns (y)); - else - error ("stem: inconsistent size of x and y"); - endif + if (length (x) == rows (y)) + x = repmat (x(:), 1, columns (y)); + else + error ("stem: inconsistent size of x and y"); + endif endif elseif (!size_equal (x, y)) error ("stem: inconsistent size of x and y"); @@ -433,7 +433,7 @@ function [lc, ls, mc, ms] = stem_line_spec (caller, str) if (! ischar (str)) error ("%s: expecting argument to be \"fill\" or a string of specifiers", - caller); + caller); endif [lc, ls, mc, ms] = set_default_values (); ## Parse the line specifier string. @@ -471,7 +471,7 @@ obj = get (kids (i)); if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline")) if (any (get (obj.baseline, "xdata") != xlim)) - set (obj.baseline, "xdata", xlim); + set (obj.baseline, "xdata", xlim); endif endif endfor @@ -485,13 +485,13 @@ for i = 1 : length (kids) obj = get (kids (i)); if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline") - && obj.baseline == h) + && obj.baseline == h) ## Only alter if changed to avoid recursion of the listener functions if (! strcmpi (get (kids(i), "showbaseline"), visible)) - set (kids (i), "showbaseline", visible); + set (kids (i), "showbaseline", visible); endif if (! strcmpi (get (kids(i), "basevalue"), visible)) - set (kids (i), "basevalue", ydata); + set (kids (i), "basevalue", ydata); endif endif endfor
--- a/scripts/plot/refreshdata.m +++ b/scripts/plot/refreshdata.m @@ -65,9 +65,9 @@ ws = "base"; else if (!ischar (ws) || !(strcmpi (ws, "base") || strcmpi (ws, "caller"))) - error ("refreshdata: expecting workspace to be \"base\" or ""caller\""); + error ("refreshdata: expecting workspace to be \"base\" or ""caller\""); else - ws = tolower (ws); + ws = tolower (ws); endif endif endif @@ -92,10 +92,10 @@ for j = 1 : length (props {i}) expr = get (objs(i), props{i}{j}); if (!isempty (expr)) - val = evalin (ws, expr); - prop = props{i}{j}(1:end-6); + val = evalin (ws, expr); + prop = props{i}{j}(1:end-6); if (! isequal (get (objs(i), prop), val)) - set (objs(i), props{i}{j}(1:end-6), val); + set (objs(i), props{i}{j}(1:end-6), val); endif endif endfor
--- a/scripts/plot/ribbon.m +++ b/scripts/plot/ribbon.m @@ -76,7 +76,7 @@ if (! ishold ()) set (ax, "view", [-37.5, 30], "box", "off", "xgrid", "on", - "ygrid", "on", "zgrid", "on"); + "ygrid", "on", "zgrid", "on"); endif if (nargout > 0)
--- a/scripts/plot/rose.m +++ b/scripts/plot/rose.m @@ -51,7 +51,7 @@ function [thout, rout] = rose (varargin) [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 1), "rose", - varargin{:}); + varargin{:}); if (nargin < 1) print_usage ();
--- a/scripts/plot/slice.m +++ b/scripts/plot/slice.m @@ -135,7 +135,7 @@ if (length(sz) > 0) for i = 1:length(sz) [xi, yi, zi] = meshgrid (squeeze (x(1,:,1)), - squeeze (y(:,1,1)), sz(i)); + squeeze (y(:,1,1)), sz(i)); vz = squeeze (interp3 (x, y, z, v, xi, yi, zi, method)); tmp(sidx++) = surface (xi, yi, sz(i) * ones (size (yi)), vz); endfor @@ -143,11 +143,11 @@ if (length (sy) > 0) for i = length(sy):-1:1 - [xi, yi, zi] = meshgrid (squeeze (x(1,:,1)), sy(i), squeeze (z(1,1,:))); + [xi, yi, zi] = meshgrid (squeeze (x(1,:,1)), sy(i), squeeze (z(1,1,:))); vy = squeeze (interp3 (x, y, z, v, xi, yi, zi, method)); tmp(sidx++) = surface (squeeze (xi), - squeeze (sy(i) * ones (size (zi))), - squeeze (zi), vy); + squeeze (sy(i) * ones (size (zi))), + squeeze (zi), vy); endfor endif @@ -156,7 +156,7 @@ [xi, yi, zi] = meshgrid (sx(i), squeeze (y(:,1,1)), squeeze (z(1,1,:))); vx = squeeze (interp3 (x, y, z, v, xi, yi, zi, method)); tmp(sidx++) = surface (squeeze (sx(i) * ones (size (zi))), - squeeze (yi), squeeze(zi), vx); + squeeze (yi), squeeze(zi), vx); endfor endif else @@ -166,7 +166,7 @@ if (! ishold ()) set (ax, "view", [-37.5, 30.0], "box", "off", "xgrid", "on", - "ygrid", "on", "zgrid", "on"); + "ygrid", "on", "zgrid", "on"); endif if (nargout > 0)
--- a/scripts/plot/sombrero.m +++ b/scripts/plot/sombrero.m @@ -46,11 +46,11 @@ tz = sin (r) ./ r; if (nargout == 0) surf (tx, ty, tz); - box ("off"); + box ("off"); else - x = tx; - y = ty; - z = tz; + x = tx; + y = ty; + z = tz; endif else error ("sombrero: number of grid lines must be greater than 1");
--- a/scripts/plot/sphere.m +++ b/scripts/plot/sphere.m @@ -33,7 +33,7 @@ function [xx, yy, zz] = sphere (varargin) [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout > 0), "sphere", - varargin{:}); + varargin{:}); if (nargin > 1) print_usage (); elseif (nargin == 1)
--- a/scripts/plot/stairs.m +++ b/scripts/plot/stairs.m @@ -65,11 +65,11 @@ else oldax = gca (); unwind_protect - axes (ax); - newplot (); - [h, xxs, yys] = __stairs__ (true, varargin{:}); + axes (ax); + newplot (); + [h, xxs, yys] = __stairs__ (true, varargin{:}); unwind_protect_cleanup - axes (oldax); + axes (oldax); end_unwind_protect endif if (nargout == 1) @@ -85,7 +85,7 @@ varargin(1) = []; if (ismatrix (y)) if (isvector (y)) - y = y(:); + y = y(:); endif x = 1:rows (y); endif @@ -116,7 +116,7 @@ else [x_nr, x_nc] = size (x); if (x_nr != nr || x_nc != nc) - error ("stairs: argument size mismatch"); + error ("stairs: argument size mismatch"); endif endif endif @@ -143,9 +143,9 @@ if ((ischar (arg) || iscell (arg)) && ! have_line_spec) [linespec, valid] = __pltopt__ ("stairs", arg, false); if (valid) - have_line_spec = true; - varargin(i) = []; - break; + have_line_spec = true; + varargin(i) = []; + break; endif endif endfor @@ -155,47 +155,47 @@ unwind_protect hold_state = get (gca (), "nextplot"); for i = 1 : size(y, 2) - hg = hggroup (); - h = [h; hg]; - args = __add_datasource__ ("stairs", hg, {"x", "y"}, varargin{:}); + hg = hggroup (); + h = [h; hg]; + args = __add_datasource__ ("stairs", hg, {"x", "y"}, varargin{:}); - addproperty ("xdata", hg, "data", x(:,i).'); - addproperty ("ydata", hg, "data", y(:,i).'); + addproperty ("xdata", hg, "data", x(:,i).'); + addproperty ("ydata", hg, "data", y(:,i).'); - addlistener (hg, "xdata", @update_data); - addlistener (hg, "ydata", @update_data); + addlistener (hg, "xdata", @update_data); + addlistener (hg, "ydata", @update_data); - if (have_line_spec) - tmp = line (xs(:,i).', ys(:,i).', "color", linespec.color, - "parent", hg); - else - tmp = line (xs(:,i).', ys(:,i).', "color", __next_line_color__ (), - "parent", hg); - endif + if (have_line_spec) + tmp = line (xs(:,i).', ys(:,i).', "color", linespec.color, + "parent", hg); + else + tmp = line (xs(:,i).', ys(:,i).', "color", __next_line_color__ (), + "parent", hg); + endif addproperty ("color", hg, "linecolor", get (tmp, "color")); - addproperty ("linewidth", hg, "linelinewidth", get (tmp, "linewidth")); - addproperty ("linestyle", hg, "linelinestyle", get (tmp, "linestyle")); + addproperty ("linewidth", hg, "linelinewidth", get (tmp, "linewidth")); + addproperty ("linestyle", hg, "linelinestyle", get (tmp, "linestyle")); - addproperty ("marker", hg, "linemarker", get (tmp, "marker")); - addproperty ("markerfacecolor", hg, "linemarkerfacecolor", - get (tmp, "markerfacecolor")); - addproperty ("markeredgecolor", hg, "linemarkeredgecolor", - get (tmp, "markeredgecolor")); - addproperty ("markersize", hg, "linemarkersize", - get (tmp, "markersize")); + addproperty ("marker", hg, "linemarker", get (tmp, "marker")); + addproperty ("markerfacecolor", hg, "linemarkerfacecolor", + get (tmp, "markerfacecolor")); + addproperty ("markeredgecolor", hg, "linemarkeredgecolor", + get (tmp, "markeredgecolor")); + addproperty ("markersize", hg, "linemarkersize", + get (tmp, "markersize")); - addlistener (hg, "color", @update_props); - addlistener (hg, "linewidth", @update_props); - addlistener (hg, "linestyle", @update_props); - addlistener (hg, "marker", @update_props); - addlistener (hg, "markerfacecolor", @update_props); - addlistener (hg, "markeredgecolor", @update_props); - addlistener (hg, "markersize", @update_props); + addlistener (hg, "color", @update_props); + addlistener (hg, "linewidth", @update_props); + addlistener (hg, "linestyle", @update_props); + addlistener (hg, "marker", @update_props); + addlistener (hg, "markerfacecolor", @update_props); + addlistener (hg, "markeredgecolor", @update_props); + addlistener (hg, "markersize", @update_props); - if (! isempty (args)) - set (hg, args{:}); - endif + if (! isempty (args)) + set (hg, args{:}); + endif endfor unwind_protect_cleanup set (gca (), "nextplot", hold_state);
--- a/scripts/plot/subplot.m +++ b/scripts/plot/subplot.m @@ -120,29 +120,29 @@ if (strcmp (get (child, "type"), "axes")) ## Skip legend and colorbar objects. if (strcmp (get (child, "tag"), "legend") || - strcmp (get (child, "tag"), "colorbar")) + strcmp (get (child, "tag"), "colorbar")) continue; endif objpos = get (child, "position"); if (all (objpos == pos)) - ## If the new axes are in exactly the same position as an - ## existing axes object, use the existing axes. - found = true; - tmp = child; + ## If the new axes are in exactly the same position as an + ## existing axes object, use the existing axes. + found = true; + tmp = child; else - ## If the new axes overlap an old axes object, delete the old - ## axes. - x0 = pos(1); - x1 = x0 + pos(3); - y0 = pos(2); - y1 = y0 + pos(4); - objx0 = objpos(1); - objx1 = objx0 + objpos(3); - objy0 = objpos(2); - objy1 = objy0 + objpos(4); - if (! (x0 >= objx1 || x1 <= objx0 || y0 >= objy1 || y1 <= objy0)) - delete (child); - endif + ## If the new axes overlap an old axes object, delete the old + ## axes. + x0 = pos(1); + x1 = x0 + pos(3); + y0 = pos(2); + y1 = y0 + pos(4); + objx0 = objpos(1); + objx1 = objx0 + objpos(3); + objy0 = objpos(2); + objy1 = objy0 + objpos(4); + if (! (x0 >= objx1 || x1 <= objx0 || y0 >= objy1 || y1 <= objy0)) + delete (child); + endif endif endif endfor
--- a/scripts/plot/surf.m +++ b/scripts/plot/surf.m @@ -41,7 +41,7 @@ if (! ishold ()) set (h, "view", [-37.5, 30], - "xgrid", "on", "ygrid", "on", "zgrid", "on"); + "xgrid", "on", "ygrid", "on", "zgrid", "on"); endif unwind_protect_cleanup axes (oldh);
--- a/scripts/plot/surface.m +++ b/scripts/plot/surface.m @@ -148,7 +148,7 @@ other_args = varargin(firststring:end); endif h = __go_surface__ (ax, "xdata", x, "ydata", y, "zdata", z, "cdata", c, - other_args{:}); + other_args{:}); if (! ishold ()) set (ax, "view", [0, 90], "box", "off");
--- a/scripts/plot/surfl.m +++ b/scripts/plot/surfl.m @@ -76,7 +76,7 @@ lstr = varargin{end}; if (strncmp (tolower (lstr), "light", 5)) warning ("light method not supported (yet), using cdata method instead"); - ## This can be implemented when light objects are supported. + ## This can be implemented when light objects are supported. use_cdata = false; elseif (strncmp (tolower (lstr), "cdata", 5)) use_cdata = true; @@ -119,7 +119,7 @@ tmp = surface (varargin{:}); if (! ishold ()) set (h, "view", [-37.5, 30], - "xgrid", "on", "ygrid", "on", "zgrid", "on", "clim", [0 1]); + "xgrid", "on", "ygrid", "on", "zgrid", "on", "clim", [0 1]); endif ## Get view vector (vv).
--- a/scripts/plot/surfnorm.m +++ b/scripts/plot/surfnorm.m @@ -54,7 +54,7 @@ function [Nx, Ny, Nz] = surfnorm (varargin) [h, varargin, nargin] = __plt_get_axis_arg__ ((nargout != 0), "surfnorm", - varargin{:}); + varargin{:}); if (nargin != 1 && nargin != 3) print_usage (); @@ -98,11 +98,11 @@ ## Create normal vectors as mesh vectices from normals at mesh centers nx = (w.x(1:end-1,1:end-1) + w.x(1:end-1,2:end) + - w.x(2:end,1:end-1) + w.x(2:end,2:end)) ./ 4; + w.x(2:end,1:end-1) + w.x(2:end,2:end)) ./ 4; ny = (w.y(1:end-1,1:end-1) + w.y(1:end-1,2:end) + - w.y(2:end,1:end-1) + w.y(2:end,2:end)) ./ 4; + w.y(2:end,1:end-1) + w.y(2:end,2:end)) ./ 4; nz = (w.z(1:end-1,1:end-1) + w.z(1:end-1,2:end) + - w.z(2:end,1:end-1) + w.z(2:end,2:end)) ./ 4; + w.z(2:end,1:end-1) + w.z(2:end,2:end)) ./ 4; ## Normalize the normal vectors len = sqrt (nx.^2 + ny.^2 + nz.^2); @@ -118,13 +118,13 @@ surf (x, y, z, varargin{ioff:end}); old_hold_state = get (h, "nextplot"); unwind_protect - set (h, "nextplot", "add"); - plot3 ([x(:)'; x(:).' + nx(:).' ; NaN(size(x(:).'))](:), - [y(:)'; y(:).' + ny(:).' ; NaN(size(y(:).'))](:), - [z(:)'; z(:).' + nz(:).' ; NaN(size(z(:).'))](:), - varargin{ioff:end}); + set (h, "nextplot", "add"); + plot3 ([x(:)'; x(:).' + nx(:).' ; NaN(size(x(:).'))](:), + [y(:)'; y(:).' + ny(:).' ; NaN(size(y(:).'))](:), + [z(:)'; z(:).' + nz(:).' ; NaN(size(z(:).'))](:), + varargin{ioff:end}); unwind_protect_cleanup - set (h, "nextplot", old_hold_state); + set (h, "nextplot", old_hold_state); end_unwind_protect unwind_protect_cleanup axes (oldh);
--- a/scripts/plot/text.m +++ b/scripts/plot/text.m @@ -50,7 +50,7 @@ if (ischar (label) || iscellstr (label)) varargin(1:offset) = []; if (ischar (label)) - label = cellstr (label); + label = cellstr (label); endif n = numel (label); nx = numel (x); @@ -73,22 +73,22 @@ ca = gca (); tmp = zeros (n, 1); if (n == 1) - label = label{1}; - for i = 1:nx - tmp(i) = __go_text__ (ca, "string", label, - "position", pos(i,:), - varargin{:}); - endfor - __request_drawnow__ (); + label = label{1}; + for i = 1:nx + tmp(i) = __go_text__ (ca, "string", label, + "position", pos(i,:), + varargin{:}); + endfor + __request_drawnow__ (); elseif (n == nx) - for i = 1:nx - tmp(i) = __go_text__ (ca, "string", label{i}, - "position", pos(i,:), - varargin{:}); - endfor - __request_drawnow__ (); + for i = 1:nx + tmp(i) = __go_text__ (ca, "string", label{i}, + "position", pos(i,:), + varargin{:}); + 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/view.m +++ b/scripts/plot/view.m @@ -34,13 +34,13 @@ el = tmp(2); elseif (nargin == 1) if (x == 2) - az = 0; - el = 90; + az = 0; + el = 90; elseif (x == 3) - az = -37.5; - el = 30; + az = -37.5; + el = 30; else - error ("view: expecting single argument to be 2 or 3"); + error ("view: expecting single argument to be 2 or 3"); endif elseif (nargin == 2) az = x;
--- a/scripts/polynomial/polyderiv.m +++ b/scripts/polynomial/polyderiv.m @@ -42,42 +42,42 @@ endif if (nargin == 2) if (! isvector (a)) - error ("polyderiv: argument must be a vector"); + error ("polyderiv: argument must be a vector"); endif if (nargout == 1) - ## derivative of p*a returns a single polynomial - q = polyderiv (conv (p, a)); + ## derivative of p*a returns a single polynomial + q = polyderiv (conv (p, a)); else - ## derivative of p/a returns numerator and denominator - r = conv (a, a); - if (numel (p) == 1) - q = -p * polyderiv (a); - elseif (numel (a) == 1) - q = a * polyderiv (p); - else - q = conv (polyderiv (p), a) - conv (p, polyderiv (a)); - q = polyreduce (q); - endif + ## derivative of p/a returns numerator and denominator + r = conv (a, a); + if (numel (p) == 1) + q = -p * polyderiv (a); + elseif (numel (a) == 1) + q = a * polyderiv (p); + else + q = conv (polyderiv (p), a) - conv (p, polyderiv (a)); + q = polyreduce (q); + endif - ## remove common factors from numerator and denominator - x = polygcd (q, r); - if (length(x) != 1) - q = deconv (q, x); - r = deconv (r, x); - endif + ## remove common factors from numerator and denominator + x = polygcd (q, r); + if (length(x) != 1) + q = deconv (q, x); + r = deconv (r, x); + endif - ## move all the gain into the numerator - q = q/r(1); - r = r/r(1); + ## move all the gain into the numerator + q = q/r(1); + r = r/r(1); endif else lp = numel (p); if (lp == 1) - q = 0; - return; + q = 0; + return; elseif (lp == 0) - q = []; - return; + q = []; + return; endif ## Force P to be a row vector.
--- a/scripts/polynomial/polygcd.m +++ b/scripts/polynomial/polygcd.m @@ -48,32 +48,32 @@ if (nargin == 2 || nargin == 3) if (nargin == 2) if (isa (a, "single") || isa (b, "single")) - tol = sqrt (eps ("single")); + tol = sqrt (eps ("single")); else - tol = sqrt (eps); + tol = sqrt (eps); endif endif if (length (a) == 1 || length (b) == 1) if (a == 0) - x = b; + x = b; elseif (b == 0) - x = a; + x = a; else - x = 1; + x = 1; endif else a /= a(1); while (1) - [d, r] = deconv (b, a); - nz = find (abs (r) > tol); - if (isempty (nz)) - x = a; - break; - else - r = r(nz(1):length(r)); - endif - b = a; - a = r / r(1); + [d, r] = deconv (b, a); + nz = find (abs (r) > tol); + if (isempty (nz)) + x = a; + break; + else + r = r(nz(1):length(r)); + endif + b = a; + a = r / r(1); endwhile endif else
--- a/scripts/polynomial/polyout.m +++ b/scripts/polynomial/polyout.m @@ -62,8 +62,8 @@ tmp = coeff (c(1)); for ii = 2:n if (real (c(ii)) < 0) - ns = " - "; - c(ii) = -c(ii); + ns = " - "; + c(ii) = -c(ii); else ns = " + "; endif
--- a/scripts/polynomial/spline.m +++ b/scripts/polynomial/spline.m @@ -125,24 +125,24 @@ - 3 * (a(n-1,:) - a(n-2,:)) / h(n-2); c(2:n-1,:) = spdiags ([[e(:); 0], dg, [0; e(:)]], - [-1, 0, 1], n-2, n-2) \ g; + [-1, 0, 1], n-2, n-2) \ g; endif c(1,:) = (3 / h(1) * (a(2,:) - a(1,:)) - 3 * dfs - - c(2,:) * h(1)) / (2 * h(1)); + - c(2,:) * h(1)) / (2 * h(1)); c(n,:) = - (3 / h(n-1) * (a(n,:) - a(n-1,:)) - 3 * dfe - + c(n-1,:) * h(n-1)) / (2 * h(n-1)); + + c(n-1,:) * h(n-1)) / (2 * h(n-1)); b(1:n-1,:) = diff (a) ./ h(1:n-1, idx) ... - - h(1:n-1,idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); + - h(1:n-1,idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); d = diff (c) ./ (3 * h(1:n-1, idx)); else g = zeros (n-2, columns (a)); g(1,:) = 3 / (h(1) + h(2)) ... - * (a(3,:) - a(2,:) - h(2) / h(1) * (a(2,:) - a(1,:))); + * (a(3,:) - a(2,:) - h(2) / h(1) * (a(2,:) - a(1,:))); g(n-2,:) = 3 / (h(n-1) + h(n-2)) ... - * (h(n-2) / h(n-1) * (a(n,:) - a(n-1,:)) - (a(n-1,:) - a(n-2,:))); + * (h(n-2) / h(n-1) * (a(n,:) - a(n-1,:)) - (a(n-1,:) - a(n-2,:))); if (n > 4) @@ -157,7 +157,7 @@ udg(1) = udg(1) - h(1); ldg(n - 3) = ldg(n-3) - h(n-1); c(2:n-1,:) = spdiags ([[ldg(:); 0], dg, [0; udg(:)]], - [-1, 0, 1], n-2, n-2) \ g; + [-1, 0, 1], n-2, n-2) \ g; elseif (n == 4) @@ -165,10 +165,10 @@ ldg = h(2) - h(3); udg = h(2) - h(1); c(2:n-1,:) = spdiags ([[ldg(:);0], dg, [0; udg(:)]], - [-1, 0, 1], n-2, n-2) \ g; + [-1, 0, 1], n-2, n-2) \ g; else # n == 3 - + dg = h(1) + 2 * h(2); c(2:n-1,:) = g/dg(1); @@ -177,7 +177,7 @@ c(1,:) = c(2,:) + h(1) / h(2) * (c(2,:) - c(3,:)); c(n,:) = c(n-1,:) + h(n-1) / h(n-2) * (c(n-1,:) - c(n-2,:)); b = diff (a) ./ h(1:n-1, idx) ... - - h(1:n-1, idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); + - h(1:n-1, idx) / 3 .* (c(2:n,:) + 2 * c(1:n-1,:)); d = diff (c) ./ (3 * h(1:n-1, idx)); endif
--- a/scripts/set/intersect.m +++ b/scripts/set/intersect.m @@ -61,9 +61,9 @@ c = [a(:); b(:)]; [c, ic] = sort (c); ## [a(:);b(:)](ic) == c if (iscellstr (c)) - ii = find (strcmp (c(1:end-1), c(2:end))); + ii = find (strcmp (c(1:end-1), c(2:end))); else - ii = find (c(1:end-1) == c(2:end)); + ii = find (c(1:end-1) == c(2:end)); endif c = c(ii); endif
--- a/scripts/set/setdiff.m +++ b/scripts/set/setdiff.m @@ -58,7 +58,7 @@ dups = find (all (dummy(1:end-1,:) == dummy(2:end,:), 2)); c(idx(dups),:) = []; if (nargout > 1) - i(idx(dups),:) = []; + i(idx(dups),:) = []; endif endif else @@ -75,15 +75,15 @@ if (iscellstr (dummy)) dups = find (strcmp (dummy(1:end-1), dummy(2:end))); else - dups = find (dummy(1:end-1) == dummy(2:end)); + dups = find (dummy(1:end-1) == dummy(2:end)); endif c(idx(dups)) = []; if (nargout > 1) - i(idx(dups)) = []; + i(idx(dups)) = []; endif ## Reshape if necessary. if (size (c, 1) != 1 && size (b, 1) == 1) - c = c.'; + c = c.'; endif endif endif
--- a/scripts/set/setxor.m +++ b/scripts/set/setxor.m @@ -63,24 +63,24 @@ n = rows (c); idx = find (all (c(1:n-1) == c(2:n), 2)); if (! isempty (idx)) - c([idx, idx+1],:) = []; - i([idx, idx+1],:) = []; + c([idx, idx+1],:) = []; + i([idx, idx+1],:) = []; endif else na = numel (a); nb = numel (b); [c, i] = sort ([a(:); b(:)]); n = length (c); if (iscell (c)) - idx = find (strcmp (c(1:n-1), c(2:n))); + idx = find (strcmp (c(1:n-1), c(2:n))); else idx = find (c(1:n-1) == c(2:n)); endif if (! isempty (idx)) - c([idx, idx+1]) = []; - i([idx, idx+1]) = []; + c([idx, idx+1]) = []; + i([idx, idx+1]) = []; endif if (size (a, 1) == 1 || size (b, 1) == 1) - c = c.'; + c = c.'; endif endif endif
--- a/scripts/signal/unwrap.m +++ b/scripts/signal/unwrap.m @@ -40,7 +40,7 @@ if (nargin == 3) if (! (isscalar (dim) && dim == round (dim)) && dim > 0 && - dim < (nd + 1)) + dim < (nd + 1)) error ("unwrap: dim must be an integer and valid dimension"); endif else
--- a/scripts/sparse/pcg.m +++ b/scripts/sparse/pcg.m @@ -122,9 +122,9 @@ ## ## @example ## @group -## n = 10; -## a = diag (sparse (1:n)); -## b = rand (n, 1); +## n = 10; +## a = diag (sparse (1:n)); +## b = rand (n, 1); ## [l, u, p, q] = luinc (a, 1.e-3); ## @end group ## @end example @@ -198,12 +198,12 @@ ## ## @sc{References} ## -## [1] C.T.Kelley, 'Iterative methods for linear and nonlinear equations', -## SIAM, 1995 (the base PCG algorithm) -## -## [2] Y.Saad, 'Iterative methods for sparse linear systems', PWS 1996 -## (condition number estimate from PCG) Revised version of this book is -## available online at http://www-users.cs.umn.edu/~saad/books.html +## [1] C.T.Kelley, 'Iterative methods for linear and nonlinear equations', +## SIAM, 1995 (the base PCG algorithm) +## +## [2] Y.Saad, 'Iterative methods for sparse linear systems', PWS 1996 +## (condition number estimate from PCG) Revised version of this book is +## available online at http://www-users.cs.umn.edu/~saad/books.html ## ## ## @seealso{sparse, pcr} @@ -272,18 +272,18 @@ while (resvec (iter-1,1) > tol * resvec (1,1) && iter < maxit) if (exist_m1) if(isnumeric (m1)) - y = m1 \ r; + y = m1 \ r; else - y = feval (m1, r, varargin{:}); + y = feval (m1, r, varargin{:}); endif else y = r; endif if (exist_m2) if (isnumeric (m2)) - z = m2 \ y; + z = m2 \ y; else - z = feval (m2, y, varargin{:}); + z = feval (m2, y, varargin{:}); endif else z = y; @@ -311,7 +311,7 @@ r -= alpha * w; if (nargout > 5 && iter > 2) T(iter-1:iter, iter-1:iter) = T(iter-1:iter, iter-1:iter) + ... - [1 sqrt(beta); sqrt(beta) beta]./oldalpha; + [1 sqrt(beta); sqrt(beta) beta]./oldalpha; ## EVS = eig(T(2:iter-1,2:iter-1)); ## fprintf(stderr,"PCG condest: %g (iteration: %d)\n", max(EVS)/min(EVS),iter); endif @@ -322,13 +322,13 @@ if (nargout > 5) if (matrix_positive_definite) if (iter > 3) - T = T(2:iter-2,2:iter-2); - l = eig (T); - eigest = [min(l), max(l)]; - ## fprintf (stderr, "pcg condest: %g\n", eigest(2)/eigest(1)); + T = T(2:iter-2,2:iter-2); + l = eig (T); + eigest = [min(l), max(l)]; + ## fprintf (stderr, "pcg condest: %g\n", eigest(2)/eigest(1)); else - eigest = [NaN, NaN]; - warning ("pcg: eigenvalue estimate failed: iteration converged too fast."); + eigest = [NaN, NaN]; + warning ("pcg: eigenvalue estimate failed: iteration converged too fast."); endif else eigest = [NaN, NaN]; @@ -338,18 +338,18 @@ ## residual. if (exist_m1) if (isnumeric (m1)) - y = m1 \ r; + y = m1 \ r; else - y = feval (m1, r, varargin{:}); + y = feval (m1, r, varargin{:}); endif else y = r; endif if (exist_m2) if (isnumeric (m2)) - z = m2 \ y; + z = m2 \ y; else - z = feval (m2, y, varargin{:}); + z = feval (m2, y, varargin{:}); endif else z = y; @@ -368,12 +368,12 @@ if (nargout < 2) warning ("pcg: maximum number of iterations (%d) reached\n", iter); warning ("the initial residual norm was reduced %g times.\n", ... - 1.0 / relres); + 1.0 / relres); endif elseif (nargout < 2) fprintf (stderr, "pcg: converged in %d iterations. ", iter); fprintf (stderr, "the initial residual norm was reduced %g times.\n",... - 1.0/relres); + 1.0/relres); endif if (! matrix_positive_definite) @@ -386,143 +386,143 @@ %!demo %! -%! # Simplest usage of pcg (see also 'help pcg') +%! # Simplest usage of pcg (see also 'help pcg') %! -%! N = 10; -%! A = diag ([1:N]); b = rand (N, 1); y = A \ b; #y is the true solution -%! x = pcg (A, b); -%! printf('The solution relative error is %g\n', norm (x - y) / norm (y)); +%! N = 10; +%! A = diag ([1:N]); b = rand (N, 1); y = A \ b; #y is the true solution +%! x = pcg (A, b); +%! printf('The solution relative error is %g\n', norm (x - y) / norm (y)); %! -%! # You shouldn't be afraid if pcg issues some warning messages in this -%! # example: watch out in the second example, why it takes N iterations -%! # of pcg to converge to (a very accurate, by the way) solution +%! # You shouldn't be afraid if pcg issues some warning messages in this +%! # example: watch out in the second example, why it takes N iterations +%! # of pcg to converge to (a very accurate, by the way) solution %!demo %! -%! # Full output from pcg, except for the eigenvalue estimates -%! # We use this output to plot the convergence history +%! # Full output from pcg, except for the eigenvalue estimates +%! # We use this output to plot the convergence history %! -%! N = 10; -%! A = diag ([1:N]); b = rand (N, 1); X = A \ b; #X is the true solution -%! [x, flag, relres, iter, resvec] = pcg (A, b); -%! printf('The solution relative error is %g\n', norm (x - X) / norm (X)); -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||/||b||)'); -%! semilogy([0:iter], resvec / resvec(1),'o-g'); +%! N = 10; +%! A = diag ([1:N]); b = rand (N, 1); X = A \ b; #X is the true solution +%! [x, flag, relres, iter, resvec] = pcg (A, b); +%! printf('The solution relative error is %g\n', norm (x - X) / norm (X)); +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||/||b||)'); +%! semilogy([0:iter], resvec / resvec(1),'o-g'); %! legend('relative residual'); %!demo %! -%! # Full output from pcg, including the eigenvalue estimates -%! # Hilbert matrix is extremely ill conditioned, so pcg WILL have problems +%! # Full output from pcg, including the eigenvalue estimates +%! # Hilbert matrix is extremely ill conditioned, so pcg WILL have problems %! -%! N = 10; -%! A = hilb (N); b = rand (N, 1); X = A \ b; #X is the true solution -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], 200); -%! printf('The solution relative error is %g\n', norm (x - X) / norm (X)); -%! printf('Condition number estimate is %g\n', eigest(2) / eigest (1)); -%! printf('Actual condition number is %g\n', cond (A)); -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); -%! semilogy([0:iter], resvec,['o-g';'+-r']); +%! N = 10; +%! A = hilb (N); b = rand (N, 1); X = A \ b; #X is the true solution +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], 200); +%! printf('The solution relative error is %g\n', norm (x - X) / norm (X)); +%! printf('Condition number estimate is %g\n', eigest(2) / eigest (1)); +%! printf('Actual condition number is %g\n', cond (A)); +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); +%! semilogy([0:iter], resvec,['o-g';'+-r']); %! legend('absolute residual','absolute preconditioned residual'); %!demo %! -%! # Full output from pcg, including the eigenvalue estimates -%! # We use the 1-D Laplacian matrix for A, and cond(A) = O(N^2) -%! # and that's the reasone we need some preconditioner; here we take -%! # a very simple and not powerful Jacobi preconditioner, -%! # which is the diagonal of A +%! # Full output from pcg, including the eigenvalue estimates +%! # We use the 1-D Laplacian matrix for A, and cond(A) = O(N^2) +%! # and that's the reasone we need some preconditioner; here we take +%! # a very simple and not powerful Jacobi preconditioner, +%! # which is the diagonal of A %! -%! N = 100; -%! A = zeros (N, N); -%! for i=1 : N - 1 # form 1-D Laplacian matrix -%! A (i:i+1, i:i+1) = [2 -1; -1 2]; -%! endfor -%! b = rand (N, 1); X = A \ b; #X is the true solution -%! maxit = 80; -%! printf('System condition number is %g\n', cond (A)); -%! # No preconditioner: the convergence is very slow! +%! N = 100; +%! A = zeros (N, N); +%! for i=1 : N - 1 # form 1-D Laplacian matrix +%! A (i:i+1, i:i+1) = [2 -1; -1 2]; +%! endfor +%! b = rand (N, 1); X = A \ b; #X is the true solution +%! maxit = 80; +%! printf('System condition number is %g\n', cond (A)); +%! # No preconditioner: the convergence is very slow! %! -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit); -%! printf('System condition number estimate is %g\n', eigest(2) / eigest(1)); -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); -%! semilogy([0:iter], resvec(:,1), 'o-g'); +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit); +%! printf('System condition number estimate is %g\n', eigest(2) / eigest(1)); +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); +%! semilogy([0:iter], resvec(:,1), 'o-g'); %! legend('NO preconditioning: absolute residual'); %! -%! pause(1); -%! # Test Jacobi preconditioner: it will not help much!!! +%! pause(1); +%! # Test Jacobi preconditioner: it will not help much!!! %! -%! M = diag (diag (A)); # Jacobi preconditioner -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit, M); -%! printf('JACOBI preconditioned system condition number estimate is %g\n', eigest(2) / eigest(1)); -%! hold on; -%! semilogy([0:iter], resvec(:,1), 'o-r'); +%! M = diag (diag (A)); # Jacobi preconditioner +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit, M); +%! printf('JACOBI preconditioned system condition number estimate is %g\n', eigest(2) / eigest(1)); +%! hold on; +%! semilogy([0:iter], resvec(:,1), 'o-r'); %! legend('NO preconditioning: absolute residual', ... %! 'JACOBI preconditioner: absolute residual'); %! -%! pause(1); -%! # Test nonoverlapping block Jacobi preconditioner: it will help much! +%! pause(1); +%! # Test nonoverlapping block Jacobi preconditioner: it will help much! %! -%! M = zeros (N, N); k = 4; -%! for i = 1 : k : N # form 1-D Laplacian matrix -%! M (i:i+k-1, i:i+k-1) = A (i:i+k-1, i:i+k-1); -%! endfor -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit, M); -%! printf('BLOCK JACOBI preconditioned system condition number estimate is %g\n', eigest(2) / eigest(1)); -%! semilogy ([0:iter], resvec(:,1),'o-b'); +%! M = zeros (N, N); k = 4; +%! for i = 1 : k : N # form 1-D Laplacian matrix +%! M (i:i+k-1, i:i+k-1) = A (i:i+k-1, i:i+k-1); +%! endfor +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], maxit, M); +%! printf('BLOCK JACOBI preconditioned system condition number estimate is %g\n', eigest(2) / eigest(1)); +%! semilogy ([0:iter], resvec(:,1),'o-b'); %! legend('NO preconditioning: absolute residual', ... %! 'JACOBI preconditioner: absolute residual', ... %! 'BLOCK JACOBI preconditioner: absolute residual'); -%! hold off; +%! hold off; %!test %! -%! #solve small diagonal system +%! #solve small diagonal system %! -%! N = 10; -%! A = diag ([1:N]); b = rand (N, 1); X = A \ b; #X is the true solution -%! [x, flag] = pcg (A, b, [], N+1); -%! assert(norm (x - X) / norm (X), 0, 1e-10); -%! assert(flag, 0); +%! N = 10; +%! A = diag ([1:N]); b = rand (N, 1); X = A \ b; #X is the true solution +%! [x, flag] = pcg (A, b, [], N+1); +%! assert(norm (x - X) / norm (X), 0, 1e-10); +%! assert(flag, 0); %! %!test %! -%! #solve small indefinite diagonal system -%! #despite A is indefinite, the iteration continues and converges -%! #indefiniteness of A is detected +%! #solve small indefinite diagonal system +%! #despite A is indefinite, the iteration continues and converges +%! #indefiniteness of A is detected %! -%! N = 10; -%! A = diag([1:N] .* (-ones(1, N) .^ 2)); b = rand (N, 1); X = A \ b; #X is the true solution -%! [x, flag] = pcg (A, b, [], N+1); -%! assert(norm (x - X) / norm (X), 0, 1e-10); -%! assert(flag, 3); +%! N = 10; +%! A = diag([1:N] .* (-ones(1, N) .^ 2)); b = rand (N, 1); X = A \ b; #X is the true solution +%! [x, flag] = pcg (A, b, [], N+1); +%! assert(norm (x - X) / norm (X), 0, 1e-10); +%! assert(flag, 3); %! %!test %! -%! #solve tridiagonal system, do not converge in default 20 iterations +%! #solve tridiagonal system, do not converge in default 20 iterations %! -%! N = 100; -%! A = zeros (N, N); -%! for i = 1 : N - 1 # form 1-D Laplacian matrix -%! A (i:i+1, i:i+1) = [2 -1; -1 2]; -%! endfor -%! b = ones (N, 1); X = A \ b; #X is the true solution -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, 1e-12); -%! assert(flag); -%! assert(relres > 1.0); -%! assert(iter, 20); #should perform max allowable default number of iterations +%! N = 100; +%! A = zeros (N, N); +%! for i = 1 : N - 1 # form 1-D Laplacian matrix +%! A (i:i+1, i:i+1) = [2 -1; -1 2]; +%! endfor +%! b = ones (N, 1); X = A \ b; #X is the true solution +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, 1e-12); +%! assert(flag); +%! assert(relres > 1.0); +%! assert(iter, 20); #should perform max allowable default number of iterations %! %!test %! -%! #solve tridiagonal system with 'prefect' preconditioner -%! #converges in one iteration, so the eigest does not work -%! #and issues a warning +%! #solve tridiagonal system with 'prefect' preconditioner +%! #converges in one iteration, so the eigest does not work +%! #and issues a warning %! -%! N = 100; -%! A = zeros (N, N); -%! for i = 1 : N - 1 # form 1-D Laplacian matrix -%! A (i:i+1, i:i+1) = [2 -1; -1 2]; -%! endfor -%! b = ones (N, 1); X = A \ b; #X is the true solution -%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], [], A, [], b); -%! assert(norm (x - X) / norm (X), 0, 1e-6); -%! assert(flag, 0); -%! assert(iter, 1); #should converge in one iteration -%! assert(isnan (eigest), isnan ([NaN, NaN])); +%! N = 100; +%! A = zeros (N, N); +%! for i = 1 : N - 1 # form 1-D Laplacian matrix +%! A (i:i+1, i:i+1) = [2 -1; -1 2]; +%! endfor +%! b = ones (N, 1); X = A \ b; #X is the true solution +%! [x, flag, relres, iter, resvec, eigest] = pcg (A, b, [], [], A, [], b); +%! assert(norm (x - X) / norm (X), 0, 1e-6); +%! assert(flag, 0); +%! assert(iter, 1); #should converge in one iteration +%! assert(isnan (eigest), isnan ([NaN, NaN])); %!
--- a/scripts/sparse/pcr.m +++ b/scripts/sparse/pcr.m @@ -100,9 +100,9 @@ ## ## @example ## @group -## n = 10; -## a = sparse (diag (1:n)); -## b = rand (N, 1); +## n = 10; +## a = sparse (diag (1:n)); +## b = rand (N, 1); ## @end group ## @end example ## @@ -131,10 +131,10 @@ ## ## @example ## @group -## function y = apply_m (x) +## function y = apply_m (x) ## k = floor (length(x)-2); ## y = x; -## y(1:k) = x(1:k)./[1:k]'; +## y(1:k) = x(1:k)./[1:k]'; ## endfunction ## ## [x, flag, relres, iter, resvec] = ... @@ -150,7 +150,7 @@ ## @group ## function y = apply_m (x, varargin) ## k = varargin@{1@}; -## y = x; y(1:k) = x(1:k)./[1:k]'; +## y = x; y(1:k) = x(1:k)./[1:k]'; ## endfunction ## ## [x, flag, relres, iter, resvec] = ... @@ -160,8 +160,8 @@ ## ## @sc{References} ## -## [1] W. Hackbusch, "Iterative Solution of Large Sparse Systems of -## Equations", section 9.5.4; Springer, 1994 +## [1] W. Hackbusch, "Iterative Solution of Large Sparse Systems of +## Equations", section 9.5.4; Springer, 1994 ## ## @seealso{sparse, pcg} ## @end deftypefn @@ -197,19 +197,19 @@ endif ## init - if (isnumeric (a)) # is A a matrix? + if (isnumeric (a)) # is A a matrix? r = b - a*x; - else # then A should be a function! + else # then A should be a function! r = b - feval (a, x, varargin{:}); endif - if (isnumeric (m)) # is M a matrix? - if (isempty (m)) # if M is empty, use no precond + if (isnumeric (m)) # is M a matrix? + if (isempty (m)) # if M is empty, use no precond p = r; - else # otherwise, apply the precond + else # otherwise, apply the precond p = m \ r; endif - else # then M should be a function! + else # then M should be a function! p = feval (m, r, varargin{:}); endif @@ -218,58 +218,58 @@ b_bot_old = 1; q_old = p_old = s_old = zeros (size (x)); - if (isnumeric (a)) # is A a matrix? + if (isnumeric (a)) # is A a matrix? q = a * p; - else # then A should be a function! + else # then A should be a function! q = feval (a, p, varargin{:}); endif - + resvec(1) = abs (norm (r)); ## iteration while (resvec(iter-1) > tol*resvec(1) && iter < maxit) - if (isnumeric (m)) # is M a matrix? - if (isempty (m)) # if M is empty, use no precond - s = q; - else # otherwise, apply the precond - s = m \ q; + if (isnumeric (m)) # is M a matrix? + if (isempty (m)) # if M is empty, use no precond + s = q; + else # otherwise, apply the precond + s = m \ q; endif - else # then M should be a function! + else # then M should be a function! s = feval (m, q, varargin{:}); endif b_top = r' * s; b_bot = q' * s; - + if (b_bot == 0.0) breakdown = true; break; endif lambda = b_top / b_bot; - + x += lambda*p; r -= lambda*q; - - if (isnumeric(a)) # is A a matrix? + + if (isnumeric(a)) # is A a matrix? t = a*s; - else # then A should be a function! + else # then A should be a function! t = feval (a, s, varargin{:}); endif - + alpha0 = (t'*s) / b_bot; alpha1 = (t'*s_old) / b_bot_old; - + p_temp = p; q_temp = q; p = s - alpha0*p - alpha1*p_old; q = t - alpha0*q - alpha1*q_old; - + s_old = s; p_old = p_temp; q_old = q_temp; b_bot_old = b_bot; - + resvec(iter) = abs (norm (r)); iter++; endwhile @@ -286,7 +286,7 @@ elseif (nargout < 2 && ! breakdown) fprintf (stderr, "pcr: converged in %d iterations. \n", iter); fprintf (stderr, "the initial residual norm was reduced %g times.\n", - 1.0 / relres); + 1.0 / relres); endif if (breakdown) @@ -301,130 +301,130 @@ %!demo %! -%! # Simplest usage of PCR (see also 'help pcr') +%! # Simplest usage of PCR (see also 'help pcr') %! -%! N = 20; -%! A = diag(linspace(-3.1,3,N)); b = rand(N,1); y = A\b; #y is the true solution -%! x = pcr(A,b); -%! printf('The solution relative error is %g\n', norm(x-y)/norm(y)); +%! N = 20; +%! A = diag(linspace(-3.1,3,N)); b = rand(N,1); y = A\b; #y is the true solution +%! x = pcr(A,b); +%! printf('The solution relative error is %g\n', norm(x-y)/norm(y)); %! -%! # You shouldn't be afraid if PCR issues some warning messages in this -%! # example: watch out in the second example, why it takes N iterations -%! # of PCR to converge to (a very accurate, by the way) solution +%! # You shouldn't be afraid if PCR issues some warning messages in this +%! # example: watch out in the second example, why it takes N iterations +%! # of PCR to converge to (a very accurate, by the way) solution %!demo %! -%! # Full output from PCR -%! # We use this output to plot the convergence history +%! # Full output from PCR +%! # We use this output to plot the convergence history %! -%! N = 20; -%! A = diag(linspace(-3.1,30,N)); b = rand(N,1); X = A\b; #X is the true solution -%! [x, flag, relres, iter, resvec] = pcr(A,b); -%! printf('The solution relative error is %g\n', norm(x-X)/norm(X)); -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||/||b||)'); -%! semilogy([0:iter],resvec/resvec(1),'o-g;relative residual;'); +%! N = 20; +%! A = diag(linspace(-3.1,30,N)); b = rand(N,1); X = A\b; #X is the true solution +%! [x, flag, relres, iter, resvec] = pcr(A,b); +%! printf('The solution relative error is %g\n', norm(x-X)/norm(X)); +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||/||b||)'); +%! semilogy([0:iter],resvec/resvec(1),'o-g;relative residual;'); %!demo %! -%! # Full output from PCR -%! # We use indefinite matrix based on the Hilbert matrix, with one -%! # strongly negative eigenvalue -%! # Hilbert matrix is extremely ill conditioned, so is ours, -%! # and that's why PCR WILL have problems +%! # Full output from PCR +%! # We use indefinite matrix based on the Hilbert matrix, with one +%! # strongly negative eigenvalue +%! # Hilbert matrix is extremely ill conditioned, so is ours, +%! # and that's why PCR WILL have problems %! -%! N = 10; -%! A = hilb(N); A(1,1)=-A(1,1); b = rand(N,1); X = A\b; #X is the true solution -%! printf('Condition number of A is %g\n', cond(A)); -%! [x, flag, relres, iter, resvec] = pcr(A,b,[],200); -%! if (flag == 3) -%! printf('PCR breakdown. System matrix is [close to] singular\n'); -%! end -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); -%! semilogy([0:iter],resvec,'o-g;absolute residual;'); +%! N = 10; +%! A = hilb(N); A(1,1)=-A(1,1); b = rand(N,1); X = A\b; #X is the true solution +%! printf('Condition number of A is %g\n', cond(A)); +%! [x, flag, relres, iter, resvec] = pcr(A,b,[],200); +%! if (flag == 3) +%! printf('PCR breakdown. System matrix is [close to] singular\n'); +%! end +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); +%! semilogy([0:iter],resvec,'o-g;absolute residual;'); %!demo %! -%! # Full output from PCR -%! # We use an indefinite matrix based on the 1-D Laplacian matrix for A, -%! # and here we have cond(A) = O(N^2) -%! # That's the reason we need some preconditioner; here we take -%! # a very simple and not powerful Jacobi preconditioner, -%! # which is the diagonal of A +%! # Full output from PCR +%! # We use an indefinite matrix based on the 1-D Laplacian matrix for A, +%! # and here we have cond(A) = O(N^2) +%! # That's the reason we need some preconditioner; here we take +%! # a very simple and not powerful Jacobi preconditioner, +%! # which is the diagonal of A %! -%! # Note that we use here indefinite preconditioners! +%! # Note that we use here indefinite preconditioners! %! -%! N = 100; -%! A = zeros(N,N); -%! for i=1:N-1 # form 1-D Laplacian matrix -%! A(i:i+1,i:i+1) = [2 -1; -1 2]; -%! endfor -%! A = [A, zeros(size(A)); zeros(size(A)), -A]; -%! b = rand(2*N,1); X = A\b; #X is the true solution -%! maxit = 80; -%! printf('System condition number is %g\n',cond(A)); -%! # No preconditioner: the convergence is very slow! +%! N = 100; +%! A = zeros(N,N); +%! for i=1:N-1 # form 1-D Laplacian matrix +%! A(i:i+1,i:i+1) = [2 -1; -1 2]; +%! endfor +%! A = [A, zeros(size(A)); zeros(size(A)), -A]; +%! b = rand(2*N,1); X = A\b; #X is the true solution +%! maxit = 80; +%! printf('System condition number is %g\n',cond(A)); +%! # No preconditioner: the convergence is very slow! %! -%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit); -%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); -%! semilogy([0:iter],resvec,'o-g;NO preconditioning: absolute residual;'); +%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit); +%! title('Convergence history'); xlabel('Iteration'); ylabel('log(||b-Ax||)'); +%! semilogy([0:iter],resvec,'o-g;NO preconditioning: absolute residual;'); %! -%! pause(1); -%! # Test Jacobi preconditioner: it will not help much!!! +%! pause(1); +%! # Test Jacobi preconditioner: it will not help much!!! %! -%! M = diag(diag(A)); # Jacobi preconditioner -%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit,M); -%! hold on; -%! semilogy([0:iter],resvec,'o-r;JACOBI preconditioner: absolute residual;'); +%! M = diag(diag(A)); # Jacobi preconditioner +%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit,M); +%! hold on; +%! semilogy([0:iter],resvec,'o-r;JACOBI preconditioner: absolute residual;'); %! -%! pause(1); -%! # Test nonoverlapping block Jacobi preconditioner: this one should give -%! # some convergence speedup! +%! pause(1); +%! # Test nonoverlapping block Jacobi preconditioner: this one should give +%! # some convergence speedup! %! -%! M = zeros(N,N);k=4; -%! for i=1:k:N # get k x k diagonal blocks of A -%! M(i:i+k-1,i:i+k-1) = A(i:i+k-1,i:i+k-1); -%! endfor -%! M = [M, zeros(size(M)); zeros(size(M)), -M]; -%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit,M); -%! semilogy([0:iter],resvec,'o-b;BLOCK JACOBI preconditioner: absolute residual;'); -%! hold off; +%! M = zeros(N,N);k=4; +%! for i=1:k:N # get k x k diagonal blocks of A +%! M(i:i+k-1,i:i+k-1) = A(i:i+k-1,i:i+k-1); +%! endfor +%! M = [M, zeros(size(M)); zeros(size(M)), -M]; +%! [x, flag, relres, iter, resvec] = pcr(A,b,[],maxit,M); +%! semilogy([0:iter],resvec,'o-b;BLOCK JACOBI preconditioner: absolute residual;'); +%! hold off; %!test %! -%! #solve small indefinite diagonal system +%! #solve small indefinite diagonal system %! -%! N = 10; -%! A = diag(linspace(-10.1,10,N)); b = ones(N,1); X = A\b; #X is the true solution -%! [x, flag] = pcr(A,b,[],N+1); -%! assert(norm(x-X)/norm(X)<1e-10); -%! assert(flag,0); +%! N = 10; +%! A = diag(linspace(-10.1,10,N)); b = ones(N,1); X = A\b; #X is the true solution +%! [x, flag] = pcr(A,b,[],N+1); +%! assert(norm(x-X)/norm(X)<1e-10); +%! assert(flag,0); %! %!test %! -%! #solve tridiagonal system, do not converge in default 20 iterations -%! #should perform max allowable default number of iterations +%! #solve tridiagonal system, do not converge in default 20 iterations +%! #should perform max allowable default number of iterations %! -%! N = 100; -%! A = zeros(N,N); -%! for i=1:N-1 # form 1-D Laplacian matrix -%! A(i:i+1,i:i+1) = [2 -1; -1 2]; -%! endfor -%! b = ones(N,1); X = A\b; #X is the true solution -%! [x, flag, relres, iter, resvec] = pcr(A,b,1e-12); -%! assert(flag,1); -%! assert(relres>0.6); -%! assert(iter,20); +%! N = 100; +%! A = zeros(N,N); +%! for i=1:N-1 # form 1-D Laplacian matrix +%! A(i:i+1,i:i+1) = [2 -1; -1 2]; +%! endfor +%! b = ones(N,1); X = A\b; #X is the true solution +%! [x, flag, relres, iter, resvec] = pcr(A,b,1e-12); +%! assert(flag,1); +%! assert(relres>0.6); +%! assert(iter,20); %! %!test %! -%! #solve tridiagonal system with 'prefect' preconditioner -%! #converges in one iteration +%! #solve tridiagonal system with 'prefect' preconditioner +%! #converges in one iteration %! -%! N = 100; -%! A = zeros(N,N); -%! for i=1:N-1 # form 1-D Laplacian matrix -%! A(i:i+1,i:i+1) = [2 -1; -1 2]; -%! endfor -%! b = ones(N,1); X = A\b; #X is the true solution -%! [x, flag, relres, iter] = pcr(A,b,[],[],A,b); -%! assert(norm(x-X)/norm(X)<1e-6); -%! assert(relres<1e-6); -%! assert(flag,0); -%! assert(iter,1); #should converge in one iteration +%! N = 100; +%! A = zeros(N,N); +%! for i=1:N-1 # form 1-D Laplacian matrix +%! A(i:i+1,i:i+1) = [2 -1; -1 2]; +%! endfor +%! b = ones(N,1); X = A\b; #X is the true solution +%! [x, flag, relres, iter] = pcr(A,b,[],[],A,b); +%! assert(norm(x-X)/norm(X)<1e-6); +%! assert(relres<1e-6); +%! assert(flag,0); +%! assert(iter,1); #should converge in one iteration %!
--- a/scripts/sparse/spaugment.m +++ b/scripts/sparse/spaugment.m @@ -78,9 +78,9 @@ c = max (max (abs (a))) / 1000; else if (ndims (a) != 2) - error ("spaugment: expecting 2-dimenisional matrix") + error ("spaugment: expecting 2-dimenisional matrix") else - c = max (abs (a(:))) / 1000; + c = max (abs (a(:))) / 1000; endif endif elseif (!isscalar (c))
--- a/scripts/sparse/spconvert.m +++ b/scripts/sparse/spconvert.m @@ -33,7 +33,7 @@ else sz = size (m); if (nargin != 1 || ! ismatrix (m) || ! isreal (m) - || length (sz) != 2 || (sz(2) != 3 && sz(2) != 4)) + || length (sz) != 2 || (sz(2) != 3 && sz(2) != 4)) error ("spconvert: argument must be sparse or real matrix with 3 or 4 columns"); elseif (sz(2) == 3) s = sparse (m(:,1), m(:,2), m(:,3));
--- a/scripts/sparse/sprand.m +++ b/scripts/sparse/sprand.m @@ -40,8 +40,8 @@ ## Changelog: ## ## Piotr Krzyzanowski <przykry2004@users.sf.net> -## 2004-09-27 use Paul's hint to allow larger random matrices -## at the price of sometimes lower density than desired +## 2004-09-27 use Paul's hint to allow larger random matrices +## at the price of sometimes lower density than desired ## David Bateman ## 2004-10-20 Texinfo help and copyright message
--- a/scripts/sparse/sprandsym.m +++ b/scripts/sparse/sprandsym.m @@ -68,7 +68,7 @@ else S1 = sparse (i1, j1+1, randn (k1, 1), m1, n1); S = [tril(S1), sparse(m1,m1); ... - sparse(i2,j2+1,randn(k2,1),n2,n2), triu(S1,1)']; + sparse(i2,j2+1,randn(k2,1),n2,n2), triu(S1,1)']; S = S + tril (S, -1)'; endif else
--- a/scripts/sparse/svds.m +++ b/scripts/sparse/svds.m @@ -142,10 +142,10 @@ ## this can also be an issue. However, we'd like to avoid double ## k for all scalar value of sigma... [V, s, flag] = eigs ([sparse(m,m), b; b', sparse(n,n)], - 2 * k, b_sigma, b_opts); + 2 * k, b_sigma, b_opts); else [V, s, flag] = eigs ([sparse(m,m), b; b', sparse(n,n)], - k, b_sigma, b_opts); + k, b_sigma, b_opts); endif s = diag (s); @@ -184,7 +184,7 @@ if (length (s) < k) warning ("returning fewer singular values than requested"); if (!ischar (sigma)) - warning ("try increasing the value of sigma"); + warning ("try increasing the value of sigma"); endif endif
--- a/scripts/sparse/treelayout.m +++ b/scripts/sparse/treelayout.m @@ -44,7 +44,7 @@ ## Checking vector of predecessors. for i = 1 : num_nodes if (tree(i) < i) - ## This part of graph was checked before. + ## This part of graph was checked before. continue; endif @@ -54,7 +54,7 @@ hare = tree(tortoise); while (tortoise != hare) - ## End after finding a cicle or reaching a checked part of graph. + ## End after finding a cicle or reaching a checked part of graph. if (hare < i) ## This part of graph was checked before. @@ -62,14 +62,14 @@ endif tortoise = tree(tortoise); - ## Hare will move faster than tortoise so in cicle hare must - ## reach tortoise. + ## Hare will move faster than tortoise so in cicle hare must + ## reach tortoise. hare = tree(tree(hare)); endwhile if (tortoise == hare) - ## If hare reach tortoise we found circle. + ## If hare reach tortoise we found circle. error ("treelayout: vector of predecessors has bad format"); endif @@ -151,9 +151,9 @@ x_coordinate_r(par_number) = left_most; max_ht = min (max_ht, level); if (length(stk) > 1 && find ((shift(stk,1)-stk) == 0) > 1 - && stk(end,2) != stk(end-1,2)) - ## Return to the nearest branching the position to return - ## position is the position on the stack, where should be + && stk(end,2) != stk(end-1,2)) + ## Return to the nearest branching the position to return + ## position is the position on the stack, where should be ## started further search (there are two nodes which has the ## same parent node). @@ -165,22 +165,22 @@ level += length (par_number_vec); - ## The level have to be decreased. + ## The level have to be decreased. x_coordinate_r(par_number_vec) = left_most; stk(position:end,:) = []; - endif + endif ## Remove the next node from "searched branch". stk(end,:) = []; - ## Choose new "parent node". + ## Choose new "parent node". par_number = stk(end,1); - ## If there is another branch start to search it. - if (par_number != -1) - y_coordinate(par_number) = level; + ## If there is another branch start to search it. + if (par_number != -1) + y_coordinate(par_number) = level; x_coordinate_l(par_number) = left_most + 1; - endif + endif else ## There were descendants of "parent nod" choose the last of
--- a/scripts/sparse/treeplot.m +++ b/scripts/sparse/treeplot.m @@ -41,13 +41,13 @@ if (nargin > 2) edge_style = edge_s; if (nargin > 1) - if (length (findstr (node_s, "*")) == 0 - && length (findstr (node_s, "+")) == 0 - && length (findstr (node_s, "x")) == 0) - node_style = [node_s, "o"]; - else - node_style = node_s; - endif + if (length (findstr (node_s, "*")) == 0 + && length (findstr (node_s, "+")) == 0 + && length (findstr (node_s, "x")) == 0) + node_style = [node_s, "o"]; + else + node_style = node_s; + endif endif endif @@ -72,13 +72,13 @@ stop = zeros (1, num_nodes+1); for i = 1:num_nodes+1 start(i) = pos; - xhelp(i) = pos; - pos += num_children(i); - stop(i) = pos; + xhelp(i) = pos; + pos += num_children(i); + stop(i) = pos; endfor for i = 1:num_nodes vec_of_child(xhelp(tree(i)+1)) = i; - xhelp(tree(i)+1) = xhelp(tree(i)+1)+1; + xhelp(tree(i)+1) = xhelp(tree(i)+1)+1; endfor ## The number of "parent" (actual) node (it's descendants will be @@ -106,57 +106,57 @@ ## The top of the stack. while (par_number != -1) - if (start(par_number+1) < stop(par_number+1)) - idx = vec_of_child(start(par_number+1):stop(par_number+1)-1); - else - idx = zeros (1, 0); - endif + if (start(par_number+1) < stop(par_number+1)) + idx = vec_of_child(start(par_number+1):stop(par_number+1)-1); + else + idx = zeros (1, 0); + endif ## Add to idx the vector of parent descendants. - stk = [stk; [idx', ones(fliplr(size(idx)))*par_number]]; - ## Add to stack the records relevant to parent descandant s. - if (par_number != 0) - skelet = [skelet; ([ones(size(idx))*par_number; idx])(:)]; - endif + stk = [stk; [idx', ones(fliplr(size(idx)))*par_number]]; + ## Add to stack the records relevant to parent descandant s. + if (par_number != 0) + skelet = [skelet; ([ones(size(idx))*par_number; idx])(:)]; + endif - ## If there is not any descendant of "parent node": - if (stk(end,2) != par_number) - left_most++; + ## If there is not any descendant of "parent node": + if (stk(end,2) != par_number) + left_most++; x_coordinate_r(par_number) = left_most; - max_ht = min (max_ht, level); + max_ht = min (max_ht, level); if (length(stk) > 1 && find ((shift(stk,1)-stk) == 0) > 1 - && stk(end,2) != stk(end-1,2)) - ## Return to the nearest branching the position to return - ## position is the position on the stack, where should be - ## started further search (there are two nodes which has the - ## same parent node). + && stk(end,2) != stk(end-1,2)) + ## Return to the nearest branching the position to return + ## position is the position on the stack, where should be + ## started further search (there are two nodes which has the + ## same parent node). position = (find ((shift(stk(:,2),1)-stk(:,2)) == 0))(end) + 1; par_number_vec = stk(position:end,2); ## The vector of removed nodes (the content of stack form - ## position to end). + ## position to end). skelet = [skelet; flipud(par_number_vec)]; level += length (par_number_vec); - ## The level have to be decreased. + ## The level have to be decreased. x_coordinate_r(par_number_vec) = left_most; stk(position:end,:) = []; - endif - ## Remove the next node from "searched branch". - stk(end,:) = []; - ## Choose new "parent node". + endif + ## Remove the next node from "searched branch". + stk(end,:) = []; + ## Choose new "parent node". par_number = stk(end,1); - ## If there is another branch start to search it. - if (par_number != -1) - skelet = [skelet; stk(end,2); par_number]; - y_coordinate(par_number) = level; - x_coordinate_l(par_number) = left_most + 1; - endif - else + ## If there is another branch start to search it. + if (par_number != -1) + skelet = [skelet; stk(end,2); par_number]; + y_coordinate(par_number) = level; + x_coordinate_l(par_number) = left_most + 1; + endif + else ## There were descendants of "parent nod" choose the last of - ## them and go on through it. + ## them and go on through it. level--; - par_number = stk(end,1); - y_coordinate(par_number) = level; - x_coordinate_l(par_number) = left_most + 1; - endif + par_number = stk(end,1); + y_coordinate(par_number) = level; + x_coordinate_l(par_number) = left_most + 1; + endif endwhile ## Calculate the x coordinates (the known values are the position @@ -169,37 +169,37 @@ hold_is_on = ishold (); unwind_protect - hold ("on"); + hold ("on"); - ## Plot grah nodes. - plot (x_coordinate, y_coordinate, node_style); + ## Plot grah nodes. + plot (x_coordinate, y_coordinate, node_style); - ## Helping command - usable for plotting edges - skelet = [skelet; 0]; + ## Helping command - usable for plotting edges + skelet = [skelet; 0]; - ## Draw graph edges. - idx = find (skelet == 0); + ## Draw graph edges. + idx = find (skelet == 0); - ## Plot each tree component in one loop. - for i = 2:length(idx) - ## Tree component start. - istart = idx(i-1) + 1; - ## Tree component end. - istop = idx(i) - 1; - if (istop - istart < 1) - continue; - endif - plot (x_coordinate(skelet(istart:istop)), - y_coordinate(skelet(istart:istop)), edge_style) - endfor + ## Plot each tree component in one loop. + for i = 2:length(idx) + ## Tree component start. + istart = idx(i-1) + 1; + ## Tree component end. + istop = idx(i) - 1; + if (istop - istart < 1) + continue; + endif + plot (x_coordinate(skelet(istart:istop)), + y_coordinate(skelet(istart:istop)), edge_style) + endfor - ## Set axis and graph size. - axis ([0.5, left_most+0.5, max_ht-0.5, num_nodes-0.5], "nolabel"); + ## Set axis and graph size. + axis ([0.5, left_most+0.5, max_ht-0.5, num_nodes-0.5], "nolabel"); unwind_protect_cleanup - if (! hold_is_on) - hold ("off"); - endif + if (! hold_is_on) + hold ("off"); + endif end_unwind_protect endif
--- a/scripts/specfun/nchoosek.m +++ b/scripts/specfun/nchoosek.m @@ -112,8 +112,8 @@ p{1} = n*s; for j = n-1:-1:1 for i = k:-1:2 - q = p{i-1}; - p{i} = [[repmat(s*j, rows (p{i-1}), 1), p{i-1}]; p{i}]; + q = p{i-1}; + p{i} = [[repmat(s*j, rows (p{i-1}), 1), p{i-1}]; p{i}]; endfor p{1} = [j;p{1}]; endfor
--- a/scripts/specfun/primes.m +++ b/scripts/specfun/primes.m @@ -83,11 +83,11 @@ x = [2, 1+2*find(sieve)]; # primes remaining after sieve else a = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, ... - 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, ... - 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, ... - 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, ... - 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, ... - 293, 307, 311, 313, 317, 331, 337, 347, 349]; + 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, ... + 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, ... + 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, ... + 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, ... + 293, 307, 311, 313, 317, 331, 337, 347, 349]; x = a(a <= p); endif
--- a/scripts/special-matrix/toeplitz.m +++ b/scripts/special-matrix/toeplitz.m @@ -100,7 +100,7 @@ ## Form matrix. retval = spdiags(repmat(c(cidx),nr,1),1-cidx,nr,nc)+... - spdiags(repmat(r(ridx),nr,1),ridx-1,nr,nc); + spdiags(repmat(r(ridx),nr,1),ridx-1,nr,nc); else ## Concatenate data into a single column vector. data = [r(end:-1:2)(:); c(:)];
--- a/scripts/statistics/base/iqr.m +++ b/scripts/statistics/base/iqr.m @@ -50,8 +50,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("iqr: dim must be an integer and valid dimension"); endif endif
--- a/scripts/statistics/base/kurtosis.m +++ b/scripts/statistics/base/kurtosis.m @@ -63,8 +63,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("kurtosis: dim must be an integer and valid dimension"); endif endif
--- a/scripts/statistics/base/qqplot.m +++ b/scripts/statistics/base/qqplot.m @@ -78,7 +78,7 @@ tmp = ""; endif q_label = sprintf ("%s with parameter(s) %g%s", func2str (f), - varargin{1}, tmp); + varargin{1}, tmp); endif if (nargout == 0)
--- a/scripts/statistics/base/quantile.m +++ b/scripts/statistics/base/quantile.m @@ -319,61 +319,61 @@ case {1, 2, 3} switch method case 1 - p = max (ceil (kron (p, m)), 1); - inv(k,:) = x(p + pcd); + p = max (ceil (kron (p, m)), 1); + inv(k,:) = x(p + pcd); case 2 - p = kron (p, m); - p_lr = max (ceil (p), 1); - p_rl = min (floor (p + 1), mm); - inv(k,:) = (x(p_lr + pcd) + x(p_rl + pcd))/2; + p = kron (p, m); + p_lr = max (ceil (p), 1); + p_rl = min (floor (p + 1), mm); + inv(k,:) = (x(p_lr + pcd) + x(p_rl + pcd))/2; case 3 ## Used by SAS, method PCTLDEF=2. ## http://support.sas.com/onlinedoc/913/getDoc/en/statug.hlp/stdize_sect14.htm - t = max (kron (p, m), 1); - t = roundb (t); - inv(k,:) = x(t + pcd); + t = max (kron (p, m), 1); + t = roundb (t); + inv(k,:) = x(t + pcd); endswitch otherwise switch method case 4 - p = kron (p, m); + p = kron (p, m); case 5 ## Used by Matlab. - p = kron (p, m) + 0.5; + p = kron (p, m) + 0.5; case 6 ## Used by Minitab and SPSS. - p = kron (p, m+1); + p = kron (p, m+1); case 7 ## Used by S and R. - p = kron (p, m-1) + 1; + p = kron (p, m-1) + 1; case 8 ## Median unbiased . - p = kron (p, m+1/3) + 1/3; + p = kron (p, m+1/3) + 1/3; case 9 ## Approximately unbiased respecting order statistics. - p = kron (p, m+0.25) + 0.375; + p = kron (p, m+0.25) + 0.375; otherwise error ("quantile: Unknown method, '%d'", method); endswitch - ## Duplicate single values. - imm1 = mm == 1; - x(2,imm1) = x(1,imm1); + ## Duplicate single values. + imm1 = mm == 1; + x(2,imm1) = x(1,imm1); - ## Interval indices. - pi = max (min (floor (p), mm-1), 1); - pr = max (min (p - pi, 1), 0); - pi += pcd; - inv(k,:) = (1-pr) .* x(pi) + pr .* x(pi+1); + ## Interval indices. + pi = max (min (floor (p), mm-1), 1); + pr = max (min (p - pi, 1), 0); + pi += pcd; + inv(k,:) = (1-pr) .* x(pi) + pr .* x(pi+1); endswitch endif
--- a/scripts/statistics/base/ranks.m +++ b/scripts/statistics/base/ranks.m @@ -50,8 +50,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("ranks: dim must be an integer and valid dimension"); endif endif @@ -77,8 +77,8 @@ len = diff (find (diff ([Inf; eq_el; -Inf]) != 1)) + 1; [eq_el, y] = sort (xi); for i = 1 : length(runs) - y (xi (runs (i) + [0:(len(i)-1)]) + floor (runs (i) ./ sz(1)) - * sz(1)) = eq_el(runs(i)) + (len(i) - 1) / 2; + y (xi (runs (i) + [0:(len(i)-1)]) + floor (runs (i) ./ sz(1)) + * sz(1)) = eq_el(runs(i)) + (len(i) - 1) / 2; endfor endif if (dim != 1)
--- a/scripts/statistics/base/run_count.m +++ b/scripts/statistics/base/run_count.m @@ -47,8 +47,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("run_count: dim must be an integer and valid dimension"); endif endif
--- a/scripts/statistics/base/skewness.m +++ b/scripts/statistics/base/skewness.m @@ -62,8 +62,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("skewness: dim must be an integer and valid dimension"); endif endif
--- a/scripts/statistics/base/statistics.m +++ b/scripts/statistics/base/statistics.m @@ -50,8 +50,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("statistics: dim must be an integer and valid dimension"); endif endif @@ -63,7 +63,7 @@ emp_inv = quantile (X, [0.25; 0.5; 0.75], dim, 7); S = cat (dim, min (X, [], dim), emp_inv, max (X, [], dim), mean (X, dim), - std (X, [], dim), skewness (X, dim), kurtosis (X, dim)); + std (X, [], dim), skewness (X, dim), kurtosis (X, dim)); endfunction
--- a/scripts/statistics/base/studentize.m +++ b/scripts/statistics/base/studentize.m @@ -49,8 +49,8 @@ endif else if (! (isscalar (dim) && dim == round (dim)) - && dim > 0 - && dim < (nd + 1)) + && dim > 0 + && dim < (nd + 1)) error ("studentize: dim must be an integer and valid dimension"); endif endif
--- a/scripts/statistics/base/var.m +++ b/scripts/statistics/base/var.m @@ -66,13 +66,13 @@ else sz(dim) = 1; if (n == 0) - if (prod (sz) == 0) - retval = zeros (sz); - else - retval = NaN (sz); - endif + if (prod (sz) == 0) + retval = zeros (sz); + else + retval = NaN (sz); + endif else - retval = zeros (sz); + retval = zeros (sz); endif endif elseif (n == 1)
--- a/scripts/statistics/distributions/betapdf.m +++ b/scripts/statistics/distributions/betapdf.m @@ -50,10 +50,10 @@ if (any (k)) if (isscalar(a) && isscalar(b)) pdf(k) = exp ((a - 1) .* log (x(k)) - + (b - 1) .* log (1 - x(k))) ./ beta (a, b); + + (b - 1) .* log (1 - x(k))) ./ beta (a, b); else pdf(k) = exp ((a(k) - 1) .* log (x(k)) - + (b(k) - 1) .* log (1 - x(k))) ./ beta (a(k), b(k)); + + (b(k) - 1) .* log (1 - x(k))) ./ beta (a(k), b(k)); endif endif
--- a/scripts/statistics/distributions/betarnd.m +++ b/scripts/statistics/distributions/betarnd.m @@ -37,7 +37,7 @@ 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 @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("betarnd: a and b must be scalar or of size [r,c]"); endif elseif (nargin == 3) @@ -65,7 +65,7 @@ endif if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("betarnd: a and b must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/binocdf.m +++ b/scripts/statistics/distributions/binocdf.m @@ -42,19 +42,19 @@ cdf = zeros (sz); k = find (isnan (x) | !(n >= 0) | (n != round (n)) - | !(p >= 0) | !(p <= 1)); + | !(p >= 0) | !(p <= 1)); if (any (k)) cdf(k) = NaN; endif k = find ((x >= n) & (n >= 0) & (n == round (n)) - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if (any (k)) cdf(k) = 1; endif k = find ((x >= 0) & (x < n) & (n == round (n)) - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if (any (k)) tmp = floor (x(k)); if (isscalar (n) && isscalar (p))
--- a/scripts/statistics/distributions/binoinv.m +++ b/scripts/statistics/distributions/binoinv.m @@ -42,35 +42,35 @@ inv = zeros (sz); k = find (!(x >= 0) | !(x <= 1) | !(n >= 0) | (n != round (n)) - | !(p >= 0) | !(p <= 1)); + | !(p >= 0) | !(p <= 1)); if (any (k)) inv(k) = NaN; endif k = find ((x >= 0) & (x <= 1) & (n >= 0) & (n == round (n)) - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if (any (k)) if (isscalar (n) && isscalar (p)) cdf = binopdf (0, n, p) * ones (size(k)); while (any (inv(k) < n)) - m = find (cdf < x(k)); - if (any (m)) + m = find (cdf < x(k)); + if (any (m)) inv(k(m)) = inv(k(m)) + 1; cdf(m) = cdf(m) + binopdf (inv(k(m)), n, p); - else + else break; - endif + endif endwhile else cdf = binopdf (0, n(k), p(k)); while (any (inv(k) < n(k))) - m = find (cdf < x(k)); - if (any (m)) + m = find (cdf < x(k)); + if (any (m)) inv(k(m)) = inv(k(m)) + 1; cdf(m) = cdf(m) + binopdf (inv(k(m)), n(k(m)), p(k(m))); - else + else break; - endif + endif endwhile endif endif
--- a/scripts/statistics/distributions/binornd.m +++ b/scripts/statistics/distributions/binornd.m @@ -37,7 +37,7 @@ 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 @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (n) != 1) - && (length (size (n)) != length (sz) || any (size (n) != sz))) + && (length (size (n)) != length (sz) || any (size (n) != sz))) error ("binornd: n and must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -65,7 +65,7 @@ endif if (any (size (n) != 1) - && (length (size (n)) != length (sz) || any (size (n) != sz))) + && (length (size (n)) != length (sz) || any (size (n) != sz))) error ("binornd: n and must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/cauchy_pdf.m +++ b/scripts/statistics/distributions/cauchy_pdf.m @@ -54,10 +54,10 @@ if (any (k)) if (isscalar (location) && isscalar (scale)) pdf(k) = ((1 ./ (1 + ((x(k) - location) ./ scale) .^ 2)) - / pi ./ scale); + / pi ./ scale); else pdf(k) = ((1 ./ (1 + ((x(k) - location(k)) ./ scale(k)) .^ 2)) - / pi ./ scale(k)); + / pi ./ scale(k)); endif endif
--- a/scripts/statistics/distributions/cauchy_rnd.m +++ b/scripts/statistics/distributions/cauchy_rnd.m @@ -37,7 +37,7 @@ if (!isscalar (l) || !isscalar (scale)) [retval, l, scale] = common_size (l, scale); if (retval > 0) - error ("cauchy_rnd: lambda and sigma must be of common size or scalar"); + error ("cauchy_rnd: lambda and sigma must be of common size or scalar"); endif endif endif @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (l) != 1) - && (length (size (l)) != length (sz) || any (size (l) != sz))) + && (length (size (l)) != length (sz) || any (size (l) != sz))) error ("cauchy_rnd: lambda and sigma must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -65,7 +65,7 @@ endif if (any (size (l) != 1) - && (length (size (l)) != length (sz) || any (size (l) != sz))) + && (length (size (l)) != length (sz) || any (size (l) != sz))) error ("cauchy_rnd: lambda and sigma must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/chi2rnd.m +++ b/scripts/statistics/distributions/chi2rnd.m @@ -42,7 +42,7 @@ sz = [r, c]; if (any (size (n) != 1) - && (length (size (n)) != length (sz) || any (size (n) != sz))) + && (length (size (n)) != length (sz) || any (size (n) != sz))) error ("chi2rnd: n must be scalar or of size [r, c]"); endif elseif (nargin == 2) @@ -55,7 +55,7 @@ endif if (any (size (n) != 1) - && (length (size (n)) != length (sz) || any (size (n) != sz))) + && (length (size (n)) != length (sz) || any (size (n) != sz))) error ("chi2rnd: n must be scalar or of size sz"); endif elseif (nargin == 1)
--- a/scripts/statistics/distributions/discrete_rnd.m +++ b/scripts/statistics/distributions/discrete_rnd.m @@ -55,11 +55,11 @@ p = r; else if (isscalar (r) && (r > 0)) - sz = [r, r]; + sz = [r, r]; elseif (isvector(r) && all (r > 0)) - sz = r(:)'; + 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
--- a/scripts/statistics/distributions/exprnd.m +++ b/scripts/statistics/distributions/exprnd.m @@ -43,7 +43,7 @@ sz = [r, c]; if (any (size (l) != 1) && - (length (size (l)) != length (sz) || any (size (l) != sz))) + (length (size (l)) != length (sz) || any (size (l) != sz))) error ("exprnd: lambda must be scalar or of size [r, c]"); endif elseif (nargin == 2) @@ -56,7 +56,7 @@ endif if (any (size (l) != 1) && - ((length (size (l)) != length (sz)) || any (size (l) != sz))) + ((length (size (l)) != length (sz)) || any (size (l) != sz))) error ("exprnd: lambda must be scalar or of size sz"); endif elseif (nargin == 1)
--- a/scripts/statistics/distributions/fcdf.m +++ b/scripts/statistics/distributions/fcdf.m @@ -58,7 +58,7 @@ cdf(k) = 1 - betainc (1 ./ (1 + m .* x(k) ./ n), n / 2, m / 2); else cdf(k) = 1 - betainc (1 ./ (1 + m(k) .* x(k) ./ n(k)), n(k) / 2, - m(k) / 2); + m(k) / 2); endif endif
--- a/scripts/statistics/distributions/finv.m +++ b/scripts/statistics/distributions/finv.m @@ -58,7 +58,7 @@ inv(k) = ((1 ./ betainv (1 - x(k), n / 2, m / 2) - 1) .* n ./ m); else inv(k) = ((1 ./ betainv (1 - x(k), n(k) / 2, m(k) / 2) - 1) - .* n(k) ./ m(k)); + .* n(k) ./ m(k)); endif endif
--- a/scripts/statistics/distributions/fpdf.m +++ b/scripts/statistics/distributions/fpdf.m @@ -52,13 +52,13 @@ if (isscalar (m) && isscalar (n)) tmp = m / n * x(k); pdf(k) = (exp ((m / 2 - 1) .* log (tmp) - - ((m + n) / 2) .* log (1 + tmp)) - .* (m / n) ./ beta (m / 2, n / 2)); + - ((m + n) / 2) .* log (1 + tmp)) + .* (m / n) ./ beta (m / 2, n / 2)); else tmp = m(k) .* x(k) ./ n(k); pdf(k) = (exp ((m(k) / 2 - 1) .* log (tmp) - - ((m(k) + n(k)) / 2) .* log (1 + tmp)) - .* (m(k) ./ n(k)) ./ beta (m(k) / 2, n(k) / 2)); + - ((m(k) + n(k)) / 2) .* log (1 + tmp)) + .* (m(k) ./ n(k)) ./ beta (m(k) / 2, n(k) / 2)); 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 @@ -54,7 +54,7 @@ sz = [r, c]; if (any (size (m) != 1) && - ((length (size (m)) != length (sz)) || any (size (m) != sz))) + ((length (size (m)) != length (sz)) || any (size (m) != sz))) error ("frnd: m and n must be scalar or of size [r,c]"); endif elseif (nargin == 3) @@ -67,7 +67,7 @@ endif if (any (size (m) != 1) && - ((length (size (m)) != length (sz)) || any (size (m) != sz))) + ((length (size (m)) != length (sz)) || any (size (m) != sz))) error ("frnd: m and n must be scalar or of size sz"); endif elseif (nargin == 2) @@ -80,12 +80,12 @@ if (isscalar (m) && isscalar (n)) if (isinf (m) || isinf (n)) if (isinf (m)) - rnd = ones (sz); + rnd = ones (sz); else - rnd = 2 ./ m .* randg(m / 2, sz); + rnd = 2 ./ m .* randg(m / 2, sz); endif if (! isinf (n)) - rnd = 0.5 .* n .* rnd ./ randg (n / 2, sz); + rnd = 0.5 .* n .* rnd ./ randg (n / 2, sz); endif elseif ((m > 0) && (m < Inf) && (n > 0) && (n < Inf)) rnd = n ./ m .* randg (m / 2, sz) ./ randg (n / 2, sz);
--- a/scripts/statistics/distributions/gampdf.m +++ b/scripts/statistics/distributions/gampdf.m @@ -52,10 +52,10 @@ if (any (k)) if (isscalar(a) && isscalar(b)) pdf(k) = (x(k) .^ (a - 1)) ... - .* exp(- x(k) ./ b) ./ gamma (a) ./ (b .^ a); + .* exp(- x(k) ./ b) ./ gamma (a) ./ (b .^ a); else pdf(k) = (x(k) .^ (a(k) - 1)) ... - .* exp(- x(k) ./ b(k)) ./ gamma (a(k)) ./ (b(k) .^ a(k)); + .* exp(- x(k) ./ b(k)) ./ gamma (a(k)) ./ (b(k) .^ a(k)); endif endif @@ -63,10 +63,10 @@ if (any (k)) if (isscalar(a) && isscalar(b)) pdf(k) = exp (- a .* log (b) + (a-1) .* log (x(k)) - - x(k) ./ b - gammaln (a)); + - x(k) ./ b - gammaln (a)); else pdf(k) = exp (- a(k) .* log (b(k)) + (a(k)-1) .* log (x(k)) - - x(k) ./ b(k) - gammaln (a(k))); + - x(k) ./ b(k) - gammaln (a(k))); endif endif
--- a/scripts/statistics/distributions/gamrnd.m +++ b/scripts/statistics/distributions/gamrnd.m @@ -38,7 +38,7 @@ 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 @@ -53,7 +53,7 @@ sz = [r, c]; if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("gamrnd: a and b must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -66,7 +66,7 @@ endif if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("gamrnd: a and b must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/geornd.m +++ b/scripts/statistics/distributions/geornd.m @@ -43,7 +43,7 @@ sz = [r, c]; if (any (size (p) != 1) && ((length (size (p)) != length (sz)) || - any (size (p) != sz))) + any (size (p) != sz))) error ("geornd: p must be scalar or of size [r, c]"); endif elseif (nargin == 2) @@ -56,7 +56,7 @@ endif if (any (size (p) != 1) && ((length (size (p)) != length (sz)) || - any (size (p) != sz))) + any (size (p) != sz))) error ("geornd: n must be scalar or of size sz"); endif elseif (nargin == 1)
--- a/scripts/statistics/distributions/hygepdf.m +++ b/scripts/statistics/distributions/hygepdf.m @@ -62,10 +62,10 @@ if (any (k)) if (isscalar (t) && isscalar (m) && isscalar (n)) pdf (k) = (bincoeff (m, x(k)) .* bincoeff (t-m, n-x(k)) - / bincoeff (t, n)); + / bincoeff (t, n)); else pdf (k) = (bincoeff (m(k), x(k)) .* bincoeff (t(k)-m(k), n(k)-x(k)) - ./ bincoeff (t(k), n(k))); + ./ bincoeff (t(k), n(k))); endif endif
--- a/scripts/statistics/distributions/laplace_inv.m +++ b/scripts/statistics/distributions/laplace_inv.m @@ -47,7 +47,7 @@ k = find ((x > 0) & (x < 1)); if (any (k)) inv(k) = ((x(k) < 1/2) .* log (2 * x(k)) - - (x(k) > 1/2) .* log (2 * (1 - x(k)))); + - (x(k) > 1/2) .* log (2 * (1 - x(k)))); endif endfunction
--- a/scripts/statistics/distributions/lognrnd.m +++ b/scripts/statistics/distributions/lognrnd.m @@ -37,7 +37,7 @@ 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 @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (mu) != 1) && - ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) + ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) error ("lognrnd: mu and sigma must be scalar or of size [r, c]"); endif @@ -66,7 +66,7 @@ endif if (any (size (mu) != 1) && - ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) + ((length (size (mu)) != length (sz)) || any (size (mu) != sz))) error ("lognrnd: mu and sigma must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/nbincdf.m +++ b/scripts/statistics/distributions/nbincdf.m @@ -45,19 +45,19 @@ cdf = zeros (size (x)); k = find (isnan (x) | (n < 1) | (n == Inf) | (n != round (n)) - | (p < 0) | (p > 1)); + | (p < 0) | (p > 1)); if (any (k)) cdf(k) = NaN; endif k = find ((x == Inf) & (n > 0) & (n < Inf) & (n == round (n)) - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if (any (k)) cdf(k) = 1; endif k = find ((x >= 0) & (x < Inf) & (x == round (x)) & (n > 0) - & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); + & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); if (any (k)) ## Does anyone know a better way to do the summation? m = zeros (size (k)); @@ -65,25 +65,25 @@ y = cdf(k); if (isscalar (n) && isscalar (p)) while (1) - l = find (m <= x); - if (any (l)) + l = find (m <= x); + if (any (l)) y(l) = y(l) + nbinpdf (m(l), n, p); m(l) = m(l) + 1; - else + else break; - endif + endif endwhile else n = n(k); p = p(k); while (1) - l = find (m <= x); - if (any (l)) + l = find (m <= x); + if (any (l)) y(l) = y(l) + nbinpdf (m(l), n(l), p(l)); m(l) = m(l) + 1; - else + else break; - endif + endif endwhile endif cdf(k) = y;
--- a/scripts/statistics/distributions/nbininv.m +++ b/scripts/statistics/distributions/nbininv.m @@ -46,45 +46,45 @@ inv = zeros (size (x)); k = find (isnan (x) | (x < 0) | (x > 1) | (n < 1) | (n == Inf) - | (n != round (n)) | (p < 0) | (p > 1)); + | (n != round (n)) | (p < 0) | (p > 1)); if (any (k)) inv(k) = NaN; endif k = find ((x == 1) & (n > 0) & (n < Inf) & (n == round (n)) - & (p >= 0) & (p <= 1)); + & (p >= 0) & (p <= 1)); if (any (k)) inv(k) = Inf; endif k = find ((x >= 0) & (x < 1) & (n > 0) & (n < Inf) - & (n == round (n)) & (p > 0) & (p <= 1)); + & (n == round (n)) & (p > 0) & (p <= 1)); if (any (k)) m = zeros (size (k)); x = x(k); if (isscalar (n) && isscalar (p)) s = p ^ n * ones (size(k)); while (1) - l = find (s < x); - if (any (l)) + l = find (s < x); + if (any (l)) m(l) = m(l) + 1; s(l) = s(l) + nbinpdf (m(l), n, p); - else + else break; - endif + endif endwhile else n = n(k); p = p(k); s = p .^ n; while (1) - l = find (s < x); - if (any (l)) + l = find (s < x); + if (any (l)) m(l) = m(l) + 1; s(l) = s(l) + nbinpdf (m(l), n(l), p(l)); - else + else break; - endif + endif endwhile endif inv(k) = m;
--- a/scripts/statistics/distributions/nbinpdf.m +++ b/scripts/statistics/distributions/nbinpdf.m @@ -46,20 +46,20 @@ pdf = zeros (size (x)); k = find (isnan (x) | (n < 1) | (n == Inf) | (n != round (n)) - | (p < 0) | (p > 1)); + | (p < 0) | (p > 1)); if (any (k)) pdf(k) = NaN; endif ## Just for the fun of it ... k = find ((x == Inf) & (n > 0) & (n < Inf) & (n == round (n)) - & (p == 0)); + & (p == 0)); if (any (k)) pdf(k) = 1; endif k = find ((x >= 0) & (x < Inf) & (x == round (x)) & (n > 0) - & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); + & (n < Inf) & (n == round (n)) & (p > 0) & (p <= 1)); if (any (k)) if (isscalar (n) && isscalar (p)) pdf(k) = bincoeff (-n, x(k)) .* (p ^ n) .* ((p - 1) .^ x(k));
--- a/scripts/statistics/distributions/nbinrnd.m +++ b/scripts/statistics/distributions/nbinrnd.m @@ -37,7 +37,7 @@ 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 @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (n) != 1) && - ((length (size (n)) != length (sz)) || any (size (n) != sz))) + ((length (size (n)) != length (sz)) || any (size (n) != sz))) error ("nbinrnd: n and p must be scalar or of size [r, c]"); endif @@ -66,7 +66,7 @@ endif if (any (size (n) != 1) && - ((length (size (n)) != length (sz)) || any (size (n) != sz))) + ((length (size (n)) != length (sz)) || any (size (n) != sz))) error ("nbinrnd: n and p must be scalar or of size sz"); endif elseif (nargin == 2) @@ -79,7 +79,7 @@ if ((n < 1) || (n == Inf) || (n != round (n)) || (p <= 0) || (p > 1)); rnd = NaN (sz); elseif ((n > 0) && (n < Inf) && (n == round (n)) && - (p > 0) && (p <= 1)) + (p > 0) && (p <= 1)) rnd = randp ((1 - p) ./ p .* randg (n, sz)); else rnd = zeros (sz); @@ -88,7 +88,7 @@ rnd = zeros (sz); k = find ((n < 1) || (n == Inf) || (n != round (n)) || - (p <= 0) || (p > 1)); + (p <= 0) || (p > 1)); if (any (k)) rnd(k) = NaN; endif
--- a/scripts/statistics/distributions/normrnd.m +++ b/scripts/statistics/distributions/normrnd.m @@ -37,7 +37,7 @@ 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 @@ -52,7 +52,7 @@ sz = [r, c]; if (any (size (m) != 1) - && (length (size (m)) != length (sz) || any (size (m) != sz))) + && (length (size (m)) != length (sz) || any (size (m) != sz))) error ("normrnd: m and s must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -65,7 +65,7 @@ endif if (any (size (m) != 1) - && (length (size (m)) != length (sz) || any (size (m) != sz))) + && (length (size (m)) != length (sz) || any (size (m) != sz))) error ("normrnd: m and s must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/poissinv.m +++ b/scripts/statistics/distributions/poissinv.m @@ -62,11 +62,11 @@ m = find (cdf < x(k)); if (any (m)) inv(k(m)) = inv(k(m)) + 1; - if (isscalar (l)) + if (isscalar (l)) cdf(m) = cdf(m) + poisspdf (inv(k(m)), l); - else + else cdf(m) = cdf(m) + poisspdf (inv(k(m)), l(k(m))); - endif + endif else break; endif
--- a/scripts/statistics/distributions/poissrnd.m +++ b/scripts/statistics/distributions/poissrnd.m @@ -41,7 +41,7 @@ sz = [r, c]; if (any (size (l) != 1) && - ((length (size (l)) != length (sz)) || any (size (l) != sz))) + ((length (size (l)) != length (sz)) || any (size (l) != sz))) error ("poissrnd: lambda must be scalar or of size [r, c]"); endif elseif (nargin == 2) @@ -54,7 +54,7 @@ endif if (any (size (l) != 1) && - ((length (size (l)) != length (sz)) || any (size (l) != sz))) + ((length (size (l)) != length (sz)) || any (size (l) != sz))) error ("poissrnd: lambda must be scalar or of size sz"); endif elseif (nargin == 1)
--- a/scripts/statistics/distributions/tinv.m +++ b/scripts/statistics/distributions/tinv.m @@ -66,12 +66,12 @@ if (any (k)) if (isscalar (n)) inv(k) = (sign (x(k) - 1/2) - .* sqrt (n .* (1 ./ betainv (2*min (x(k), 1 - x(k)), - n/2, 1/2) - 1))); + .* sqrt (n .* (1 ./ betainv (2*min (x(k), 1 - x(k)), + n/2, 1/2) - 1))); else inv(k) = (sign (x(k) - 1/2) - .* sqrt (n(k) .* (1 ./ betainv (2*min (x(k), 1 - x(k)), - n(k)/2, 1/2) - 1))); + .* sqrt (n(k) .* (1 ./ betainv (2*min (x(k), 1 - x(k)), + n(k)/2, 1/2) - 1))); endif endif
--- a/scripts/statistics/distributions/tpdf.m +++ b/scripts/statistics/distributions/tpdf.m @@ -50,10 +50,10 @@ if (any (k)) if (isscalar (n)) pdf(k) = (exp (- (n + 1) .* log (1 + x(k) .^ 2 ./ n)/2) - / (sqrt (n) * beta (n/2, 1/2))); + / (sqrt (n) * beta (n/2, 1/2))); else pdf(k) = (exp (- (n(k) + 1) .* log (1 + x(k) .^ 2 ./ n(k))/2) - ./ (sqrt (n(k)) .* beta (n(k)/2, 1/2))); + ./ (sqrt (n(k)) .* beta (n(k)/2, 1/2))); endif endif
--- a/scripts/statistics/distributions/trnd.m +++ b/scripts/statistics/distributions/trnd.m @@ -43,7 +43,7 @@ sz = [r, c]; if (any (size (n) != 1) && - ((length (size (n)) != length (sz)) || any (size (n) != sz))) + ((length (size (n)) != length (sz)) || any (size (n) != sz))) error ("trnd: n must be scalar or of size sz"); endif elseif (nargin == 2) @@ -56,7 +56,7 @@ endif if (any (size (n) != 1) && - ((length (size (n)) != length (sz)) || any (size (n) != sz))) + ((length (size (n)) != length (sz)) || any (size (n) != sz))) error ("trnd: n must be scalar or of size sz"); endif elseif (nargin == 1)
--- a/scripts/statistics/distributions/unidrnd.m +++ b/scripts/statistics/distributions/unidrnd.m @@ -44,7 +44,7 @@ elseif (nargin > 2) for i = 1:nargin-1 if (! isscalar (varargin{i})) - error ("unidrnd: expecting scalar dimensions"); + error ("unidrnd: expecting scalar dimensions"); endif endfor dims = [varargin{:}];
--- a/scripts/statistics/distributions/unifrnd.m +++ b/scripts/statistics/distributions/unifrnd.m @@ -36,7 +36,7 @@ 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 @@ -51,7 +51,7 @@ sz = [r, c]; if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("unifrnd: a and b must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -64,7 +64,7 @@ endif if (any (size (a) != 1) - && (length (size (a)) != length (sz) || any (size (a) != sz))) + && (length (size (a)) != length (sz) || any (size (a) != sz))) error ("unifrnd: a and b must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/statistics/distributions/wblpdf.m +++ b/scripts/statistics/distributions/wblpdf.m @@ -71,12 +71,12 @@ if (any (k)) if (isscalar (shape) && isscalar (scale)) pdf(k) = (shape .* (scale .^ -shape) - .* (x(k) .^ (shape - 1)) - .* exp(- (x(k) / scale) .^ shape)); + .* (x(k) .^ (shape - 1)) + .* exp(- (x(k) / scale) .^ shape)); else pdf(k) = (shape(k) .* (scale(k) .^ -shape(k)) - .* (x(k) .^ (shape(k) - 1)) - .* exp(- (x(k) ./ scale(k)) .^ shape(k))); + .* (x(k) .^ (shape(k) - 1)) + .* exp(- (x(k) ./ scale(k)) .^ shape(k))); endif endif
--- a/scripts/statistics/distributions/wblrnd.m +++ b/scripts/statistics/distributions/wblrnd.m @@ -37,7 +37,7 @@ if (!isscalar(shape) || !isscalar(scale)) [retval, shape, scale] = common_size (shape, scale); if (retval > 0) - error ("wblrnd: shape and scale must be of common size or scalar"); + error ("wblrnd: shape and scale must be of common size or scalar"); endif endif endif @@ -52,8 +52,8 @@ sz = [r, c]; if (any (size (scale) != 1) && - ((length (size (scale)) != length (sz)) - || any (size (scale) != sz))) + ((length (size (scale)) != length (sz)) + || any (size (scale) != sz))) error ("wblrnd: shape and scale must be scalar or of size [r, c]"); endif elseif (nargin == 3) @@ -66,8 +66,8 @@ endif if (any (size (scale) != 1) && - ((length (size (scale)) != length (sz)) - || any (size (scale) != sz))) + ((length (size (scale)) != length (sz)) + || any (size (scale) != sz))) error ("wblrnd: shape and scale must be scalar or of size sz"); endif elseif (nargin == 2)
--- a/scripts/strings/cstrcat.m +++ b/scripts/strings/cstrcat.m @@ -50,11 +50,11 @@ if (iscellstr (varargin)) ## All arguments are character strings. unwind_protect - tmp = warning ("query", "Octave:empty-list-elements"); - warning ("off", "Octave:empty-list-elements"); - st = [varargin{:}]; + tmp = warning ("query", "Octave:empty-list-elements"); + warning ("off", "Octave:empty-list-elements"); + st = [varargin{:}]; unwind_protect_cleanup - warning (tmp.state, "Octave:empty-list-elements"); + warning (tmp.state, "Octave:empty-list-elements"); end_unwind_protect else error ("cstrcat: expecting arguments to character strings");
--- a/scripts/strings/deblank.m +++ b/scripts/strings/deblank.m @@ -40,16 +40,16 @@ if (! isempty (s)) if (char_arg) - k = find (! isspace (s) & s != "\0"); + k = find (! isspace (s) & s != "\0"); else - warning ("deblank: expecting character string argument") - k = find (s != 0); + warning ("deblank: expecting character string argument") + k = find (s != 0); endif if (isempty (k)) - s = resize (s, 0, 0); + s = resize (s, 0, 0); else - s = s(:,1:ceil (max (k) / rows (s))); + s = s(:,1:ceil (max (k) / rows (s))); endif endif
--- a/scripts/strings/findstr.m +++ b/scripts/strings/findstr.m @@ -82,8 +82,8 @@ ## the much smaller list to determine which of them are real matches limit = l_s - l_t + 1; v = find (s(1:limit) == t(1) - & s(2:limit+1) == t(2) - & s (3:limit+2) == t(3)); + & s(2:limit+1) == t(2) + & s (3:limit+2) == t(3)); endif ## Need to search the index vector if our find was too short @@ -103,19 +103,19 @@ ind = 0:l_t-1; if (overlap) for idx = 1:length (v) - keep(idx) = all (s(v(idx) + ind) == t); + keep(idx) = all (s(v(idx) + ind) == t); endfor else ## First possible position for next non-overlapping match. next = 1; for idx = 1:length (v) - if (v(idx) >= next && s(v(idx) + ind) == t) - keep(idx) = 1; - ## Skip to the next possible match position. - next = v(idx) + l_t; - else - keep(idx) = 0; - endif + if (v(idx) >= next && s(v(idx) + ind) == t) + keep(idx) = 1; + ## Skip to the next possible match position. + next = v(idx) + l_t; + else + keep(idx) = 0; + endif endfor endif if (! isempty (v))
--- a/scripts/strings/isstrprop.m +++ b/scripts/strings/isstrprop.m @@ -85,31 +85,31 @@ if (nargin == 2) switch (pred) case "alpha" - retval = isalpha (str); + retval = isalpha (str); case {"alnum", "alphanum"} - retval = isalnum (str); + retval = isalnum (str); case "ascii" - retval = isascii (str); + retval = isascii (str); case "cntrl" - retval = iscntrl (str); + retval = iscntrl (str); case "digit" - retval = isdigit (str); + retval = isdigit (str); case {"graph", "graphic"} - retval = isgraph (str); + retval = isgraph (str); case "lower" - retval = islower (str); + retval = islower (str); case "print" - retval = isprint (str); + retval = isprint (str); case "punct" - retval = ispunct (str); + retval = ispunct (str); case {"space", "wspace"} - retval = isspace (str); + retval = isspace (str); case "upper" - retval = isupper (str); + retval = isupper (str); case "xdigit" - retval = isxdigit (str); + retval = isxdigit (str); otherwise - error ("isstrprop: invalid predicate"); + error ("isstrprop: invalid predicate"); endswitch else print_usage ();
--- a/scripts/strings/regexptranslate.m +++ b/scripts/strings/regexptranslate.m @@ -58,12 +58,12 @@ op = tolower (op); if (strcmp ("wildcard", op)) y = regexprep (regexprep (regexprep (x, "\\.", "\\."), "\\*", - ".*"), "\\?", "."); + ".*"), "\\?", "."); elseif (strcmp ("escape", op)) ch = {'\$', '\.', '\?', '\[', '\]'}; y = x; for i = 1 : length (ch) - y = regexprep (y, ch{i}, ch{i}); + y = regexprep (y, ch{i}, ch{i}); endfor else error ("regexptranslate: unexpected operation");
--- a/scripts/strings/strtok.m +++ b/scripts/strings/strtok.m @@ -58,14 +58,14 @@ len = length (str); while (start <= len) if (all (str(start) != delim)) - break; + break; endif start++; endwhile stop = start; while (stop <= len) if (any (str(stop) == delim)) - break; + break; endif stop++; endwhile @@ -86,11 +86,11 @@ ## Find first non-leading delimiter. skip = find (idx(:)' != 1:length(idx)); if (isempty (skip)) - tok = str(idx(length(idx))+1:length(str)); - rem = ""; + tok = str(idx(length(idx))+1:length(str)); + rem = ""; else - tok = str(skip(1):idx(skip(1))-1); - rem = str(idx(skip(1)):length(str)); + tok = str(skip(1):idx(skip(1))-1); + rem = str(idx(skip(1)):length(str)); endif endif endif
--- a/scripts/testfun/assert.m +++ b/scripts/testfun/assert.m @@ -67,10 +67,10 @@ if (nargin == 1 || (nargin > 1 && islogical (cond) && ischar (varargin{1}))) if ((! isnumeric (cond) && ! islogical (cond)) || ! all (cond(:))) if (nargin == 1) - ## Say which elements failed? - error ("assert %s failed", in); + ## Say which elements failed? + error ("assert %s failed", in); else - error (varargin{:}); + error (varargin{:}); endif endif else @@ -98,46 +98,46 @@ elseif (iscell (expected)) if (! iscell (cond) || any (size (cond) != size (expected))) - iserror = 1; + iserror = 1; else - try - for i = 1:length (expected(:)) - assert (cond{i}, expected{i}, tol); - endfor - catch - iserror = 1; - end_try_catch + try + for i = 1:length (expected(:)) + assert (cond{i}, expected{i}, tol); + endfor + catch + iserror = 1; + end_try_catch endif elseif (isstruct (expected)) if (! isstruct (cond) || any (size (cond) != size (expected)) - || rows (fieldnames (cond)) != rows (fieldnames (expected))) - iserror = 1; + || rows (fieldnames (cond)) != rows (fieldnames (expected))) + iserror = 1; else - try - empty = numel (cond) == 0; - normal = numel (cond) == 1; - for [v, k] = cond - if (! isfield (expected, k)) - error (); - endif - if (empty) - v = cell (1, 0); - endif - if (normal) - v = {v}; - else - v = v(:)'; - endif - assert (v, {expected.(k)}, tol); - endfor - catch - iserror = 1; - end_try_catch + try + empty = numel (cond) == 0; + normal = numel (cond) == 1; + for [v, k] = cond + if (! isfield (expected, k)) + error (); + endif + if (empty) + v = cell (1, 0); + endif + if (normal) + v = {v}; + else + v = v(:)'; + endif + assert (v, {expected.(k)}, tol); + endfor + catch + iserror = 1; + end_try_catch endif elseif (ndims (cond) != ndims (expected) - || any (size (cond) != size (expected))) + || any (size (cond) != size (expected))) iserror = 1; coda = "Dimensions don't match";
--- a/scripts/testfun/example.m +++ b/scripts/testfun/example.m @@ -45,11 +45,11 @@ if (nargout > 0) if (n > 0) if (n <= length (idx)) - code_r = code(idx(n):idx(n+1)-1); - idx_r = [1, length(code_r)+1]; + code_r = code(idx(n):idx(n+1)-1); + idx_r = [1, length(code_r)+1]; else - code_r = ""; - idx_r = []; + code_r = ""; + idx_r = []; endif else code_r = code; @@ -87,7 +87,7 @@ %!test %! [code, idx] = example('example'); %! assert (code, ... -%! "\n example('example');\n t=0:0.01:2*pi; x=sin(t);\n plot(t,x)") +%! "\n example('example');\n t=0:0.01:2*pi; x=sin(t);\n plot(t,x)") %! assert (idx, [1, 22, 59]); %!error example;
--- a/scripts/testfun/fail.m +++ b/scripts/testfun/fail.m @@ -91,11 +91,11 @@ if (isempty (err)) msg = sprintf ("expected warning <%s> but got none", pattern); else - ## Transform "warning: ...\n" to "...". + ## Transform "warning: ...\n" to "...". err([1:9, end]) = []; if (! isempty (regexp (err, pattern, "once"))) - return; - endif + return; + endif msg = sprintf ("expected warning <%s>\nbut got <%s>", pattern, err); endif catch @@ -117,7 +117,7 @@ err([1:6, end]) = []; # transform "error: ...\n", to "..." endif if (! isempty (regexp (err, pattern, "once"))) - return; + return; endif msg = sprintf ("expected error <%s>\nbut got <%s>", pattern, err); end_try_catch
--- a/scripts/testfun/rundemos.m +++ b/scripts/testfun/rundemos.m @@ -32,9 +32,9 @@ else fullname = find_dir_in_path (directory); if (! isempty (fullname)) - dirs = {fullname}; + dirs = {fullname}; else - error ("rundemos: expecting argument to be a directory name"); + error ("rundemos: expecting argument to be a directory name"); endif endif else @@ -56,10 +56,10 @@ if (length (f) > 2 && strcmp (f((end-1):end), ".m")) f = fullfile (directory, f); if (has_demos (f)) - demo (f); - if (i != numel (flist)) - input ("Press <enter> to continue: ", "s"); - endif + demo (f); + if (i != numel (flist)) + input ("Press <enter> to continue: ", "s"); + endif endif endif endfor
--- a/scripts/testfun/runtests.m +++ b/scripts/testfun/runtests.m @@ -32,9 +32,9 @@ else fullname = find_dir_in_path (directory); if (! isempty (fullname)) - dirs = {fullname}; + dirs = {fullname}; else - error ("runtests: expecting argument to be a directory name"); + error ("runtests: expecting argument to be a directory name"); endif endif else
--- a/scripts/testfun/speed.m +++ b/scripts/testfun/speed.m @@ -224,12 +224,12 @@ if (! isempty (__f2)) eval (cstrcat ("__t = time();", __f2, "; __v2=ans; __t = time()-__t;")); if (__t < 0.25) - eval (cstrcat ("__t2 = time();", __f2, "; __t2 = time()-__t2;")); - eval (cstrcat ("__t3 = time();", __f2, "; __t3 = time()-__t3;")); + eval (cstrcat ("__t2 = time();", __f2, "; __t2 = time()-__t2;")); + eval (cstrcat ("__t3 = time();", __f2, "; __t3 = time()-__t3;")); endif __torig(k) = __t; if (! isinf(__tol)) - assert (__v1, __v2, __tol); + assert (__v1, __v2, __tol); endif endif endfor @@ -264,20 +264,20 @@ if (doplot && ! isempty (__f2)) subplot (1, 2, 1); semilogx (__test_n, __torig./__tnew, - cstrcat ("-*r;", strrep (__f1, ";", "."), "/", - strrep (__f2, ";", "."), ";"), - __test_n, __tnew./__torig, - cstrcat ("-*g;", strrep (__f2, ";", "."), "/", - strrep (__f1, ";", "."), ";")); + cstrcat ("-*r;", strrep (__f1, ";", "."), "/", + strrep (__f2, ";", "."), ";"), + __test_n, __tnew./__torig, + cstrcat ("-*g;", strrep (__f2, ";", "."), "/", + strrep (__f1, ";", "."), ";")); xlabel ("test length"); title (__f1); ylabel ("speedup ratio"); subplot (1, 2, 2); loglog (__test_n, __tnew*1000, - cstrcat ("*-g;", strrep (__f1, ";", "."), ";"), - __test_n, __torig*1000, - cstrcat ("*-r;", strrep (__f2,";","."), ";")); + cstrcat ("*-g;", strrep (__f1, ";", "."), ";"), + __test_n, __torig*1000, + cstrcat ("*-r;", strrep (__f2,";","."), ";")); xlabel ("test length"); ylabel ("best execution time (ms)");
--- a/scripts/testfun/test.m +++ b/scripts/testfun/test.m @@ -105,7 +105,7 @@ if (ischar (__fid)) __fid = fopen (__fid, "wt"); if (__fid < 0) - error ("could not open log file"); + error ("could not open log file"); endif __close_fid = 1; endif @@ -176,7 +176,7 @@ fprintf (__fid, "%s%s does not exist in path\n", __signal_empty, __name); fflush (__fid); if (nargout > 0) - __ret1 = __ret2 = 0; + __ret1 = __ret2 = 0; endif endif if (__close_fid) @@ -196,7 +196,7 @@ fprintf (__fid, "%s%s has no tests available\n", __signal_empty, __file); fflush (__fid); if (nargout > 0) - __ret1 = __ret2 = 0; + __ret1 = __ret2 = 0; endif endif if (__close_fid) @@ -266,25 +266,25 @@ __istest = 0; if (__grabdemo && __isdemo) - if (isempty(__demo_code)) - __demo_code = __code; - __demo_idx = [1, length(__demo_code)+1]; - else - __demo_code = cstrcat(__demo_code, __code); - __demo_idx = [__demo_idx, length(__demo_code)+1]; - endif + if (isempty(__demo_code)) + __demo_code = __code; + __demo_idx = [1, length(__demo_code)+1]; + else + __demo_code = cstrcat(__demo_code, __code); + __demo_idx = [__demo_idx, length(__demo_code)+1]; + endif elseif (__rundemo && __isdemo) - try - ## process the code in an environment without variables - eval (sprintf ("function __test__()\n%s\nendfunction", __code)); - __test__; - input ("Press <enter> to continue: ", "s"); - catch - __success = 0; - __msg = sprintf ("%sdemo failed\n%s", __signal_fail, __error_text__); - end_try_catch - clear __test__; + try + ## process the code in an environment without variables + eval (sprintf ("function __test__()\n%s\nendfunction", __code)); + __test__; + input ("Press <enter> to continue: ", "s"); + catch + __success = 0; + __msg = sprintf ("%sdemo failed\n%s", __signal_fail, __error_text__); + end_try_catch + clear __test__; endif ## Code already processed. @@ -298,36 +298,36 @@ ## Separate initialization code from variables. __idx = find (__code == "\n"); if (isempty (__idx)) - __vars = __code; - __code = ""; + __vars = __code; + __code = ""; else - __vars = __code (1:__idx(1)-1); - __code = __code (__idx(1):length(__code)); + __vars = __code (1:__idx(1)-1); + __code = __code (__idx(1):length(__code)); endif ## Strip comments off the variables. __idx = find (__vars == "%" | __vars == "#"); if (! isempty (__idx)) - __vars = __vars(1:__idx(1)-1); + __vars = __vars(1:__idx(1)-1); endif ## Assign default values to variables. try - __vars = deblank (__vars); - if (! isempty (__vars)) - eval (cstrcat (strrep (__vars, ",", "=[];"), "=[];")); - __shared = __vars; - __shared_r = cstrcat ("[ ", __vars, "] = "); - else - __shared = " "; - __shared_r = " "; - endif + __vars = deblank (__vars); + if (! isempty (__vars)) + eval (cstrcat (strrep (__vars, ",", "=[];"), "=[];")); + __shared = __vars; + __shared_r = cstrcat ("[ ", __vars, "] = "); + else + __shared = " "; + __shared_r = " "; + endif catch - ## Couldn't declare, so don't initialize. - __code = ""; - __success = 0; - __msg = sprintf ("%sshared variable initialization failed\n", - __signal_fail); + ## Couldn't declare, so don't initialize. + __code = ""; + __success = 0; + __msg = sprintf ("%sshared variable initialization failed\n", + __signal_fail); end_try_catch ## Clear shared function definitions. @@ -345,7 +345,7 @@ if (isempty (__name_position)) __success = 0; __msg = sprintf ("%stest failed: missing function name\n", - __signal_fail); + __signal_fail); else __name = __block(__name_position(1):__name_position(2)); __code = __block; @@ -355,7 +355,7 @@ catch __success = 0; __msg = sprintf ("%stest failed: syntax error\n%s", - __signal_fail, __error_text__); + __signal_fail, __error_text__); end_try_catch endif __code = ""; @@ -380,24 +380,24 @@ __patstr = ["<",__pattern,">"]; endif try - eval (sprintf ("function __test__(%s)\n%s\nendfunction", - __shared, __code)); + eval (sprintf ("function __test__(%s)\n%s\nendfunction", + __shared, __code)); catch - __success = 0; - __msg = sprintf ("%stest failed: syntax error\n%s", - __signal_fail, __error_text__); + __success = 0; + __msg = sprintf ("%stest failed: syntax error\n%s", + __signal_fail, __error_text__); end_try_catch if (__success) __success = 0; - __warnstate = warning ("query", "quiet"); - warning ("on", "quiet"); - try - eval (sprintf ("__test__(%s);", __shared)); + __warnstate = warning ("query", "quiet"); + warning ("on", "quiet"); + try + eval (sprintf ("__test__(%s);", __shared)); if (! __warning) - __msg = sprintf ("%sexpected %s but got no error\n", - __signal_fail, __patstr); - else + __msg = sprintf ("%sexpected %s but got no error\n", + __signal_fail, __patstr); + else if (! isempty (__id)) [~, __err] = lastwarn; __mismatch = ! strcmp (__err, __id); @@ -408,16 +408,16 @@ warning (__warnstate.state, "quiet"); if (isempty (__err)) __msg = sprintf ("%sexpected %s but got no warning\n", - __signal_fail, __patstr); + __signal_fail, __patstr); elseif (__mismatch) __msg = sprintf ("%sexpected %s but got %s\n", - __signal_fail, __patstr, __err); + __signal_fail, __patstr, __err); else __success = 1; endif - endif + endif - catch + catch if (! isempty (__id)) [~, __err] = lasterr; __mismatch = ! strcmp (__err, __id); @@ -428,15 +428,15 @@ warning (__warnstate.state, "quiet"); if (__warning) __msg = sprintf ("%sexpected warning %s but got error %s\n", - __signal_fail, __patstr, __err); - elseif (__mismatch) + __signal_fail, __patstr, __err); + elseif (__mismatch) __msg = sprintf ("%sexpected %s but got %s\n", - __signal_fail, __patstr, __err); + __signal_fail, __patstr, __err); else - __success = 1; + __success = 1; endif - end_try_catch - clear __test__; + end_try_catch + clear __test__; endif ## Code already processed. __code = ""; @@ -447,14 +447,14 @@ [__e, __feat] = regexp (__code, '^\s*([^\s]+)', 'end', 'tokens'); if (isempty (findstr (octave_config_info ("DEFS"), __feat{1}{1}))) __xskip++; - __success = 0; - __istest = 0; - ## Skip the code. - __code = ""; - __msg = sprintf ("%sskipped test\n", __signal_skip); + __success = 0; + __istest = 0; + ## Skip the code. + __code = ""; + __msg = sprintf ("%sskipped test\n", __signal_skip); else __istest = 1; - __code = __code(__e + 1 : end); + __code = __code(__e + 1 : end); endif ### TEST @@ -481,20 +481,20 @@ ## evaluate code for test, shared, and assert. if (! isempty(__code)) try - eval (sprintf ("function %s__test__(%s)\n%s\nendfunction", - __shared_r,__shared, __code)); - eval (sprintf ("%s__test__(%s);", __shared_r, __shared)); + eval (sprintf ("function %s__test__(%s)\n%s\nendfunction", + __shared_r,__shared, __code)); + eval (sprintf ("%s__test__(%s);", __shared_r, __shared)); catch if (strcmp (__type, "xtest")) __msg = sprintf ("%sknown failure\n%s", __signal_fail, __error_text__); - __xfail++; + __xfail++; else __msg = sprintf ("%stest failed\n%s", __signal_fail, __error_text__); - __success = 0; + __success = 0; endif - if (isempty (__error_text__)) - error ("empty error text, probably Ctrl-C --- aborting"); - endif + if (isempty (__error_text__)) + error ("empty error text, probably Ctrl-C --- aborting"); + endif end_try_catch clear __test__; endif @@ -503,31 +503,31 @@ if (! isempty (__msg)) ## Make sure the user knows what caused the error. if (! __verbose) - fprintf (__fid, "%s%s\n", __signal_block, __block); - fflush (__fid); + fprintf (__fid, "%s%s\n", __signal_block, __block); + fflush (__fid); endif fputs (__fid, __msg); fputs (__fid, "\n"); fflush (__fid); ## Show the variable context. if (! strcmp (__type, "error") && ! strcmp (__type, "testif") - && ! all (__shared == " ")) - fputs (__fid, "shared variables "); - eval (sprintf ("fdisp(__fid,bundle(%s));", __shared)); - fflush (__fid); + && ! all (__shared == " ")) + fputs (__fid, "shared variables "); + eval (sprintf ("fdisp(__fid,bundle(%s));", __shared)); + fflush (__fid); endif endif if (__success == 0) __all_success = 0; ## Stop after one error if not in batch mode. if (! __batch) - if (nargout > 0) - __ret1 = __ret2 = 0; - endif - if (__close_fid) - fclose(__fid); - endif - return; + if (nargout > 0) + __ret1 = __ret2 = 0; + endif + if (__close_fid) + fclose(__fid); + endif + return; endif endif __tests += __istest; @@ -538,13 +538,13 @@ if (nargout == 0) if (__tests || __xfail || __xskip) if (__xfail) - printf ("PASSES %d out of %d tests (%d expected failures)\n", - __successes, __tests, __xfail); + printf ("PASSES %d out of %d tests (%d expected failures)\n", + __successes, __tests, __xfail); else - printf ("PASSES %d out of %d tests\n", __successes, __tests); + printf ("PASSES %d out of %d tests\n", __successes, __tests); endif if (__xskip) - printf ("Skipped %d tests due to missing features\n", __xskip); + printf ("Skipped %d tests due to missing features\n", __xskip); endif else printf ("%s%s has no tests available\n", __signal_empty, __file); @@ -582,7 +582,7 @@ ## Find the beginning of the name. left = max ([find(def(1:right)==" ", 1, "last"), ... - find(def(1:right)=="=", 1, "last")]); + find(def(1:right)=="=", 1, "last")]); if (isempty (left)) return; endif
--- a/scripts/time/datestr.m +++ b/scripts/time/datestr.m @@ -198,7 +198,7 @@ maxdatevec = [Inf, 12, 31, 23, 59, 60]; for i = 1:numel (maxdatevec) if (any (date(:,i) > maxdatevec(i)) || - (i != 6 && any (floor (date(:, i)) != date (:, i)))) + (i != 6 && any (floor (date(:, i)) != date (:, i)))) v = datevec (date, p); break; endif @@ -214,7 +214,7 @@ if (isempty (f) || f == -1) if (v(i,4:6) == 0) f = 1; - ## elseif (v(i,1:3) == [0, 1, 1]) + ## elseif (v(i,1:3) == [0, 1, 1]) elseif (v(i,1:3) == [-1, 12, 31]) f = 16; else