Changeset 744 for library/bdm/design

Show
Ignore:
Timestamp:
11/28/09 14:38:48 (15 years ago)
Author:
smidl
Message:

Working unitsteps and controlloop + corresponding fixes

Location:
library/bdm/design
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • library/bdm/design/arx_ctrl.h

    r737 r744  
    124124                lq.validate(); 
    125125 
     126                rv = urvm; // rv is not shifted to t+1!! 
    126127                rvc = concat ( xrv, urvm ); 
    127128                rvc2ar_y.set_connection ( ar->_yrv(), rvc ); 

  • library/bdm/design/ctrlbase.cpp

    r738 r744  
    1313        //penalization 
    1414        qux.set_submatrix ( 0, 0, Qu._Ch() ); 
    15         qux.set_submatrix ( 0, dimx + dimu + dimy, Qu._Ch() ); 
     15        qux.set_submatrix ( 0, dimx + dimu + dimy, -Qu._Ch() ); 
    1616 
    1717        qyx.set_submatrix ( 0, 0, S->_C() ); 
    … …  
    5757 
    5858void LQG::ricatti_step() { 
    59         pre_qr.set_submatrix ( 0, 0, s*pr ); 
    60         pre_qr.set_submatrix ( dimx + dimu + dimy, dimu + dimx, -Qy.to_mat() *y_req ); 
     59//      pre_qr.set_submatrix ( 0, 0, s*pr ); 
     60//      pre_qr.set_submatrix ( dimx + dimu + dimy, dimu + dimx, -Qy.to_mat() *y_req ); 
    6161        if ( !qr ( pre_qr, post_qr ) ) { 
    6262                bdm_warning ( "QR in LQG unstable" );