Changeset 593

Timestamp:

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

Author:

smidl

Message:

new test for mxArrayDS (former MexDS)

Files:

• applications/bdmtoolbox/mex/estimator.cpp (modified) (3 diffs)
• applications/bdmtoolbox/tutorial/estimation/mexds_test.m (added)
• library/bdm/base/bdmbase.h (modified) (1 diff)
• library/bdm/mex/config2mxstruct.h (modified) (2 diffs)
• library/bdm/mex/mex_datasource.h (modified) (6 diffs)
• library/bdm/mex/mex_logger.h (modified) (3 diffs)
• library/bdm/mex/mex_parser.h (modified) (2 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++){

library/bdm/base/bdmbase.h

@@ -812 +812 @@
                         return Urv;
                 }
-                //! set random rvariables
+                //! set random variables
                 virtual void set_drv (const  RV &drv, const RV &urv) {
                         Drv = drv;

library/bdm/mex/config2mxstruct.h

@@ +1 @@
+#ifndef CFGSTR_H
+#define CFGSTR_H
+
 #include "../base/libconfig/libconfig.h++"
 #include <itpp/itbase.h>
@@ -154 +157 @@
         }
 };
+
+#endif //CFGSTR_H

library/bdm/mex/mex_datasource.h

@@ +1 @@
+#ifndef MXDS_H
+#define MXDS_H
+
+
 #include "../bdm/bdmerror.h"
-#include "../bdm/stat/datasources.h"
+#include "../bdm/base/datasources.h"
 #include "mex_parser.h"
 
@@ -11 +15 @@
 The data can be loaded from a file.
 */
-class MexDS : public MemDS {
+class mxArrayDS : public MemDS {
+        public:
         //!Default constructor
-        MexDS () {};
+        mxArrayDS ():MemDS() {};
 
         /*! \brief Create memory data source from mxArray
@@ -20 +25 @@
         system={
                 type="mexDS";
-                varname="";            // name of workspace variable
-                rids=[1 1 1];          // numbers of data rows
-                tds =[0 1 2];          // time delays
+                varname="";                // name of workspace variable
+                row_rv = {class='RV',...}  // definition of 
                 };
         \endcode
@@ -28 +32 @@
         MemDS with the above fields will be created;
 
-        \todo Very memory inefficient implementation. The data file is copied 2 times!
-        For better implementatin we would need MemDS with pointer to the raw data. Then it could operate directly inside mxArray.
-
         */
         void from_setting ( const Setting &set ) {
                 Data = mxArray2mat ( mexGetVariable ( "base", set["varname"] ) );
-                UI::get ( rowid, set, "rids" , UI::compulsory );
+/*              UI::get ( rowid, set, "rids" , UI::compulsory );
                 bdm_assert_debug ( max ( rowid ) <= Data.rows(), "MemDS rowid is too high for given Dat." );
 
@@ -40 +41 @@
                 time = max ( delays );
                 bdm_assert_debug ( time < Data.cols(), "MemDS delays are too high." );
-
-                shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::compulsory );
+*/
+                //set MemDS
+                rowid = linspace(0,Data.rows()-1);
+                delays = zeros_i(Data.rows());
+                dtsize=rowid.length();
+                utsize=0;
+                
+                shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
                 RV ru = RV();
-                set_rvs ( *r, ru );
+                if (r){
+                        set_rvs ( *r, ru );
+                } else {
+                        RV def((const char*)set["varname"],Data.rows());
+                        set_rvs(def, ru);
+                }
         }
 
@@ -50 +62 @@
 };
 
-UIREGISTER ( MexDS );
-SHAREDPTR ( MexDS );
+UIREGISTER ( mxArrayDS );
+SHAREDPTR ( mxArrayDS );
 
 }
+#endif //MXDS_H

library/bdm/mex/mex_logger.h

@@ +1 @@
+#ifndef MXLOG_H
+#define MXLOG_H
+
 #include "base/loggers.h"
 
@@ -33 +36 @@
                 for ( r = 0; r < rows; r++ ) {
                         *temp++ = in ( c ) ( r );
+                        
                 }
         }
@@ -75 +79 @@
 SHAREDPTR ( mexlog );
 }
+
+#endif //MXLOG_H

library/bdm/mex/mex_parser.h

@@ +1 @@
+#ifndef MXPARSE_H
+#define MXPARSE_H
+
+
 #include "../base/libconfig/libconfig.h++"
 #include <itpp/itbase.h>
 #include <itpp/itmex.h>
 #include <stdlib.h>
+
 
 using namespace itpp;
@@ -127 +132 @@
         }
 };
+
+#endif //MXPARSE_H