Mercurial > forge

changeset 6638:168d1405ff0c octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-oo: minor clarifications
author paramaniac
date Tue, 02 Feb 2010 05:51:28 +0000
parents f8f102e230fb
children 41940d598abf
files extra/control-oo/doc/octave_forge_specific_api.txt extra/control-oo/inst/kalman.m extra/control-oo/inst/place.m
diffstat 3 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-oo/doc/octave_forge_specific_api.txt	Tue Feb 02 05:23:37 2010 +0000
+++ b/extra/control-oo/doc/octave_forge_specific_api.txt	Tue Feb 02 05:51:28 2010 +0000
@@ -3,4 +3,8 @@
 feedback (sys)      # equivalent to feedback (sys, eye (size (sys)))
 feedback (sys, "+") # equivalent to feedback (sys, eye (size (sys)), +1)
 
-H = sys(w)  # equivalent to H = freqresp (sys, w) where w is a frequency vector
\ No newline at end of file
+H = sys(w)  # equivalent to H = freqresp (sys, w) where w is a frequency vector
+
+place (sys, p, alpha)   # If parameter alpha is specified, poles with real parts
+place (a, b, p, alpha)  # (continuous time) or moduli (discrete time) below alpha
+                        # are left untouched.
\ No newline at end of file
--- a/extra/control-oo/inst/kalman.m	Tue Feb 02 05:23:37 2010 +0000
+++ b/extra/control-oo/inst/kalman.m	Tue Feb 02 05:51:28 2010 +0000
@@ -37,7 +37,7 @@
     print_usage ();
   endif
 
-  [a, b, c, d, tsam] = ssdata (sys);
+  [a, b, c, d] = ssdata (sys);
 
   if (isempty (s))
     bs = [];
@@ -45,10 +45,10 @@
     bs = b*s;
   endif
 
-  if (tsam > 0)
+  if (isct (sys))
+    [x, l, g] = care (a', c', b*q*b', r, bs);
+  else
     [x, l, g] = dare (a', c', b*q*b', r, bs);
-  else
-    [x, l, g] = care (a', c', b*q*b', r, bs);
   endif
 
   g = g';
--- a/extra/control-oo/inst/place.m	Tue Feb 02 05:23:37 2010 +0000
+++ b/extra/control-oo/inst/place.m	Tue Feb 02 05:51:28 2010 +0000
@@ -32,6 +32,7 @@
 ## LTI system.
 ## @item p
 ## Desired eigenvalues of the closed-loop system state-matrix A-B*F.
+## length (P) <= rows (A)
 ## @item alpha
 ## Specifies the maximum admissible value, either for real
 ## parts or for moduli, of the eigenvalues of A which will