[Octave-cvsupdate] SF.net SVN: octave:[8432] trunk/octave-forge/main/control/devel

[<par...@us...>]

Revision: 8432
          http://octave.svn.sourceforge.net/octave/?rev=8432&view=rev
Author:   paramaniac
Date:     2011-08-04 21:10:29 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
control: fix ncfsyn

Modified Paths:
--------------
    trunk/octave-forge/main/control/devel/ncfsyn/ncfsyn.m

Added Paths:
-----------
    trunk/octave-forge/main/control/devel/test_pzmap.m

Modified: trunk/octave-forge/main/control/devel/ncfsyn/ncfsyn.m
===================================================================
--- trunk/octave-forge/main/control/devel/ncfsyn/ncfsyn.m	2011-08-04 19:18:41 UTC (rev 8431)
+++ trunk/octave-forge/main/control/devel/ncfsyn/ncfsyn.m	2011-08-04 21:10:29 UTC (rev 8432)
@@ -46,7 +46,7 @@
 ## @item K
 ## State-space model of the H-infinity loop-shaping controller.
 ## @item N
-## State-space model of closed loop.
+## State-space model of the closed loop depicted below.
 ## @item gamma
 ## L-infinity norm of @var{N}.
 ## @item info
@@ -60,6 +60,21 @@
 ## @item info.rcond
 ## Estimates of the reciprocal condition numbers of the Riccati equations.
 ## @end table
+##
+## @strong{Block Diagram of N}
+## @example
+## @group
+##
+##             ^ z1              ^ z2
+##             |                 |
+##  w1  +      |   +--------+    |            +--------+
+## ----->(+)---+-->|   Ks   |----+--->(+)---->|   Gs   |----+
+##        ^ +      +--------+          ^      +--------+    |
+##        |                        w2  |                    |
+##        |                                                 |
+##        +-------------------------------------------------+
+## @end group
+## @end example
 ## @end deftypefn
 
 ## Author: Lukas Reichlin <luk...@gm...>
@@ -104,7 +119,7 @@
   K = W1 * Ks * W2;
 
   if (nargout > 1)
-    N = append (eye (p), K, G);
+    N = append (eye (p), Ks, Gs);
     M = [zeros(p,p), zeros(p,m),     eye(p);
              eye(p), zeros(p,m), zeros(p,p);
          zeros(m,p),     eye(m), zeros(m,p)];

Added: trunk/octave-forge/main/control/devel/test_pzmap.m
===================================================================
--- trunk/octave-forge/main/control/devel/test_pzmap.m	                        (rev 0)
+++ trunk/octave-forge/main/control/devel/test_pzmap.m	2011-08-04 21:10:29 UTC (rev 8432)
@@ -0,0 +1,5 @@
+pzmap2 (WestlandLynx, Boeing707, BMWengine)
+
+
+%__next_line_color__ ("reset")
+%__next_line_color__
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.