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

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

Revision: 10482
          http://octave.svn.sourceforge.net/octave/?rev=10482&view=rev
Author:   paramaniac
Date:     2012-05-21 20:15:41 +0000 (Mon, 21 May 2012)
Log Message:
-----------
control-devel: don't confirm system order if requested

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
    trunk/octave-forge/extra/control-devel/inst/test_devel.m

Modified: trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-05-21 19:56:13 UTC (rev 10481)
+++ trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-05-21 20:15:41 UTC (rev 10482)
@@ -67,6 +67,7 @@
   tol = -1.0; % 0;
   s = [];
   n = [];
+  conf = [];
   
   ## handle keys and values
   for k = 1 : 2 : nkv
@@ -84,6 +85,8 @@
         tol = val;
       case "rcond"
         rcond = val;
+      case "confirm"
+        conf = logical (val);
       otherwise
         warning ("%s: invalid property name '%s' ignored", method, key);
     endswitch
@@ -114,6 +117,9 @@
     endif
   endif
 
+  if (! isempty (conf))
+    ctrl = ! conf;
+  endif
   
   ## perform system identification
   [a, b, c, d, q, ry, s, k, x0] = slident (dat.y, dat.u, nobr, n, meth, alg, conct, ctrl, rcond, tol);

Modified: trunk/octave-forge/extra/control-devel/inst/test_devel.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/test_devel.m	2012-05-21 19:56:13 UTC (rev 10481)
+++ trunk/octave-forge/extra/control-devel/inst/test_devel.m	2012-05-21 20:15:41 UTC (rev 10482)
@@ -3,3 +3,5 @@
 test @iddata/cat
 test @iddata/detrend
 test @iddata/fft
+
+test moen4
\ No newline at end of file

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