Changeset 979 for applications/bdmtoolbox

Timestamp:

05/25/10 20:55:06 (14 years ago)

Author:

smidl

Message:

estimator returns the array of posterior estimators as second argument

Location:

applications/bdmtoolbox

Files:

• mex/estimator.cpp (modified) (4 diffs)
• tutorial/userguide/arx_basic_example.m (modified) (1 diff)

applications/bdmtoolbox/mex/estimator.cpp

@@ -38 +38 @@
 Execute command:
 \code
->> estimator('config_file.cfg');
+>> estimator
 \endcode
-when using loggers storing results on hard drives, and
-\code
->> Res=estimator('config_file.cfg');
-\endcode
-when using logger of the type \c "mex_logger". The results will be stored in structure \c M.
+and follow the help there.
 
  */
@@ -69 +65 @@
         // Check the number of inputs and output arguments
         if ( n_input<2 ) mexErrMsgTxt ( "Usage:\n"
-                                                "result=estimator(system, estimators, experiment, logger)\n"
+                                                "[Res,estimators,Res2]=estimator(system, estimators, experiment, logger)\n"
                                                 "  system     = struct('class','datasource',...);  % Estimated system\n"
                                                 "  estimators = {struct('class','estimator',...),  % Estimators\n"
@@ -76 +72 @@
                                                 "  experiment = struct('ndat',10);                 % number of data in experiment, full length of finite datasources, 10 otherwise \n"
                                                 "  logger     = struct('class','mexlogger');       % How to store results, default=mexlog, i.e. matlab structure\n\n"
+                                                "Output:\n"
+                                                "  Res          Matlab structure with logged results, \n"  
+                                                "  estimators   Array of estimators updated with data \n"
+                                                "  Res2         When logfull log_level is on, this structure is filled with structures of posterior densities\n\n"
                                                 "see documentation of classes datasource, BM, and mexlogger and their offsprings in BDM." );
 
@@ -206 +206 @@
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();
-                if (n_output>1) {
+                if (n_output>1){ // write estimators
+                        UImxArray Ests;
+                        UI::save(Es, Ests,"estimators");
+                        output[1]=UImxArray::create_mxArray(Ests);
+                }
+                if (n_output>2) {
                         mL->_setting_conf().setAutoConvert(true);
-                        output[1]= UImxArray::create_mxArray(mL->_setting_conf().getRoot());
+                        output[2]= UImxArray::create_mxArray(mL->_setting_conf().getRoot());
                 }
         }
 #endif
         for (int i=0;i<Dls.length(); i++){delete Dls(i); delete Dlsc(i);}
+        UIFile F;
+        UI::save(Es, F.getRoot(),"estimators");
+        F.writeFile("estim_out.cfg");
 }

applications/bdmtoolbox/tutorial/userguide/arx_basic_example.m

@@ -15 +15 @@
 A1.log_level = 'logbounds,logevidence';
 
-M=estimator(DS,{A1});
+[M,Apost]=estimator(DS,{A1});
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%