Mercurial > octave
changeset 3397:1a8e2c0d627a
[project @ 1999-12-18 03:02:18 by jwe]
line wrap: on
line diff
--- a/scripts/control/DEMOcontrol.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/DEMOcontrol.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All rights reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/abcddim.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/abcddim.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved. +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/abcddims.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/abcddims.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1997 Auburn University. All Rights Reserved +## Copyright (C) 1997 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/analdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/analdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/are.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/are.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/axis2dlim.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/axis2dlim.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/bddemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/bddemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/bode.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/bode.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/bode_bounds.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/bode_bounds.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -70,4 +70,5 @@ ## run digital frequency all the way to pi if (DIGITAL) wmax = log10(pi/tsam); endif + endfunction
--- a/scripts/control/bodquist.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/bodquist.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/com2str.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/com2str.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/controldemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/controldemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -16,12 +16,13 @@ ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -function DEMOcontrol () ## Controls toolbox demo. ## Demo programs: bddemo.m, frdemo.m, analdemo.m, moddmeo.m, rldemo.m ## ## Written by David Clem August 15, 1994 +function DEMOcontrol () + disp(' O C T A V E C O N T R O L S Y S T E M S T O O L B O X') while (1)
--- a/scripts/control/d2c.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/d2c.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -53,8 +53,6 @@ ## @strong{Outputs} @var{csys} continuous time system (same dimensions and ## signal names as in @var{sys}). ## @end deftypefn -## - function csys = d2c (sys, opt)
--- a/scripts/control/dare.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dare.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1997 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1997 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/dcgain.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dcgain.m Sat Dec 18 03:02:45 1999 +0000 @@ -24,8 +24,9 @@ ## number of @var{A}-Matrix in @var{sys} (default @var{tol} = 1.0e-10) ## @end deftypefn +## Written by Kai P Mueller (mueller@ifr.ing.tu-bs.de) October 1, 1997 + function gm = dcgain (sys, tol) -## Written by Kai P Mueller (mueller@ifr.ing.tu-bs.de) October 1, 1997 if((nargin < 1) || (nargin > 2) || (nargout > 1)) usage("[gm, ok] = dcgain(sys[, tol])"); @@ -48,4 +49,5 @@ warning("dcgain: unstable system; dimensions [nc=%d,nz=%d,mm=%d,pp=%d]", ... nn,nz,mm,pp); endif + endfunction
--- a/scripts/control/demomarsyas.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/demomarsyas.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/dgkfdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dgkfdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -21,8 +21,9 @@ ## Octave Controls toolbox demo: H2/Hinfinity options demos ##@end deftypefn +## Written by A. S. Hodel June 1995 + function dgkfdemo () -## Written by A. S. Hodel June 1995 save_val = page_screen_output; page_screen_output = 1; @@ -348,5 +349,5 @@ prompt endwhile page_screen_output = save_val; + endfunction -
--- a/scripts/control/dgram.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dgram.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -45,4 +45,5 @@ ## let dlyap do the error checking... m = dlyap(a,b*b'); + endfunction
--- a/scripts/control/dhinfdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dhinfdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Kai Mueller +## Copyright (C) 1996, 1998 Kai Mueller ## ## This file is part of Octave. ##
--- a/scripts/control/dlqe.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dlqe.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved. +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -104,7 +104,7 @@ error ("dlqe: invalid number of arguments"); endif -## The problem is dual to the regulator design, so transform to dlqr call. + ## The problem is dual to the regulator design, so transform to dlqr call. if (nargin == 5) [k, p, e] = dlqr (a', c', g*sigw*g', sigv);
--- a/scripts/control/dlqg.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dlqg.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/dlqr.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dlqr.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved. +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -113,36 +113,35 @@ error ("dlqr: invalid number of arguments"); endif -## Check a. + ## Check a. if ((n = is_square (a)) == 0) error ("dlqr: requires 1st parameter(a) to be square"); endif -## Check b. + ## Check b. [n1, m] = size (b); if (n1 != n) error ("dlqr: a,b not conformal"); endif -## Check q. - + ## Check q. if ((n1 = is_square (q)) == 0 || n1 != n) error ("dlqr: q must be square and conformal with a"); endif -## Check r. + ## Check r. if((m1 = is_square(r)) == 0 || m1 != m) error ("dlqr: r must be square and conformal with column dimension of b"); endif -## Check if n is there. + ## Check if n is there. if (nargin == 5) [n1, m1] = size (s); if (n1 != n || m1 != m) error ("dlqr: z must be identically dimensioned with b"); endif -## Incorporate cross term into a and q. + ## Incorporate cross term into a and q. ao = a - (b/r)*s'; qo = q - (s/r)*s'; @@ -152,8 +151,7 @@ qo = q; endif -## Check that q, (r) are symmetric, positive (semi)definite - + ## Check that q, (r) are symmetric, positive (semi)definite if (is_symmetric (q) && is_symmetric (r) ... && all (eig (q) >= 0) && all (eig (r) > 0)) p = dare (ao, b, qo, r);
--- a/scripts/control/dlyap.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dlyap.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved. +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/dmr2d.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dmr2d.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/dre.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/dre.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -122,4 +122,5 @@ tvlen,maxerr,Ptol); tvals = tvals(1:length(Plist)); endif + endfunction
--- a/scripts/control/fir2sys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/fir2sys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/frdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/frdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -597,4 +597,5 @@ prompt endif endwhile + endfunction
--- a/scripts/control/freqchkw.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/freqchkw.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -37,4 +37,5 @@ w = sort(w); USEW = 1; # vector provided (check values later) endif + endfunction
--- a/scripts/control/freqresp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/freqresp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/gram.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/gram.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -24,10 +24,11 @@ ## @var{m} satisfies @math{ a m + m a' + b b' = 0 }. ## @end deftypefn -function m = gram (a, b) +## Written by A. S. Hodel - ## Written by A. S. Hodel +function m = gram (a, b) ## let lyap do the error checking... m = lyap(a,b*b'); + endfunction
--- a/scripts/control/h2norm.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/h2norm.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/h2syn.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/h2syn.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/hinf_ctr.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinf_ctr.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/hinfdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinfdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Kai Mueller +## Copyright (C) 1996, 1998 Kai Mueller ## ## This file is part of Octave. ##
--- a/scripts/control/hinfnorm.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinfnorm.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/hinfsyn.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinfsyn.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/hinfsyn_chk.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinfsyn_chk.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/hinfsyn_ric.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/hinfsyn_ric.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/impulse.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/impulse.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_controllable.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_controllable.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_detectable.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_detectable.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_dgkf.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_dgkf.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_digital.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_digital.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1999 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_observable.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_observable.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_sample.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_sample.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -22,9 +22,10 @@ ## (real,scalar, > 0) ## @end deftypefn -function out = is_sample (Ts) ## A. S. Hodel July 1995 -out = (is_scalar(Ts) && (Ts == abs(Ts)) && (Ts != 0) ); +function out = is_sample (Ts) + + out = (is_scalar(Ts) && (Ts == abs(Ts)) && (Ts != 0) ); endfunction
--- a/scripts/control/is_signal_list.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_signal_list.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -23,13 +23,14 @@ ## @end deftypefn function flg = is_signal_list (mylist) -flg = is_list(mylist); -if(flg) - for ii=1:length(mylist) - if(!(isstr(nth(mylist,ii)) & rows(nth(mylist,ii)) ==1) ) - flg = 0; - endif - endfor -endif + + flg = is_list(mylist); + if(flg) + for ii=1:length(mylist) + if(!(isstr(nth(mylist,ii)) & rows(nth(mylist,ii)) ==1) ) + flg = 0; + endif + endfor + endif endfunction
--- a/scripts/control/is_siso.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_siso.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -22,11 +22,9 @@ ## @var{sys} is single-input, single-output. ## @end deftypefn +## a s hodel July 1996, 1998 + function SISO = is_siso (sys) -## function SISO = is_siso(sys) -## return nonzero if the system sys is single-input, single-output. - -## a s hodel July 1996, 1998 if(nargin != 1) usage("SISO = is_siso(sys)");
--- a/scripts/control/is_stabilizable.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_stabilizable.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/is_stable.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/is_stable.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/jet707.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/jet707.m Sat Dec 18 03:02:45 1999 +0000 @@ -56,4 +56,5 @@ onam = ["speed"; "pitch"]; snam = ["x1"; "x2"; "x3"; "x4"]; outsys = ss2sys(a, b, c, d, 0.0, 4, 0, snam, inam, onam); + endfunction
--- a/scripts/control/lqe.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/lqe.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/lqg.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/lqg.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1997 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1997 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/lqr.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/lqr.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993, 1994, 1995 Auburn University. All Rights Reserved +## Copyright (C) 1993, 1994, 1995 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/lsim.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/lsim.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/ltifr.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/ltifr.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/lyap.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/lyap.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1997 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1997 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/mb.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/mb.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/minfo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/minfo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/moddemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/moddemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/nichols.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/nichols.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/nyquist.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/nyquist.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/outlist.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/outlist.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/packedform.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/packedform.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/packsys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/packsys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -29,7 +29,6 @@ function Asys = packsys (a, b, c, d, dflg) - ## Written by R. Bruce Tenison July 29, 1994 ## Modified by David Clem November 13, 1994 ## Modified by A. S. Hodel April 1995
--- a/scripts/control/parallel.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/parallel.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/polyout.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/polyout.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1995,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1995, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/prompt.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/prompt.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -31,16 +31,16 @@ function prompt (str) -if(nargin > 1) - usage("prompt([str])"); -elseif(nargin == 0) - str = "\n ---- Press a key to continue ---"; -elseif ( !isstr(str) ) - error("prompt: input must be a string"); -endif + if(nargin > 1) + usage("prompt([str])"); + elseif(nargin == 0) + str = "\n ---- Press a key to continue ---"; + elseif ( !isstr(str) ) + error("prompt: input must be a string"); + endif -disp(str); -fflush(stdout); -kbhit; + disp(str); + fflush(stdout); + kbhit; endfunction
--- a/scripts/control/pzmap.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/pzmap.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/qzval.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/qzval.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -35,8 +35,9 @@ ## @strong{Note} @code{qzval} is obsolete; use @code{qz} instead. ## @end deftypefn +## A. S. Hodel July 1998 + function lam = qzval (A, B) -## A. S. Hodel July 1998 warning("qzval is obsolete; calling qz instead") lam = qz(A,B);
--- a/scripts/control/rldemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/rldemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -21,10 +21,11 @@ ##Octave Controls toolbox demo: Root Locus demo ##@end deftypefn -function rldemo () ## Written by David Clem August 15, 1994 ## Updated by John Ingram December 1996 +function rldemo () + while (1) clc k = menu("Octave Root Locus Demo", ...
--- a/scripts/control/rlocus.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/rlocus.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/rotg.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/rotg.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/run_cmd.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/run_cmd.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/series.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/series.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -16,7 +16,6 @@ ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -function [a, b, c, d] = series (a1, b1, c1, d1, a2, b2, c2, d2) ## Forms the series connection of two systems. ## ## Superseded by sysmult. Do not use this routine! @@ -35,8 +34,11 @@ ## Type of input: system data structure ## Command: syst=series(syst1,syst2) ## Forms the series representation of the two mu system arguments. + ## Written by David Clem August 15, 1994 +function [a, b, c, d] = series (a1, b1, c1, d1, a2, b2, c2, d2) + ## If two arguments input, take care of mu system case warning("series is superseded by sysmult; use sysmult instead.")
--- a/scripts/control/sortcom.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sortcom.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/ss2sys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/ss2sys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -187,7 +187,7 @@ ## ## @end deftypefn -function retsys = ss2sys (a, b, c, d, tsam, n, nz, stname, inname, outname, outlist) +function retsys = ss2sys (a, b, c, d, tsam, n, nz, stname, inname, outname, outlist) ## Written by John Ingram (ingraje@eng.auburn.edu) July 20, 1996
--- a/scripts/control/ss2tf.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/ss2tf.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/ss2zp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/ss2zp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -30,7 +30,6 @@ ## @end format ## @end deftypefn - function [zer, pol, k] = ss2zp (a, b, c, d) ## Written by David Clem August 15, 1994
--- a/scripts/control/starp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/starp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/step.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/step.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -17,10 +17,10 @@ ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. ## -*- texinfo -*- -## @deftypefn {Function File } {[@var{y}, @var{t}] =} impulse (@var{sys}@{, @var{inp},@var{tstop}, @var{n}@}) +## @deftypefn {Function File } {[@var{y}, @var{t}] =} step (@var{sys}@{, @var{inp},@var{tstop}, @var{n}@}) ## Step response for a linear system. ## The system can be discrete or multivariable (or both). -## If no output arguments are specified, @code{impulse} +## If no output arguments are specified, @code{step} ## produces a plot or the step response data for system @var{sys}. ## ## @strong{Inputs} @@ -46,26 +46,10 @@ ## See also: impulse, stepimp -## step: Step response for a linear system. -## The system can be discrete or multivariable (or both). -## -## [y, t] = step(sys[, inp, tstop, n]) -## Produces a plot or the step response data for system sys. -## -## The argument tstop (scalar value) denotes the time when the -## simulation should end. The Parameter n is the number of data values. -## Both parameters tstop and n can be ommitted and will be -## computed from the eigenvalues of the A-Matrix. -## -## When the step function is invoked with the output parameter y -## a plot is not displayed. -## -## See also: impulse, stepimp +function [y, t] = step (sys, inp, tstop, n) -function [y, t] = step (sys, inp, tstop, n) ## Written by Kai P. Mueller September 30, 1997 ## based on lsim.m of Scottedward Hodel -## modified by if((nargin < 1) || (nargin > 4)) usage("[y, u] = step(sys[, inp, tstop, n])");
--- a/scripts/control/stepimp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/stepimp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/strappend.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/strappend.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -16,11 +16,11 @@ ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. +## retval = strappend(strlist,suffix); +## append string suffix to each string in the list of strings strlist + function retval = strappend (strlist, suffix); - ## retval = strappend(strlist,suffix); - ## append string suffix to each string in the list of strings strlist - if(nargin != 2 | nargout > 1) usage(" retval = strappend(strlist,suffix)"); elseif(!is_signal_list(strlist))
--- a/scripts/control/susball.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/susball.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/swap.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/swap.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/swapcols.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/swapcols.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/swaprows.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/swaprows.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sys2fir.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sys2fir.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sys2ss.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sys2ss.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sys2tf.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sys2tf.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sys2zp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sys2zp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysadd.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysadd.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1999 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysappend.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysappend.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syschnames.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syschnames.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syschnamesl.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syschnamesl.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -28,34 +28,6 @@ ## @end deftypefn function old_names = syschnamesl (olist, old_names, inames, listname) - ## $Revision: 2.1.14.5 $ - ## $Log: syschnamesl.m,v $ - ## Revision 2.1.14.5 1999/09/22 21:55:46 scotte - ## Auburn copyright fixed; krylov.m patched to fix bug - ## - ## Revision 2.1.14.4 1999/07/21 19:49:21 scotte - ## sysgroup, sysadd, sysmult, syssub accept variable # of input args - ## - ## Revision 1.3 1998/07/17 15:08:50 hodelas - ## use isempty instead of max(size(...)) - ## - ## Revision 1.2 1998/07/01 16:23:39 hodelas - ## Updated c2d, d2c to perform bilinear transforms. - ## Updated several files per bug updates from users. - ## - ## Revision 1.5 1997/02/28 23:47:26 hodel - ## fixed bug in checking parameters; (inames dimension not checked against olist) - ## a.s.hodel@eng.auburn.edu - ## - ## Revision 1.4 1997/02/13 15:56:37 hodel - ## added code to convert zeros in the name matrix to blanks - ## a.s.hodel@eng.auburn.edu - ## - ## Revision 1.3 1997/02/13 15:11:17 hodel - ## fixed bug when len_my < len_out a.s.hodel@eng.auburn.edu - ## - ## Revision 1.2 1997/02/12 22:54:50 hodel - ## fixed string matrix <-> numerical matrix problem probstr = []; if( max(olist) > rows(old_names) )
--- a/scripts/control/syschtsam.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syschtsam.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysconnect.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysconnect.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syscont.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syscont.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syscont_disc.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syscont_disc.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysdefioname.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysdefioname.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysdefstname.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysdefstname.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysdimensions.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysdimensions.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysdisc.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysdisc.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysdup.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysdup.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysgetsignals.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysgetsignals.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysgettsam.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysgettsam.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -16,14 +16,15 @@ ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -function T = sysgettsam (sys) ## T = sysgettsam(sys) ## return the sampling time of the system -if(!is_struct(sys)) - usage("T = sysgettsam(sys)"); -endif +function T = sysgettsam (sys) -T = sys.tsam; + if(!is_struct(sys)) + usage("T = sysgettsam(sys)"); + endif + + T = sys.tsam; endfunction
--- a/scripts/control/sysgettype.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysgettype.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1998 Auburn University. All Rights Reserved. +## Copyright (C) 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysgroup.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysgroup.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996, 1998, 1999 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998, 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysgroupn.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysgroupn.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved. +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysidx.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysidx.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1999 Auburn University. All rights reserved. +## Copyright (C) 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -15,21 +15,20 @@ ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -## + +## idxvec = sysidx(sys,sigtype,signamelist) +## return indices of signals with specified signal names +## inputs: +## sys: OCST system data structure +## sigtype: signal type to be selected: "in", "out", "st" +## signamelist: list of desired signal names +## outputs: +## idxvec: vector of signal indices (appropriate for use with sysprune) + ## Written by A. S. Hodel, a.s.hodel@eng.auburn.edu - function idxvec = sysidx (sys, sigtype, signamelist) - ## idxvec = sysidx(sys,sigtype,signamelist) - ## return indices of signals with specified signal names - ## inputs: - ## sys: OCST system data structure - ## sigtype: signal type to be selected: "in", "out", "st" - ## signamelist: list of desired signal names - ## outputs: - ## idxvec: vector of signal indices (appropriate for use with sysprune) - if(nargin != 3) usage("idxvec = sysidx(sys,sigtype,signamelist)"); elseif(!is_struct(sys)) error("sys must be a system data structure"); elseif(!isstr(sigtype)) error("sigtype must be a string");
--- a/scripts/control/sysmin.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysmin.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All rights reserved. +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -15,26 +15,26 @@ ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -## + +## [retsys,nc,no] = sysmin(sys{,flg}); +## return a minimal (or reduced order) system +## inputs: +## sys: system data structure +## flg: 0 [default] return minimal system; state names lost +## : 1 return system with physical states removed that +## are either uncontrollable or unobservable +## (cannot reduce further without discarding physical +## meaning of states) +## outputs: +## retsys: returned system +## nc: number of controllable states in the returned system +## no: number of observable states in the returned system +## cflg: is_controllable(retsys) +## oflg: is_observable(retsys) + ## Written by A. S. Hodel a.s.hodel@eng.auburn.edu function [retsys, nc, no, cflg, oflg] = sysmin (sys, flg); - - ## [retsys,nc,no] = sysmin(sys{,flg}); - ## return a minimal (or reduced order) system - ## inputs: - ## sys: system data structure - ## flg: 0 [default] return minimal system; state names lost - ## : 1 return system with physical states removed that - ## are either uncontrollable or unobservable - ## (cannot reduce further without discarding physical - ## meaning of states) - ## outputs: - ## retsys: returned system - ## nc: number of controllable states in the returned system - ## no: number of observable states in the returned system - ## cflg: is_controllable(retsys) - ## oflg: is_observable(retsys) switch(nargin) case(1), flg = 0;
--- a/scripts/control/sysmult.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysmult.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1999 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysout.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysout.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysprune.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysprune.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysreorder.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysreorder.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysrepdemo.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysrepdemo.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -24,10 +24,9 @@ ## Octave Controls toolbox demo: System representation ## Written by A. S. Hodel June 1995 ## Revised Aug 1995 for system data structure format + function sysrepdemo () - - save_val = page_screen_output; page_screen_output = 1;
--- a/scripts/control/sysscale.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysscale.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syssetsignals.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syssetsignals.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/syssub.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/syssub.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1999 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1999 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/sysupdate.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/sysupdate.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/tf2ss.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tf2ss.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/tf2sys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tf2sys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/tf2sysl.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tf2sysl.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -23,17 +23,13 @@ ## @end deftypefn function vec = tf2sysl (vec) -## vec = tf2sysl(vec) -## -## used internally in tf2sys -## strip leading zero coefficients to get the true polynomial length - -while( (length(vec) > 1) & (vec(1) == 0) ) - vec = vec(2:length(vec)); -endwhile -if(vec(1) == 0) - warning("tf2sys: polynomial has no nonzero coefficients!") -endif + while( (length(vec) > 1) & (vec(1) == 0) ) + vec = vec(2:length(vec)); + endwhile + + if(vec(1) == 0) + warning("tf2sys: polynomial has no nonzero coefficients!") + endif endfunction
--- a/scripts/control/tf2zp.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tf2zp.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/tfout.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tfout.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/tzero.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tzero.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -46,7 +46,6 @@ ## @end enumerate ## @end deftypefn - function [zer, gain] = tzero (A, B, C, D) ## R. Bruce Tenison July 4, 1994
--- a/scripts/control/tzero2.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/tzero2.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1993 Auburn University. All Rights Reserved +## Copyright (C) 1993 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/unpacksys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/unpacksys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ## @@ -16,10 +16,10 @@ ## along with Octave; see the file COPYING. If not, write to the Free ## Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. -function [a, b, c, d] = unpacksys (syst) +## [a,b,c,d] = unpacksys(sys) +## Obsolete. Use sys2ss instead. - ## [a,b,c,d] = unpacksys(sys) - ## Obsolete. Use sys2ss instead. +function [a, b, c, d] = unpacksys (syst) ## Written by David Clem August 19, 1994
--- a/scripts/control/zgfmul.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgfmul.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgfslv.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgfslv.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zginit.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zginit.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgpbal.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgpbal.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgreduce.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgreduce.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgrownorm.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgrownorm.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgscal.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgscal.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgsgiv.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgsgiv.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zgshsr.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zgshsr.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zp2ss.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zp2ss.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zp2ssg2.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zp2ssg2.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zp2sys.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zp2sys.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zp2tf.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zp2tf.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996,1998 Auburn University. All Rights Reserved +## Copyright (C) 1996, 1998 Auburn University. All rights reserved. ## ## This file is part of Octave. ##
--- a/scripts/control/zpout.m Sat Dec 18 02:04:45 1999 +0000 +++ b/scripts/control/zpout.m Sat Dec 18 03:02:45 1999 +0000 @@ -1,4 +1,4 @@ -## Copyright (C) 1996 Auburn University. All Rights Reserved +## Copyright (C) 1996 Auburn University. All rights reserved. ## ## This file is part of Octave. ##