Mercurial > forge
changeset 8679:ddd705c59ea8 octave-forge
control-devel: touch up hnamodred
author | paramaniac |
---|---|
date | Wed, 26 Oct 2011 18:07:10 +0000 |
parents | 6827a4b31653 |
children | 10f9883709ae |
files | extra/control-devel/inst/hnamodred.m extra/control-devel/src/slab09jd.cc |
diffstat | 2 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/control-devel/inst/hnamodred.m Wed Oct 26 16:23:52 2011 +0000 +++ b/extra/control-devel/inst/hnamodred.m Wed Oct 26 18:07:10 2011 +0000 @@ -178,7 +178,7 @@ %! %! DV = [ 1 ]; %! -%! sysv = ss (AV, BV, CV, DV); +%! sysv = ss (AV, BV, CV, DV, "scaled", true); %! %! sysr = hnamodred (sys, "left", sysv, "tol1", 1e-1, "tol2", 1e-14); %! [Ao, Bo, Co, Do] = ssdata (sysr);
--- a/extra/control-devel/src/slab09jd.cc Wed Oct 26 16:23:52 2011 +0000 +++ b/extra/control-devel/src/slab09jd.cc Wed Oct 26 18:07:10 2011 +0000 @@ -380,6 +380,29 @@ } } } + + if (iwarn != 0) + { + switch (iwarn) + { + case 1: + warning ("hnamodred: 1: with ORDSEL = 'F', the selected order NR is greater\ + than NSMIN, the sum of the order of the\ + ALPHA-unstable part and the order of a minimal\ + realization of the ALPHA-stable part of the given\ + system. In this case, the resulting NR is set equal\ + to NSMIN."); + break; + case 2: + warning ("hnamodred: 2: with ORDSEL = 'F', the selected order NR is less\ + than the order of the ALPHA-unstable part of the\ + given system. In this case NR is set equal to the\ + order of the ALPHA-unstable part."); + break; + default: + warning ("hnamodred: unknown warning, iwarn = %d", info); + } + } // resize a.resize (nr, nr);