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

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

Revision: 9274
          http://octave.svn.sourceforge.net/octave/?rev=9274&view=rev
Author:   paramaniac
Date:     2011-12-05 14:18:46 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
control-devel: touch up draft code

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m
    trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m
    trunk/octave-forge/extra/control-devel/inst/hnamodred.m

Modified: trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m	2011-12-05 14:10:00 UTC (rev 9273)
+++ trunk/octave-forge/extra/control-devel/inst/__conred_sb16ad__.m	2011-12-05 14:18:46 UTC (rev 9274)
@@ -81,14 +81,14 @@
   alpha = __modred_default_alpha__ (dt);
   tol1 = 0.0;
   tol2 = 0.0;
-  dico = 0; %%%%%%%%%%
   jobc = jobo = 0;
   bf = true;                                # balancing-free
   weight = 0;
-  equil = 0;
+  equil = scaled && scaledc;
   ordsel = 1;
   ncr = 0;
 
+
   ## handle keys and values
   for k = 1 : 2 : nkv
     key = lower (varargin{k});
@@ -131,6 +131,9 @@
         endswitch
 
       ## TODO: jobc, jobo
+      
+      case {"equil", "equilibrate", "equilibration", "scale", "scaling"}
+        scaled = __modred_check_equil__ (val);
 
       otherwise
         warning ("modred: invalid property name ""%s"" ignored", prop);
@@ -153,7 +156,7 @@
   
   
   ## perform model order reduction
-  [acr, bcr, ccr, dcr, ncr, hsvc, ncs] = slsb16ad (a, b, c, d, dico, equil, ncr, ordsel, alpha, jobmr, \
+  [acr, bcr, ccr, dcr, ncr, hsvc, ncs] = slsb16ad (a, b, c, d, dt, equil, ncr, ordsel, alpha, jobmr, \
                                                    ac, bc, cc, dc, \
                                                    weight, jobc, jobo, tol1, tol2);
 

Modified: trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m	2011-12-05 14:10:00 UTC (rev 9273)
+++ trunk/octave-forge/extra/control-devel/inst/__modred_ab09id__.m	2011-12-05 14:18:46 UTC (rev 9274)
@@ -115,6 +115,9 @@
 
       ## TODO: alphac, alphao, jobc, jobo
 
+      case {"equil", "equilibrate", "equilibration", "scale", "scaling"}
+        scaled = __modred_check_equil__ (val);
+
       otherwise
         warning ("modred: invalid property name ""%s"" ignored", prop);
     endswitch

Modified: trunk/octave-forge/extra/control-devel/inst/hnamodred.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/hnamodred.m	2011-12-05 14:10:00 UTC (rev 9273)
+++ trunk/octave-forge/extra/control-devel/inst/hnamodred.m	2011-12-05 14:18:46 UTC (rev 9274)
@@ -154,6 +154,9 @@
             error ("hnamodred: invalid computational approach");
         endswitch
 
+      case {"equil", "equilibrate", "equilibration", "scale", "scaling"}
+        scaled = __modred_check_equil__ (val);
+
       otherwise
         warning ("hnamodred: invalid property name ""%s"" ignored", prop);
     endswitch

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