From: <par...@us...> - 2012-03-06 15:52:19
|
Revision: 9755 http://octave.svn.sourceforge.net/octave/?rev=9755&view=rev Author: paramaniac Date: 2012-03-06 15:52:10 +0000 (Tue, 06 Mar 2012) Log Message: ----------- control: fix bug with scaling option Modified Paths: -------------- trunk/octave-forge/main/control/inst/cfconred.m trunk/octave-forge/main/control/inst/fwcfconred.m Modified: trunk/octave-forge/main/control/inst/cfconred.m =================================================================== --- trunk/octave-forge/main/control/inst/cfconred.m 2012-03-06 13:49:13 UTC (rev 9754) +++ trunk/octave-forge/main/control/inst/cfconred.m 2012-03-06 15:52:10 UTC (rev 9755) @@ -197,7 +197,7 @@ tol2 = 0.0; jobcf = 0; jobmr = 2; # balancing-free BTA - equil = scaled && scaledc; + equil = scaled # equil: 0 means "S", 1 means "N" ordsel = 1; ncr = 0; negfb = true; # A-BK, A-LC Hurwitz Modified: trunk/octave-forge/main/control/inst/fwcfconred.m =================================================================== --- trunk/octave-forge/main/control/inst/fwcfconred.m 2012-03-06 13:49:13 UTC (rev 9754) +++ trunk/octave-forge/main/control/inst/fwcfconred.m 2012-03-06 15:52:10 UTC (rev 9755) @@ -151,7 +151,7 @@ error ("fwcfconred: keys and values must come in pairs"); endif - [a, b, c, d, tsam, scaled] = ssdata (G); + [a, b, c, d, tsam] = ssdata (G); [p, m] = size (G); n = rows (a); [mf, nf] = size (F); @@ -173,7 +173,6 @@ tol1 = 0.0; jobcf = 1; jobmr = 1; # balancing-free BTA - equil = scaled && scaledc; ordsel = 1; ncr = 0; negfb = true; # A-BK, A-LC Hurwitz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |