Mercurial > octave-nkf
changeset 3229:28aba52a2368
[project @ 1998-12-10 03:06:31 by jwe]
line wrap: on
line diff
--- a/scripts/control/DEMOcontrol.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/DEMOcontrol.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # Demo programs: bddemo.m, frdemo.m, analdemo.m, moddmeo.m, rldemo.m # # Written by David Clem August 15, 1994 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ 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')
--- a/scripts/control/abcddim.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/abcddim.m Thu Dec 10 03:06:32 1998 +0000 @@ -35,11 +35,17 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. # a s hodel: modified to accept pure-gain systems aug 1996 -# $Revision: 1.16 $ +# $Revision: 1.17 $ # $Log: abcddim.m,v $ -# Revision 1.16 1998-12-09 18:42:12 jwe +# Revision 1.17 1998-12-10 03:06:31 jwe # *** empty log message *** # +# Revision 2.0.0.2 1998/12/08 23:29:21 hodel +# Octave-Marsyas Interface updated for signals-as-lists +# +# Revision 2.0.0.1 1998/12/08 21:40:44 hodel +# Dummy version to match ftp.eng.auburn.edu version number +# # Revision 2.0.0.0 1998/12/08 21:36:51 hodel # Branch for beta release patches #
--- a/scripts/control/abcddims.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/abcddims.m Thu Dec 10 03:06:32 1998 +0000 @@ -24,7 +24,7 @@ # get set to 0. my and ny are the row and column dimensions of the result. # Written by A. S. Hodel (scotte@eng.auburn.edu) Feb 1997 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ y = x; if(isempty(y))
--- a/scripts/control/analdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/analdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -20,7 +20,7 @@ # Octave Controls toolbox demo: State Space analysis demo # Written by David Clem August 15, 1994 # Updated by John Ingram December 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ while (1) clc
--- a/scripts/control/are.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/are.m Thu Dec 10 03:06:32 1998 +0000 @@ -35,7 +35,7 @@ # See also: balance # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. -# $Revision: 1.19 $ +# $Revision: 1.20 $ if (nargin == 3 || nargin == 4) if (nargin == 4)
--- a/scripts/control/bode.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/bode.m Thu Dec 10 03:06:32 1998 +0000 @@ -57,8 +57,14 @@ # Modified by David Clem November 13, 1994 # again by A. S. Hodel July 1995 (smart plot range, etc.) # Modified by Kai P. Mueller September 28, 1997 (multiplot mode) -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # $Log: bode.m,v $ +# Revision 2.0.0.2 1998/12/08 23:29:23 hodel +# Octave-Marsyas Interface updated for signals-as-lists +# +# Revision 2.0.0.1 1998/12/08 21:40:45 hodel +# Dummy version to match ftp.eng.auburn.edu version number +# # Revision 2.0.0.0 1998/12/08 21:36:52 hodel # Branch for beta release patches #
--- a/scripts/control/bode_bounds.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/bode_bounds.m Thu Dec 10 03:06:32 1998 +0000 @@ -24,7 +24,7 @@ # # used internally in freqresp -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # make sure zer,pol are row vectors if(!isempty(pol)) pol = reshape(pol,1,length(pol)); endif
--- a/scripts/control/buildssic.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/buildssic.m Thu Dec 10 03:06:32 1998 +0000 @@ -108,7 +108,7 @@ # # Written by Kai Mueller April 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin < 5) || (nargin > 12)) usage("[sys] = buildssic(Clst,Ulst,Olst,Ilst,s1,s2,s3,s4,s5,s6,s7,s8)");
--- a/scripts/control/c2d.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/c2d.m Thu Dec 10 03:06:32 1998 +0000 @@ -49,7 +49,7 @@ # Written by R.B. Tenison (btenison@eng.auburn.edu) # October 1993 # Updated by John Ingram for system data structure August 1996 -# $Revision: 1.14 $ +# $Revision: 1.15 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/com2str.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/com2str.m Thu Dec 10 03:06:32 1998 +0000 @@ -25,7 +25,7 @@ # 0 (default): -1, 0, 1, 1i, 1 + 0.5i # 1 (for use with zpout): -1, 0, + 1, + 1i, + 1 + 0.5i # -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (nargin < 1 | nargin > 2) usage("com2str(zz{,flg})");
--- a/scripts/control/controldemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/controldemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # Demo programs: bddemo.m, frdemo.m, analdemo.m, moddmeo.m, rldemo.m # # Written by David Clem August 15, 1994 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ 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')
--- a/scripts/control/ctrb.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ctrb.m Thu Dec 10 03:06:32 1998 +0000 @@ -35,7 +35,7 @@ # Written by Kai P. Mueller November 4, 1997 # based on is_controllable.m of Scottedward Hodel # modified by - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if (nargin == 2) a = sys;
--- a/scripts/control/d2c.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/d2c.m Thu Dec 10 03:06:32 1998 +0000 @@ -53,7 +53,7 @@ # Written by R. Bruce Tenison August 23, 1994 # Updated by John Ingram for system data structure August 1996 # SYS_INTERNAL accesses members of system data structure -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/damp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/damp.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # Written by Kai P. Mueller September 29, 1997. # Update -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # assume a continuous system DIGITAL = 0;
--- a/scripts/control/dare.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dare.m Thu Dec 10 03:06:32 1998 +0000 @@ -47,7 +47,7 @@ ## Author: A. S. Hodel <scotte@eng.auburn.edu> ## Created: August 1993 ## Adapted-By: jwe -## $Revision: 1.16 $ +## $Revision: 1.17 $ function x = dare (a, b, c, r, opt)
--- a/scripts/control/dcgain.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dcgain.m Thu Dec 10 03:06:32 1998 +0000 @@ -26,7 +26,7 @@ # # Written by Kai P Mueller (mueller@ifr.ing.tu-bs.de) October 1, 1997 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin < 1) || (nargin > 2) || (nargout > 1)) usage("[gm, ok] = dcgain(sys[, tol])");
--- a/scripts/control/dezero.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dezero.m Thu Dec 10 03:06:32 1998 +0000 @@ -26,7 +26,7 @@ ## Adapted from deblank by A. S. Hodel (a.s.hodel@eng.auburn.edu) ## (the name dezero is a reference to the Fermilab D0 experiment, ## where my sister did her PhD research) -## $Revision: 2.0.0.0 $ +## $Revision: 2.0.0.2 $ function t = dezero (s)
--- a/scripts/control/dgkfdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dgkfdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -19,7 +19,7 @@ function dgkfdemo() # Octave Controls toolbox demo: H2/Hinfinity options demos # Written by A. S. Hodel June 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = page_screen_output; page_screen_output = 1;
--- a/scripts/control/dgram.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dgram.m Thu Dec 10 03:06:32 1998 +0000 @@ -25,7 +25,7 @@ # a m a' - m + b*b' = 0 # Written by A. S. Hodel July 1995 - # $Revision: 1.12 $ + # $Revision: 1.13 $ # let dlyap do the error checking... m = dlyap(a,b*b');
--- a/scripts/control/dhinfdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dhinfdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -40,7 +40,7 @@ # K. Mueller, <mueller@ifr.ing.tu-bs.de> # Technical University of Braunschweig, IfR -# $Revision: 2.0.0.0 $ $Date: 1998/12/08 21:36:55 $ +# $Revision: 2.0.0.2 $ $Date: 1998/12/08 23:29:27 $ # echo off
--- a/scripts/control/dlqe.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dlqe.m Thu Dec 10 03:06:32 1998 +0000 @@ -45,7 +45,7 @@ # Modified for discrete time by R. Bruce Tenison (btenison@eng.auburn.edu) # October, 1993 -# $Revision: 1.15 $ +# $Revision: 1.16 $ if (nargin != 5 && nargin != 6) error ("dlqe: invalid number of arguments");
--- a/scripts/control/dlqg.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dlqg.m Thu Dec 10 03:06:32 1998 +0000 @@ -47,7 +47,7 @@ # See also: lqg, dlqe, dlqr # Written by A. S. Hodel August 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ warning("dlqg: obsolete. use lqg instead (system data structure format)");
--- a/scripts/control/dlqr.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dlqr.m Thu Dec 10 03:06:32 1998 +0000 @@ -46,7 +46,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. # Converted to discrete time by R. B. Tenison # (btenison@eng.auburn.edu) October 1993 -# $Revision: 1.16 $ +# $Revision: 1.17 $ if (nargin != 4 && nargin != 5) error ("dlqr: invalid number of arguments");
--- a/scripts/control/dlyap.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/dlyap.m Thu Dec 10 03:06:32 1998 +0000 @@ -34,7 +34,7 @@ # (1977). # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. -# $Revision: 1.14 $ +# $Revision: 1.15 $ if ((n = is_square (a)) == 0) warning ("dlyap: a must be square");
--- a/scripts/control/fir2sys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/fir2sys.m Thu Dec 10 03:06:32 1998 +0000 @@ -32,7 +32,7 @@ # Name changed to TF2SYS July 1995 # updated for new system data structure format July 1996 # adapted from tf2sys july 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; implicit_str_to_num_ok = 1;
--- a/scripts/control/frdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/frdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -20,7 +20,7 @@ # Octave Controls toolbox demo: Frequency Response demo # Written by David Clem August 15, 1994 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # a s hodel: updated to match new order of ss2zp outputs # J Ingram: updated for system data structure format August 1996
--- a/scripts/control/freqchkw.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/freqchkw.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # used by freqresp to check that input frequency vector is legal # A S Hodel July 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if(isempty(w)) USEW = 0;
--- a/scripts/control/freqresp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/freqresp.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # ff and w are both returned as row vectors # Written by: R. Bruce Tenison July 11, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ # SYS_INTERNAL accesses members of system data structure save_val = empty_list_elements_ok;
--- a/scripts/control/gram.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/gram.m Thu Dec 10 03:06:32 1998 +0000 @@ -25,7 +25,7 @@ # a m + a' + b*b' = 0 # Written by A. S. Hodel - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ # let lyap do the error checking... m = lyap(a,b*b');
--- a/scripts/control/h2norm.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/h2norm.m Thu Dec 10 03:06:32 1998 +0000 @@ -30,7 +30,7 @@ # A. S. Hodel Aug 1995 # updated for system data structure by John Ingram November 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if((nargin != 1)) usage("h2gain = h2norm(sys)");
--- a/scripts/control/h2syn.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/h2syn.m Thu Dec 10 03:06:32 1998 +0000 @@ -42,7 +42,7 @@ # Pf: ARE solution matrix for filter subproblem # Updated for System structure December 1996 by John Ingram - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if ((nargin < 3) | (nargin > 4)) usage("[K,gain, Kc, Kf, Pc, Pf] = h2syn(Asys,nu,ny[,tol])");
--- a/scripts/control/hinf_ctr.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/hinf_ctr.m Thu Dec 10 03:06:32 1998 +0000 @@ -31,11 +31,11 @@ # Do not attempt to use this at home; no argument checking performed. # A. S. Hodel August 1995 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ # Revised by Kai P Mueller April 1998 to solve the general H_infinity # problem using unitary transformations Q (on w and z) # and non-singular transformations R (on u and y). - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ nw = dgs.nw; nu = dgs.nu;
--- a/scripts/control/hinfdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/hinfdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -99,7 +99,7 @@ # Kai P. Mueller 30-APR-1998 <mueller@ifr.ing.tu-bs.de -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ yn = []; while (length(yn) < 1)
--- a/scripts/control/hinfnorm.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/hinfnorm.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # Iglesias and Glover, "State-Space approach to discrete-time Hinf control," # Int. J. Control, vol 54, #5, 1991 # Zhou, Doyle, Glover, "Robust and Optimal Control," Prentice-Hall, 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if((nargin == 0) || (nargin > 4)) usage("[g gmin gmax] = hinfnorm(sys[,tol,gmin,gmax,ptol])");
--- a/scripts/control/hinfsyn.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/hinfsyn.m Thu Dec 10 03:06:32 1998 +0000 @@ -56,12 +56,12 @@ # A. S. Hodel August 1995 # Updated for Packed system structures December 1996 by John Ingram - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ # # Revised by Kai P Mueller April 1998 to solve the general H_infinity # problem using unitary transformations Q (on w and z) # and non-singular transformations R (on u and y). - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ old_page_val = page_screen_output; page_screen_output = 0;
--- a/scripts/control/hinfsyn_chk.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/hinfsyn_chk.m Thu Dec 10 03:06:32 1998 +0000 @@ -35,7 +35,7 @@ # Do not attempt to use this at home; no argument checking performed. # A. S. Hodel August 1995 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ Pc = Pf = [];
--- a/scripts/control/impulse.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/impulse.m Thu Dec 10 03:06:32 1998 +0000 @@ -36,7 +36,7 @@ # Written by Kai P. Mueller October 2, 1997 # based on lsim.m of Scottedward Hodel # modified by -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin < 1) || (nargin > 4)) usage("[y, u] = impulse(sys[, inp, tstop, n])");
--- a/scripts/control/is_abcd.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_abcd.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # Written by Kai P. Mueller November 4, 1997 # based on is_controllable.m of Scottedward Hodel # modified by - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ retval = 0; switch (nargin)
--- a/scripts/control/is_controllable.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_controllable.m Thu Dec 10 03:06:32 1998 +0000 @@ -37,7 +37,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August, 1993. # Updated by A. S. Hodel (scotte@eng.auburn.edu) Aubust, 1995 to use krylovb # Updated by John Ingram (ingraje@eng.auburn.edu) July, 1996 for packed systems -# $Revision: 1.15 $ +# $Revision: 1.16 $ deftol = 1; # assume default tolerance if(nargin < 1 | nargin > 3)
--- a/scripts/control/is_detectable.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_detectable.m Thu Dec 10 03:06:32 1998 +0000 @@ -31,7 +31,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. # Updated by John Ingram (ingraje@eng.auburn.edu) July 1996. -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if( nargin < 1) usage("[retval,U] = is_detectable(a , c {, tol})");
--- a/scripts/control/is_dgkf.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_dgkf.m Thu Dec 10 03:06:32 1998 +0000 @@ -70,7 +70,7 @@ # Written by A. S. Hodel # Updated by John Ingram July 1996 to accept structured systems - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ # # Revised by Kai P Mueller April 1998 to solve the general H_infinity # problem using unitary transformations Q (on w and z) @@ -92,7 +92,7 @@ # # This transformation together with the algorithm in [1] solves # the general problem (see [2] for example). - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if (nargin < 3) | (nargin > 4) usage("[retval,dgkf_struct] = is_dgkf(Asys,nu,ny{,tol})");
--- a/scripts/control/is_digital.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_digital.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # exits with an error of sys is a mixed (continuous and discrete) system # a s hodel July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # SYS_INTERNAL accesses members of system structure # checked for sampled data system (mixed)
--- a/scripts/control/is_observable.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_observable.m Thu Dec 10 03:06:32 1998 +0000 @@ -31,7 +31,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. # Updated by John Ingram (ingraje@eng.auburn.edu) July 1996. -# $Revision: 1.15 $ +# $Revision: 1.16 $ if( nargin < 1) usage("[retval,U] = is_observable(a , c {, tol})");
--- a/scripts/control/is_sample.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_sample.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # (real,scalar, > 0) # A. S. Hodel July 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ out = (is_scalar(Ts) && (Ts == abs(Ts)) && (Ts != 0) );
--- a/scripts/control/is_siso.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_siso.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # return nonzero if the system sys is single-input, single-output. # a s hodel July 1996, 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # SYS_INTERNAL accesses members of system structure if(nargin != 1)
--- a/scripts/control/is_stabilizable.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_stabilizable.m Thu Dec 10 03:06:32 1998 +0000 @@ -38,7 +38,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August, 1993. # Updated by A. S. Hodel (scotte@eng.auburn.edu) Aubust, 1995 to use krylovb # Updated by John Ingram (ingraje@eng.auburn.edu) July, 1996 to accept systems -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin < 1) usage("[retval,U] = is_stabilizable(a {, b ,tol})"); elseif(is_struct(a))
--- a/scripts/control/is_stable.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/is_stable.m Thu Dec 10 03:06:32 1998 +0000 @@ -33,7 +33,7 @@ # Written by A. S. Hodel (scotte@eng.auburn.edu) August, 1993. # Updated by John Ingram (ingraje@eng.auburn.edu) July, 1996 for systems # Updated to simpler form by a.s.hodel 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if( (nargin < 1) | (nargin > 3) ) usage("is_stable(a {,tol,disc})"); elseif(is_struct(a))
--- a/scripts/control/jet707.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/jet707.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # Written by Kai P. Mueller September 28, 1997 # Updates - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if (nargin != 0) usage("outsys = jet707()")
--- a/scripts/control/lqe.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/lqe.m Thu Dec 10 03:06:32 1998 +0000 @@ -40,7 +40,7 @@ # e = closed loop poles of (A - K C) # Written by A. S. Hodel (scotte@eng.auburn.edu) August, 1993. -# $Revision: 1.15 $ +# $Revision: 1.16 $ if ( (nargin != 5) && (nargin != 6)) error ("lqe: invalid number of arguments");
--- a/scripts/control/lqg.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/lqg.m Thu Dec 10 03:06:32 1998 +0000 @@ -48,7 +48,7 @@ # Written by A. S. Hodel August 1995; revised for new system format # August 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ sav_val = implicit_str_to_num_ok; implicit_str_to_num_ok = 1;
--- a/scripts/control/lqr.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/lqr.m Thu Dec 10 03:06:32 1998 +0000 @@ -47,7 +47,7 @@ # reference: Anderson and Moore, OPTIMAL CONTROL: LINEAR QUADRATIC METHODS, # Prentice-Hall, 1990, pp. 56-58 -# $Revision: 1.14 $ +# $Revision: 1.15 $ # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993.
--- a/scripts/control/lsim.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/lsim.m Thu Dec 10 03:06:32 1998 +0000 @@ -35,7 +35,7 @@ # Written by David Clem, A. S. Hodel July 1995 # modified by John Ingram for system format August 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin < 3)||(nargin > 4))
--- a/scripts/control/ltifr.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ltifr.m Thu Dec 10 03:06:32 1998 +0000 @@ -32,7 +32,7 @@ # R. B. Tenison, D. Clem, A. S. Hodel, July 1995 # updated by John Ingram August 1996 for system format - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if ((nargin < 2) || (nargin > 3)) error("incorrect number of input arguments");
--- a/scripts/control/mb.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/mb.m Thu Dec 10 03:06:32 1998 +0000 @@ -1,7 +1,7 @@ # I think that this m-file can be deleted # a.s.hodel@eng.auburn.edu - 4 Dec. 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ Ap = [0 1;1960 0]; Bp = [0;-6261];
--- a/scripts/control/minfo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/minfo.m Thu Dec 10 03:06:32 1998 +0000 @@ -33,7 +33,7 @@ # Written by R. Bruce Tenison July 29, 1994 # Modified by David Clem November 13, 1994 # Modified by A. S. Hodel July 1995 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ warning("minfo: obsolete. Use sys2ss, sys2tf, or sys2zp.");
--- a/scripts/control/moddemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/moddemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -20,7 +20,7 @@ # Octave Controls toolbox demo: Model Manipulations demo # Written by David Clem August 15, 1994 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # a s hodel: updated to reflect updated output order in ss2zp while (1)
--- a/scripts/control/nichols.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/nichols.m Thu Dec 10 03:06:32 1998 +0000 @@ -94,14 +94,12 @@ xlabel("Phase (deg)"); ylabel("Gain in dB"); if(is_siso(sys)) - title(["Nichols plot of |[Y/U]",tistr,"|, u=", inname, ... - ", y=",outname]); + title(["Nichols plot of |[Y/U]",tistr,"|, u=", ... + sysgetsignals(sys,"in",1,1), ", y=",sysgetsignals(sys,"out",1,1)]); else title([ "||Y(", tistr, ")/U(", tistr, ")||"]); - disp("MIMO plot from") - outlist(inname," "); - disp("to") - outlist(outname," "); + printf("MIMO plot from\n%s\nto\n%s\n",outlist(inname," "), ... + outlist(outname," ")); endif md = 20*log10(mag); axvec = axis2dlim([vec(phase),vec(md)]);
--- a/scripts/control/obsv.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/obsv.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # Written by Kai P. Mueller November 4, 1997 # modified by - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if (nargin == 2) a = sys;
--- a/scripts/control/ord2.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ord2.m Thu Dec 10 03:06:32 1998 +0000 @@ -38,7 +38,7 @@ # Written by Kai P. Mueller September 28, 1997 # Updates - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if(nargin != 2 & nargin != 3) usage("outsys = ord2(nfreq, damp[, gain])")
--- a/scripts/control/outlist.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/outlist.m Thu Dec 10 03:06:32 1998 +0000 @@ -34,7 +34,7 @@ # prints the list to the screen, numbering each string in order. # A. S. Hodel Dec. 1995, 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ #save for restore later save_empty = empty_list_elements_ok;
--- a/scripts/control/packsys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/packsys.m Thu Dec 10 03:06:32 1998 +0000 @@ -32,7 +32,7 @@ # Written by R. Bruce Tenison July 29, 1994 # Modified by David Clem November 13, 1994 # Modified by A. S. Hodel April 1995 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ warning("packsys is obsolete! Use ss2sys instead.");
--- a/scripts/control/parallel.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/parallel.m Thu Dec 10 03:06:32 1998 +0000 @@ -33,7 +33,7 @@ # Written by David Clem August 15, 1994 # completely rewritten Oct 1996 a s hodel # SYS_INTERNAL accesses members of system structure -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin != 2) usage("sysp = parallel(Asys,Bsys)");
--- a/scripts/control/place.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/place.m Thu Dec 10 03:06:32 1998 +0000 @@ -40,7 +40,7 @@ # # code adaped by A.S.Hodel (a.s.hodel@eng.auburn.edu) for use in controls # toolbox -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ sav_val = empty_list_elements_ok; empty_list_elements_ok = 1;
--- a/scripts/control/polyout.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/polyout.m Thu Dec 10 03:06:32 1998 +0000 @@ -30,7 +30,7 @@ # Written by A. Scottedward Hodel (scotte@eng.auburn.edu) May 1995) # Nov 1998: Correctly handles complex coefficients -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (nargin < 1 ) || (nargin > 2) || (nargout < 0 ) || (nargout > 1) usage("[y = ] polyout(c,[x])");
--- a/scripts/control/prompt.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/prompt.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # Written by David Clem August 15, 1994 # Modified A. S. Hodel June 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin > 1) usage("prompt([str])");
--- a/scripts/control/rldemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/rldemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -20,7 +20,7 @@ # Octave Controls toolbox demo: Root Locus demo # Written by David Clem August 15, 1994 # Updated by John Ingram December 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ while (1) clc
--- a/scripts/control/rlocus.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/rlocus.m Thu Dec 10 03:06:32 1998 +0000 @@ -42,7 +42,7 @@ # Written by Clem and Tenison # Updated by Kristi McGowan July 1996 for intelligent gain selection # Updated by John Ingram July 1996 for systems - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if (nargin < 1) | (nargin > 4) usage("rlocus(sys[,inc,mink,maxk])");
--- a/scripts/control/rotg.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/rotg.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # # NOTE: Use [c,s] = givens(a,b) instead. - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ [c,s] = givens(a,b); endfunction
--- a/scripts/control/run_cmd.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/run_cmd.m Thu Dec 10 03:06:32 1998 +0000 @@ -1,7 +1,7 @@ # run_cmd: short script used in demos # prints string cmd to the screen, then executes after a pause -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ disp(["Command: ",cmd]) puts("Press a key to execute command");
--- a/scripts/control/series.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/series.m Thu Dec 10 03:06:32 1998 +0000 @@ -38,7 +38,7 @@ # Written by David Clem August 15, 1994 # If two arguments input, take care of mu system case -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ warning("series is superseded by sysmult; use sysmult instead.")
--- a/scripts/control/sortcom.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sortcom.m Thu Dec 10 03:06:32 1998 +0000 @@ -32,7 +32,7 @@ # idx: permutation vector: yy = xx(idx) # Written by A. S. Hodel June 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if( nargin < 1 | nargin > 2 ) usage("yy = sortcom(xx[,opt]");
--- a/scripts/control/ss2sys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ss2sys.m Thu Dec 10 03:06:32 1998 +0000 @@ -72,7 +72,7 @@ # # Written by John Ingram (ingraje@eng.auburn.edu) July 20, 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.1 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1; @@ -168,7 +168,7 @@ retsys = syssetsignals(retsys,"yd",ones(1,p)*(tsam > 0)); else if(!isempty(outlist)) - retsys = syssetsignals(retsys,"yd",outlist,ones(size(outlist))); + retsys = syssetsignals(retsys,"yd",ones(size(outlist)),outlist); endif endif
--- a/scripts/control/ss2tf.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ss2tf.m Thu Dec 10 03:06:32 1998 +0000 @@ -34,7 +34,7 @@ # Written by R. Bruce Tenison (June 24, 1994) btenison@eng.auburn.edu # a s hodel: modified to allow for pure gain blocks Aug 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # Check args [n,m,p] = abcddim(a,b,c,d);
--- a/scripts/control/ss2zp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ss2zp.m Thu Dec 10 03:06:32 1998 +0000 @@ -27,7 +27,7 @@ # Written by David Clem August 15, 1994 # Hodel: changed order of output arguments to zer, pol, k. July 1996 # a s hodel: added argument checking, allow for pure gain blocks aug 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin != 4) usage("[zer,pol,k] = ss2zp(a,b,c,d)");
--- a/scripts/control/starp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/starp.m Thu Dec 10 03:06:32 1998 +0000 @@ -46,7 +46,7 @@ # ny and/or nu may be negative (= negative feedback) # Written by Kai Mueller May 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin != 2) && (nargin != 4)) usage("[sys] = starp(P, K, ny, nu)");
--- a/scripts/control/step.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/step.m Thu Dec 10 03:06:32 1998 +0000 @@ -36,7 +36,7 @@ # Written by Kai P. Mueller September 30, 1997 # based on lsim.m of Scottedward Hodel # modified by -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if((nargin < 1) || (nargin > 4)) usage("[y, u] = step(sys[, inp, tstop, n])");
--- a/scripts/control/stepimp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/stepimp.m Thu Dec 10 03:06:32 1998 +0000 @@ -31,7 +31,7 @@ # Written by Kai P. Mueller October 2, 1997 # based on lsim.m of Scottedward Hodel -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (sitype == 1) IMPULSE = 0; elseif (sitype == 2) IMPULSE = 1;
--- a/scripts/control/strappend.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/strappend.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,8 +23,10 @@ if(nargin != 2 | nargout > 1) usage(" retval = strappend(strlist,suffix)"); elseif(!is_signal_list(strlist)) + strlist error("strlist must be a list of strings (see is_signal_list)"); - elseif(!(isstr(suffix) & is_vector(suffix))) + elseif(!(isstr(suffix) & rows(suffix) == 1)) + suffix error("suffix must be a single string"); endif
--- a/scripts/control/swap.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/swap.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # A. S. Hodel July 24 1992 # Conversion to Octave R. Bruce Tenison July 4, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ a1 = b; b1 = a;
--- a/scripts/control/swapcols.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/swapcols.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # A. S. Hodel July 23, 1992 # Conversion to Octave R. Bruce Tenison July 4, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ m = length(A(1,:)); idx = m:-1:1;
--- a/scripts/control/swaprows.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/swaprows.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # A. S. Hodel July 23, 1992 # Conversion to Octave R. Bruce Tenison July 4, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ m = rows(A); idx = m:-1:1;
--- a/scripts/control/sys2fir.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sys2fir.m Thu Dec 10 03:06:32 1998 +0000 @@ -20,7 +20,7 @@ # function [c,tsam,inname,outname] = sys2fir(sys) # extract fir system from system data structure -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # a s hodel July 1996 # let sys2tf do most of the work
--- a/scripts/control/sys2ss.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sys2ss.m Thu Dec 10 03:06:32 1998 +0000 @@ -41,7 +41,7 @@ # Written by David Clem August 19, 1994 # Updates by John Ingram July 14, 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if(nargin != 1) usage("[a,b,c,d,tsam,n,nz,stname,inname,outname,yd] = sys2ss(sys)")
--- a/scripts/control/sys2tf.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sys2tf.m Thu Dec 10 03:06:32 1998 +0000 @@ -31,7 +31,7 @@ # Written by R. Bruce Tenison (June 24, 1994) btenison@eng.auburn.edu # modified to make sys2tf by A. S. Hodel Aug 1995 # modified again for updated system format by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin != 1) usage("[num,den,tsam,inname,outname] = sys2tf(Asys)");
--- a/scripts/control/sys2zp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sys2zp.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # inname, outname: input/output signal names (strings) # Created by John Ingram July 15 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin != 1) usage("[zer,pol,k,tsam,inname,outname] = sys2zp(sys)");
--- a/scripts/control/sysadd.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysadd.m Thu Dec 10 03:06:32 1998 +0000 @@ -36,7 +36,7 @@ # -------- # Written by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/sysappend.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysappend.m Thu Dec 10 03:06:32 1998 +0000 @@ -48,7 +48,7 @@ # sys = discrete: yd = ones(1,rows(c)) # written by John Ingram August 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ sav_implicit_str_to_num_ok = implicit_str_to_num_ok; # save for later sav_empty_list_elements_ok = empty_list_elements_ok;
--- a/scripts/control/syschnames.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/syschnames.m Thu Dec 10 03:06:32 1998 +0000 @@ -40,7 +40,7 @@ # (or yd values, where appropriate) # Written by John Ingram August 1996; updated by A. S. Hodel 1998 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ retsys = syssetsignals(sys,opt,names,list);
--- a/scripts/control/syschtsam.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/syschtsam.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # This function changes the sampling time (tsam) of the system. # Written by John Ingram August 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (nargin != 2) usage("retsys = syschtsam(sys,tsam)");
--- a/scripts/control/sysconnect.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysconnect.m Thu Dec 10 03:06:32 1998 +0000 @@ -50,7 +50,7 @@ # A. S. Hodel August 1995 # modified by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/syscont.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/syscont.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # returns csys empty if no continuous/continous path exists # Written by John Ingram August 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later save_empty = empty_list_elements_ok;
--- a/scripts/control/sysdefstname.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysdefstname.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # return default state names given n, nz # used internally, minimal argument checking -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ stname = list(); if(n > 0)
--- a/scripts/control/sysdisc.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysdisc.m Thu Dec 10 03:06:32 1998 +0000 @@ -26,7 +26,7 @@ # outputs, respectively. # -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later save_empty = empty_list_elements_ok;
--- a/scripts/control/sysdup.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysdup.m Thu Dec 10 03:06:32 1998 +0000 @@ -43,7 +43,7 @@ # A. S. Hodel August 1995 # modified by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/sysgettsam.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysgettsam.m Thu Dec 10 03:06:32 1998 +0000 @@ -2,7 +2,7 @@ # T = sysgettsam(sys) # return the sampling time of the system -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(!is_struct(sys)) usage("T = sysgettsam(sys)");
--- a/scripts/control/sysgroup.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysgroup.m Thu Dec 10 03:06:32 1998 +0000 @@ -40,7 +40,7 @@ # A. S. Hodel August 1995 # modified by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/sysgroupn.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysgroupn.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # # used internally in sysgroup -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # check for duplicate names l = length(names);
--- a/scripts/control/sysmult.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysmult.m Thu Dec 10 03:06:32 1998 +0000 @@ -36,7 +36,7 @@ # does not recognize discrete inputs) # Written by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/sysout.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysout.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # "all": all of the above # Written by A S Hodel: 1995-1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # save for restoring at end of routine save_val = implicit_str_to_num_ok;
--- a/scripts/control/sysprune.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysprune.m Thu Dec 10 03:06:32 1998 +0000 @@ -38,7 +38,7 @@ # A. S. Hodel August 1995 # Updated by John Ingram 7-15-96 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if( nargin != 3 ) usage("retsys = sysprune(sys,output_list,input_list)");
--- a/scripts/control/sysreorder.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysreorder.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # to use this at home! # A. S. Hodel, Aug 1995 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ #disp('sysreorder: entry')
--- a/scripts/control/sysrepdemo.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysrepdemo.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # Written by A. S. Hodel June 1995 # Revised Aug 1995 for system data structure format -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = page_screen_output; page_screen_output = 1;
--- a/scripts/control/sysscale.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysscale.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # A. S. Hodel August 1995 # modified by John Ingram 7-15-96 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if( (nargin < 3) || (nargin > 5) ) usage("retsys = sysscale(Asys,output_list,input_list{,inname,outname})");
--- a/scripts/control/syssub.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/syssub.m Thu Dec 10 03:06:32 1998 +0000 @@ -36,7 +36,7 @@ # -------- # Written by John Ingram July 1996 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1;
--- a/scripts/control/sysupdate.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/sysupdate.m Thu Dec 10 03:06:32 1998 +0000 @@ -34,7 +34,7 @@ # see also: tf2sys, ss2sys, zp2sys, sysout, sys2ss, sys2tf, sys2zp # Written by John Ingram 7-9-96 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # check for correct number of inputs if (nargin != 2)
--- a/scripts/control/tf2ss.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tf2ss.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # Written by R. Bruce Tenison (June 22, 1994) btenison@eng.auburn.edu # mod A S Hodel July, Aug 1995 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if(nargin != 2) error("tf2ss: wrong number of input arguments") elseif(isempty(num)) error("tf2ss: empty numerator");
--- a/scripts/control/tf2sys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tf2sys.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # Written by R. Bruce Tenison July 29, 1994 # Name changed to TF2SYS July 1995 # updated for new system data structure format July 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; implicit_str_to_num_ok = 1;
--- a/scripts/control/tf2sysl.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tf2sysl.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # used internally in tf2sys # strip leading zero coefficients to get the true polynomial length -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ while( (length(vec) > 1) & (vec(1) == 0) ) vec = vec(2:length(vec));
--- a/scripts/control/tf2zp.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tf2zp.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # defined by num/den. K is a gain associated with the system zeros. # Written by A. S. Hodel, etc. -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if(nargin == 2) if(length(den) > 1) pol = roots(den);
--- a/scripts/control/tfout.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tfout.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # filter, polyderiv, polyinteg, polyout # Written by A. Scottedward Hodel (scotte@eng.auburn.edu) June 1995) -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; save_empty = empty_list_elements_ok;
--- a/scripts/control/tzero.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tzero.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # R. Bruce Tenison July 4, 1994 # A. S. Hodel Aug 1995: allow for MIMO and system data structures - # $Revision: 1.17 $ + # $Revision: 1.18 $ # get A,B,C,D and Asys variables, regardless of initial form if(nargin == 4)
--- a/scripts/control/tzero2.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/tzero2.m Thu Dec 10 03:06:32 1998 +0000 @@ -27,7 +27,7 @@ # Needs to incorporate mvzero algorithm to isolate finite zeros. # Written by A. S. Hodel (scotte@eng.auburn.edu) August 1993. -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (nargin == 4) bal = "B";
--- a/scripts/control/ugain.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/ugain.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # Written by Kai P. Mueller April, 1998 # Updates - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if((nargin != 1) || (nargout > 1)) usage("outsys = ugain(n)")
--- a/scripts/control/unpacksys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/unpacksys.m Thu Dec 10 03:06:32 1998 +0000 @@ -21,7 +21,7 @@ # Obsolete. Use sys2ss instead. # Written by David Clem August 19, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ warning("unpacksys obsolete; calling sys2ss"); [a,b,c,d] = sys2ss(syst);
--- a/scripts/control/wgt1o.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/wgt1o.m Thu Dec 10 03:06:32 1998 +0000 @@ -30,7 +30,7 @@ # fc = Corner frequency (in Hz, *not* in rad/sec) # Written by Kai P. Mueller September 30, 1997 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ if (nargin != 3) usage("wsys = wgt1o(vl, vh, fc)");
--- a/scripts/control/zgfmul.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgfmul.m Thu Dec 10 03:06:32 1998 +0000 @@ -30,7 +30,7 @@ # A. S. Hodel July 24 1992 # Conversion to Octave July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ [n,m] = size(b); [p,m1] = size(c);
--- a/scripts/control/zgfslv.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgfslv.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # Written by A. Scotte Hodel # Converted to Octave by R Bruce Tenison, July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ nmp = n+m+p; gam1 = (2*n)+m+p; gam2 = n+p; gam3 = n+m;
--- a/scripts/control/zginit.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zginit.m Thu Dec 10 03:06:32 1998 +0000 @@ -29,7 +29,7 @@ # A. S. Hodel July 24 1992 # Conversion to Octave by R. Bruce Tenison, July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ [nn,mm] = size(b); [pp,mm] = size(d);
--- a/scripts/control/zgpbal.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgpbal.m Thu Dec 10 03:06:32 1998 +0000 @@ -38,7 +38,7 @@ # A. S. Hodel July 24 1992 # Conversion to Octave by R. Bruce Tenison July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if( (nargin != 1) | (!is_struct(Asys))) usage("retsys = zgpbal(Asys)");
--- a/scripts/control/zgreduce.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgreduce.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # # used internally in tzero; minimal argument checking performed -#$Revision: 2.0.0.0 $ +#$Revision: 2.0.0.2 $ # SYS_INTERNAL accesses members of system data structure is_digital(Asys); # make sure it's pure digital/continuous
--- a/scripts/control/zgrownorm.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgrownorm.m Thu Dec 10 03:06:32 1998 +0000 @@ -22,7 +22,7 @@ # returns nonz = number of rows of mat whose two norm exceeds meps # zer = number of rows of mat whose two norm is less than meps -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ rownorm = []; for ii=1:rows(mat)
--- a/scripts/control/zgscal.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgscal.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # A. S. Hodel July 24 1992 # Conversion to Octave R. Bruce Tenison July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ #************************************************************************** #initialize parameters:
--- a/scripts/control/zgsgiv.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgsgiv.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # A. S. Hodel July 29, 1992 # Convertion to Octave by R. Bruce Tenison July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ t1 = c*a + s*b; t2 = -s*a + c*b;
--- a/scripts/control/zgshsr.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zgshsr.m Thu Dec 10 03:06:32 1998 +0000 @@ -24,7 +24,7 @@ # A. S. Hodel July 24, 1992 # Conversion to Octave by R. Bruce Tenison July 3, 1994 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ if(!is_vector(y)) error(sprintf("y(%dx%d) must be a vector",rows(y),columns(y)));
--- a/scripts/control/zp2ss.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zp2ss.m Thu Dec 10 03:06:32 1998 +0000 @@ -39,7 +39,7 @@ # k is a gain that is associated with the zero vector. # Written by David Clem August 15, 1994 -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ sav_val = empty_list_elements_ok; empty_list_elements_ok = 1;
--- a/scripts/control/zp2ssg2.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zp2ssg2.m Thu Dec 10 03:06:32 1998 +0000 @@ -23,7 +23,7 @@ # extract 2 values from rvals (if possible) and construct # a polynomial with those roots. -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # A. S. Hodel Aug 1996 # locate imaginary roots (if any)
--- a/scripts/control/zp2sys.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zp2sys.m Thu Dec 10 03:06:32 1998 +0000 @@ -28,7 +28,7 @@ # outputs: sys: system data structure # Modified by John Ingram July 20, 1996 - # $Revision: 2.0.0.0 $ + # $Revision: 2.0.0.2 $ save_val = implicit_str_to_num_ok; # save for restoring later implicit_str_to_num_ok = 1;
--- a/scripts/control/zp2tf.m Wed Dec 09 18:42:13 1998 +0000 +++ b/scripts/control/zp2tf.m Thu Dec 10 03:06:32 1998 +0000 @@ -32,7 +32,7 @@ # convert to a column vector if necessary # Written by A. S. Hodel with help from students Ingram, McGowan. # a.s.hodel@eng.auburn.edu -# $Revision: 2.0.0.0 $ +# $Revision: 2.0.0.2 $ # [rp,cp] = size(pol);