Mercurial > hg > octave-nkf
diff scripts/control/sysadd.m @ 3381:69b167451491
[project @ 1999-12-15 20:48:10 by jwe]
author | jwe |
---|---|
date | Wed, 15 Dec 1999 20:48:45 +0000 |
parents | 8dd4718801fd |
children | ebf69eb3d07d |
line wrap: on
line diff
--- a/scripts/control/sysadd.m +++ b/scripts/control/sysadd.m @@ -1,20 +1,20 @@ -# Copyright (C) 1996,1999 Auburn University. All Rights Reserved. -# -# This file is part of Octave. -# -# Octave is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2, or (at your option) any -# later version. -# -# Octave is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# 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. +## Copyright (C) 1996,1999 Auburn University. All Rights Reserved. +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by the +## Free Software Foundation; either version 2, or (at your option) any +## later version. +## +## Octave is distributed in the hope that it will be useful, but WITHOUT +## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +## for more details. +## +## 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. ## -*- texinfo -*- ## @deftypefn {Function File } { @var{sys} =} sysadd ( @var{Gsys},@var{Hsys}) @@ -40,8 +40,9 @@ ## @end deftypefn function sys = sysadd(...) -# Written by John Ingram July 1996 -# Updated for variable number of arguments July 1999 A. S. Hodel + + ## Written by John Ingram July 1996 + ## Updated for variable number of arguments July 1999 A. S. Hodel save_val = implicit_str_to_num_ok; # save for later implicit_str_to_num_ok = 1; @@ -50,7 +51,7 @@ usage("sysadd: sys = sysysadd(Gsys{,Hsys, ...})"); endif - # collect all arguments + ## collect all arguments arglist = list(); va_start(); for kk=1:nargin @@ -60,7 +61,7 @@ endif endfor - # check system dimensions + ## check system dimensions [n,nz,mg,pg,Gyd] = sysdimensions(nth(arglist,1)); for kk=2:nargin [n,nz,mh,ph,Hyd] = sysdimensions(nth(arglist,kk)); @@ -74,11 +75,11 @@ endif endfor - # perform the add + ## perform the add if(nargin == 2) Gsys = nth(arglist,1); Hsys = nth(arglist,2); if( strcmp(sysgettype(Gsys),"tf") | strcmp(sysgettype(Hsys),"tf") ) - # see if adding transfer functions with identical denominators + ## see if adding transfer functions with identical denominators [Gnum,Gden,GT,Gin,Gout] = sys2tf(Gsys); [Hnum,Hden,HT,Hin,Hout] = sys2tf(Hsys); if(length(Hden) == length(Gden) ) @@ -86,15 +87,15 @@ sys = tf2sys(Gnum+Hnum,Gden,GT,Gin,Gout); return endif - # if not, we go on and do the usual thing... + ## if not, we go on and do the usual thing... endif endif - # make sure in ss form + ## make sure in ss form Gsys = sysupdate(Gsys,"ss"); Hsys = sysupdate(Hsys,"ss"); - # change signal names to avoid warning messages from sysgroup + ## change signal names to avoid warning messages from sysgroup Gsys = syssetsignals(Gsys,"in",sysdefioname(length(Gin),"Gin_u")); Gsys = syssetsignals(Gsys,"out",sysdefioname(length(Gout),"Gout_u")); Hsys = syssetsignals(Hsys,"in",sysdefioname(length(Hin),"Hin_u")); @@ -108,7 +109,7 @@ sys = sysscale(sys,[eyout, eyout],[eyin;eyin],Gout,Gin); else - # multiple systems (or a single system); combine together one by one + ## multiple systems (or a single system); combine together one by one sys = nth(arglist,1); for kk=2:length(arglist) sys = sysadd(sys,nth(arglist,kk));