[Octave-cvsupdate] SF.net SVN: octave:[8865] trunk/octave-forge/extra/control-devel

[<par...@us...>]

Revision: 8865
          http://octave.svn.sourceforge.net/octave/?rev=8865&view=rev
Author:   paramaniac
Date:     2011-10-26 18:07:10 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
control-devel: touch up hnamodred

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/inst/hnamodred.m
    trunk/octave-forge/extra/control-devel/src/slab09jd.cc

Modified: trunk/octave-forge/extra/control-devel/inst/hnamodred.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/hnamodred.m	2011-10-26 16:23:52 UTC (rev 8864)
+++ trunk/octave-forge/extra/control-devel/inst/hnamodred.m	2011-10-26 18:07:10 UTC (rev 8865)
@@ -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);

Modified: trunk/octave-forge/extra/control-devel/src/slab09jd.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slab09jd.cc	2011-10-26 16:23:52 UTC (rev 8864)
+++ trunk/octave-forge/extra/control-devel/src/slab09jd.cc	2011-10-26 18:07:10 UTC (rev 8865)
@@ -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);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.