Changeset 760 for applications/bdmtoolbox

Timestamp:

01/05/10 22:19:49 (14 years ago)

Author:

smidl

Message:

cleanups & stuff for SYSID like estimation

Location:

applications/bdmtoolbox/mex

Files:

• estimator.cpp (modified) (2 diffs)
• merger.cpp (modified) (1 diff)

applications/bdmtoolbox/mex/estimator.cpp

@@ -122 +122 @@
         int Ndat=10;
         if ( Cfg.exists ( "experiment" ) ) {
-                if ( Cfg.getRoot().lookupValue ( "experiment.ndat",Ndat ) ) {
+                if (  UI::get(Ndat, Cfg.getRoot()["experiment"],"ndat" ) ) {
                         bdm_assert ( Ndat<=Ds->max_length(), "Data source has less data then required" );
                 };
@@ -209 +209 @@
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();
-                if (n_output>1) 
+                if (n_output>1) {
+                        mL->_setting_conf().setAutoConvert(true);
                         output[1]= UImxArray::create_mxArray(mL->_setting_conf().getRoot());
+                }
         }
 #endif

applications/bdmtoolbox/mex/merger.cpp

@@ -145 +145 @@
                 output[0] = tmp;
         }
+        if (n_output>1){
+                Config C;
+                C.setAutoConvert(true);
+                UI::save(&(Merger->_Smp()),C.getRoot());
+                output[1]= UImxArray::create_mxArray(C.getRoot());
+        }
 #endif
 }