Mercurial > hg > octave-nkf
diff scripts/control/parallel.m @ 3381:69b167451491
[project @ 1999-12-15 20:48:10 by jwe]
author | jwe |
---|---|
date | Wed, 15 Dec 1999 20:48:45 +0000 |
parents | f7e4a95916f2 |
children | 10f21f7ccc7f |
line wrap: on
line diff
--- a/scripts/control/parallel.m +++ b/scripts/control/parallel.m @@ -1,38 +1,39 @@ -# Copyright (C) 1996 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 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. +## function sysp = parallel(Asys,Bsys) +## Forms the parallel connection of two systems. +## +## ____________________ +## | ________ | +## u ----->|----> | Asys |--->|----> y1 +## | | -------- | +## | | ________ | +## |--->|----> | Bsys |--->|----> y2 +## | -------- | +## -------------------- +## Ksys + function sysp = parallel(Asys,Bsys) -# function sysp = parallel(Asys,Bsys) -# Forms the parallel connection of two systems. -# -# ____________________ -# | ________ | -# u ----->|----> | Asys |--->|----> y1 -# | | -------- | -# | | ________ | -# |--->|----> | Bsys |--->|----> y2 -# | -------- | -# -------------------- -# Ksys -# Written by David Clem August 15, 1994 -# completely rewritten Oct 1996 a s hodel -# SYS_INTERNAL accesses members of system structure + ## Written by David Clem August 15, 1994 + ## completely rewritten Oct 1996 a s hodel + ## SYS_INTERNAL accesses members of system structure if(nargin != 2) usage("sysp = parallel(Asys,Bsys)"); @@ -48,10 +49,10 @@ error(["Asys has ",num2str(mA)," inputs, Bsys has ",num2str(mB)," inputs"]); endif - # save signal names + ## save signal names Ain = sysgetsignals(Asys,"in"); - # change signal names to avoid warning messages from sysgroup + ## change signal names to avoid warning messages from sysgroup Asys = syssetsignals(Asys,"in",sysdefioname(length(Ain),"Ain_u")); Bsys = syssetsignals(Bsys,"in",sysdefioname(length(Ain),"Bin_u"));