From: <par...@us...> - 2010-10-22 18:33:01
|
Revision: 7867 http://octave.svn.sourceforge.net/octave/?rev=7867&view=rev Author: paramaniac Date: 2010-10-22 18:32:54 +0000 (Fri, 22 Oct 2010) Log Message: ----------- doc fix Modified Paths: -------------- trunk/octave-forge/main/control/inst/h2syn.m trunk/octave-forge/main/control/inst/hinfsyn.m Modified: trunk/octave-forge/main/control/inst/h2syn.m =================================================================== --- trunk/octave-forge/main/control/inst/h2syn.m 2010-10-21 14:39:32 UTC (rev 7866) +++ trunk/octave-forge/main/control/inst/h2syn.m 2010-10-22 18:32:54 UTC (rev 7867) @@ -31,7 +31,7 @@ ## to calculate the H-2 norm. ## @item ncon ## Number of controlled inputs u. The last ncon inputs of @var{P} are connected to the -## outputs of controller @var{K}. The remaining inputs r (indices 1 to m-ncon) are excited +## outputs of controller @var{K}. The remaining inputs w (indices 1 to m-ncon) are excited ## by a harmonic test signal. ## @end table ## @@ -53,7 +53,7 @@ ## K 2 ## ## +--------+ -## r ----->| |-----> z +## w ----->| |-----> z ## | P(s) | ## u +---->| |-----+ e ## | +--------+ | @@ -63,7 +63,7 @@ ## +--------+ ## ## +--------+ -## r ----->| N(s) |-----> z +## w ----->| N(s) |-----> z ## +--------+ ## @end group ## @end example Modified: trunk/octave-forge/main/control/inst/hinfsyn.m =================================================================== --- trunk/octave-forge/main/control/inst/hinfsyn.m 2010-10-21 14:39:32 UTC (rev 7866) +++ trunk/octave-forge/main/control/inst/hinfsyn.m 2010-10-22 18:32:54 UTC (rev 7867) @@ -32,7 +32,7 @@ ## to calculate the H-infinity norm. ## @item ncon ## Number of controlled inputs u. The last ncon inputs of @var{P} are connected to the -## outputs of controller @var{K}. The remaining inputs r (indices 1 to m-ncon) are excited +## outputs of controller @var{K}. The remaining inputs w (indices 1 to m-ncon) are excited ## by a harmonic test signal. ## @item gmax ## The maximum value of the H-infinity norm of @var{N}. It is assumed that @var{gmax} is @@ -57,7 +57,7 @@ ## K inf ## ## +--------+ -## r ----->| |-----> z +## w ----->| |-----> z ## | P(s) | ## u +---->| |-----+ e ## | +--------+ | @@ -67,7 +67,7 @@ ## +--------+ ## ## +--------+ -## r ----->| N(s) |-----> z +## w ----->| N(s) |-----> z ## +--------+ ## @end group ## @end example This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |