Mercurial > forge

changeset 9569:b23f33c2edce octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control: fix bug with scaling option
author paramaniac
date Tue, 06 Mar 2012 15:52:10 +0000
parents 6063e6456f36
children 52ef2dae3fe9
files main/control/inst/cfconred.m main/control/inst/fwcfconred.m
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/main/control/inst/cfconred.m	Tue Mar 06 13:49:13 2012 +0000
+++ b/main/control/inst/cfconred.m	Tue Mar 06 15:52:10 2012 +0000
@@ -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
--- a/main/control/inst/fwcfconred.m	Tue Mar 06 13:49:13 2012 +0000
+++ b/main/control/inst/fwcfconred.m	Tue Mar 06 15:52:10 2012 +0000
@@ -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