changeset 9090:9771703bf49e octave-forge

control-devel: work on tests
author paramaniac
date Mon, 05 Dec 2011 21:04:27 +0000
parents 9d6d55fdce98
children aae406c9cbde
files extra/control-devel/inst/btamodred.m extra/control-devel/inst/cfconred.m
diffstat 2 files changed, 59 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/inst/btamodred.m	Mon Dec 05 16:07:29 2011 +0000
+++ b/extra/control-devel/inst/btamodred.m	Mon Dec 05 21:04:27 2011 +0000
@@ -91,7 +91,7 @@
 %!
 %! sysv = ss (AV, BV, CV, DV);
 %!
-%! sysr = btamodred (sys, "nr", 2, "left", sysv, "tol1", 0.1, "tol2", 0.0);
+%! sysr = btamodred (sys, 2, "left", sysv, "tol1", 0.1, "tol2", 0.0);
 %! [Ao, Bo, Co, Do] = ssdata (sysr);
 %!
 %! Ae = [  9.1900   0.0000
@@ -107,4 +107,4 @@
 %! Mo = [Ao, Bo; Co, Do];
 %! Me = [Ae, Be; Ce, De];
 %!
-%!assert (Mo, Me, 1e-4);
\ No newline at end of file
+%!assert (Mo, Me, 1e-4);
--- a/extra/control-devel/inst/cfconred.m	Mon Dec 05 16:07:29 2011 +0000
+++ b/extra/control-devel/inst/cfconred.m	Mon Dec 05 21:04:27 2011 +0000
@@ -210,5 +210,60 @@
 endfunction
 
 
-
-
+%!shared Mo, Me
+%! A =  [       0    1.0000         0         0         0         0         0        0
+%!              0         0         0         0         0         0         0        0
+%!              0         0   -0.0150    0.7650         0         0         0        0
+%!              0         0   -0.7650   -0.0150         0         0         0        0
+%!              0         0         0         0   -0.0280    1.4100         0        0
+%!              0         0         0         0   -1.4100   -0.0280         0        0
+%!              0         0         0         0         0         0   -0.0400    1.850
+%!              0         0         0         0         0         0   -1.8500   -0.040 ];
+%!
+%! B =  [  0.0260
+%!        -0.2510
+%!         0.0330
+%!        -0.8860
+%!        -4.0170
+%!         0.1450
+%!         3.6040
+%!         0.2800 ];
+%!
+%! C =  [  -.996 -.105 0.261 .009 -.001 -.043 0.002 -0.026 ];
+%!
+%! D =  [  0.0 ];
+%!
+%! Go = ss (A, B, C, D);  % "scaled", false
+%!
+%! F = [  4.4721e-002  6.6105e-001  4.6986e-003  3.6014e-001  1.0325e-001 -3.7541e-002 -4.2685e-002  3.2873e-002 ];
+%!
+%! G = [  4.1089e-001
+%!        8.6846e-002
+%!        3.8523e-004
+%!       -3.6194e-003
+%!       -8.8037e-003
+%!        8.4205e-003
+%!        1.2349e-003
+%!        4.2632e-003 ];
+%!
+%! Kr = cfconred (Go, F, G, 4, "ERROR", "left", "tol1", 0.1, "tol2", 0.0);
+%! [Ao, Bo, Co, Do] = ssdata (Kr);
+%!
+%! Ae = [  0.5946  -0.7336   0.1914  -0.3368
+%!         0.5960  -0.0184  -0.1088   0.0207
+%!         1.2253   0.2043   0.1009  -1.4948
+%!        -0.0330  -0.0243   1.3440   0.0035 ];
+%!
+%! Be = [  0.0015
+%!        -0.0202
+%!         0.0159
+%!        -0.0544 ];
+%!
+%! Ce = [  0.3534   0.0274   0.0337  -0.0320 ];
+%!
+%! De = [  0.0000 ];
+%!
+%! Mo = [Ao, Bo; Co, Do];
+%! Me = [Ae, Be; Ce, De];
+%!
+%!assert (Mo, Me, 1e-4);