Changeset 609 for applications/bdmtoolbox/mex/estimator.cpp

Timestamp:

09/13/09 23:14:23 (15 years ago)

Author:

smidl

Message:

remove "delays" from memory DS, check length of datasource

Files:

• applications/bdmtoolbox/mex/estimator.cpp (modified) (6 diffs)

applications/bdmtoolbox/mex/estimator.cpp

@@ -65 +65 @@
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
         // Check the number of inputs and output arguments
-        if(n_input<3) mexErrMsgTxt("Usage:\n"  
+        if(n_input<2) mexErrMsgTxt("Usage:\n"  
                 "result=estimator(system, estimators, experiment, logger)\n"
                 "  system     = struct('class','datasource',...);  % Estimated system\n"
                 "  estimators = {struct('class','estimator',...),  % Estimators\n"
                 "                struct('class','estimator',...),...} \n"
-                "  experiment = struct('ndat',100);                % number of data in experiment \n"
                 "  === optional ==="
+                "  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"
                 "see documentation of classes datasource, BM, and mexlogger and their offsprings in BDM.");
@@ -81 +81 @@
         Cfg.addGroup(input[0],"system");
         Cfg.addList(input[1],"estimators");
-        Cfg.addGroup(input[2],"experiment");
+        if (n_input>2){
+                Cfg.addGroup(input[2],"experiment");
+        }
         if (n_input>3){
                 Cfg.addGroup(input[3],"logger");
-        }else{
+        }/*else{
                 // define logger as mexlog
                 Setting &S=Cfg.getRoot();
@@ -94 +96 @@
                 S["experiment"].lookupValue("ndat",maxlen);
                 S["logger"]["maxlen"]=maxlen;
-        }
+        }*/
         } catch(SettingException e){it_error("error: "+string(e.getPath()));}
 
@@ -111 +113 @@
 #endif
         
-        shared_ptr<logger> L = UI::build<logger>( Cfg, "logger");
         shared_ptr<DS> Ds = UI::build<DS>( Cfg, "system" );
         Array<shared_ptr<BM> > Es;      UI::get(Es,Cfg, "estimators" );
-        int Ndat;
-        Cfg.lookupValue ( "experiment.ndat",Ndat );
-
+        long Ndat=10;
+        if (Cfg.exists("experiment")) {
+                if (Cfg.lookupValue ( "experiment.ndat",Ndat )) {
+                        bdm_assert(Ndat<=Ds->max_length(), "Data source has less data then required");
+                };
+        } else {
+                if (Ds->max_length() < inf) {
+                        Ndat=Ds->max_length();
+                };// else Ndat=10;
+        }
+        shared_ptr<logger> L = UI::build<logger>( Cfg, "logger",UI::optional);
+        if (!L) {
+                #ifdef MEX
+                //mex logger has only from_setting constructor - we  have to fill it...
+                L=new mexlog(Ndat);
+                #else
+                L=new memlog(Ndat, "estimator_logger.it");
+                #endif
+        }
+        
         Ds->log_add ( *L );
         string Ename;
@@ -137 +155 @@
         }
         
-        for ( int tK=1;tK<Ndat;tK++ ) {
-                Ds->step();                                                     // simulator step
+        for ( int tK=0;tK<Ndat;tK++ ) {
                 Ds->getdata ( dt );                                     // read data
                 Ds->logit ( *L );
@@ -147 +164 @@
                 }
                 L->step();
+                Ds->step();                                                     // simulator step
         }