From: <par...@us...> - 2012-03-17 16:00:11
|
Revision: 9936 http://octave.svn.sourceforge.net/octave/?rev=9936&view=rev Author: paramaniac Date: 2012-03-17 16:00:05 +0000 (Sat, 17 Mar 2012) Log Message: ----------- control-devel: check results with assert Modified Paths: -------------- trunk/octave-forge/extra/control-devel/devel/test_slident.m trunk/octave-forge/extra/control-devel/src/slident.cc Modified: trunk/octave-forge/extra/control-devel/devel/test_slident.m =================================================================== --- trunk/octave-forge/extra/control-devel/devel/test_slident.m 2012-03-17 12:41:13 UTC (rev 9935) +++ trunk/octave-forge/extra/control-devel/devel/test_slident.m 2012-03-17 16:00:05 UTC (rev 9936) @@ -2033,6 +2033,48 @@ [a, b, c, d, q, ry, s, k] = slident (Y, U, nobr, meth, alg, jobd, batch, conct, ctrl, rcond, tol) + +ae = [ 0.8924 0.3887 0.1285 0.1716 + -0.0837 0.6186 -0.6273 -0.4582 + 0.0052 0.1307 0.6685 -0.6755 + 0.0055 0.0734 -0.2148 0.4788 ]; + +ce = [ -0.4442 0.6663 0.3961 0.4102 ]; + +be = [ -0.2142 + -0.1968 + 0.0525 + 0.0361 ]; + +de = [ -0.0041 ]; + +ke = [ -1.9513 + -0.1867 + 0.6348 + -0.3486 ]; + +qe = [ 0.0052 0.0005 -0.0017 0.0009 + 0.0005 0.0000 -0.0002 0.0001 + -0.0017 -0.0002 0.0006 -0.0003 + 0.0009 0.0001 -0.0003 0.0002 ]; + +rye = [ 0.0012 ]; + +se = [ -0.0025 + -0.0002 + 0.0008 + -0.0005 ]; + +assert (a, ae, 1e-4); +assert (b, be, 1e-4); +assert (c, ce, 1e-4); +assert (d, de, 1e-4); +assert (k, ke, 1e-4); +assert (q, qe, 1e-4); +assert (ry, rye, 1e-4); +assert (s, se, 1e-4); + + %n %sv Modified: trunk/octave-forge/extra/control-devel/src/slident.cc =================================================================== --- trunk/octave-forge/extra/control-devel/src/slident.cc 2012-03-17 12:41:13 UTC (rev 9935) +++ trunk/octave-forge/extra/control-devel/src/slident.cc 2012-03-17 16:00:05 UTC (rev 9936) @@ -556,6 +556,11 @@ //////////////////////////////////////////////////////////////////////////////////// // SLICOT IB01CD - estimating the initial state // //////////////////////////////////////////////////////////////////////////////////// + +// TODO: use only one iwork and dwork for all three slicot routines +// ldwork = max (ldwork_a, ldwork_b, ldwork_c) + + /* // arguments in char jobx0 = 'X'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |