changeset 11369:c6f9cbae2114 octave-forge

control: commit forgotten changes
author paramaniac
date Thu, 10 Jan 2013 19:02:54 +0000
parents 2c801e9bebc3
children 4da3b9846c3b
files main/control/devel/testcare.m main/control/devel/testdare.m main/control/src/sl_are.cc
diffstat 3 files changed, 65 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/control/devel/testcare.m	Thu Jan 10 19:02:54 2013 +0000
@@ -0,0 +1,46 @@
+%{
+    READ ( NIN, FMT = * ) N, JOB, DICO, HINV, TRANA, UPLO, SCAL, SORT,
+     $                      FACT, LYAPUN
+
+Program Data
+ SB02RD EXAMPLE PROGRAM DATA
+   2     A     C     D     N     U     N     S     N     O
+   0.0   1.0
+   0.0   0.0
+   1.0   0.0
+   0.0   2.0
+   0.0   0.0
+   0.0   1.0
+Program Results
+ SB02RD EXAMPLE PROGRAM RESULTS
+
+ The solution matrix X is 
+   2.0000   1.0000
+   1.0000   2.0000
+
+ Estimated separation =   0.4000
+
+ Estimated reciprocal condition number =   0.1333
+
+ Estimated error bound =   0.0000
+
+%}
+
+%A,Q,G
+
+A = [   0.0   1.0
+        0.0   0.0 ];
+   
+Q = [   1.0   0.0
+        0.0   2.0 ];
+   
+G = [   0.0   0.0
+        0.0   1.0 ];
+
+
+R = eye (2);
+
+[B, p] = chol (G, "lower");
+
+X = care (A, B, Q, R)
+   
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/control/devel/testdare.m	Thu Jan 10 19:02:54 2013 +0000
@@ -0,0 +1,19 @@
+ a = [ 0.4   1.7
+       0.9   3.8];
+
+ b = [ 0.8
+       2.1];
+
+ c = [ 1  -1];
+
+ r = 3;
+
+ [x, l, g] = dare (a, b, c.'*c, r)
+
+ xe = [ 1.5354    1.2623
+        1.2623   10.5596];
+
+ le = [-0.0022
+        0.2454];
+
+ ge = [ 0.4092    1.7283];
--- a/main/control/src/sl_are.cc	Thu Jan 10 19:02:16 2013 +0000
+++ b/main/control/src/sl_are.cc	Thu Jan 10 19:02:54 2013 +0000
@@ -186,7 +186,6 @@
         char trana = 'N';
         char scal = 'G';
         char sort = 'S';
-        //char fact = 'N';
         char lyapun = 'O';
         
         int ldt = max (1, n);