changeset 10296:6847197945fd octave-forge

control-devel: don't confirm system order if requested
author paramaniac
date Mon, 21 May 2012 20:15:41 +0000
parents 8ebb7fe24db8
children 119c285e853d
files extra/control-devel/inst/__slicot_identification__.m extra/control-devel/inst/test_devel.m
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/inst/__slicot_identification__.m	Mon May 21 19:56:13 2012 +0000
+++ b/extra/control-devel/inst/__slicot_identification__.m	Mon May 21 20:15:41 2012 +0000
@@ -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);
--- a/extra/control-devel/inst/test_devel.m	Mon May 21 19:56:13 2012 +0000
+++ b/extra/control-devel/inst/test_devel.m	Mon May 21 20:15:41 2012 +0000
@@ -3,3 +3,5 @@
 test @iddata/cat
 test @iddata/detrend
 test @iddata/fft
+
+test moen4
\ No newline at end of file