From: <par...@us...> - 2011-12-22 15:35:11
|
Revision: 9457 http://octave.svn.sourceforge.net/octave/?rev=9457&view=rev Author: paramaniac Date: 2011-12-22 15:35:00 +0000 (Thu, 22 Dec 2011) Log Message: ----------- control-devel: use key 'feedback' for tests instead of negative signs Modified Paths: -------------- trunk/octave-forge/extra/control-devel/inst/btaconred.m trunk/octave-forge/extra/control-devel/inst/cfconred.m trunk/octave-forge/extra/control-devel/inst/fwcfconred.m Modified: trunk/octave-forge/extra/control-devel/inst/btaconred.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/btaconred.m 2011-12-22 13:22:04 UTC (rev 9456) +++ trunk/octave-forge/extra/control-devel/inst/btaconred.m 2011-12-22 15:35:00 UTC (rev 9457) @@ -251,7 +251,7 @@ %! %! K = ss (AC, BC, CC, DC, "scaled", true); %! -%! [Kr, Info] = btaconred (G, K, 2, "weight", "input"); +%! [Kr, Info] = btaconred (G, K, 2, "weight", "input", "feedback", "+"); %! [Ao, Bo, Co, Do] = ssdata (Kr); %! %! Ae = [ 9.1900 0.0000 Modified: trunk/octave-forge/extra/control-devel/inst/cfconred.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/cfconred.m 2011-12-22 13:22:04 UTC (rev 9456) +++ trunk/octave-forge/extra/control-devel/inst/cfconred.m 2011-12-22 15:35:00 UTC (rev 9457) @@ -288,9 +288,9 @@ %! %! G = ss (A, B, C, D); % "scaled", false %! -%! F = -[ 4.4721e-002 6.6105e-001 4.6986e-003 3.6014e-001 1.0325e-001 -3.7541e-002 -4.2685e-002 3.2873e-002 ]; +%! F = [ 4.4721e-002 6.6105e-001 4.6986e-003 3.6014e-001 1.0325e-001 -3.7541e-002 -4.2685e-002 3.2873e-002 ]; %! -%! L = -[ 4.1089e-001 +%! L = [ 4.1089e-001 %! 8.6846e-002 %! 3.8523e-004 %! -3.6194e-003 @@ -299,7 +299,7 @@ %! 1.2349e-003 %! 4.2632e-003 ]; %! -%! [Kr, Info] = cfconred (G, F, L, 4, "method", "bfsr-bta", "cf", "left"); +%! [Kr, Info] = cfconred (G, F, L, 4, "method", "bfsr-bta", "cf", "left", "feedback", "+"); %! [Ao, Bo, Co, Do] = ssdata (Kr); %! %! Ae = [ 0.5946 -0.7336 0.1914 -0.3368 Modified: trunk/octave-forge/extra/control-devel/inst/fwcfconred.m =================================================================== --- trunk/octave-forge/extra/control-devel/inst/fwcfconred.m 2011-12-22 13:22:04 UTC (rev 9456) +++ trunk/octave-forge/extra/control-devel/inst/fwcfconred.m 2011-12-22 15:35:00 UTC (rev 9457) @@ -261,9 +261,9 @@ %! %! G = ss (A, B, C, D); % "scaled", false %! -%! F = -[ 4.472135954999638e-002 6.610515358414598e-001 4.698598960657579e-003 3.601363251422058e-001 1.032530880771415e-001 -3.754055214487997e-002 -4.268536964759344e-002 3.287284547842979e-002 ]; +%! F = [ 4.472135954999638e-002 6.610515358414598e-001 4.698598960657579e-003 3.601363251422058e-001 1.032530880771415e-001 -3.754055214487997e-002 -4.268536964759344e-002 3.287284547842979e-002 ]; %! -%! L = -[ 4.108939884667451e-001 +%! L = [ 4.108939884667451e-001 %! 8.684600000000012e-002 %! 3.852317308197148e-004 %! -3.619366874815911e-003 @@ -272,7 +272,7 @@ %! 1.234944428038507e-003 %! 4.263205617645322e-003 ]; %! -%! [Kr, Info] = fwcfconred (G, F, L, 2, "method", "bfsr", "cf", "right"); +%! [Kr, Info] = fwcfconred (G, F, L, 2, "method", "bfsr", "cf", "right", "feedback", "+"); %! [Ao, Bo, Co, Do] = ssdata (Kr); %! %! Ae = [ -0.4334 0.4884 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |