annotate scripts/control/system/sysadd.m @ 7492:bd1168732c95

datestr.m: fix 6 datenum vector bug
author bill@denney.ws
date Wed, 13 Feb 2008 22:46:24 -0500
parents 8aa770b6c5bf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7017
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
1 ## Copyright (C) 1996, 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
2 ## Auburn University. All rights reserved.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
3 ##
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
4 ## This file is part of Octave.
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
5 ##
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
6 ## Octave is free software; you can redistribute it and/or modify it
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
7 ## under the terms of the GNU General Public License as published by
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
9 ## your option) any later version.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
10 ##
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
11 ## Octave is distributed in the hope that it will be useful, but
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
14 ## General Public License for more details.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
15 ##
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
16 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
18 ## <http://www.gnu.org/licenses/>.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
19
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
20 ## -*- texinfo -*-
3502
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
21 ## @deftypefn {Function File} {} sysadd (@var{gsys}, @var{hsys})
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
22 ## returns @var{sys} = @var{gsys} + @var{hsys}.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
23 ## @itemize @bullet
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
24 ## @item Exits with
3502
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
25 ## an error if @var{gsys} and @var{hsys} are not compatibly dimensioned.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
26 ## @item Prints a warning message is system states have identical names;
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
27 ## duplicate names are given a suffix to make them unique.
3502
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
28 ## @item @var{sys} input/output names are taken from @var{gsys}.
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
29 ## @end itemize
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
30 ## @example
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
31 ## @group
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
32 ## ________
3502
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
33 ## ----| gsys |---
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
34 ## u | ---------- +|
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
35 ## ----- (_)----> y
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
36 ## | ________ +|
3502
b5238ac1dca9 [project @ 2000-01-31 07:40:53 by jwe]
jwe
parents: 3500
diff changeset
37 ## ----| hsys |---
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
38 ## --------
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
39 ## @end group
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
40 ## @end example
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
41 ## @end deftypefn
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
42
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
43 ## Author: John Ingram <ingraje@eng.auburn.edu>
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
44 ## Created: July 1996
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
45 ## Updated for variable number of arguments July 1999 A. S. Hodel
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
46
3979
e0b7a493e5a8 [project @ 2002-07-10 17:45:34 by jwe]
jwe
parents: 3502
diff changeset
47 function sys = sysadd (varargin)
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
48
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
49 if (nargin < 1)
6046
34f96dd5441b [project @ 2006-10-10 16:10:25 by jwe]
jwe
parents: 5307
diff changeset
50 print_usage ();
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
51 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
52
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
53 ## collect all arguments
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
54 arglist = {};
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
55 for kk = 1:nargin
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
56 arglist{kk} = varargin{kk};
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
57 if (! isstruct (arglist{kk}))
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
58 error ("sysadd: argument %d is not a data structure", kk);
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
59 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
60 endfor
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
61
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
62 ## check system dimensions
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
63 [n, nz, mg, pg, Gyd] = sysdimensions (arglist{1});
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
64 for kk = 2:nargin
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
65 [n, nz, mh, ph, Hyd] = sysdimensions (arglist{kk});
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
66 if (mg != mh)
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
67 error ("arg 1 has %d inputs; arg %d has vs %d inputs", mg, kk, mh);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
68 elseif (pg != ph)
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
69 error ("arg 1 has %d outputs; arg %d has vs %d outputs", pg, kk, ph);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
70 elseif (norm (Gyd - Hyd))
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
71 warning ("cannot add a discrete output to a continuous output");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
72 error ("Output type mismatch: arguments 1 and %d\n", kk);
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
73 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
74 endfor
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
75
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
76 ## perform the add
4404
c05051baf03b [project @ 2003-05-01 19:41:57 by jwe]
jwe
parents: 4030
diff changeset
77 if (nargin == 2)
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
78 Gsys = arglist{1};
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
79 Hsys = arglist{2};
4404
c05051baf03b [project @ 2003-05-01 19:41:57 by jwe]
jwe
parents: 4030
diff changeset
80
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
81 # check if adding scalar transfer functions with identical denoms
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
82 [Gn, Gnz, Gm, Gp] = sysdimensions (Gsys);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
83 [Hn, Hnz, Hm, Hp] = sysdimensions (Hsys);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
84 if (Gm == 1 & Gp == 1 & Hm == 1 & Hp == 1 & Gn == Hn & Gnz == Hnz)
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
85 ## dimensions are compatible, check if can add
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
86 [Gnum, Gden, GT, Gin, Gout] = sys2tf (Gsys);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
87 [Hnum, Hden, HT, Hin, Hout] = sys2tf (Hsys);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
88 if (length (Hden) == length (Gden) )
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
89 if ((Hden == Gden) & (HT == GT))
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
90 sys = tf (Gnum+Hnum, Gden, GT, Gin, Gout);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
91 return;
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
92 endif
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
93 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
94 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
95
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
96 ## make sure in ss form
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
97 Gsys = sysupdate (Gsys, "ss");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
98 Hsys = sysupdate (Hsys, "ss");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
99 Gin = sysgetsignals (Gsys, "in");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
100 Gout = sysgetsignals (Gsys, "out");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
101 Hin = sysgetsignals (Hsys, "in");
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
102 Hout = sysgetsignals (Hsys, "out");
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
103
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
104 ## change signal names to avoid warning messages from sysgroup
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
105 Gsys = syssetsignals (Gsys, "in",
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
106 __sysdefioname__ (length (Gin), "Gin_u"));
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
107
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
108 Gsys = syssetsignals (Gsys, "out",
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
109 __sysdefioname__ (length (Gout), "Gout_u"));
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
110
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
111 Hsys = syssetsignals (Hsys, "in",
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
112 __sysdefioname__ (length (Hin), "Hin_u"));
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
113
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
114 Hsys = syssetsignals (Hsys, "out",
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
115 __sysdefioname__ (length (Hout), "Hout_u"));
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
116
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
117 sys = sysgroup (Gsys, Hsys);
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
118
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
119 eyin = eye (mg);
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
120 eyout = eye (pg);
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
121
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
122 sys = sysscale (sys, [eyout, eyout], [eyin; eyin], Gout, Gin);
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
123
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
124 else
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
125 ## multiple systems (or a single system); combine together one by one
4771
b8105302cfe8 [project @ 2004-02-16 17:45:50 by jwe]
jwe
parents: 4404
diff changeset
126 sys = arglist{1};
7135
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
127 for kk = 2:length(arglist)
8aa770b6c5bf [project @ 2007-11-08 18:54:10 by jwe]
jwe
parents: 7017
diff changeset
128 sys = sysadd (sys, arglist{kk});
3430
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
129 endfor
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
130 endif
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
131
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
132 endfunction
65b3519ac3a1 [project @ 2000-01-14 03:44:03 by jwe]
jwe
parents:
diff changeset
133