Changeset 883

Timestamp:

03/29/10 23:01:19 (14 years ago)

Author:

smidl

Message:

bdmtoolbox + arx

Files:

• applications/bdmtoolbox/mex/arena.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/controlloop.cpp (modified) (2 diffs)
• applications/bdmtoolbox/tutorial/mpdm/dist_ctrl_acc.m (modified) (1 diff)
• library/bdm/design/arx_ctrl.h (modified) (1 diff)
• library/bdm/estim/arx.cpp (modified) (1 diff)

applications/bdmtoolbox/mex/arena.cpp

@@ -58 +58 @@
 
         //DBG
-//      Cfg.writeFile ( "arena.cfg" );
+        Cfg.writeFile ( "arena.cfg" );
 
 #else

applications/bdmtoolbox/mex/controlloop.cpp

@@ -100 +100 @@
 
         //DBG
-//      Cfg.writeFile ( "controlloop.cfg" );
+        Cfg.writeFile ( "controlloop.cfg" );
 
 #else
@@ -230 +230 @@
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();
+                if (n_output>1) {
+                        mL->_setting_conf().setAutoConvert(true);
+                        output[1]= UImxArray::create_mxArray(mL->_setting_conf().getRoot());
+                }
         }
 #endif

applications/bdmtoolbox/tutorial/mpdm/dist_ctrl_acc.m

@@ -49 +49 @@
 P1.merger.method = 'geometric';
 %P1.merger.dbg_file = 'mp.it';
-P1.merger.ncoms = 20;
+P1.merger.ncoms = 1;
 P1.merger.stop_niter= 5;
 P1.neighbours = {};%{'P2'};

library/bdm/design/arx_ctrl.h

@@ -66 +66 @@
                         state ( state.length() - 1 ) = 1;
                 }
-                return lq.ctrlaction ( state, cond.right ( Stsp->_B().cols() ) );
+                vec tmp=lq.ctrlaction ( state, cond.right ( Stsp->_B().cols() ) );
+                if (!isfinite(sum(tmp))) {
+                        cout << "infinite ctrl action";
+                }
+                return tmp;
         }
         //!

library/bdm/estim/arx.cpp

@@ -216 +216 @@
 void ARX::from_setting ( const Setting &set ) {
         BMEF::from_setting(set);
+        
         shared_ptr<RV> yrv_ = UI::build<RV> ( set, "rv", UI::compulsory );
         shared_ptr<RV> rrv = UI::build<RV> ( set, "rgr", UI::compulsory );