Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8766] trunk/octave-forge/main/control/devel
|
From: <par...@us...> - 2011-10-17 18:58:02
|
Revision: 8766
http://octave.svn.sourceforge.net/octave/?rev=8766&view=rev
Author: paramaniac
Date: 2011-10-17 18:57:55 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
control: add a test case, remove cruft
Added Paths:
-----------
trunk/octave-forge/main/control/devel/test_tf2dss.m
Removed Paths:
-------------
trunk/octave-forge/main/control/devel/__sys2ss__.m
Deleted: trunk/octave-forge/main/control/devel/__sys2ss__.m
===================================================================
--- trunk/octave-forge/main/control/devel/__sys2ss__.m 2011-10-17 18:55:20 UTC (rev 8765)
+++ trunk/octave-forge/main/control/devel/__sys2ss__.m 2011-10-17 18:57:55 UTC (rev 8766)
@@ -1,159 +0,0 @@
-## Copyright (C) 2009, 2011 Lukas F. Reichlin
-##
-## This file is part of LTI Syncope.
-##
-## LTI Syncope 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 3 of the License, or
-## (at your option) any later version.
-##
-## LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## TF to SS conversion.
-
-## Author: Lukas Reichlin <luk...@gm...>
-## Created: October 2009
-## Version: 0.3
-
-function [retsys, retlti] = __sys2ss__ (sys)
-
- ## TODO: determine appropriate tolerance from number of inputs
- ## (since we multiply all denominators in a row), index, ...
- ## default tolerance from TB01UD is TOLDEF = N*N*EPS
-
- ## SECRET WISH: a routine which accepts individual denominators for
- ## each channel and which supports descriptor systems
-
- [p, m] = size (sys);
- [num, den] = tfdata (sys);
-
- len_num = cellfun (@length, num);
- len_den = cellfun (@length, den);
-
- ## check for properness
- ## tfpoly ensures that there are no leading zeros
- tmp = len_num > len_den;
- if (any (tmp(:)))
- ## separation into strictly proper and polynomial part
- [numq, numr] = cellfun (@deconv, num, den, "uniformoutput", false);
- numq = cellfun (@__remove_leading_zeros__, numq, "uniformoutput", false);
- numr = cellfun (@__remove_leading_zeros__, numr, "uniformoutput", false);
-
- ## minimal state-space realization for the proper part
- [a1, b1, c1] = __proper_tf2ss__ (numr, den, p, m);
- e1 = eye (size (a1));
-
- ## minimal realization for the polynomial part
- [e2, a2, b2, c2] = __polynomial_tf2ss__ (numq, p, m);
-
- ## assemble irreducible descriptor realization
- e = blkdiag (e1, e2);
- a = blkdiag (a1, a2);
- b = vertcat (b1, b2);
- c = horzcat (c1, c2);
- retsys = dss (a, b, c, [], e);
- else
- [a, b, c, d] = __proper_tf2ss__ (num, den, p, m);
- retsys = ss (a, b, c, d);
- endif
-
- retlti = sys.lti; # preserve lti properties such as tsam
-
-endfunction
-
-
-## transfer function to state-space conversion for proper models
-function [a, b, c, d] = __proper_tf2ss__ (num, den, p, m)
-num, den
- ## new cells for the TF of same row denominators
- numc = cell (p, m);
- denc = cell (p, 1);
-
- ## multiply all denominators in a row and
- ## update each numerator accordingly
- for i = 1 : p
- denc(i) = __conv__ (den{i,:});
- for j = 1 : m
- idx = setdiff (1:m, j);
- numc(i,j) = __conv__ (num{i,j}, den{i,idx});
- endfor
- endfor
-
- len_numc = cellfun (@length, numc);
- len_denc = cellfun (@length, denc);
-
- ## check for properness
- ## tfpoly ensures that there are no leading zeros
- tmp = len_numc > repmat (len_denc, 1, m);
- if (any (tmp(:)))
- error ("tf: tf2ss: system must be proper");
- endif
-
- ## create arrays and fill in the data
- ## in a way that Slicot TD04AD can use
- max_len_denc = max (len_denc(:));
- ucoeff = zeros (p, m, max_len_denc);
- dcoeff = zeros (p, max_len_denc);
- index = len_denc-1;
-
- for i = 1 : p
- len = len_denc(i);
- dcoeff(i, 1:len) = denc{i};
- for j = 1 : m
- ucoeff(i, j, len-len_numc(i,j)+1 : len) = numc{i,j};
- endfor
- endfor
-
- [a, b, c, d] = sltd04ad (ucoeff, dcoeff, index, sqrt (eps));
-
-endfunction
-
-
-function [e2, a2, b2, c2] = __polynomial_tf2ss__ (numq, p, m)
-
- len_numq = cellfun (@length, numq);
- max_len_numq = max (len_numq(:));
- numq = cellfun (@(x) prepad (x, max_len_numq, 0, 2), numq, "uniformoutput", false);
- f = @(y) cellfun (@(x) x(y), numq);
- s = num2cell (1 : max_len_numq);
- D = cellfun (f, s, "uniformoutput", false)
-
- e2 = diag (ones (p*max_len_numq, 1), -p);
- a2 = eye (p*max_len_numq)
- b2 = vertcat (D{:})
- c2 = horzcat (zeros (p, (p-1)*max_len_numq), -eye (p))
-
- ## TODO: remove uncontrollable part
-
-endfunction
-
-## convolution for more than two arguments
-function vec = __conv__ (vec, varargin)
-
- if (nargin == 1)
- return;
- else
- for k = 1 : nargin-1
- vec = conv (vec, varargin{k});
- endfor
- endif
-
-endfunction
-
-
-function p = __remove_leading_zeros__ (p)
-
- idx = find (p != 0);
-
- if (! isempty (idx) && idx(1) > 1)
- p = p(idx(1) : end); # p(idx) would remove all zeros
- endif
-
-endfunction
\ No newline at end of file
Added: trunk/octave-forge/main/control/devel/test_tf2dss.m
===================================================================
--- trunk/octave-forge/main/control/devel/test_tf2dss.m (rev 0)
+++ trunk/octave-forge/main/control/devel/test_tf2dss.m 2011-10-17 18:57:55 UTC (rev 8766)
@@ -0,0 +1,15 @@
+num = {[1, 5, 6], [1, 2], [1, 2, -1, 2, 2]; [1, 8, 6], [1, 3, 2], [3, 4, 0]};
+den = {[1, 5, 7], [1], [1, -1, 1]; [1, 7], [1, 5, 5], [1, 1]};
+
+%num = {[1, 5, 6], [1, 2], [1, 2, -1, 2, 2]; [1, 8, 6], [1, 3, 2], [3, 4, 0]}.';
+%den = {[1, 5, 7], [1], [1, -1, 1]; [1, 7], [1, 5, 5], [1, 1]}.';
+
+%num = {[1, 5, 6], [1, 2]; [1, 8, 6], [1, 3, 2]};
+%den = {[1, 5, 7], [1]; [1, 7], [1, 5, 5]};
+
+
+sys = tf (num, den)
+
+P = ss (sys)
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
