Changeset 593 for applications/bdmtoolbox/mex

Timestamp:

08/31/09 23:13:25 (15 years ago)

Author:

smidl

Message:

new test for mxArrayDS (former MexDS)

Files:

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

applications/bdmtoolbox/mex/estimator.cpp

@@ -58 +58 @@
 #ifdef MEX
 #include <itpp/itmex.h>
+#include "mex/mex_BM.h"
 #include "mex/mex_logger.h"
-#include "mex/mex_parser.h"
+#include "mex/mex_datasource.h"
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
@@ -110 +111 @@
         
         shared_ptr<logger> L = UI::build<logger>( Cfg, "logger");
-        shared_ptr<ArxDS> DS = UI::build<ArxDS>( Cfg, "system" );
+        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 );
 
-        DS->log_add ( *L );
+        Ds->log_add ( *L );
         string Ename;
         Setting &S=Cfg;
@@ -127 +128 @@
                 Es(i)->log_add(*L,Ename); // estimate
         }
-        L->init();
+                L->init();
 
-        vec dt=zeros ( DS->_drv()._dsize() );   //data variable
+        vec dt=zeros ( Ds->_drv()._dsize() );   //data variable
         Array<datalink*> Dls(Es.length()); 
         for (int i=0; i<Es.length(); i++){
-                Dls(i)=new datalink( Es(i)->_drv(),DS->_drv() ); //datalink between a datasource and estimator
+                Dls(i)=new datalink( Es(i)->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
         }
         
         for ( int tK=1;tK<Ndat;tK++ ) {
-                DS->step();                                                     // simulator step
-                DS->getdata ( dt );                                     // read data
-                DS->logit ( *L );
+                Ds->step();                                                     // simulator step
+                Ds->getdata ( dt );                                     // read data
+                Ds->logit ( *L );
                 
                 for (int i=0; i<Es.length(); i++){