# HG changeset patch # User jwe # Date 1028919616 0 # Node ID 22bd65326ec1a0082e329fe4e879255c6f24dd9d # Parent 2cc57b6169cfb2d270d152e3417af816f06980ba [project @ 2002-08-09 18:58:13 by jwe] diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/ChangeLog --- a/scripts/ChangeLog Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/ChangeLog Fri Aug 09 19:00:16 2002 +0000 @@ -11,6 +11,7 @@ * deprecated/is_struct.m: New file. * deprecated/is_symmetric.m: New file. * deprecated/is_vector.m: New file. + * Change all callers of these functions to use the new names. * deprecated: New directory. * Makefile.in (SUBDIRS): Add it to the list. diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/audio/playaudio.m --- a/scripts/audio/playaudio.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/audio/playaudio.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,7 +33,7 @@ usage_msg = "playaudio (name, ext) or playaudio (X)"; - if (nargin == 1 && is_vector (name) && ! isstr (name)) + if (nargin == 1 && isvector (name) && ! isstr (name)) ## play a vector [nr, nc] = size (name); if (nc != 1) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/__bodquist__.m --- a/scripts/control/base/__bodquist__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/__bodquist__.m Fri Aug 09 19:00:16 2002 +0000 @@ -58,7 +58,7 @@ endif ## check each argument to see if it's in the correct form - if (!is_struct(sys)) + if (!isstruct(sys)) error("sys must be a system data structure"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/are.m --- a/scripts/control/base/are.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/are.m Fri Aug 09 19:00:16 2002 +0000 @@ -77,21 +77,21 @@ else opt = "B"; endif - if ((n = is_square(a)) == 0) + if ((n = issquare(a)) == 0) error ("are: a is not square"); endif if (is_controllable(a,b) == 0) warning ("are: a, b are not controllable"); endif - if ((m = is_square (b)) == 0) + if ((m = issquare (b)) == 0) b = b * b'; m = rows (b); endif if (is_observable (a, c) == 0) warning ("are: a,c are not observable"); endif - if ((p = is_square (c)) == 0) + if ((p = issquare (c)) == 0) c = c' * c; p = rows (c); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/ctrb.m --- a/scripts/control/base/ctrb.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/ctrb.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,7 +40,7 @@ if (nargin == 2) a = sys; - elseif (nargin == 1 && is_struct(sys)) + elseif (nargin == 1 && isstruct(sys)) sysupdate(sys,"ss"); [a,b] = sys2ss(sys); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/damp.m --- a/scripts/control/base/damp.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/damp.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ if(nargin < 1 || nargin > 2) usage("damp(p,[ tsamp])") endif - if(is_struct(p)) + if(isstruct(p)) if (nargin != 1) error("damp: when p is a system, tsamp parameter is not allowed."); endif @@ -50,7 +50,7 @@ t_samp = tsam; endif endif - if (!is_square(aa)) + if (!issquare(aa)) error("damp: Matrix p is not square.") endif if (DIGITAL && t_samp <= 0.0) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dare.m --- a/scripts/control/base/dare.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dare.m Fri Aug 09 19:00:16 2002 +0000 @@ -93,7 +93,7 @@ warning ("dare: a,c are not observable"); endif - if ((p = is_square (c)) == 0) + if ((p = issquare (c)) == 0) c = c'*c; p = rows (c); endif @@ -101,7 +101,7 @@ ## Check r dimensions. n = rows(a); m = columns(b); - if ((m1 = is_square (r)) == 0) + if ((m1 = issquare (r)) == 0) warning ("dare: r is not square"); elseif (m1 != m) warning ("b,r are not conformable"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dcgain.m --- a/scripts/control/base/dcgain.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dcgain.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ if((nargin < 1) || (nargin > 2) || (nargout > 1)) usage("[gm, ok] = dcgain(sys[, tol])"); endif - if(!is_struct(sys)) + if(!isstruct(sys)) error("dcgain: first argument is not a system data structure.") endif sys = sysupdate(sys, "ss"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dkalman.m --- a/scripts/control/base/dkalman.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dkalman.m Fri Aug 09 19:00:16 2002 +0000 @@ -115,7 +115,7 @@ endif ## Check A. - if ((n = is_square (A)) == 0) + if ((n = issquare (A)) == 0) error ("dkalman: requires 1st parameter(A) to be square"); endif @@ -132,7 +132,7 @@ endif ## Check Qw. - if ((nw1 = is_square (Qw)) == 0) + if ((nw1 = issquare (Qw)) == 0) error ("dkalman: requires 4rd parameter(Qw) to be square"); else if (nw1 != nw) @@ -141,7 +141,7 @@ endif ## Check Rv. - if ((p1 = is_square (Rv)) == 0) + if ((p1 = issquare (Rv)) == 0) error ("dkalman: requires 5rd parameter(Rv) to be square"); else if (p1 != p) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dlqr.m --- a/scripts/control/base/dlqr.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dlqr.m Fri Aug 09 19:00:16 2002 +0000 @@ -111,7 +111,7 @@ endif ## Check a. - if ((n = is_square (a)) == 0) + if ((n = issquare (a)) == 0) error ("dlqr: requires 1st parameter(a) to be square"); endif @@ -122,12 +122,12 @@ endif ## Check q. - if ((n1 = is_square (q)) == 0 || n1 != n) + if ((n1 = issquare (q)) == 0 || n1 != n) error ("dlqr: q must be square and conformal with a"); endif ## Check r. - if((m1 = is_square(r)) == 0 || m1 != m) + if((m1 = issquare(r)) == 0 || m1 != m) error ("dlqr: r must be square and conformal with column dimension of b"); endif @@ -149,7 +149,7 @@ endif ## Check that q, (r) are symmetric, positive (semi)definite - if (is_symmetric (q) && is_symmetric (r) + if (issymmetric (q) && issymmetric (r) && all (eig (q) >= 0) && all (eig (r) > 0)) p = dare (ao, b, qo, r); k = (r+b'*p*b)\(b'*p*a + s'); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dlyap.m --- a/scripts/control/base/dlyap.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dlyap.m Fri Aug 09 19:00:16 2002 +0000 @@ -63,11 +63,11 @@ function x = dlyap (a, b) - if ((n = is_square (a)) == 0) + if ((n = issquare (a)) == 0) warning ("dlyap: a must be square"); endif - if ((m = is_square (b)) == 0) + if ((m = issquare (b)) == 0) [n1, m] = size (b); if (n1 == n) b = b*b'; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/dre.m --- a/scripts/control/base/dre.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/dre.m Fri Aug 09 19:00:16 2002 +0000 @@ -92,22 +92,22 @@ if(nargin < 6 | nargin > 8 | nargout != 2) usage("[tvals,Plist] = dre(sys,Q,R,Qf,t0,tf{,Ptol})"); - elseif(!is_struct(sys)) + elseif(!isstruct(sys)) error("sys must be a system data structure") elseif(is_digital(sys)) error("sys must be a continuous time system") - elseif(!is_matrix(Q) | !is_matrix(R) | !is_matrix(Qf)) + elseif(!ismatrix(Q) | !ismatrix(R) | !ismatrix(Qf)) error("Q, R, and Qf must be matrices."); - elseif(!is_scalar(t0) | !is_scalar(tf)) + elseif(!isscalar(t0) | !isscalar(tf)) error("t0 and tf must be scalars") elseif(t0 >= tf) error("t0=%e >= tf=%e",t0,tf); elseif(nargin == 6) Ptol = 0.1; - elseif(!is_scalar(Ptol)) error("Ptol must be a scalar"); + elseif(!isscalar(Ptol)) error("Ptol must be a scalar"); elseif(Ptol <= 0) error("Ptol must be positive"); endif if(nargin < 8) maxits = 10; - elseif(!is_scalar(maxits)) error("maxits must be a scalar"); + elseif(!isscalar(maxits)) error("maxits must be a scalar"); elseif(maxits <= 0) error("maxits must be positive"); endif maxits = ceil(maxits); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/freqchkw.m --- a/scripts/control/base/freqchkw.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/freqchkw.m Fri Aug 09 19:00:16 2002 +0000 @@ -30,7 +30,7 @@ if(isempty(w)) USEW = 0; - elseif(!is_vector(w)) + elseif(!isvector(w)) error(["w (",num2str(rows(w)),"x",num2str(columns(w)), ... "): must be [], a vector or a scalar"]); elseif( (max(abs(imag(w))) != 0) && (min(real(w)) <= 0) ) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/impulse.m --- a/scripts/control/base/impulse.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/impulse.m Fri Aug 09 19:00:16 2002 +0000 @@ -58,7 +58,7 @@ usage ("[y, u] = impulse (sys, inp, tstop, n)"); endif - if (! is_struct (sys)) + if (! isstruct (sys)) error ("impulse: sys must be a system data structure."); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/lqg.m --- a/scripts/control/base/lqg.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/lqg.m Fri Aug 09 19:00:16 2002 +0000 @@ -72,7 +72,7 @@ if ( (nargin < 5) | (nargin > 6)) usage("[K,Q1,P1,Ee,Er] = lqg(sys,Sigw, Sigv,Q,R{,input_list})"); - elseif(!is_struct(sys) ) + elseif(!isstruct(sys) ) error("sys must be in system data structure"); endif @@ -108,7 +108,7 @@ varname = list("Sigw","Sigv","Q","R"); for kk=1:length(varname); - eval(sprintf("chk = is_square(%s);",nth(varname,kk))); + eval(sprintf("chk = issquare(%s);",nth(varname,kk))); if(! chk ) error("lqg: %s is not square",nth(varname,kk)); endif endfor diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/lqr.m --- a/scripts/control/base/lqr.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/lqr.m Fri Aug 09 19:00:16 2002 +0000 @@ -123,7 +123,7 @@ endif ## Check a. - if ((n = is_square (a)) == 0) + if ((n = issquare (a)) == 0) error ("lqr: requires 1st parameter(a) to be square"); endif @@ -134,12 +134,12 @@ endif ## Check q. - if ( ((n1 = is_square (q)) == 0) || (n1 != n)) + if ( ((n1 = issquare (q)) == 0) || (n1 != n)) error ("lqr: q must be square and conformal with a"); endif ## Check r. - if ( ((m1 = is_square(r)) == 0) || (m1 != m)) + if ( ((m1 = issquare(r)) == 0) || (m1 != m)) error ("lqr: r must be square and conformal with column dimension of b"); endif @@ -161,7 +161,7 @@ ## Check that q, (r) are symmetric, positive (semi)definite - if (is_symmetric (q) && is_symmetric (r) ... + if (issymmetric (q) && issymmetric (r) ... && all (eig (q) >= 0) && all (eig (r) > 0)) p = are (ao, (b/r)*b', qo); k = r\(b'*p + s'); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/lsim.m --- a/scripts/control/base/lsim.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/lsim.m Fri Aug 09 19:00:16 2002 +0000 @@ -45,7 +45,7 @@ usage("[y,x] = lsim(sys,u,t[,x0])"); endif - if(!is_struct(sys)) + if(!isstruct(sys)) error("sys must be in system data structure"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/ltifr.m --- a/scripts/control/base/ltifr.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/ltifr.m Fri Aug 09 19:00:16 2002 +0000 @@ -54,11 +54,11 @@ if (nargin == 2) sys = a; w = b; - if(!is_struct(sys)) + if(!isstruct(sys)) error("two arguments: 1st must be a system data structure"); endif - if (!is_vector(w)) + if (!isvector(w)) error("w must be a vector"); endif @@ -79,13 +79,13 @@ rows(b),columns(b)); endif - if (!is_square(a)) + if (!issquare(a)) error("ltifr: A(%dx$d) must be square.",rows(a),columns(a)) endif endif - if (!is_vector(w)) + if (!isvector(w)) error("w must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/lyap.m --- a/scripts/control/base/lyap.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/lyap.m Fri Aug 09 19:00:16 2002 +0000 @@ -86,7 +86,7 @@ usage ("lyap (a, b {,c})"); endif - if ((n = is_square(a)) == 0) + if ((n = issquare(a)) == 0) error ("lyap: a is not square"); endif @@ -94,7 +94,7 @@ ## Transform Lyapunov equation to Sylvester equation form. - if ((m = is_square (b)) == 0) + if ((m = issquare (b)) == 0) if ((m = rows (b)) == n) ## solve a x + x a' + b b' = 0 @@ -124,7 +124,7 @@ ## Check dimensions. - if ((m = is_square (b)) == 0) + if ((m = issquare (b)) == 0) error ("lyap: b must be square in a sylvester equation"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/obsv.m --- a/scripts/control/base/obsv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/obsv.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ if (nargin == 2) a = sys; - elseif (nargin == 1 && is_struct(sys)) + elseif (nargin == 1 && isstruct(sys)) sysupdate(sys,"ss"); [a,b,c] = sys2ss(sys); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/place.m --- a/scripts/control/base/place.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/place.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ ## check arguments - if(!is_struct(sys)) + if(!isstruct(sys)) error("sys must be in system data structure format (see ss2sys)"); endif sys = sysupdate(sys,"ss"); # make sure it has state space form up to date diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/pzmap.m --- a/scripts/control/base/pzmap.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/pzmap.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ if(nargin != 1) usage("pzmap(sys) or [zer,pol] = pzmap(sys)"); - elseif (!is_struct(sys)); + elseif (!isstruct(sys)); error("sys must be in system format"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/step.m --- a/scripts/control/base/step.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/step.m Fri Aug 09 19:00:16 2002 +0000 @@ -59,7 +59,7 @@ usage ("[y, u] = step (sys, inp, tstop, n)"); endif - if (! is_struct (sys)) + if (! isstruct (sys)) error ("step: sys must be a system data structure."); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/base/tzero.m --- a/scripts/control/base/tzero.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/base/tzero.m Fri Aug 09 19:00:16 2002 +0000 @@ -55,7 +55,7 @@ ## get A,B,C,D and Asys variables, regardless of initial form if(nargin == 4) Asys = ss2sys(A,B,C,D); - elseif( (nargin == 1) && (! is_struct(A))) + elseif( (nargin == 1) && (! isstruct(A))) usage("[zer,gain] = tzero(A,B,C,D) or zer = tzero(Asys)"); elseif(nargin != 1) usage("[zer,gain] = tzero(A,B,C,D) or zer = tzero(Asys)"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/hinf/h2norm.m --- a/scripts/control/hinf/h2norm.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/hinf/h2norm.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,7 +33,7 @@ if((nargin != 1)) usage("h2gain = h2norm(sys)"); - elseif(!is_struct(sys)) + elseif(!isstruct(sys)) error("Sys must be in system data structure"); end dflg = is_digital(sys); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/hinf/hinfnorm.m --- a/scripts/control/hinf/hinfnorm.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/hinf/hinfnorm.m Fri Aug 09 19:00:16 2002 +0000 @@ -67,7 +67,7 @@ if((nargin == 0) || (nargin > 4)) usage("[g gmin gmax] = hinfnorm(sys[,tol,gmin,gmax,ptol])"); - elseif(!is_struct(sys)) + elseif(!isstruct(sys)) error("Sys must be a system data structure"); endif @@ -103,8 +103,8 @@ endif ## check for scalar input arguments 2...5 - if( ! (is_scalar(tol) && is_scalar(gmin) - && is_scalar(gmax) && is_scalar(ptol)) ) + if( ! (isscalar(tol) && isscalar(gmin) + && isscalar(gmax) && isscalar(ptol)) ) error("hinfnorm: tol, gmin, gmax, ptol must be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/hinf/hinfsyn_ric.m --- a/scripts/control/hinf/hinfsyn_ric.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/hinf/hinfsyn_ric.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,8 +48,8 @@ x_ha_err = 0; # assume success Xinf = []; # default return value - n = is_square(A); - nw = is_square(R); + n = issquare(A); + nw = issquare(R); if(rank(R) != nw) x_ha_err = 6; else # build hamiltonian Ha for X_inf xx = ([BB; -C1'*d1dot]/R) * [d1dot'*C1, BB']; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/hinf/is_dgkf.m --- a/scripts/control/hinf/is_dgkf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/hinf/is_dgkf.m Fri Aug 09 19:00:16 2002 +0000 @@ -124,9 +124,9 @@ if (nargin < 3) | (nargin > 4) usage("[retval,dgkf_struct] = is_dgkf(Asys,nu,ny{,tol})"); - elseif (! is_scalar(nu) | ! is_scalar(ny) ) + elseif (! isscalar(nu) | ! isscalar(ny) ) error("is_dgkf: arguments 2 and 3 must be scalars") - elseif (! is_struct(Asys) ) + elseif (! isstruct(Asys) ) error("Argument 1 must be a system data structure"); endif if(nargin < 4) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/obsolete/dlqg.m --- a/scripts/control/obsolete/dlqg.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/obsolete/dlqg.m Fri Aug 09 19:00:16 2002 +0000 @@ -54,7 +54,7 @@ ## system data structure format ## check that it really is system data structure - if(! is_struct(A) ) + if(! isstruct(A) ) error("dlqg: 5 arguments, first argument is not a system data structure structure") endif @@ -106,7 +106,7 @@ error ("dlqg: invalid number of arguments") endif - if (! (is_square(Sigw) && is_square(Sigv) ) ) + if (! (issquare(Sigw) && issquare(Sigv) ) ) error("dlqg: Sigw, Sigv must be square"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/obsolete/packsys.m --- a/scripts/control/obsolete/packsys.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/obsolete/packsys.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,7 +42,7 @@ ## check dflg if(nargin == 5) - if( !is_scalar(dflg)) + if( !isscalar(dflg)) [m,n] = size(dflg); error(["packsys: dflg (",num2str(m),",",num2str(n), ... ") must be a scalar."]); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/abcddim.m --- a/scripts/control/system/abcddim.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/abcddim.m Fri Aug 09 19:00:16 2002 +0000 @@ -78,7 +78,7 @@ [c, cn, cm] = __abcddims__ (c); [d, dn, dm] = __abcddims__ (d); - if ( (!is_square(a)) & (!isempty(a)) ) + if ( (!issquare(a)) & (!isempty(a)) ) warning (["abcddim: a is not square (",num2str(an),"x",num2str(am),")"]); return endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/buildssic.m --- a/scripts/control/system/buildssic.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/buildssic.m Fri Aug 09 19:00:16 2002 +0000 @@ -134,7 +134,7 @@ usage("sys = buildssic(Clst,Ulst,Olst,Ilst,s1,s2,s3,s4,s5,s6,s7,s8)"); endif if (nargin >= 5) - if (!is_struct(s1)) + if (!isstruct(s1)) error("---> s1 must be a structed system."); endif s1 = sysupdate(s1, "ss"); @@ -151,7 +151,7 @@ endif for ii = 6:nargin eval(["ss = s", num2str(ii-4), ";"]); - if (!is_struct(ss)) + if (!isstruct(ss)) error("---> Parameter must be a structed system."); endif ss = sysupdate(ss, "ss"); @@ -197,7 +197,7 @@ ## empty vector Ulst is OK lul = length(Ulst); if (lul) - if (!is_vector(Ulst)) + if (!isvector(Ulst)) error("---> Input u list Ulst must be a vector."); endif if (lul > m) @@ -206,10 +206,10 @@ endif if (!length(Olst)) Olst = [1:(p+lul)]; endif if (!length(Ilst)) Ilst = [1:m]; endif - if (!is_vector(Olst)) + if (!isvector(Olst)) error("---> Output list Olst must be a vector."); endif - if (!is_vector(Ilst)) + if (!isvector(Ilst)) error("---> Input list Ilst must be a vector."); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/c2d.m --- a/scripts/control/system/c2d.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/c2d.m Fri Aug 09 19:00:16 2002 +0000 @@ -78,7 +78,7 @@ ## parse input arguments if(nargin < 1 | nargin > 3) usage("dsys=c2d(sys[,T])"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be a system data structure"); elseif (nargin == 1) opt = "ex"; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/d2c.m --- a/scripts/control/system/d2c.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/d2c.m Fri Aug 09 19:00:16 2002 +0000 @@ -64,7 +64,7 @@ if( (nargin != 1) & (nargin != 2) ) usage("csys = d2c(sys[,tol]), csys = d2c(sys,opt)"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be in system data structure"); elseif(nargin == 1) opt = "log"; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/dmr2d.m --- a/scripts/control/system/dmr2d.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/dmr2d.m Fri Aug 09 19:00:16 2002 +0000 @@ -78,7 +78,7 @@ if(nargin != 4 | nargout > 2) usage("[dsys,fidx] = dmr2d (sys, idx, sprefix, Ts2 {,cuflg})"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be in system data structure form"); elseif(!is_digital(sys)) @@ -89,7 +89,7 @@ if(is_signal_list(idx) | isstr(idx)) idx = sysidx(sys,"st",idx); - elseif (!(is_vector(idx) | isempty(idx))) + elseif (!(isvector(idx) | isempty(idx))) error(["idx(",num2str(rows(idx)),"x",num2str(columns(idx)), ... ") must be a vector"]); @@ -110,7 +110,7 @@ ## optional argument: cuflg if(nargin <= 4) cuflg = 1; # default: constant inputs over Ts2 sampling interv. - elseif( !is_scalar(cuflg) ) + elseif( !isscalar(cuflg) ) error("cuflg must be a scalar") elseif( cuflg != 0 | cuflg != 1) error(["cuflg = ",num2str(cuflg),", should be 0 or 1"]); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_controllable.m --- a/scripts/control/system/is_controllable.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_controllable.m Fri Aug 09 19:00:16 2002 +0000 @@ -53,7 +53,7 @@ ## has a single input; otherwise a block Arnoldi iteration is performed ## with @code{krylovb}. ## @end deftypefn -## @seealso{size, rows, columns, length, is_matrix, is_scalar, is_vector +## @seealso{size, rows, columns, length, ismatrix, isscalar, isvector ## is_observable, is_stabilizable, is_detectable, krylov, and krylovb} ## Author: A. S. Hodel @@ -67,7 +67,7 @@ if(nargin < 1 | nargin > 3) usage("[retval,U] = %s\n\t%s", "is_controllable(a {, b, tol})", ... "is_controllable(sys{,tol})"); - elseif(is_struct(a)) + elseif(isstruct(a)) ## system structure passed. sys = sysupdate(a,"ss"); [a,bs] = sys2ss(sys); @@ -91,7 +91,7 @@ if(deftol) tol = 1000*eps; endif ## check tol dimensions - if( !is_scalar(tol) ) + if( !isscalar(tol) ) error("is_controllable: tol(%dx%d) must be a scalar", ... rows(tol),columns(tol)); elseif( !is_sample(tol) ) @@ -99,7 +99,7 @@ endif ## check dimensions compatibility - n = is_square (a); + n = issquare (a); [nr, nc] = size (b); if (n == 0 | n != nr | nc == 0) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_detectable.m --- a/scripts/control/system/is_detectable.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_detectable.m Fri Aug 09 19:00:16 2002 +0000 @@ -31,8 +31,8 @@ ## Default: tol = 10*norm(a,'fro')*eps ## ## @end deftypefn -## @seealso{is_stabilizable, size, rows, columns, length, is_matrix, -## is_scalar, and is_vector} +## @seealso{is_stabilizable, size, rows, columns, length, ismatrix, +## isscalar, and isvector} ## Author: A. S. Hodel ## Created: August 1993 @@ -42,7 +42,7 @@ if( nargin < 1) usage("[retval,U] = is_detectable(a , c {, tol})"); - elseif(is_struct(a)) + elseif(isstruct(a)) ## system form if(nargin == 2) tol = c; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_observable.m --- a/scripts/control/system/is_observable.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_observable.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ ## @strong{See} @code{is_controllable} for detailed description of arguments ## and default values. ## @end deftypefn -## @seealso{size, rows, columns, length, is_matrix, is_scalar, and is_vector} +## @seealso{size, rows, columns, length, ismatrix, isscalar, and isvector} ## Author: A. S. Hodel ## Created: August 1993 @@ -39,7 +39,7 @@ if( nargin < 1) usage("[retval,U] = is_observable(a , c {, tol})"); - elseif(is_struct(a)) + elseif(isstruct(a)) ## system form if(nargin == 2) tol = c; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_sample.m --- a/scripts/control/system/is_sample.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_sample.m Fri Aug 09 19:00:16 2002 +0000 @@ -27,6 +27,6 @@ function out = is_sample (Ts) - out = (is_scalar(Ts) && (Ts == abs(Ts)) && (Ts != 0) ); + out = (isscalar(Ts) && (Ts == abs(Ts)) && (Ts != 0) ); endfunction diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_signal_list.m --- a/scripts/control/system/is_signal_list.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_signal_list.m Fri Aug 09 19:00:16 2002 +0000 @@ -23,7 +23,7 @@ function flg = is_signal_list(mylist) - flg = is_list(mylist); + flg = islist(mylist); if (flg) for ii = 1:length (mylist) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_siso.m --- a/scripts/control/system/is_siso.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_siso.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ if(nargin != 1) usage("SISO = is_siso(sys)"); - elseif( !is_struct(sys)) + elseif( !isstruct(sys)) error("input must be a system structure (see ss2sys, tf2sys, zp2sys)"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_stabilizable.m --- a/scripts/control/system/is_stabilizable.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_stabilizable.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ ## tol is a roundoff paramter, set to 200*eps if omitted. ## @end deftypefn -## See also: size, rows, columns, length, is_matrix, is_scalar, is_vector +## See also: size, rows, columns, length, ismatrix, isscalar, isvector ## is_observable, is_stabilizable, is_detectable ## Author: A. S. Hodel @@ -48,7 +48,7 @@ function [retval, U] = is_stabilizable (a, b, tol) if(nargin < 1) usage("[retval,U] = is_stabilizable(a {, b ,tol})"); - elseif(is_struct(a)) + elseif(isstruct(a)) ## sustem passed. if(nargin == 2) tol = b; % get tolerance diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/is_stable.m --- a/scripts/control/system/is_stable.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/is_stable.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ ## @end table ## @end table ## @end deftypefn -## @seealso{size, rows, columns, length, is_matrix, is_scalar, is_vector +## @seealso{size, rows, columns, length, ismatrix, isscalar, isvector ## is_observable, is_stabilizable, is_detectable, krylov, and krylovb} ## Author: A. S. Hodel @@ -48,7 +48,7 @@ function retval = is_stable (a, tol, disc) if( (nargin < 1) | (nargin > 3) ) usage("is_stable(a {,tol,disc})"); - elseif(is_struct(a)) + elseif(isstruct(a)) ## system was passed if(nargin < 3) disc = is_digital(a); elseif(disc != is_digital(a)) @@ -58,13 +58,13 @@ a = sys2ss(sys); else if(nargin < 3) disc = 0; endif - if(is_square(a) == 0) + if(issquare(a) == 0) error("A(%dx%d) must be square",rows(A), columns(A)); endif endif if(nargin < 2) tol = 200*eps; - elseif( !is_scalar(tol) ) + elseif( !isscalar(tol) ) error("is_stable: tol(%dx%d) must be a scalar",rows(tol),columns(tol)); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/parallel.m --- a/scripts/control/system/parallel.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/parallel.m Fri Aug 09 19:00:16 2002 +0000 @@ -41,9 +41,9 @@ if(nargin != 2) usage("sysp = parallel(Asys,Bsys)"); endif - if(! is_struct(Asys) ) + if(! isstruct(Asys) ) error("1st input argument is not a system data structure") - elseif (! is_struct(Bsys) ) + elseif (! isstruct(Bsys) ) error("2nd input argument is not a system data structure") endif [Ann,Anz,mA] = sysdimensions(Asys); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/ss2sys.m --- a/scripts/control/system/ss2sys.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/ss2sys.m Fri Aug 09 19:00:16 2002 +0000 @@ -214,10 +214,10 @@ ## check for continuous states if( (nargin < 6) & (tsam == 0) ) n = na; elseif(nargin < 6) n = 0; - elseif((!is_matrix(n)) | isstr(n)) + elseif((!ismatrix(n)) | isstr(n)) error("Parameter n is not a numerical value."); - elseif( (!is_scalar(n)) | (n < 0 ) | (n != round(n)) ) - if(is_scalar(n)) error("invalid value of n=%d,%e",n,n); + elseif( (!isscalar(n)) | (n < 0 ) | (n != round(n)) ) + if(isscalar(n)) error("invalid value of n=%d,%e",n,n); else error("invalid value of n=(%dx%d)", ... rows(n), columns(n)); endif endif @@ -225,10 +225,10 @@ ## check for num discrete states if( (nargin < 7) & (tsam == 0)) nz = 0; elseif(nargin < 7) nz = na - n; - elseif((!is_matrix(nz)) | isstr(nz)) + elseif((!ismatrix(nz)) | isstr(nz)) error("Parameter nz is not a numerical value."); - elseif( (!is_scalar(nz)) | (nz < 0 ) | (nz != round(nz)) ) - if(is_scalar(nz)) + elseif( (!isscalar(nz)) | (nz < 0 ) | (nz != round(nz)) ) + if(isscalar(nz)) error(["invalid value of nz=",num2str(nz)]); else error(["invalid value of nz=(",num2str(rows(nz)),"x", ... diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/starp.m --- a/scripts/control/system/starp.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/starp.m Fri Aug 09 19:00:16 2002 +0000 @@ -55,10 +55,10 @@ if((nargin != 2) && (nargin != 4)) usage("sys = starp(P, K, ny, nu)"); endif - if (!is_struct(P)) + if (!isstruct(P)) error("---> P must be in system data structure"); endif - if (!is_struct(K)) + if (!isstruct(K)) error("---> K must be in system data structure"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sys2ss.m --- a/scripts/control/system/sys2ss.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sys2ss.m Fri Aug 09 19:00:16 2002 +0000 @@ -83,7 +83,7 @@ usage("[a,b,c,d,tsam,n,nz,stname,inname,outname,yd] = sys2ss(sys)") endif - if( ! is_struct(sys) ) + if( ! isstruct(sys) ) error("input argument must be a system data structure"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sys2tf.m --- a/scripts/control/system/sys2tf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sys2tf.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,7 +42,7 @@ usage("[num,den,tsam,inname,outname] = sys2tf(Asys)"); endif - if( !is_struct(Asys)) + if( !isstruct(Asys)) error("Asys must be a system data structure (see ss2sys, tf2sys, zp2sys)"); elseif (! is_siso(Asys) ) [n, nz, m, p] = sysdimensions(Asys); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sys2zp.m --- a/scripts/control/system/sys2zp.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sys2zp.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,7 +42,7 @@ if(nargin != 1) usage("[zer,pol,k,tsam,inname,outname] = sys2zp(sys)"); - elseif( !is_struct(sys)) + elseif( !isstruct(sys)) error("sysconnect: sys must be in system data structure form") elseif (! is_siso(sys) ) [n, nz, m, p] = sysdimensions(sys); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysadd.m --- a/scripts/control/system/sysadd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysadd.m Fri Aug 09 19:00:16 2002 +0000 @@ -53,7 +53,7 @@ arglist = list(); for kk=1:nargin arglist(kk) = varargin{kk}; - if(!is_struct(nth(arglist,kk))) + if(!isstruct(nth(arglist,kk))) error("sysadd: argument %d is not a data structure",kk); endif endfor diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysappend.m --- a/scripts/control/system/sysappend.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysappend.m Fri Aug 09 19:00:16 2002 +0000 @@ -82,9 +82,9 @@ empty_list_elements_ok = 1; ## check input arguments - if ( (nargin < 2) | (nargin > 7) | (!is_struct(sys))) + if ( (nargin < 2) | (nargin > 7) | (!isstruct(sys))) usage("retsys = sysappend(sys,b,c[,d,outname,inname,yd]) "); - elseif(!is_struct(sys)) + elseif(!isstruct(sys)) error("sys must be a system data structure"); endif @@ -149,7 +149,7 @@ ## construct new yd entries if(nargin == 7) - if(!is_vector(yd)) + if(!isvector(yd)) error(sprintf("yd(%dx%d) must be a vector",rows(yd),columns(yd))) elseif(rows(c) != length(yd) & rows(d) != length(yd)) error(sprintf("length(yd) = %d; c(%dx%d), d(%dx%d); mismatch", ... diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/syschtsam.m --- a/scripts/control/system/syschtsam.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/syschtsam.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,9 +29,9 @@ if (nargin != 2) usage("retsys = syschtsam(sys,tsam)"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be in system data structure form"); - elseif(!is_scalar(tsam)) + elseif(!isscalar(tsam)) disp("syschtsam:") tsam error("tsam must be a scalar") diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysconnect.m --- a/scripts/control/system/sysconnect.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysconnect.m Fri Aug 09 19:00:16 2002 +0000 @@ -116,7 +116,7 @@ [nc,nz,mm,pp] = sysdimensions(sys); nn = nc+nz; - if( !is_struct(sys)) + if( !isstruct(sys)) error("sys must be in structured system form") elseif(pp < li) error(["length(output_list)=",num2str(li),", sys has only ", ... diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/syscont.m --- a/scripts/control/system/syscont.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/syscont.m Fri Aug 09 19:00:16 2002 +0000 @@ -46,7 +46,7 @@ if (nargin != 1) usage("[csys,Acd,Ccd,Dcd] = syscont(sys)"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be in system data structure form"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysdimensions.m --- a/scripts/control/system/sysdimensions.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysdimensions.m Fri Aug 09 19:00:16 2002 +0000 @@ -69,7 +69,7 @@ if(nargout > 5 | nargin < 1 | nargin > 2) usage("[n,nz,m,p[,yd]] = sysdimensions(sys{,opt})"); - elseif(!is_struct(sys)) + elseif(!isstruct(sys)) usage("[n,nz,m,p] = sysdimensions(sys)"); elseif(nargin == 1) opt = "all"; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysdisc.m --- a/scripts/control/system/sysdisc.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysdisc.m Fri Aug 09 19:00:16 2002 +0000 @@ -41,7 +41,7 @@ if (nargin != 1) usage("[dsys,Adc,Cdc] = sysdisc(sys)"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be in system data structure form"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysdup.m --- a/scripts/control/system/sysdup.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysdup.m Fri Aug 09 19:00:16 2002 +0000 @@ -61,7 +61,7 @@ usage("retsys = sysdup(Asys,output_list,input_list)"); endif - if( !is_struct(Asys)) + if( !isstruct(Asys)) error("Asys must be a system data structure (see ss2sys, tf2sys, or zp2sys)") endif @@ -78,7 +78,7 @@ endif ## first duplicate inputs - if(is_vector(input_list)) + if(isvector(input_list)) for ii=1:length(input_list); bb(:,mm+ii) = bb(:,input_list(ii)); dd(:,mm+ii) = dd(:,input_list(ii)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysgetsignals.m --- a/scripts/control/system/sysgetsignals.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysgetsignals.m Fri Aug 09 19:00:16 2002 +0000 @@ -145,7 +145,7 @@ usage("[stname{,inname,outname,yd}] = sysgetsignals(sys{,sigid,signum})") elseif(nargin > 1 & nargout > 1) usage("sig = sysgetsignals(sys,sigid{,signum,strflg})") - elseif( ! is_struct(sys) ) + elseif( ! isstruct(sys) ) error("input argument must be a system data structure"); endif if(nargin < 4) strflg = 0; endif @@ -174,7 +174,7 @@ error(sprintf("sysgetsignals(sys,\"%s\",%d):only %d entries.\n", ... sigid,signum, rows(stname))); else - if(!is_scalar(strflg)) + if(!isscalar(strflg)) error("strflg must be a scalar"); endif switch(strflg) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysgettsam.m --- a/scripts/control/system/sysgettsam.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysgettsam.m Fri Aug 09 19:00:16 2002 +0000 @@ -23,7 +23,7 @@ function T = sysgettsam (sys) - if(!is_struct(sys)) + if(!isstruct(sys)) usage("T = sysgettsam(sys)"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysgettype.m --- a/scripts/control/system/sysgettype.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysgettype.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,7 +33,7 @@ function systype = sysgettype (sys) - if(!is_struct(sys)) + if(!isstruct(sys)) error("sysgettype: input sys is not a structure"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysgroup.m --- a/scripts/control/system/sysgroup.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysgroup.m Fri Aug 09 19:00:16 2002 +0000 @@ -63,7 +63,7 @@ arglist = list(); for kk=1:nargin arglist(kk) = varargin{kk}; - if(!is_struct(nth(arglist,kk))) + if(!isstruct(nth(arglist,kk))) error("sysgroup: argument %d is not a data structure",kk); endif endfor diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysidx.m --- a/scripts/control/system/sysidx.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysidx.m Fri Aug 09 19:00:16 2002 +0000 @@ -28,7 +28,7 @@ if (nargin != 3) usage ("idxvec = sysidx (sys, sigtype, signamelist)"); - elseif (! is_struct (sys)) + elseif (! isstruct (sys)) error ("sys must be a system data structure"); elseif (! isstr (sigtype)) error ("sigtype must be a string"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysmult.m --- a/scripts/control/system/sysmult.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysmult.m Fri Aug 09 19:00:16 2002 +0000 @@ -46,7 +46,7 @@ arglist = list(); for kk=1:nargin arglist(kk) = varargin{kk}; - if(!is_struct(nth(arglist,kk))) + if(!isstruct(nth(arglist,kk))) error("sysadd: argument %d is not a data structure",kk); endif endfor diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysout.m --- a/scripts/control/system/sysout.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysout.m Fri Aug 09 19:00:16 2002 +0000 @@ -54,7 +54,7 @@ return; endif - if(! is_struct(sys)) + if(! isstruct(sys)) disp("sysout: input must be a system structure") endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysprune.m --- a/scripts/control/system/sysprune.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysprune.m Fri Aug 09 19:00:16 2002 +0000 @@ -78,8 +78,8 @@ endif ## check dimensions - if( !(is_vector(output_idx) | isempty(output_idx) ) ) - if(!is_matrix(output_idx)) + if( !(isvector(output_idx) | isempty(output_idx) ) ) + if(!ismatrix(output_idx)) error("sysprune: bad argument passed for output_idx"); else error("sysprune: output_idx (%d x %d) must be a vector or empty", ... @@ -89,8 +89,8 @@ error("sysprune: duplicate entries found in output_idx"); endif - if( !(is_vector(input_idx) | isempty(input_idx) ) ) - if(!is_matrix(input_idx)) + if( !(isvector(input_idx) | isempty(input_idx) ) ) + if(!ismatrix(input_idx)) error("sysprune: bad argument passed for input_idx"); else error("sysprune: input_idx (%d x %d) must be a vector or empty", ... @@ -100,8 +100,8 @@ error("sysprune: duplicate entries found in input_idx"); endif - if( !(is_vector(state_idx) | isempty(state_idx) ) ) - if(!is_matrix(state_idx)) + if( !(isvector(state_idx) | isempty(state_idx) ) ) + if(!ismatrix(state_idx)) error("sysprune: bad argument passed for state_idx"); else error("sysprune: state_idx (%d x %d) must be a vector or empty", ... @@ -117,7 +117,7 @@ li = length(input_idx); lst = length(state_idx); - if( !is_struct(sys)) + if( !isstruct(sys)) error("Asys must be a system data structure (see ss2sys, tf2sys, or zp2sys)") elseif(pp < lo) error([num2str(lo)," output_idx entries, system has only ", ... diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysreorder.m --- a/scripts/control/system/sysreorder.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysreorder.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ A = pv'*ones(size(list)); B = ones(size(pv'))*list; X = (A != B); - if(!is_vector(X)) + if(!isvector(X)) y = min(X'); else y = X'; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysscale.m --- a/scripts/control/system/sysscale.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysscale.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ if( (nargin < 3) || (nargin > 5) ) usage("retsys = sysscale(Asys,output_list,input_list{,inname,outname})"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be a structured system"); endif @@ -110,7 +110,7 @@ sysc = outscale*sysc; sysd = outscale*sysd*inscale; - if( !is_square(outscale) ) + if( !issquare(outscale) ) ## strip extra output names (if any) sysoutname = sysoutname(1:min(rows(outscale),columns(outscale))); if( nargin < 4) @@ -121,7 +121,7 @@ else outname = sysoutname; endif - if( !is_square(inscale) ) + if( !issquare(inscale) ) ## strip extra output names (if any) sysinname = sysinname(1:min(rows(inscale),columns(inscale))); if(nargin < 5) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/syssetsignals.m --- a/scripts/control/system/syssetsignals.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/syssetsignals.m Fri Aug 09 19:00:16 2002 +0000 @@ -91,7 +91,7 @@ if (nargin < 3 | nargin > 4) usage("retsys=syssetsignals(sys,opt,names{,sig_idx})"); - elseif (!is_struct(sys)) + elseif (!isstruct(sys)) error("sys must be a system data structure"); elseif (isempty(opt)) opt = "out"; @@ -125,7 +125,7 @@ if(strcmp(opt,"yd") == 0) ## it's a signal name list we're changing - if(!is_list(names)) + if(!islist(names)) names = list(names); endif if(!is_signal_list(names)) @@ -179,7 +179,7 @@ sigvals = []; else nsigs = length(sig_vals); - if(!is_vector(names)) + if(!isvector(names)) error("syssetsignals: opt=yd, names(%dx%d) must be a vector", ... rows(names), columns(names)); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/syssub.m --- a/scripts/control/system/syssub.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/syssub.m Fri Aug 09 19:00:16 2002 +0000 @@ -52,7 +52,7 @@ arglist = list(); for kk=1:nargin arglist(kk) = varargin{kk}; - if(!is_struct(nth(arglist,kk))) + if(!isstruct(nth(arglist,kk))) error("syssub: argument %d is not a data structure",kk); endif endfor diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/sysupdate.m --- a/scripts/control/system/sysupdate.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/sysupdate.m Fri Aug 09 19:00:16 2002 +0000 @@ -55,7 +55,7 @@ ## check for correct number of inputs if (nargin != 2) usage("newsys = sysupdate(sys,opt)"); - elseif(! is_struct(sys) ) + elseif(! isstruct(sys) ) error("1st argument must be system data structure") elseif(! (strcmp(opt,"tf") + strcmp(opt,"zp") + ... strcmp(opt,"ss") + strcmp(opt,"all")) ) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/tf2ss.m --- a/scripts/control/system/tf2ss.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/tf2ss.m Fri Aug 09 19:00:16 2002 +0000 @@ -51,9 +51,9 @@ if(nargin != 2) error("tf2ss: wrong number of input arguments") elseif(isempty(num)) error("tf2ss: empty numerator"); elseif(isempty(den)) error("tf2ss: empy denominator"); - elseif(!is_vector(num)) + elseif(!isvector(num)) error(sprintf("num(%dx%d) must be a vector",rows(num),columns(num))); - elseif(!is_vector(den)) + elseif(!isvector(den)) error(sprintf("den(%dx%d) must be a vector",rows(den),columns(den))); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/tf2sys.m --- a/scripts/control/system/tf2sys.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/tf2sys.m Fri Aug 09 19:00:16 2002 +0000 @@ -66,8 +66,8 @@ endif ## check input format - if( ! ( (is_vector(num) || is_scalar(num)) && ... - (is_vector(den) || is_scalar(den))) ) + if( ! ( (isvector(num) || isscalar(num)) && ... + (isvector(den) || isscalar(den))) ) error(["num (",num2str(rows(num)),"x",num2str(columns(num)), ... ") and den (",num2str(rows(den)),"x",num2str(columns(den)), ... ") must be vectors"]) @@ -84,7 +84,7 @@ ## check sampling interval (if any) if(nargin <= 2) tsam = 0; # default elseif (isempty(tsam)) tsam = 0; endif - if ( (! (is_scalar(tsam) && (imag(tsam) == 0) )) || (tsam < 0) ) + if ( (! (isscalar(tsam) && (imag(tsam) == 0) )) || (tsam < 0) ) error("tsam must be a positive real scalar") endif @@ -113,7 +113,7 @@ if (nargin > 3) ## make sure its a list of a single string if(!isempty(inname)) - if(!is_list(inname)) inname = list(inname); endif + if(!islist(inname)) inname = list(inname); endif if( !is_signal_list(inname) ) error("inname must be a string or list of strings"); endif @@ -128,7 +128,7 @@ ## Set name of output if (nargin > 4) if(!isempty(outname)) - if(!is_list(outname)) outname = list(outname); endif + if(!islist(outname)) outname = list(outname); endif if(!is_signal_list(outname)) error("outname must be a string or a list of strings"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/tfout.m --- a/scripts/control/system/tfout.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/tfout.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ usage("tfout(num,denom[,x])"); endif - if ( (!is_vector(num)) | (!is_vector(denom)) ) + if ( (!isvector(num)) | (!isvector(denom)) ) error("tfout: first two argument must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/zp2ss.m --- a/scripts/control/system/zp2ss.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/zp2ss.m Fri Aug 09 19:00:16 2002 +0000 @@ -58,13 +58,13 @@ error("Incorrect number of input arguments"); endif - if(! (is_vector(zer) | isempty(zer)) ) + if(! (isvector(zer) | isempty(zer)) ) error(["zer(",num2str(rows(zer)),",",num2str(columns(zer)), ... ") should be a vector"]); - elseif(! (is_vector(pol) | isempty(pol) ) ) + elseif(! (isvector(pol) | isempty(pol) ) ) error(["pol(",num2str(rows(pol)),",",num2str(columns(pol)), ... ") should be a vector"]); - elseif(! is_scalar(k)) + elseif(! isscalar(k)) error(["k(",num2str(rows(k)),",",num2str(columns(k)), ... ") should be a scalar"]); elseif( k != real(k)) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/zp2sys.m --- a/scripts/control/system/zp2sys.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/zp2sys.m Fri Aug 09 19:00:16 2002 +0000 @@ -63,21 +63,21 @@ endif ## check input format - if( ! (is_vector(zer) | isempty(zer) ) ) + if( ! (isvector(zer) | isempty(zer) ) ) error("zer must be a vector or empty"); endif if(!isempty(zer)) zer = reshape(zer,1,length(zer)); # make it a row vector endif - if( ! (is_vector(pol) | isempty(pol))) + if( ! (isvector(pol) | isempty(pol))) error("pol must be a vector"); endif if(!isempty(pol)) pol = reshape(pol,1,length(pol)); endif - if (! is_scalar(k)) + if (! isscalar(k)) error("k must be a scalar"); endif @@ -104,7 +104,7 @@ ## Set the type of system if (nargin > 3) - if( !is_scalar(tsam) ) + if( !isscalar(tsam) ) error("tsam must be a nonnegative scalar"); endif if (tsam < 0) @@ -125,7 +125,7 @@ if (nargin > 4) ## make sure its a string if(!isempty(inname)) - if(!is_list(inname)) inname = list(inname); endif + if(!islist(inname)) inname = list(inname); endif if(!is_signal_list(inname)) error("inname must be a single signal name"); endif @@ -136,7 +136,7 @@ ## Set name of output if (nargin > 5) if(!isempty(outname)) - if(!is_list(outname)) outname = list(outname); endif + if(!islist(outname)) outname = list(outname); endif if(!is_signal_list(outname)) error("outname must be a single signal name"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/zp2tf.m --- a/scripts/control/system/zp2tf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/zp2tf.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,9 +43,9 @@ [rp,cp] = size(pol); [rz,cz] = size(zer); - if(!(is_vector(zer) | isempty(zer)) ) + if(!(isvector(zer) | isempty(zer)) ) error(sprintf("zer(%dx%d) must be a vector",rz,cz)); - elseif(!(is_vector(pol) | isempty(pol)) ) + elseif(!(isvector(pol) | isempty(pol)) ) error(sprintf("pol(%dx%d) must be a vector",rp,cp)); elseif(length(zer) > length(pol)) error(sprintf("zer(%dx%d) longer than pol(%dx%d)",rz,cz,rp,cp)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/system/zpout.m --- a/scripts/control/system/zpout.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/system/zpout.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,11 +36,11 @@ usage("zpout(zer,pol,k[,x])"); endif - if( !(is_vector(zer) | isempty(zer)) | !(is_vector(pol) | isempty(pol)) ) + if( !(isvector(zer) | isempty(zer)) | !(isvector(pol) | isempty(pol)) ) error("zer, pol must be vectors or empty"); endif - if(!is_scalar(k)) + if(!isscalar(k)) error("zpout: argument k must be a scalar.") endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/util/__outlist__.m --- a/scripts/control/util/__outlist__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/util/__outlist__.m Fri Aug 09 19:00:16 2002 +0000 @@ -66,7 +66,7 @@ str_val = ""; dstr = list(""," (discrete)"); - if((m >= 1) && (is_list(name_list))) + if((m >= 1) && (islist(name_list))) for ii=1:m str_val = sprintf("%s%s%d: %s%s\n",str_val,tabchar, ilist(ii), ... nth(name_list,ii),nth(dstr,yd(ii)+1)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/util/__zgpbal__.m --- a/scripts/control/util/__zgpbal__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/util/__zgpbal__.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ function retsys = __zgpbal__ (Asys) - if( (nargin != 1) | (!is_struct(Asys))) + if( (nargin != 1) | (!isstruct(Asys))) usage("retsys = __zgpbal__ (Asys)"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/util/sortcom.m --- a/scripts/control/util/sortcom.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/util/sortcom.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,7 +40,7 @@ if( nargin < 1 | nargin > 2 ) usage("yy = sortcom(xx[,opt]"); - elseif( !(is_vector(xx) | isempty(xx) )) + elseif( !(isvector(xx) | isempty(xx) )) error("sortcom: first argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/util/zgscal.m --- a/scripts/control/util/zgscal.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/util/zgscal.m Fri Aug 09 19:00:16 2002 +0000 @@ -53,7 +53,7 @@ endfor [U,H,k1] = krylov(F,z,nmp,1e-12,1); - if(!is_square(H)) + if(!issquare(H)) if(columns(H) != k1) error("zgscal(tzero): k1=%d, columns(H)=%d",k1,columns(H)); elseif(rows(H) != k1+1) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/control/util/zgshsr.m --- a/scripts/control/util/zgshsr.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/control/util/zgshsr.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ function x = zgshsr (y) - if(!is_vector(y)) + if(!isvector(y)) error(sprintf("y(%dx%d) must be a vector",rows(y),columns(y))); endif x = vec(y); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/fv.m --- a/scripts/finance/fv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/fv.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,11 +43,11 @@ usage ("fv (r, n, p, l, method)"); endif - if (! (is_scalar (r) && (r > -1))) + if (! (isscalar (r) && (r > -1))) error ("fv: r must be a scalar > -1"); - elseif (! (is_scalar (n) && (n > 0))) + elseif (! (isscalar (n) && (n > 0))) error ("fv: n must be a positive scalar"); - elseif (! is_scalar (p)) + elseif (! isscalar (p)) error ("fv: p must be a scalar"); endif @@ -71,7 +71,7 @@ if strcmp (m, "b") v = v * (1 + r); endif - if is_scalar (l) + if isscalar (l) v = v + fvl (r, n, l); else error ("fv: l must be a scalar"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/fvl.m --- a/scripts/finance/fvl.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/fvl.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,11 +36,11 @@ usage ("fvl (r, n, l)"); endif - if (! (is_scalar (r) && (r > -1))) + if (! (isscalar (r) && (r > -1))) error ("fvl: r has to be a scalar > -1"); - elseif (! (is_scalar (n) && (n > 0))) + elseif (! (isscalar (n) && (n > 0))) error ("fvl: n has to be a positive scalar"); - elseif (! is_scalar (l)) + elseif (! isscalar (l)) error ("fvl: l has to be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/irr.m --- a/scripts/finance/irr.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/irr.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,13 +37,13 @@ usage ("irr (p, i)"); endif - if (! (is_vector (p))) + if (! (isvector (p))) error ("irr: p must be a vector"); else p_string = strcat ("[", sprintf ("%.15f, ", p), "]"); endif - if (! is_scalar (i)) + if (! isscalar (i)) error ("irr: i must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/nper.m --- a/scripts/finance/nper.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/nper.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,11 +43,11 @@ usage ("nper (r, p, a, l, method)"); endif - if (! (is_scalar (r) && (r > -1))) + if (! (isscalar (r) && (r > -1))) error ("nper: r must be a scalar > -1"); - elseif (! is_scalar (p)) + elseif (! isscalar (p)) error ("nper: p must be a scalar"); - elseif (! is_scalar (a)) + elseif (! isscalar (a)) error ("nper: a must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/npv.m --- a/scripts/finance/npv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/npv.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,7 +42,7 @@ usage ("npv (r, p, i"); endif - if (! (is_vector (p))) + if (! (isvector (p))) error ("npv: p has to be a vector"); else n = length (p); @@ -52,16 +52,16 @@ if (any (any (r <= -1))) error ("npv: all interest rates must be > -1"); endif - if (is_scalar (r)) + if (isscalar (r)) d = 1 ./ (1 + r) .^ (0 : n); - elseif (is_vector (r) && (length (r) == n)) + elseif (isvector (r) && (length (r) == n)) d = [1, (1 ./ cumprod (reshape (1 + r, 1, n)))]; else error ("npv: r must be a scalar or a vector of the same length as p"); endif if (nargin == 3) - if (! is_scalar (i)) + if (! isscalar (i)) error ("npv: I_0 must be a scalar"); endif else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/pmt.m --- a/scripts/finance/pmt.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/pmt.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,11 +40,11 @@ usage ("pmt (r, n, a, l, method)"); endif - if (! (is_scalar (r) && r > -1)) + if (! (isscalar (r) && r > -1)) error ("pmt: rate must be a scalar > -1"); - elseif (! (is_scalar (n) && n > 0)) + elseif (! (isscalar (n) && n > 0)) error ("pmt: n must be a positive scalar"); - elseif (! (is_scalar (a) && a > 0)) + elseif (! (isscalar (a) && a > 0)) error ("pmt: a must be a positive scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/pv.m --- a/scripts/finance/pv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/pv.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,11 +43,11 @@ usage ("pv (r, n, p, l, method)"); endif - if (! (is_scalar (r) && (r > -1))) + if (! (isscalar (r) && (r > -1))) error ("pv: r must be a scalar > -1"); - elseif (! (is_scalar (n) && (n > 0))) + elseif (! (isscalar (n) && (n > 0))) error ("pv: n must be a positive scalar"); - elseif (! is_scalar (p)) + elseif (! isscalar (p)) error ("pv: p must be a scalar"); endif @@ -71,7 +71,7 @@ if (strcmp (m, "b")) v = v * (1 + r); endif - if (is_scalar (l)) + if (isscalar (l)) v = v + pvl (r, n, l); else error ("pv: l must be a scalar"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/pvl.m --- a/scripts/finance/pvl.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/pvl.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,11 +36,11 @@ usage ("pvl (r, n, p)"); endif - if (! (is_scalar (r) && (r > -1))) + if (! (isscalar (r) && (r > -1))) error ("pvl: r has to be a scalar > -1"); - elseif (! (is_scalar (n) && (n > 0))) + elseif (! (isscalar (n) && (n > 0))) error ("pvl: n has to be a positive scalar"); - elseif (! is_scalar (p)) + elseif (! isscalar (p)) error ("pvl: p has to be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/finance/rate.m --- a/scripts/finance/rate.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/finance/rate.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,11 +40,11 @@ usage ("rate (n, p, v, l, method)"); endif - if (! (is_scalar (n) && (n > 0))) + if (! (isscalar (n) && (n > 0))) error ("rate: n must be a positive scalar"); - elseif (! is_scalar (p)) + elseif (! isscalar (p)) error ("rate: p must be a scalar"); - elseif (! is_scalar (v)) + elseif (! isscalar (v)) error ("rate: p must be a scalar"); endif @@ -64,7 +64,7 @@ m = "e"; endif - if (! is_scalar (l)) + if (! isscalar (l)) error ("rate: l must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/cart2pol.m --- a/scripts/general/cart2pol.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/cart2pol.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,9 +40,9 @@ error ("cart2pol: number of output arguments must not be greater than number of input arguments"); endif - if ((! (is_matrix (X) && is_matrix (Y))) + if ((! (ismatrix (X) && ismatrix (Y))) || (size (X) != size (Y)) - || (nargin == 3 && (! (size (X) == size (Z) && is_matrix (Z))))) + || (nargin == 3 && (! (size (X) == size (Z) && ismatrix (Z))))) error ("cart2pol: arguments must be matrices of same size"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/cart2sph.m --- a/scripts/general/cart2sph.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/cart2sph.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ usage ("[Theta, Phi, R] = cart2sph (X, Y, Z)") endif - if ((! (is_matrix (X) && is_matrix (Y) && is_matrix (Z))) + if ((! (ismatrix (X) && ismatrix (Y) && ismatrix (Z))) || size (X) != size (Y) || size (X) != size (Z)) error ("cart2sph: arguments must be matrices of same size"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/columns.m --- a/scripts/general/columns.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/columns.m Fri Aug 09 19:00:16 2002 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} columns (@var{a}) ## Return the number of columns of @var{a}. ## @end deftypefn -## @seealso{size, rows, length, is_scalar, is_vector, and is_matrix} +## @seealso{size, rows, length, isscalar, isvector, and ismatrix} ## Author: jwe diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/diff.m --- a/scripts/general/diff.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/diff.m Fri Aug 09 19:00:16 2002 +0000 @@ -47,7 +47,7 @@ if (nargin == 1) k = 1; elseif (nargin == 2) - if (! (is_scalar (k) && k == round (k) && k >= 0)) + if (! (isscalar (k) && k == round (k) && k >= 0)) error ("diff: k must be a nonnegative integer"); elseif (k == 0) return; @@ -58,7 +58,7 @@ if (isstr (x)) error ("diff: symbolic differentiation not (yet) supported"); - elseif (is_vector (x)) + elseif (isvector (x)) n = length (x); if (n <= k) x = []; @@ -67,7 +67,7 @@ x = x (2 : (n - i + 1)) - x (1 : (n - i)); endfor endif - elseif (is_matrix (x)) + elseif (ismatrix (x)) n = rows (x); if (n <= k) x = []; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/is_duplicate_entry.m --- a/scripts/general/is_duplicate_entry.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/is_duplicate_entry.m Fri Aug 09 19:00:16 2002 +0000 @@ -28,7 +28,7 @@ function retval = is_duplicate_entry (x) if (nargin == 1) - if (is_matrix (x)) + if (ismatrix (x)) [m, n] = size (x); lx = m*n; lx1 = lx-1; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/mod.m --- a/scripts/general/mod.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/mod.m Fri Aug 09 19:00:16 2002 +0000 @@ -44,7 +44,7 @@ usage ("r = mod (x, y)"); endif - if (any (size (x) != size (y)) && ! (is_scalar (x) || is_scalar (y))) + if (any (size (x) != size (y)) && ! (isscalar (x) || isscalar (y))) error ("mod: argument sizes must agree"); endif @@ -56,12 +56,12 @@ if (all (nz(:))) ## No elements of y are zero. r = x - y .* floor (x ./ y); - elseif (is_scalar (y)) + elseif (isscalar (y)) ## y must be zero. r = x; else ## Some elements of y are zero. - if (is_scalar (x)) + if (isscalar (x)) r = x * ones (size (y)); else r = x; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/nextpow2.m --- a/scripts/general/nextpow2.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/nextpow2.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ usage ("nextpow2 (x)"); endif - if (! (is_scalar (x) || is_vector (x))) + if (! (isscalar (x) || isvector (x))) error ("nextpow2: x must be a scalar or a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/pol2cart.m --- a/scripts/general/pol2cart.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/pol2cart.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,9 +40,9 @@ error ("pol2cart: number of output arguments must not be greater than number of input arguments"); endif - if ((! (is_matrix (Theta) && is_matrix (R))) + if ((! (ismatrix (Theta) && ismatrix (R))) || (size (Theta) != size (R)) - || (nargin == 3 && (! (size (R) == size (Z) && is_matrix (Z))))) + || (nargin == 3 && (! (size (R) == size (Z) && ismatrix (Z))))) error ("pol2cart: arguments must be matrices of same size"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/postpad.m --- a/scripts/general/postpad.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/postpad.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,9 +33,9 @@ usage ("postpad (x, l) or postpad (x, l, c)"); endif - if (! is_matrix (x)) + if (! ismatrix (x)) error ("first argument must be a vector or matrix"); - elseif (! is_scalar (l)) + elseif (! isscalar (l)) error ("second argument must be a scaler"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/prepad.m --- a/scripts/general/prepad.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/prepad.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,9 +42,9 @@ usage ("prepad (x, l) or prepad (x, l, c)"); endif - if (! is_matrix (x)) + if (! ismatrix (x)) error ("first argument must be a vector or matrix"); - elseif (! is_scalar (l)) + elseif (! isscalar (l)) error ("second argument must be a scaler"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/randperm.m --- a/scripts/general/randperm.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/randperm.m Fri Aug 09 19:00:16 2002 +0000 @@ -28,7 +28,7 @@ function retval = randperm (n) - if (nargin == 1 && is_scalar (n) && floor (n) == n) + if (nargin == 1 && isscalar (n) && floor (n) == n) if (n > 0) [junk, retval] = sort (rand (1, n)); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/rem.m --- a/scripts/general/rem.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/rem.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ usage ("rem (x, y)"); endif - if (any (size (x) != size (y)) && ! (is_scalar (x) || is_scalar (y))) + if (any (size (x) != size (y)) && ! (isscalar (x) || isscalar (y))) error ("rem: argument sizes must agree"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/repmat.m --- a/scripts/general/repmat.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/repmat.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,9 +35,9 @@ endif if (nargin == 2) - if (is_scalar (m)) + if (isscalar (m)) n = m; - elseif (is_vector (m) && length (m) == 2) + elseif (isvector (m) && length (m) == 2) n = m(2); m = m(1); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/rows.m --- a/scripts/general/rows.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/rows.m Fri Aug 09 19:00:16 2002 +0000 @@ -21,7 +21,7 @@ ## @deftypefn {Function File} {} rows (@var{a}) ## Return the number of rows of @var{a}. ## @end deftypefn -## @seealso{size, columns, length, is_scalar, is_vector, and is_matrix} +## @seealso{size, columns, length, isscalar, isvector, and ismatrix} ## Author: jwe diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/shift.m --- a/scripts/general/shift.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/shift.m Fri Aug 09 19:00:16 2002 +0000 @@ -45,7 +45,7 @@ nc = 0; endif - if (! (is_scalar (b) && b == round (b))) + if (! (isscalar (b) && b == round (b))) error ("shift: b must be an integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/sph2cart.m --- a/scripts/general/sph2cart.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/sph2cart.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ usage ("[X, Y, Z] = sph2cart (Theta, Phi, R)"); endif - if ((! (is_matrix (Theta) && is_matrix (Phi) && is_matrix (R))) + if ((! (ismatrix (Theta) && ismatrix (Phi) && ismatrix (R))) || size (Theta) != size (Phi) || size (Theta) != size (R)) error ("sph2cart: arguments must be matrices of same size"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/general/strerror.m --- a/scripts/general/strerror.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/general/strerror.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ error ("strerror: first argument must be a string"); endif - if (! is_scalar (err)) + if (! isscalar (err)) error ("strerror: second argument must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/image/hsv2rgb.m --- a/scripts/image/hsv2rgb.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/image/hsv2rgb.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ usage ("rgb_map = hsv2rgb (hsv_map)"); endif - if (! is_matrix (hsv_map) || columns (hsv_map) != 3) + if (! ismatrix (hsv_map) || columns (hsv_map) != 3) error ("hsv2rgb: argument must be a matrix of size nx3"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/image/ocean.m --- a/scripts/image/ocean.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/image/ocean.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ if (nargin == 0) number = 64; elseif (nargin == 1) - if (! is_scalar (number)) + if (! isscalar (number)) error ("ocean: argument must be a scalar"); endif else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/image/rgb2hsv.m --- a/scripts/image/rgb2hsv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/image/rgb2hsv.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ usage ("hsv_map = rgb2hsv (rgb_map)"); endif - if (! is_matrix (rgb) || columns (rgb) != 3) + if (! ismatrix (rgb) || columns (rgb) != 3) error ("rgb2hsv: argument must be a matrix of size n x 3"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/image/saveimage.m --- a/scripts/image/saveimage.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/image/saveimage.m Fri Aug 09 19:00:16 2002 +0000 @@ -100,7 +100,7 @@ error ("unsupported image format specification"); endif - if (! is_matrix (img)) + if (! ismatrix (img)) warning ("image variable is not a matrix"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/commutation_matrix.m --- a/scripts/linear-algebra/commutation_matrix.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/commutation_matrix.m Fri Aug 09 19:00:16 2002 +0000 @@ -89,12 +89,12 @@ if (nargin < 1 || nargin > 2) usage ("commutation_matrix (m, n)"); else - if (! (is_scalar (m) && m == round (m) && m > 0)) + if (! (isscalar (m) && m == round (m) && m > 0)) error ("commutation_matrix: m must be a positive integer"); endif if (nargin == 1) n = m; - elseif (! (is_scalar (n) && n == round (n) && n > 0)) + elseif (! (isscalar (n) && n == round (n) && n > 0)) error ("commutation_matrix: n must be a positive integer"); endif endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/dot.m --- a/scripts/linear-algebra/dot.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/dot.m Fri Aug 09 19:00:16 2002 +0000 @@ -30,7 +30,7 @@ usage ("dot (x, y)"); endif - if (is_vector (x) && is_vector (y) && length (x) == length (y)) + if (isvector (x) && isvector (y) && length (x) == length (y)) [x_nr, x_nc] = size (x); [y_nr, y_nc] = size (y); if (x_nr == 1) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/duplication_matrix.m --- a/scripts/linear-algebra/duplication_matrix.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/duplication_matrix.m Fri Aug 09 19:00:16 2002 +0000 @@ -79,7 +79,7 @@ usage ("duplication_matrix (n)"); endif - if (! (is_scalar (n) && n == round (n) && n > 0)) + if (! (isscalar (n) && n == round (n) && n > 0)) error ("duplication_matrix: n must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/housh.m --- a/scripts/linear-algebra/housh.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/housh.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,9 +35,9 @@ function [housv, beta, zer] = housh (x, j, z) ## check for valid inputs - if (!is_vector (x) && ! is_scalar (x)) + if (!isvector (x) && ! isscalar (x)) error ("housh: first input must be a vector") - elseif (! is_scalar(j)) + elseif (! isscalar(j)) error ("housh: second argment must be an integer scalar") else housv = x; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/krylov.m --- a/scripts/linear-algebra/krylov.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/krylov.m Fri Aug 09 19:00:16 2002 +0000 @@ -61,7 +61,7 @@ eps1 = defeps; endif - na = is_square (A); + na = issquare (A); if (! na) error ("A(%d x %d) must be square", rows (A), columns (A)); endif @@ -72,7 +72,7 @@ na, na, m, kb) endif - if (! is_scalar (k)) + if (! isscalar (k)) error ("krylov: third argument must be a scalar integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/linear-algebra/vech.m --- a/scripts/linear-algebra/vech.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/linear-algebra/vech.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ usage ("vech (x)"); endif - if (! is_square (x)) + if (! issquare (x)) error ("vech: x must be square"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/miscellaneous/etime.m --- a/scripts/miscellaneous/etime.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/miscellaneous/etime.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,7 +42,7 @@ usage ("etime (t1, t0)"); endif - if (is_vector (t1) && length (t1) == 6 && is_vector (t0) && length (t0) == 6) + if (isvector (t1) && length (t1) == 6 && isvector (t0) && length (t0) == 6) if (t1 (1) != t0 (1)) error ("etime: can't handle timings over year boundaries yet"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/miscellaneous/list_primes.m --- a/scripts/miscellaneous/list_primes.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/miscellaneous/list_primes.m Fri Aug 09 19:00:16 2002 +0000 @@ -38,7 +38,7 @@ function retval = list_primes (n) if (nargin > 0) - if (! is_scalar (n)) + if (! isscalar (n)) error ("list_primes: argument must be a scalar"); endif endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/miscellaneous/menu.m --- a/scripts/miscellaneous/menu.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/miscellaneous/menu.m Fri Aug 09 19:00:16 2002 +0000 @@ -64,7 +64,7 @@ printf ("\n"); s = input ("pick a number, any number: ", "s"); eval (sprintf ("num = %s;", s), "num = [];"); - if (! is_scalar (num) || num < 1 || num > nopt) + if (! isscalar (num) || num < 1 || num > nopt) printf ("\nerror: input invalid or out of range\n\n"); else break; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/miscellaneous/xor.m --- a/scripts/miscellaneous/xor.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/miscellaneous/xor.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ function z = xor (x, y) if (nargin == 2) - if (is_scalar (x) || is_scalar (y) || size (x) == size (y)) + if (isscalar (x) || isscalar (y) || size (x) == size (y)) z = logical ((x | y) - (x & y)); else error ("xor: x and y must be of common size or scalars"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/__errcomm__.m --- a/scripts/plot/__errcomm__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/__errcomm__.m Fri Aug 09 19:00:16 2002 +0000 @@ -46,9 +46,9 @@ while (nargin) a = varargin{k++}; nargin--; - if (is_vector (a)) + if (isvector (a)) a = a(:); - elseif (is_matrix (a)) + elseif (ismatrix (a)) ; else usage ("%s (...)", caller); @@ -67,9 +67,9 @@ endfor eval (sprintf ("%s, fmt);", cmd)); break; - elseif (is_vector (a)) + elseif (isvector (a)) a = a(:); - elseif (is_matrix (a)) + elseif (ismatrix (a)) ; else error ("wrong argument types"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/__plr2__.m --- a/scripts/plot/__plr2__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/__plr2__.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,14 +37,14 @@ rho = real (rho); endif - if (is_scalar (theta)) - if (is_scalar (rho)) + if (isscalar (theta)) + if (isscalar (rho)) x = rho * cos (theta); y = rho * sin (theta); __plt2ss__ (x, y, fmt); endif - elseif (is_vector (theta)) - if (is_vector (rho)) + elseif (isvector (theta)) + if (isvector (rho)) if (length (theta) != length (rho)) error ("polar: vector lengths must match"); endif @@ -57,7 +57,7 @@ x = rho .* cos (theta); y = rho .* sin (theta); __plt2vv__ (x, y, fmt); - elseif (is_matrix (rho)) + elseif (ismatrix (rho)) [t_nr, t_nc] = size (theta); if (t_nr == 1) theta = theta'; @@ -79,8 +79,8 @@ y = diag (sin (theta)) * rho; __plt2vm__ (x, y, fmt); endif - elseif (is_matrix (theta)) - if (is_vector (rho)) + elseif (ismatrix (theta)) + if (isvector (rho)) [r_nr, r_nc] = size (rho); if (r_nr == 1) rho = rho'; @@ -102,7 +102,7 @@ x = diag_r * cos (theta); y = diag_r * sin (theta); __plt2mv__ (x, y, fmt); - elseif (is_matrix (rho)) + elseif (ismatrix (rho)) if (size (rho) != size (theta)) error ("polar: matrix dimensions must match"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/__plr__.m --- a/scripts/plot/__plr__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/__plr__.m Fri Aug 09 19:00:16 2002 +0000 @@ -50,14 +50,14 @@ if (any (imag (rho))) rho = real (rho); endif - if (is_scalar (theta)) - if (is_scalar (rho)) + if (isscalar (theta)) + if (isscalar (rho)) x = rho * cos (theta); y = rho * sin (theta); __plt2ss__ (x, y, fmt); endif - elseif (is_vector (theta)) - if (is_vector (rho)) + elseif (isvector (theta)) + if (isvector (rho)) if (length (theta) != length (rho)) error ("polar: vector lengths must match"); endif @@ -70,7 +70,7 @@ x = rho .* cos (theta); y = rho .* sin (theta); __plt2vv__ (x, y, fmt); - elseif (is_matrix (rho)) + elseif (ismatrix (rho)) [t_nr, t_nc] = size (theta); if (t_nr == 1) theta = theta.'; @@ -92,8 +92,8 @@ y = diag (sin (theta)) * rho; __plt2vm__ (x, y, fmt); endif - elseif (is_matrix (theta)) - if (is_vector (rho)) + elseif (ismatrix (theta)) + if (isvector (rho)) [r_nr, r_nc] = size (rho); if (r_nr == 1) rho = rho.'; @@ -115,7 +115,7 @@ x = diag_r * cos (theta); y = diag_r * sin (theta); __plt2mv__ (x, y, fmt); - elseif (is_matrix (rho)) + elseif (ismatrix (rho)) if (size (rho) != size (theta)) error ("polar: matrix dimensions must match"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/__plt2__.m --- a/scripts/plot/__plt2__.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/__plt2__.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,20 +43,20 @@ if (any (any (imag (x2)))) x2 = real (x2); endif - if (is_scalar (x1)) - if (is_scalar (x2)) + if (isscalar (x1)) + if (isscalar (x2)) __plt2ss__ (x1, x2, fmt); endif - elseif (is_vector (x1)) - if (is_vector (x2)) + elseif (isvector (x1)) + if (isvector (x2)) __plt2vv__ (x1, x2, fmt); - elseif (is_matrix (x2)) + elseif (ismatrix (x2)) __plt2vm__ (x1, x2, fmt); endif - elseif (is_matrix (x1)) - if (is_vector (x2)) + elseif (ismatrix (x1)) + if (isvector (x2)) __plt2mv__ (x1, x2, fmt); - elseif (is_matrix (x2)) + elseif (ismatrix (x2)) __plt2mm__ (x1, x2, fmt); endif endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/axis.m --- a/scripts/plot/axis.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/axis.m Fri Aug 09 19:00:16 2002 +0000 @@ -232,7 +232,7 @@ warning (["unknown axis option '", ax, "'"]); endif - elseif (is_vector (ax)) + elseif (isvector (ax)) len = length (ax); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/bar.m --- a/scripts/plot/bar.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/bar.m Fri Aug 09 19:00:16 2002 +0000 @@ -50,7 +50,7 @@ function [xb, yb] = bar (x, y) if (nargin == 1) - if (is_vector (x)) + if (isvector (x)) len = 3 * length (x) + 1; tmp_xb = tmp_yb = zeros (len, 1); tmp_xb(1) = 0.5; @@ -69,7 +69,7 @@ error ("bar: argument must be a vector"); endif elseif (nargin == 2) - if (is_vector (x) && is_vector (y)) + if (isvector (x) && isvector (y)) xlen = length (x); ylen = length (y); if (xlen == ylen) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/contour.m --- a/scripts/plot/contour.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/contour.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,13 +42,13 @@ else n = y; endif - if (is_matrix (z)) + if (ismatrix (z)) gset nosurface; gset contour; gset cntrparam bspline; - if (is_scalar (n)) + if (isscalar (n)) command = sprintf ("gset cntrparam levels %d", n); - elseif (is_vector (n)) + elseif (isvector (n)) tmp = sprintf ("%f", n(1)); for i = 2:length (n) tmp = sprintf ("%s, %f", tmp, n(i)); @@ -66,7 +66,7 @@ if (nargin == 3) n = 10; endif - if (is_vector (x) && is_vector (y) && is_matrix (z)) + if (isvector (x) && isvector (y) && ismatrix (z)) xlen = length (x); ylen = length (y); if (xlen == rows (z) && ylen == columns (z)) @@ -85,9 +85,9 @@ gset nosurface; gset contour; gset cntrparam bspline; - if (is_scalar (n)) + if (isscalar (n)) command = sprintf ("gset cntrparam levels %d", n); - elseif (is_vector (n)) + elseif (isvector (n)) tmp = sprintf ("%f", n(1)); for i = 2:length (n) tmp = sprintf ("%s, %f", tmp, n(i)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/hist.m --- a/scripts/plot/hist.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/hist.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ usage ("[nn, xx] = hist (y, x, norm)"); endif - if (is_vector (y)) + if (isvector (y)) max_val = max (y); min_val = min (y); else @@ -63,7 +63,7 @@ cutoff = x + delta; else ## nargin is either 2 or 3 - if (is_scalar (x)) + if (isscalar (x)) n = x; if (n <= 0) error ("hist: number of bins must be positive"); @@ -71,7 +71,7 @@ delta = (max_val - min_val) / n / 2; x = linspace (min_val+delta, max_val-delta, n); cutoff = x + delta; - elseif (is_vector (x)) + elseif (isvector (x)) tmp = sort (x); if (any (tmp != x)) warning ("hist: bin values not sorted on input"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/mesh.m --- a/scripts/plot/mesh.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/mesh.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ if (nargin == 1) z = x; - if (is_matrix (z)) + if (ismatrix (z)) gset hidden3d; gset data style lines; gset surface; @@ -52,7 +52,7 @@ error ("mesh: argument must be a matrix"); endif elseif (nargin == 3) - if (is_vector (x) && is_vector (y) && is_matrix (z)) + if (isvector (x) && isvector (y) && ismatrix (z)) xlen = length (x); ylen = length (y); if (xlen == columns (z) && ylen == rows (z)) @@ -82,7 +82,7 @@ msg = sprintf ("%s\ncolumns (z) must be the same as length (x)", msg); error (msg); endif - elseif (is_matrix (x) && is_matrix (y) && is_matrix (z)) + elseif (ismatrix (x) && ismatrix (y) && ismatrix (z)) xlen = columns (z); ylen = rows (z); if (xlen == columns (x) && xlen == columns (y) && diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/meshdom.m --- a/scripts/plot/meshdom.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/meshdom.m Fri Aug 09 19:00:16 2002 +0000 @@ -31,7 +31,7 @@ function [xx, yy] = meshdom (x, y) if (nargin == 2) - if (is_vector (x) && is_vector (y)) + if (isvector (x) && isvector (y)) xx = ones (length (y), 1) * x(:).'; yy = flipud (y(:)) * ones (1, length (x)); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/meshgrid.m --- a/scripts/plot/meshgrid.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/meshgrid.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,7 +35,7 @@ y = x; endif if (nargin > 0 && nargin < 3) - if (is_vector (x) && is_vector (y)) + if (isvector (x) && isvector (y)) xx = ones (length (y), 1) * x(:).'; yy = y(:) * ones (1, length (x)); else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/multiplot.m --- a/scripts/plot/multiplot.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/multiplot.m Fri Aug 09 19:00:16 2002 +0000 @@ -51,7 +51,7 @@ usage ("multiplot (xn, yn)"); endif - if (! (is_scalar (xn) && is_scalar (yn))) + if (! (isscalar (xn) && isscalar (yn))) error ("multiplot: xn and yn have to be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/stairs.m --- a/scripts/plot/stairs.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/stairs.m Fri Aug 09 19:00:16 2002 +0000 @@ -51,7 +51,7 @@ if (nargin == 1) - if (is_vector (x)) + if (isvector (x)) len = 2 * length (x); tmp_xs = tmp_ys = zeros (len, 1); k = 0; @@ -65,7 +65,7 @@ error ("stairs: argument must be a vector"); endif elseif (nargin == 2) - if (is_vector (x) && is_vector (y)) + if (isvector (x) && isvector (y)) xlen = length (x); ylen = length (y); if (xlen == ylen) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/subplot.m --- a/scripts/plot/subplot.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/subplot.m Fri Aug 09 19:00:16 2002 +0000 @@ -94,7 +94,7 @@ if (nargin == 1) - if (! (is_scalar (rows) && rows >= 0)) + if (! (isscalar (rows) && rows >= 0)) error ("subplot: input rcn has to be a positive scalar"); endif @@ -105,7 +105,7 @@ tmp = (tmp - columns) / 10; rows = rem (tmp, 10); - elseif (! (is_scalar (columns) && is_scalar (rows) && is_scalar (index))) + elseif (! (isscalar (columns) && isscalar (rows) && isscalar (index))) error ("subplot: columns, rows, and index have to be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/plot/subwindow.m --- a/scripts/plot/subwindow.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/plot/subwindow.m Fri Aug 09 19:00:16 2002 +0000 @@ -51,7 +51,7 @@ ## check for scalar inputs - if (! (is_scalar (xn) && is_scalar (yn))) + if (! (isscalar (xn) && isscalar (yn))) error ("subwindow: xn and yn have to be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/compan.m --- a/scripts/polynomial/compan.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/compan.m Fri Aug 09 19:00:16 2002 +0000 @@ -65,7 +65,7 @@ usage ("compan (vector)"); endif - if (! is_vector (c)) + if (! isvector (c)) error ("compan: expecting a vector argument"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/conv.m --- a/scripts/polynomial/conv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/conv.m Fri Aug 09 19:00:16 2002 +0000 @@ -38,7 +38,7 @@ usage ("conv(a, b)"); endif - if (! (is_vector (a) && is_vector (b))) + if (! (isvector (a) && isvector (b))) error("conv: both arguments must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/deconv.m --- a/scripts/polynomial/deconv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/deconv.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,7 +40,7 @@ usage ("deconv (y, a)"); endif - if (! (is_vector (y) && is_vector (a))) + if (! (isvector (y) && isvector (a))) error("conv: both arguments must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyderiv.m --- a/scripts/polynomial/polyderiv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyderiv.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,7 +35,7 @@ usage ("polyderiv (vector)"); endif - if (! is_vector (p)) + if (! isvector (p)) error ("polyderiv: argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyfit.m --- a/scripts/polynomial/polyfit.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyfit.m Fri Aug 09 19:00:16 2002 +0000 @@ -52,11 +52,11 @@ usage ("polyfit (x, y, n)"); endif - if (! (is_vector (x) && is_vector (y) && size (x) == size (y))) + if (! (isvector (x) && isvector (y) && size (x) == size (y))) error ("polyfit: x and y must be vectors of the same size"); endif - if (! (is_scalar (n) && n >= 0 && ! isinf (n) && n == round (n))) + if (! (isscalar (n) && n >= 0 && ! isinf (n) && n == round (n))) error ("polyfit: n must be a nonnegative integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyinteg.m --- a/scripts/polynomial/polyinteg.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyinteg.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ usage ("polyinteg (vector)"); endif - if (! (is_vector (p) || isempty (p))) + if (! (isvector (p) || isempty (p))) error ("argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyout.m --- a/scripts/polynomial/polyout.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyout.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ usage("polyout (c, x)"); endif - if (! is_vector (c)) + if (! isvector (c)) error("polyout: first argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyreduce.m --- a/scripts/polynomial/polyreduce.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyreduce.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,7 +35,7 @@ usage ("polyreduce (p)"); endif - if (! (is_vector (p) || isempty (p))) + if (! (isvector (p) || isempty (p))) error ("polyreduce: argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyval.m --- a/scripts/polynomial/polyval.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyval.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,7 +40,7 @@ usage ("polyval (c, x)"); endif - if (! (is_vector (c) || isempty (c))) + if (! (isvector (c) || isempty (c))) error ("polyval: first argument must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/polynomial/polyvalm.m --- a/scripts/polynomial/polyvalm.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/polynomial/polyvalm.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,11 +40,11 @@ usage ("polyvalm (c, x)"); endif - if (! (is_vector (c) || isempty (c))) + if (! (isvector (c) || isempty (c))) error ("polyvalm: first argument must be a vector"); endif - if (! is_square (x)) + if (! issquare (x)) error ("polyvalm: second argument must be a square matrix"); endif @@ -55,7 +55,7 @@ [v, d] = eig (x); - if (is_symmetric (x)) + if (issymmetric (x)) y = v * diag (polyval (c, diag (d))) * v'; else y = v * (diag (polyval (c, diag (d))) / v); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/quaternion/qtrans.m --- a/scripts/quaternion/qtrans.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/quaternion/qtrans.m Fri Aug 09 19:00:16 2002 +0000 @@ -28,9 +28,9 @@ function v = qtrans (v, q) - if (! is_vector (v) || length (v) != 4) + if (! isvector (v) || length (v) != 4) error ("qtrans: v(%d,%d) must be a quaternion", rows (v), columns (v)); - elseif (! is_vector (q) || length (q) != 4) + elseif (! isvector (q) || length (q) != 4) error ("qtrans: q(%d,%d) must be a quaternion", rows (q), columns (q)); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/quaternion/qtransv.m --- a/scripts/quaternion/qtransv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/quaternion/qtransv.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,9 +36,9 @@ function vi = qtransv (vb, qib) - if (! is_vector (vb) || length (vb) != 3) + if (! isvector (vb) || length (vb) != 3) error ("qtransv: v(%d,%d) must be a 3-D vector", rows (vb), columns (vb)); - elseif (! is_vector (qib) || length (qib) != 4) + elseif (! isvector (qib) || length (qib) != 4) error ("qtransv: q(%d,%d) must be a quaternion", rows (qib), columns (qib)); elseif (max (abs (imag (vb))) + max (abs (imag (qib))) != 0) error ("qtransv: input values must be real"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/quaternion/qtransvmat.m --- a/scripts/quaternion/qtransvmat.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/quaternion/qtransvmat.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ function Aib = qtransvmat (qib) - if (! is_vector(qib) || length (qib) != 4) + if (! isvector(qib) || length (qib) != 4) error ("qtransvmat: q(%d,%d) must be a quaternion", rows (qib), \ columns (qib)); elseif (max (abs (imag (qib))) != 0) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/quaternion/quaternion.m --- a/scripts/quaternion/quaternion.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/quaternion/quaternion.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ switch (nargin) case(1) - if (! (is_vector (w) && length (w) == 4)) + if (! (isvector (w) && length (w) == 4)) error ("input vector must be of length 4)"); endif ## extract data @@ -80,9 +80,9 @@ vv = w; theta = x; - if (! is_vector (vv) || length (vv) != 3) + if (! isvector (vv) || length (vv) != 3) error ("vv must be a length three vector"); - elseif (! is_scalar (theta)) + elseif (! isscalar (theta)) error ("theta must be a scalar"); elseif (norm (vv) == 0) error ("quaternion: vv is zero"); @@ -103,7 +103,7 @@ if (nargout != 1) usage ("w = quaterion (a, b, c, d)"); endif - if (! (is_scalar (w) && is_scalar (x) && is_scalar (y) && is_scalar (z))) + if (! (isscalar (w) && isscalar (x) && isscalar (y) && isscalar (z))) error ("input values must be scalars"); endif a = [w, x, y, z]; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/arch_fit.m --- a/scripts/signal/arch_fit.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/arch_fit.m Fri Aug 09 19:00:16 2002 +0000 @@ -55,7 +55,7 @@ usage ("arch_fit (y, X, p, ITER, gamma, a0, b0)"); endif - if (! (is_vector (y))) + if (! (isvector (y))) error ("arch_test: y must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/arch_rnd.m --- a/scripts/signal/arch_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/arch_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,7 +48,7 @@ if (! ((min (size (a)) == 1) && (min (size (b)) == 1))) error ("arch_rnd: a and b must both be scalars or vectors"); endif - if (! (is_scalar (T) && (T > 0) && (rem (T, 1) == 0))) + if (! (isscalar (T) && (T > 0) && (rem (T, 1) == 0))) error ("arch_rnd: T must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/arch_test.m --- a/scripts/signal/arch_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/arch_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -72,7 +72,7 @@ error ("arch_test needs 3 input arguments"); endif - if (! (is_vector (y))) + if (! (isvector (y))) error ("arch_test: y must be a vector"); endif T = length (y); @@ -83,7 +83,7 @@ elseif (! (rx == T)) error ("arch_test: either rows(X) == length(y), or X is a scalar"); endif - if (! (is_scalar(p) && (rem(p, 1) == 0) && (p > 0))) + if (! (isscalar(p) && (rem(p, 1) == 0) && (p > 0))) error ("arch_test: p must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/arma_rnd.m --- a/scripts/signal/arma_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/arma_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ if (nargin == 4) n = 100; elseif (nargin == 5) - if (!is_scalar (t)) + if (!isscalar (t)) error ("arma_rnd: n must be a scalar"); endif else @@ -60,7 +60,7 @@ error ("arma_rnd: a and b must not be matrices"); endif - if (!is_scalar (t)) + if (!isscalar (t)) error ("arma_rnd: t must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/autocov.m --- a/scripts/signal/autocov.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/autocov.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ [n, c] = size (X); - if (is_vector (X)) + if (isvector (X)) n = length (X); c = 1; X = reshape (X, n, 1); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/autoreg_matrix.m --- a/scripts/signal/autoreg_matrix.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/autoreg_matrix.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ usage ("autoreg_matrix (y, k)"); endif - if (! (is_vector (y))) + if (! (isvector (y))) error ("autoreg_matrix: y must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/bartlett.m --- a/scripts/signal/bartlett.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/bartlett.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,7 +35,7 @@ usage ("bartlett (m)"); endif - if (! (is_scalar (m) && (m == round (m)) && (m > 0))) + if (! (isscalar (m) && (m == round (m)) && (m > 0))) error ("bartlett: m has to be an integer > 0"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/blackman.m --- a/scripts/signal/blackman.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/blackman.m Fri Aug 09 19:00:16 2002 +0000 @@ -34,7 +34,7 @@ usage ("blackman (m)"); endif - if (! (is_scalar (m) && (m == round (m)) && (m > 0))) + if (! (isscalar (m) && (m == round (m)) && (m > 0))) error ("blackman: m has to be an integer > 0"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/detrend.m --- a/scripts/signal/detrend.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/detrend.m Fri Aug 09 19:00:16 2002 +0000 @@ -38,7 +38,7 @@ if (nargin == 1) p = 1; elseif (nargin == 2) - if (! (is_scalar (p) && p == round (p) && p >= 0)) + if (! (isscalar (p) && p == round (p) && p >= 0)) error ("detrend: p must be a nonnegative integer"); endif else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/diffpara.m --- a/scripts/signal/diffpara.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/diffpara.m Fri Aug 09 19:00:16 2002 +0000 @@ -45,7 +45,7 @@ if ((nargin < 1) || (nargin > 3)) usage ("[d, D] = diffpara (X, a, b)"); else - if (is_vector (X)) + if (isvector (X)) n = length (X); k = 1; X = reshape (X, n, 1); @@ -61,7 +61,7 @@ endif endif - if (! (is_scalar (a) && is_scalar (b))) + if (! (isscalar (a) && isscalar (b))) error ("diffpara: a and b must be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/fftconv.m --- a/scripts/signal/fftconv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/fftconv.m Fri Aug 09 19:00:16 2002 +0000 @@ -38,7 +38,7 @@ usage ("fftconv (b, x, N)"); endif - if (! (is_vector (a) && is_vector (b))) + if (! (isvector (a) && isvector (b))) error ("fftconv: both a and b should be vectors"); endif la = length (a); @@ -52,7 +52,7 @@ if (nargin == 2) c = fftfilt (a, b); else - if (! (is_scalar (N))) + if (! (isscalar (N))) error ("fftconv: N has to be a scalar"); endif c = fftfilt (a, b, N); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/fftfilt.m --- a/scripts/signal/fftfilt.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/fftfilt.m Fri Aug 09 19:00:16 2002 +0000 @@ -69,7 +69,7 @@ y = ifft (fft (x, N) .* B(:,ones (1, c_x))); else ## Use overlap-add method ... - if (! (is_scalar (N))) + if (! (isscalar (N))) error ("fftfilt: N has to be a scalar"); endif N = 2 ^ (ceil (log (max ([N, l_b])) / log (2))); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/fftshift.m --- a/scripts/signal/fftshift.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/fftshift.m Fri Aug 09 19:00:16 2002 +0000 @@ -46,11 +46,11 @@ usage ("usage: fftshift (X)"); endif - if (is_vector (V)) + if (isvector (V)) x = length (V); xx = ceil (x/2); retval = V([xx+1:x, 1:xx]); - elseif (is_matrix (V)) + elseif (ismatrix (V)) [x, y] = size (V); xx = ceil (x/2); yy = ceil (y/2); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/fractdiff.m --- a/scripts/signal/fractdiff.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/fractdiff.m Fri Aug 09 19:00:16 2002 +0000 @@ -30,11 +30,11 @@ N = 100; - if (! is_vector (x)) + if (! isvector (x)) error ("fractdiff: x must be a vector") endif - if (! is_scalar (d)) + if (! isscalar (d)) error ("fractdiff: d must be a scalar") endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/freqz.m --- a/scripts/signal/freqz.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/freqz.m Fri Aug 09 19:00:16 2002 +0000 @@ -117,7 +117,7 @@ b = reshape (b, 1, lb); k = max ([la, lb]); - if (! is_scalar (n)) + if (! isscalar (n)) if (nargin == 4) ## Fs was specified w = 2*pi*n/Fs; else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/hamming.m --- a/scripts/signal/hamming.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/hamming.m Fri Aug 09 19:00:16 2002 +0000 @@ -34,7 +34,7 @@ usage ("hamming (m)"); endif - if (! (is_scalar (m) && (m == round (m)) && (m > 0))) + if (! (isscalar (m) && (m == round (m)) && (m > 0))) error ("hamming: m has to be an integer > 0"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/hanning.m --- a/scripts/signal/hanning.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/hanning.m Fri Aug 09 19:00:16 2002 +0000 @@ -34,7 +34,7 @@ usage ("hanning (m)"); endif - if (! (is_scalar (m) && (m == round (m)) && (m > 0))) + if (! (isscalar (m) && (m == round (m)) && (m > 0))) error ("hanning: m has to be an integer > 0"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/hurst.m --- a/scripts/signal/hurst.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/hurst.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,9 +33,9 @@ usage ("hurst (x)"); endif - if (is_scalar (x)) + if (isscalar (x)) error ("hurst: x must not be a scalar") - elseif (is_vector (x)) + elseif (isvector (x)) x = reshape (x, length (x), 1); end diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/sinetone.m --- a/scripts/signal/sinetone.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/sinetone.m Fri Aug 09 19:00:16 2002 +0000 @@ -45,11 +45,11 @@ endif [err, f, a] = common_size (f, a); - if (err || ! is_vector (f)) + if (err || ! isvector (f)) error ("sinetone: freq and ampl must be vectors of common size"); endif - if (! (is_scalar (r) && is_scalar (s))) + if (! (isscalar (r) && isscalar (s))) error ("sinetone: rate and sec must be scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/signal/spencer.m --- a/scripts/signal/spencer.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/signal/spencer.m Fri Aug 09 19:00:16 2002 +0000 @@ -37,7 +37,7 @@ n = xr; c = xc; - if (is_vector(X)) + if (isvector(X)) n = length(X); c = 1; X = reshape(X, n, 1); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/special-matrix/sylvester_matrix.m --- a/scripts/special-matrix/sylvester_matrix.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/special-matrix/sylvester_matrix.m Fri Aug 09 19:00:16 2002 +0000 @@ -39,7 +39,7 @@ usage ("sylvester_matrix (n)"); endif - if (is_scalar (k)) + if (isscalar (k)) if (k < 1) retval = 1; else diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/special-matrix/vander.m --- a/scripts/special-matrix/vander.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/special-matrix/vander.m Fri Aug 09 19:00:16 2002 +0000 @@ -57,7 +57,7 @@ usage ("vander (c)"); endif - if (is_vector (c)) + if (isvector (c)) n = length (c); retval = zeros (n, n); j = 1:n; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/center.m --- a/scripts/statistics/base/center.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/center.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,9 +32,9 @@ usage ("center (x)"); endif - if (is_vector (x)) + if (isvector (x)) retval = x - mean (x); - elseif (is_matrix (x)) + elseif (ismatrix (x)) retval = x - ones (rows (x), 1) * mean (x); elseif (isempty (x)) retval = x; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/cut.m --- a/scripts/statistics/base/cut.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/cut.m Fri Aug 09 19:00:16 2002 +0000 @@ -41,13 +41,13 @@ usage ("cut (X, BREAKS)"); endif - if (! is_vector (X)) + if (! isvector (X)) error ("cut: X must be a vector"); endif - if is_scalar (BREAKS) + if isscalar (BREAKS) BREAKS = linspace (min (X), max (X), BREAKS + 1); BREAKS(1) = BREAKS(1) - 1; - elseif is_vector (BREAKS) + elseif isvector (BREAKS) BREAKS = sort (BREAKS); else error ("cut: BREAKS must be a scalar or vector"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/kurtosis.m --- a/scripts/statistics/base/kurtosis.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/kurtosis.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,14 +49,14 @@ usage ("kurtosis (x)"); endif - if (is_vector (x)) + if (isvector (x)) x = x - mean (x); if (! any (x)) retval = 0; else retval = sum (x .^ 4) / (length (x) * std (x) ^ 4) - 3; endif - elseif (is_matrix (x)) + elseif (ismatrix (x)) [nr, nc] = size (x); x = x - ones (nr, 1) * mean (x); retval = zeros (1, nc); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/ppplot.m --- a/scripts/statistics/base/ppplot.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/ppplot.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ usage ("ppplot (x, dist, params)"); endif - if (! is_vector (x)) + if (! isvector (x)) error ("ppplot: x must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/qqplot.m --- a/scripts/statistics/base/qqplot.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/qqplot.m Fri Aug 09 19:00:16 2002 +0000 @@ -51,7 +51,7 @@ usage ("qqplot (x, dist, params)"); endif - if (! (is_vector(x))) + if (! (isvector(x))) error ("qqplot: x must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/skewness.m --- a/scripts/statistics/base/skewness.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/skewness.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,14 +49,14 @@ usage ("skewness (x)"); endif - if (is_vector (x)) + if (isvector (x)) x = x - mean (x); if (! any (x)) retval = 0; else retval = sum (x .^ 3) / (length (x) * std (x) ^ 3); endif - elseif (is_matrix (x)) + elseif (ismatrix (x)) [nr, nc] = size (x); x = x - ones (nr, 1) * mean (x); retval = zeros (1, nc); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/statistics.m --- a/scripts/statistics/base/statistics.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/statistics.m Fri Aug 09 19:00:16 2002 +0000 @@ -36,7 +36,7 @@ endif if (prod (size (X)) > 1) - if (is_vector (X)) + if (isvector (X)) X = reshape (X, length (X), 1); endif for k=1:columns(X) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/studentize.m --- a/scripts/statistics/base/studentize.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/studentize.m Fri Aug 09 19:00:16 2002 +0000 @@ -34,13 +34,13 @@ usage ("studentize (x)"); endif - if is_vector (x) + if isvector (x) if (std (x) == 0) t = zeros (size (x)); else t = (x - mean (x)) / std (x); endif - elseif is_matrix (x) + elseif ismatrix (x) l = ones (rows (x), 1); t = x - l * mean (x); t = t ./ (l * max ([(std (t)); (! any (t))])); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/table.m --- a/scripts/statistics/base/table.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/table.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ function [t, v, w] = table (x, y) if (nargin == 1) - if (! (is_vector (x))) + if (! (isvector (x))) error ("table: x must be a vector"); endif v = values (x); @@ -40,7 +40,7 @@ t(i) = sum (x == v(i) | isnan (v(i)) * isnan (x)); endfor elseif (nargin == 2) - if (! (is_vector (x) && is_vector (y) && (length (x) == length (y)))) + if (! (isvector (x) && isvector (y) && (length (x) == length (y)))) error ("table: x and y must be vectors of the same length"); endif v = values (x); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/base/values.m --- a/scripts/statistics/base/values.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/base/values.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,7 +32,7 @@ usage ("values (x)"); endif - if (! (is_vector (x))) + if (! (isvector (x))) error ("values: x must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/beta_rnd.m --- a/scripts/statistics/distributions/beta_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/beta_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = beta_rnd (a, b, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("beta_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("beta_rnd: c must be a positive integer"); endif [retval, a, b] = common_size (a, b, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/binomial_rnd.m --- a/scripts/statistics/distributions/binomial_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/binomial_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = binomial_rnd (n, p, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("binomial_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("binomial_rnd: c must be a positive integer"); endif [retval, n, p] = common_size (n, p, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/cauchy_rnd.m --- a/scripts/statistics/distributions/cauchy_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/cauchy_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = cauchy_rnd (l, scale, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("cauchy_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("cauchy_rnd: c must be a positive integer"); endif [retval, l, scale] = common_size (l, scale, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/chisquare_rnd.m --- a/scripts/statistics/distributions/chisquare_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/chisquare_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = chisquare_rnd (n, r, c) if (nargin == 3) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("chisquare_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("chisquare_rnd: c must be a positive integer"); endif [retval, n] = common_size (n, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/discrete_cdf.m --- a/scripts/statistics/distributions/discrete_cdf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/discrete_cdf.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,9 +35,9 @@ [r, c] = size (x); - if (! is_vector (v)) + if (! isvector (v)) error ("discrete_cdf: v must be a vector"); - elseif (! is_vector (p) || (length (p) != length (v))) + elseif (! isvector (p) || (length (p) != length (v))) error ("discrete_cdf: p must be a vector with length (v) elements"); elseif (! (all (p >= 0) && any (p))) error ("discrete_cdf: p must be a nonzero, nonnegative vector"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/discrete_inv.m --- a/scripts/statistics/distributions/discrete_inv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/discrete_inv.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,9 +35,9 @@ [r, c] = size (x); - if (! is_vector (v)) + if (! isvector (v)) error ("discrete_inv: v must be a vector"); - elseif (! is_vector (p) || (length (p) != length (v))) + elseif (! isvector (p) || (length (p) != length (v))) error ("discrete_inv: p must be a vector with length (v) elements"); elseif (! (all (p >= 0) && any (p))) error ("discrete_inv: p must be a nonzero, nonnegative vector"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/discrete_pdf.m --- a/scripts/statistics/distributions/discrete_pdf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/discrete_pdf.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,9 +35,9 @@ [r, c] = size (x); - if (! is_vector (v)) + if (! isvector (v)) error ("discrete_pdf: v must be a vector"); - elseif (! is_vector (p) || (length (p) != length (v))) + elseif (! isvector (p) || (length (p) != length (v))) error ("discrete_pdf: p must be a vector with length (v) elements"); elseif (! (all (p >= 0) && any (p))) error ("discrete_pdf: p must be a nonzero, nonnegative vector"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/discrete_rnd.m --- a/scripts/statistics/distributions/discrete_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/discrete_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -35,13 +35,13 @@ usage ("discrete_rnd (n, v, p)"); endif - if (! is_scalar (n)) + if (! isscalar (n)) error ("discrete_rnd: n must be a scalar"); endif - if (! is_vector (v)) + if (! isvector (v)) error ("discrete_rnd: v must be a vector"); - elseif (! is_vector (p) || (length (p) != length (v))) + elseif (! isvector (p) || (length (p) != length (v))) error ("discrete_rnd: p must be a vector with length (v) elements"); elseif (! (all (p >= 0) && any (p))) error ("discrete_rnd: p must be a nonzero, nonnegative vector"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/empirical_cdf.m --- a/scripts/statistics/distributions/empirical_cdf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/empirical_cdf.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ function cdf = empirical_cdf (x, data) - if (! is_vector (data)) + if (! isvector (data)) error ("empirical_cdf: data must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/empirical_inv.m --- a/scripts/statistics/distributions/empirical_inv.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/empirical_inv.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ function inv = empirical_inv (x, data) - if (! is_vector (data)) + if (! isvector (data)) error ("empirical_inv: data must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/empirical_pdf.m --- a/scripts/statistics/distributions/empirical_pdf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/empirical_pdf.m Fri Aug 09 19:00:16 2002 +0000 @@ -29,7 +29,7 @@ function pdf = empirical_pdf (x, data) - if (! is_vector (data)) + if (! isvector (data)) error ("empirical_pdf: data must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/empirical_rnd.m --- a/scripts/statistics/distributions/empirical_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/empirical_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -28,7 +28,7 @@ function rnd = empirical_rnd (n, data) - if (! is_vector (data)) + if (! isvector (data)) error ("empirical_rnd: data must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/exponential_rnd.m --- a/scripts/statistics/distributions/exponential_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/exponential_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = exponential_rnd (l, r, c) if (nargin == 3) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("exponential_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("exponential_rnd: c must be a positive integer"); endif [retval, l] = common_size (l, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/f_rnd.m --- a/scripts/statistics/distributions/f_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/f_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = f_rnd (m, n, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("f_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("f_rnd: c must be a positive integer"); endif [retval, m, n] = common_size (m, n, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/gamma_rnd.m --- a/scripts/statistics/distributions/gamma_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/gamma_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = gamma_rnd (a, b, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("gamma_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("gamma_rnd: c must be a positive integer"); endif [retval, a, b] = common_size (a, b, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/geometric_rnd.m --- a/scripts/statistics/distributions/geometric_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/geometric_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = geometric_rnd (p, r, c) if (nargin == 3) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("geometric_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("geometric_rnd: c must be a positive integer"); endif [retval, p] = common_size (p, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/kolmogorov_smirnov_cdf.m --- a/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/kolmogorov_smirnov_cdf.m Fri Aug 09 19:00:16 2002 +0000 @@ -52,7 +52,7 @@ if (nargin == 1) tol = eps; else - if (! is_scalar (tol) || ! (tol > 0)) + if (! isscalar (tol) || ! (tol > 0)) error ("kolmogorov_smirnov_cdf: tol has to be a positive scalar"); endif endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/laplace_rnd.m --- a/scripts/statistics/distributions/laplace_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/laplace_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,10 +32,10 @@ usage ("laplace_rnd (r, c)"); endif - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("laplace_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("laplace_rnd: c must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/logistic_rnd.m --- a/scripts/statistics/distributions/logistic_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/logistic_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,10 +32,10 @@ usage ("logistic_rnd (r, c)"); endif - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("logistic_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("logistic_rnd: c must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/lognormal_rnd.m --- a/scripts/statistics/distributions/lognormal_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/lognormal_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = lognormal_rnd (a, v, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("lognormal_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("lognormal_rnd: c must be a positive integer"); endif [retval, a, v] = common_size (a, v, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/normal_rnd.m --- a/scripts/statistics/distributions/normal_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/normal_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = normal_rnd (m, v, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("normal_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("normal_rnd: c must be a positive integer"); endif [retval, m, v] = common_size (m, v, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/pascal_rnd.m --- a/scripts/statistics/distributions/pascal_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/pascal_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = pascal_rnd (n, p, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("pascal_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("pascal_rnd: c must be a positive integer"); endif [retval, n, p] = common_size (n, p, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/poisson_rnd.m --- a/scripts/statistics/distributions/poisson_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/poisson_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = poisson_rnd (l, r, c) if (nargin == 3) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("poisson_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("poisson_rnd: c must be a positive integer"); endif [retval, l] = common_size (l, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/stdnormal_rnd.m --- a/scripts/statistics/distributions/stdnormal_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/stdnormal_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -32,10 +32,10 @@ usage ("stdnormal_rnd (r, c)"); endif - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("stdnormal_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("stdnormal_rnd: c must be a positive integer"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/t_rnd.m --- a/scripts/statistics/distributions/t_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/t_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = t_rnd (n, r, c) if (nargin == 3) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("t_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("t_rnd: c must be a positive integer"); endif [retval, n] = common_size (n, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/uniform_rnd.m --- a/scripts/statistics/distributions/uniform_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/uniform_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = uniform_rnd (a, b, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("uniform_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("uniform_rnd: c must be a positive integer"); endif [retval, a, b] = common_size (a, b, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/distributions/weibull_rnd.m --- a/scripts/statistics/distributions/weibull_rnd.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/distributions/weibull_rnd.m Fri Aug 09 19:00:16 2002 +0000 @@ -33,10 +33,10 @@ function rnd = weibull_rnd (shape, scale, r, c) if (nargin == 4) - if (! (is_scalar (r) && (r > 0) && (r == round (r)))) + if (! (isscalar (r) && (r > 0) && (r == round (r)))) error ("weibull_rnd: r must be a positive integer"); endif - if (! (is_scalar (c) && (c > 0) && (c == round (c)))) + if (! (isscalar (c) && (c > 0) && (c == round (c)))) error ("weibull_rnd: c must be a positive integer"); endif [retval, shape, scale] = common_size (shape, scale, zeros (r, c)); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/anova.m --- a/scripts/statistics/tests/anova.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/anova.m Fri Aug 09 19:00:16 2002 +0000 @@ -50,18 +50,18 @@ if ((nargin < 1) || (nargin > 2)) usage ("anova (y, g)"); elseif (nargin == 1) - if (is_vector (y)) + if (isvector (y)) error ("anova: for `anova (y)', y must not be a vector"); endif [group_count, k] = size (y); n = group_count * k; group_mean = mean (y); else - if (! is_vector (y)) + if (! isvector (y)) error ("anova: for `anova (y, g)', y must be a vector"); endif n = length (y); - if (! is_vector (g) || (length (g) != n)) + if (! isvector (g) || (length (g) != n)) error ("anova: g must be a vector of the same length as y"); endif s = sort (g); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/bartlett_test.m --- a/scripts/statistics/tests/bartlett_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/bartlett_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -47,7 +47,7 @@ for i = 1 : k; x = varargin{i}; - if (! is_vector (x)) + if (! isvector (x)) error ("bartlett_test: all arguments must be vectors"); endif f(i) = length (x) - 1; diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/chisquare_test_homogeneity.m --- a/scripts/statistics/tests/chisquare_test_homogeneity.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/chisquare_test_homogeneity.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ usage ("[pval, chisq, df] = chisquare_test_homogeneity (x, y, c)"); endif - if (! (is_vector(x) && is_vector(y) && is_vector(c))) + if (! (isvector(x) && isvector(y) && isvector(c))) error ("chisquare_test_homogeneity: x, y and c must be vectors"); endif ## Now test c for strictly increasing entries diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/cor_test.m --- a/scripts/statistics/tests/cor_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/cor_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -67,7 +67,7 @@ usage ("cor_test (X, Y, ALTERNATIVE, METHOD)") endif - if (!is_vector (X) || !is_vector (Y) || length (X) != length (Y)) + if (!isvector (X) || !isvector (Y) || length (X) != length (Y)) error ("cor_test: X and Y must be vectors of the same length") endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/f_test_regression.m --- a/scripts/statistics/tests/f_test_regression.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/f_test_regression.m Fri Aug 09 19:00:16 2002 +0000 @@ -43,7 +43,7 @@ endif [T, k] = size (X); - if (! (is_vector (y) && (length (y) == T))) + if (! (isvector (y) && (length (y) == T))) error ("f_test_regression: y must be a vector of length rows (X)"); endif y = reshape (y, T, 1); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/hotelling_test.m --- a/scripts/statistics/tests/hotelling_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/hotelling_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -42,18 +42,18 @@ usage ("hotelling_test (x, m)"); endif - if (is_vector (x)) - if (! is_scalar (m)) + if (isvector (x)) + if (! isscalar (m)) error ("hotelling_test: if x is a vector, m must be a scalar"); endif n = length (x); p = 1; - elseif (is_matrix (x)) + elseif (ismatrix (x)) [n, p] = size (x); if (n <= p) error ("hotelling_test: x must have more rows than columns"); endif - if (is_vector (m) && length (m) == p) + if (isvector (m) && length (m) == p) m = reshape (m, 1, p); else error ("hotelling_test: if x is a matrix, m must be a vector of length columns (x)"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/hotelling_test_2.m --- a/scripts/statistics/tests/hotelling_test_2.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/hotelling_test_2.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,15 +49,15 @@ usage ("hotelling_test_2 (x, y)"); endif - if (is_vector (x)) + if (isvector (x)) n_x = length (x); - if (! is_vector (y)) + if (! isvector (y)) error ("hotelling_test_2: if x is a vector, y must also be a vector"); else n_y = length (y); p = 1; endif - elseif (is_matrix (x)) + elseif (ismatrix (x)) [n_x, p] = size (x); [n_y, q] = size (y); if (p != q) diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/kolmogorov_smirnov_test.m --- a/scripts/statistics/tests/kolmogorov_smirnov_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -56,7 +56,7 @@ usage ("[pval, ks] = kolmogorov_smirnov_test (x, dist,, params, alt)"); endif - if (! is_vector (x)) + if (! isvector (x)) error ("kolmogorov_smirnov_test: x must be a vector"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/kolmogorov_smirnov_test_2.m --- a/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/kolmogorov_smirnov_test_2.m Fri Aug 09 19:00:16 2002 +0000 @@ -52,7 +52,7 @@ usage ("[pval, ks] = kolmogorov_smirnov_test_2 (x, y, tol)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error ("kolmogorov_smirnov_test_2: both x and y must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/kruskal_wallis_test.m --- a/scripts/statistics/tests/kruskal_wallis_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/kruskal_wallis_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -50,7 +50,7 @@ for i = 1 : m; x = varargin{i}; - if (! is_vector (x)) + if (! isvector (x)) error ("kruskal_wallis_test: all arguments must be vectors"); endif l = length (x); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/manova.m --- a/scripts/statistics/tests/manova.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/manova.m Fri Aug 09 19:00:16 2002 +0000 @@ -47,13 +47,13 @@ usage ("manova (Y, g)"); endif - if (is_vector (Y)) + if (isvector (Y)) error ("manova: Y must not be a vector"); endif [n, p] = size (Y); - if (!is_vector (g) || (length (g) != n)) + if (!isvector (g) || (length (g) != n)) error ("manova: g must be a vector of length rows (Y)"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/mcnemar_test.m --- a/scripts/statistics/tests/mcnemar_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/mcnemar_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -41,7 +41,7 @@ usage ("mcnemar_test (x)"); endif - if (! (min (size (x)) > 1) && is_square (x)) + if (! (min (size (x)) > 1) && issquare (x)) error ("mcnemar_test: x must be a square matrix of size > 1"); elseif (! (all (all (x >= 0)) && all (all (x == round (x))))) error ("mcnemar_test: all entries of x must be nonnegative integers"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/sign_test.m --- a/scripts/statistics/tests/sign_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/sign_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -49,7 +49,7 @@ usage ("[pval, b, n] = sign_test (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y) && (length (x) == length (y)))) + if (! (isvector (x) && isvector (y) && (length (x) == length (y)))) error ("sign_test: x and y must be vectors of the same length"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/t_test.m --- a/scripts/statistics/tests/t_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/t_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,10 +48,10 @@ usage ("[pval, t, df] = t_test (x, m, alt)"); endif - if (! is_vector (x)) + if (! isvector (x)) error ("t_test: x must be a vector"); endif - if (! is_scalar (m)) + if (! isscalar (m)) error ("t_test: m must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/t_test_2.m --- a/scripts/statistics/tests/t_test_2.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/t_test_2.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,7 +48,7 @@ usage ("[pval, t, df] = t_test_2 (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error ("t_test_2: both x and y must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/t_test_regression.m --- a/scripts/statistics/tests/t_test_regression.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/t_test_regression.m Fri Aug 09 19:00:16 2002 +0000 @@ -58,14 +58,14 @@ usage ("[pval, t, df] = t_test_regression (y, X, R, r, alt)"); endif - if (! is_scalar (r)) + if (! isscalar (r)) error ("t_test_regression: r must be a scalar"); elseif (! isstr (alt)) error ("t_test_regression: alt must be a string"); endif [T, k] = size (X); - if (! (is_vector (y) && (length (y) == T))) + if (! (isvector (y) && (length (y) == T))) error ("t_test_regression: y must be a vector of length rows (X)"); endif s = size (R); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/u_test.m --- a/scripts/statistics/tests/u_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/u_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -50,7 +50,7 @@ usage ("[pval, z] = u_test (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error ("u_test: both x and y must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/var_test.m --- a/scripts/statistics/tests/var_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/var_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -47,7 +47,7 @@ usage ("[pval, f, df_num, df_den] = var_test (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error ("var_test: both x and y must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/welch_test.m --- a/scripts/statistics/tests/welch_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/welch_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -47,7 +47,7 @@ usage ("[pval, t, df] = welch_test (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error ("welch_test: both x and y must be vectors"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/wilcoxon_test.m --- a/scripts/statistics/tests/wilcoxon_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/wilcoxon_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -46,7 +46,7 @@ usage ("[pval, z] = wilcoxon_test (x, y, alt)"); endif - if (! (is_vector (x) && is_vector (y) && (length (x) == length (y)))) + if (! (isvector (x) && isvector (y) && (length (x) == length (y)))) error ("wilcoxon_test: x and y must be vectors of the same length"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/z_test.m --- a/scripts/statistics/tests/z_test.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/z_test.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,13 +48,13 @@ usage ("[pval, z] = z_test (x, m, v, alt)"); endif - if (! is_vector (x)) + if (! isvector (x)) error ("z_test: x must be a vector"); endif - if (! is_scalar (m)) + if (! isscalar (m)) error ("z_test: m must be a scalar"); endif - if (! (is_scalar (v) && (v > 0))) + if (! (isscalar (v) && (v > 0))) error ("z_test: v must be a positive scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/statistics/tests/z_test_2.m --- a/scripts/statistics/tests/z_test_2.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/statistics/tests/z_test_2.m Fri Aug 09 19:00:16 2002 +0000 @@ -48,10 +48,10 @@ usage ("[pval, z] = z_test_2 (x, y, v_x, v_y, alt)"); endif - if (! (is_vector (x) && is_vector (y))) + if (! (isvector (x) && isvector (y))) error("z_test_2: both x and y must be vectors"); - elseif (! (is_scalar (v_x) && (v_x > 0) - && is_scalar (v_y) && (v_y > 0))) + elseif (! (isscalar (v_x) && (v_x > 0) + && isscalar (v_y) && (v_y > 0))) error ("z_test_2: both v_x and v_y must be positive scalars"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/strings/base2dec.m --- a/scripts/strings/base2dec.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/strings/base2dec.m Fri Aug 09 19:00:16 2002 +0000 @@ -60,7 +60,7 @@ if (any (diff (sort (toascii (symbols))) == 0)) error ("base2dec: symbols representing digits must be unique."); endif - elseif (! is_scalar (base)) + elseif (! isscalar (base)) error ("base2dec: cannot convert from several bases at once."); elseif (base < 2 || base > length (symbols)) error ("base2dec: base must be between 2 and 36 or a string of symbols"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/strings/blanks.m --- a/scripts/strings/blanks.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/strings/blanks.m Fri Aug 09 19:00:16 2002 +0000 @@ -31,7 +31,7 @@ usage ("blanks (n)"); endif - if (is_scalar (n) && n == round (n) && (treat_neg_dim_as_zero || n >= 0)) + if (isscalar (n) && n == round (n) && (treat_neg_dim_as_zero || n >= 0)) s = setstr (ones (1, n) * toascii (" ")); else error ("blanks: n must be a non-negative integer"); diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/strings/com2str.m --- a/scripts/strings/com2str.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/strings/com2str.m Fri Aug 09 19:00:16 2002 +0000 @@ -40,7 +40,7 @@ flg = 0; endif - if (! (is_scalar (zz) && is_scalar (flg))) + if (! (isscalar (zz) && isscalar (flg))) error ("com2str: arguments must be a scalar"); endif diff -r 2cc57b6169cf -r 22bd65326ec1 scripts/strings/dec2base.m --- a/scripts/strings/dec2base.m Fri Aug 09 07:38:55 2002 +0000 +++ b/scripts/strings/dec2base.m Fri Aug 09 19:00:16 2002 +0000 @@ -64,7 +64,7 @@ if any (diff (sort (toascii (symbols))) == 0) error ("dec2base: symbols representing digits must be unique."); endif - elseif (! is_scalar (base)) + elseif (! isscalar (base)) error ("dec2base: cannot convert from several bases at once."); elseif (base < 2 || base > length (symbols)) error ("dec2base: base must be between 2 and 36 or a string of symbols"); diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/linalg/qr-7.m --- a/test/octave.test/linalg/qr-7.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/linalg/qr-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -8,7 +8,7 @@ else n1 = norm (q'*q-eye(columns(q))) retval = (n1 < tol); - if (is_vector (p)) + if (isvector (p)) n2 = norm (q*r-a(:,p)) retval = (retval && n2 < tol); else diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-1.m --- a/test/octave.test/number/is_matrix-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_matrix (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-10.m --- a/test/octave.test/number/is_matrix-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_matrix ([1, 2; 3, 4], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-2.m --- a/test/octave.test/number/is_matrix-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_matrix ([1, 2, 3]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-3.m --- a/test/octave.test/number/is_matrix-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -## Yes, this is right, is_matrix() checks for non-empty matrices. - -is_matrix ([]) == 0 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-4.m --- a/test/octave.test/number/is_matrix-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_matrix ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-5.m --- a/test/octave.test/number/is_matrix-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_matrix ("t"); -implicit_str_to_num_ok = 1; -t2 = is_matrix ("t"); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-6.m --- a/test/octave.test/number/is_matrix-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_matrix ("test"); -implicit_str_to_num_ok = 1; -t2 = is_matrix ("test"); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-7.m --- a/test/octave.test/number/is_matrix-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_matrix (["test"; "ing"]); -implicit_str_to_num_ok = 1; -t2 = is_matrix (["test"; "ing"]); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-8.m --- a/test/octave.test/number/is_matrix-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_matrix (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_matrix-9.m --- a/test/octave.test/number/is_matrix-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_matrix () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-1.m --- a/test/octave.test/number/is_scalar-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-10.m --- a/test/octave.test/number/is_scalar-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar (1, 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-2.m --- a/test/octave.test/number/is_scalar-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-3.m --- a/test/octave.test/number/is_scalar-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-4.m --- a/test/octave.test/number/is_scalar-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-5.m --- a/test/octave.test/number/is_scalar-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_scalar ("t"); -implicit_str_to_num_ok = 1; -t2 = is_scalar ("t"); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-6.m --- a/test/octave.test/number/is_scalar-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-7.m --- a/test/octave.test/number/is_scalar-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-8.m --- a/test/octave.test/number/is_scalar-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_scalar (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_scalar-9.m --- a/test/octave.test/number/is_scalar-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_scalar () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-1.m --- a/test/octave.test/number/is_square-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-10.m --- a/test/octave.test/number/is_square-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-11.m --- a/test/octave.test/number/is_square-11.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ([1, 2; 3, 4], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-2.m --- a/test/octave.test/number/is_square-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-3.m --- a/test/octave.test/number/is_square-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-4.m --- a/test/octave.test/number/is_square-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ([1, 2; 3, 4]) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-5.m --- a/test/octave.test/number/is_square-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_square ("t"); -implicit_str_to_num_ok = 1; -t2 = (is_square ("t") == 1); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-6.m --- a/test/octave.test/number/is_square-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-7.m --- a/test/octave.test/number/is_square-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_square (["test"; "ing"; "1"; "2"]); -implicit_str_to_num_ok = 1; -t2 = (is_square (["test"; "ing"; "1"; "2"]) == 4); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-8.m --- a/test/octave.test/number/is_square-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_square (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_square-9.m --- a/test/octave.test/number/is_square-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_square ([1, 2; 3, 4; 5, 6]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-1.m --- a/test/octave.test/number/is_symmetric-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-10.m --- a/test/octave.test/number/is_symmetric-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ([1, 2; 2, 1], 0, 0) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-11.m --- a/test/octave.test/number/is_symmetric-11.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-2.m --- a/test/octave.test/number/is_symmetric-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-3.m --- a/test/octave.test/number/is_symmetric-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-4.m --- a/test/octave.test/number/is_symmetric-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ([1, 2; 2, 1]) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-5.m --- a/test/octave.test/number/is_symmetric-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_symmetric ("t"); -implicit_str_to_num_ok = 1; -t2 = (is_symmetric ("t") == 1); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-6.m --- a/test/octave.test/number/is_symmetric-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-7.m --- a/test/octave.test/number/is_symmetric-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_symmetric (["te"; "et"]); -implicit_str_to_num_ok = 1; -t2 = (is_symmetric (["te"; "et"]) == 2); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-8.m --- a/test/octave.test/number/is_symmetric-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_symmetric (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_symmetric-9.m --- a/test/octave.test/number/is_symmetric-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_symmetric ([1, 2.1; 2, 1.1], 0.2) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-1.m --- a/test/octave.test/number/is_vector-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-10.m --- a/test/octave.test/number/is_vector-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector ([1, 2], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-2.m --- a/test/octave.test/number/is_vector-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector ([1; 2; 3]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-3.m --- a/test/octave.test/number/is_vector-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-4.m --- a/test/octave.test/number/is_vector-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-5.m --- a/test/octave.test/number/is_vector-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_vector ("t"); -implicit_str_to_num_ok = 1; -t2 = is_vector ("t"); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-6.m --- a/test/octave.test/number/is_vector-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -implicit_str_to_num_ok = 0; -t1 = ! is_vector ("test"); -implicit_str_to_num_ok = 1; -t2 = is_vector ("test"); -t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-7.m --- a/test/octave.test/number/is_vector-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-8.m --- a/test/octave.test/number/is_vector-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_vector (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/is_vector-9.m --- a/test/octave.test/number/is_vector-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_vector () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +ismatrix (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +ismatrix ([1, 2; 3, 4], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +ismatrix ([1, 2, 3]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,3 @@ +## Yes, this is right, ismatrix() checks for non-empty matrices. + +ismatrix ([]) == 0 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +ismatrix ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! ismatrix ("t"); +implicit_str_to_num_ok = 1; +t2 = ismatrix ("t"); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! ismatrix ("test"); +implicit_str_to_num_ok = 1; +t2 = ismatrix ("test"); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! ismatrix (["test"; "ing"]); +implicit_str_to_num_ok = 1; +t2 = ismatrix (["test"; "ing"]); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +ismatrix (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/ismatrix-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/ismatrix-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +ismatrix () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar (1, 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! isscalar ("t"); +implicit_str_to_num_ok = 1; +t2 = isscalar ("t"); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +isscalar (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isscalar-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isscalar-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isscalar () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-11.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-11.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ([1, 2; 3, 4], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ([1, 2; 3, 4]) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! issquare ("t"); +implicit_str_to_num_ok = 1; +t2 = (issquare ("t") == 1); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! issquare (["test"; "ing"; "1"; "2"]); +implicit_str_to_num_ok = 1; +t2 = (issquare (["test"; "ing"; "1"; "2"]) == 4); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +issquare (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issquare-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issquare-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issquare ([1, 2; 3, 4; 5, 6]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ([1, 2; 2, 1], 0, 0) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-11.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-11.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ([1, 2; 2, 1]) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! issymmetric ("t"); +implicit_str_to_num_ok = 1; +t2 = (issymmetric ("t") == 1); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! issymmetric (["te"; "et"]); +implicit_str_to_num_ok = 1; +t2 = (issymmetric (["te"; "et"]) == 2); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +issymmetric (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/issymmetric-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/issymmetric-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +issymmetric ([1, 2.1; 2, 1.1], 0.2) == 2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector ([1, 2], 2) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector ([1; 2; 3]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! isvector ("t"); +implicit_str_to_num_ok = 1; +t2 = isvector ("t"); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,5 @@ +implicit_str_to_num_ok = 0; +t1 = ! isvector ("test"); +implicit_str_to_num_ok = 1; +t2 = isvector ("test"); +t1 && t2 diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +isvector (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/number/isvector-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/number/isvector-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isvector () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-1.m --- a/test/octave.test/struct/is_struct-1.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-10.m --- a/test/octave.test/struct/is_struct-10.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-11.m --- a/test/octave.test/struct/is_struct-11.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_struct (s, 1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-2.m --- a/test/octave.test/struct/is_struct-2.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-3.m --- a/test/octave.test/struct/is_struct-3.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-4.m --- a/test/octave.test/struct/is_struct-4.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-5.m --- a/test/octave.test/struct/is_struct-5.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct ("t") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-6.m --- a/test/octave.test/struct/is_struct-6.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-7.m --- a/test/octave.test/struct/is_struct-7.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -is_struct (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-8.m --- a/test/octave.test/struct/is_struct-8.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a = 1; -is_struct (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/is_struct-9.m --- a/test/octave.test/struct/is_struct-9.m Fri Aug 09 07:38:55 2002 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -s.a.b = 1; -is_struct (s.a) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-1.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct (1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-10.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-10.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct () diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-11.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-11.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +isstruct (s, 1) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-2.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-2.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct ([1, 2]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-3.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-3.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct ([]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-4.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-4.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct ([1, 2; 3, 4]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-5.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-5.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct ("t") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-6.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-6.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct ("test") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-7.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-7.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,1 @@ +isstruct (["test"; "ing"]) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-8.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-8.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a = 1; +isstruct (s) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/struct/isstruct-9.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/octave.test/struct/isstruct-9.m Fri Aug 09 19:00:16 2002 +0000 @@ -0,0 +1,2 @@ +s.a.b = 1; +isstruct (s.a) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/getgrent-1.m --- a/test/octave.test/system/getgrent-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/getgrent-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,5 +1,5 @@ x = getgrent (); -(is_struct (x) +(isstruct (x) && struct_contains (x, "name") && struct_contains (x, "passwd") && struct_contains (x, "gid") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/getpwent-1.m --- a/test/octave.test/system/getpwent-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/getpwent-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,5 +1,5 @@ s = getpwent (); -(is_struct (s) +(isstruct (s) && struct_contains (s, "name") && struct_contains (s, "passwd") && struct_contains (s, "uid") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/getrusage-1.m --- a/test/octave.test/system/getrusage-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/getrusage-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,1 +1,1 @@ -is_struct (getrusage ()) +isstruct (getrusage ()) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/gmtime-1.m --- a/test/octave.test/system/gmtime-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/gmtime-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,5 +1,5 @@ ts = gmtime (time ()); -(is_struct (ts) +(isstruct (ts) && struct_contains (ts, "usec") && struct_contains (ts, "year") && struct_contains (ts, "mon") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/localtime-1.m --- a/test/octave.test/system/localtime-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/localtime-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,5 +1,5 @@ ts = localtime (time ()) -(is_struct (ts) +(isstruct (ts) && struct_contains (ts, "usec") && struct_contains (ts, "year") && struct_contains (ts, "mon") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/lstat-1.m --- a/test/octave.test/system/lstat-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/lstat-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,6 +1,6 @@ [s, err, msg] = lstat ("/"); (err == 0 - && is_struct (s) + && isstruct (s) && struct_contains (s, "dev") && struct_contains (s, "ino") && struct_contains (s, "modestr") diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/octave_config_info-1.m --- a/test/octave.test/system/octave_config_info-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/octave_config_info-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,1 +1,1 @@ -is_struct (octave_config_info ()) +isstruct (octave_config_info ()) diff -r 2cc57b6169cf -r 22bd65326ec1 test/octave.test/system/stat-1.m --- a/test/octave.test/system/stat-1.m Fri Aug 09 07:38:55 2002 +0000 +++ b/test/octave.test/system/stat-1.m Fri Aug 09 19:00:16 2002 +0000 @@ -1,6 +1,6 @@ [s, err, msg] = stat ("/"); (err == 0 - && is_struct (s) + && isstruct (s) && struct_contains (s, "dev") && struct_contains (s, "ino") && struct_contains (s, "modestr")