Changeset 685

Timestamp:

10/29/09 23:23:56 (14 years ago)

Author:

smidl

Message:

mex tutorial cleanup + working mexDS

Files:

• applications/bdmtoolbox/mex/RV.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RV.m)
• applications/bdmtoolbox/mex/RVjoin.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RVjoin.m)
• applications/bdmtoolbox/mex/RVtimes.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RVtimes.m)
• applications/bdmtoolbox/mex/epdf2mpdf.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/epdf2mpdf.m)
• applications/bdmtoolbox/mex/estimator.cpp (modified) (5 diffs)
• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (4 diffs)
• library/bdm/base/loggers.h (modified) (1 diff)
• library/bdm/mex/mex_BM.h (modified) (1 diff)
• library/bdm/mex/mex_datasource.h (modified) (2 diffs)
• library/bdm/mex/mex_logger.h (modified) (1 diff)

applications/bdmtoolbox/mex/estimator.cpp

@@ -145 +145 @@
         Setting &S=Cfg;
         for ( int i=0; i<Es.length(); i++ ) {
-                try {
-                        UI::get ( Ename, S["estimators"][i], "name" );
-                } catch ( UIException e ) {
+                if (!UI::get ( Ename, S["estimators"][i], "name" ,UI::optional)){
                         Ename="Est"+num2str ( i );
                 }
@@ -157 +155 @@
         vec dt=zeros ( Ds->_drv()._dsize() );   //data variable
         Array<datalink*> Dls ( Es.length() );
+        Array<datalink*> Dlsc ( Es.length() );
         Array<datalink_buffered*> Dls_buf (0);
         for ( int i=0; i<Es.length(); i++ ) {
-                if (Es ( i )->_drv().mint()<0){ 
+                //connect actual data
+                Dls ( i ) = new datalink ( Es ( i )->_yrv(),Ds->_drv() ); //datalink between a datasource and estimator
+                //connect data in condition
+                if (Es ( i )->_rvc().mint()<0){ 
                         //delayed values are required
                         
@@ -167 +169 @@
                         Dls_buf(ith_buf) = new datalink_buffered(); 
                         //add dl to list of buffered DS
-                        Dls(i) = Dls_buf(ith_buf);
-                        Dls(i)->set_connection ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+                        Dlsc(i) = Dls_buf(ith_buf);
+                        Dlsc(i)->set_connection ( Es ( i )->_rvc(),Ds->_drv() ); //datalink between a datasource and estimator
                         
                 } else {
-                        Dls ( i ) = new datalink ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+                        Dlsc ( i ) = new datalink ( Es ( i )->_rvc(),Ds->_drv() ); //datalink between a datasource and estimator
                 }
         }
@@ -180 +182 @@
 
                 for ( int i=0; i<Es.length(); i++ ) {
-                        Es ( i )->bayes ( Dls ( i )->pushdown ( dt ) );         // update estimates
+                        Es ( i )->bayes ( Dls ( i )->pushdown ( dt ), Dlsc(i) ->pushdown(dt) );         // update estimates
                         Es ( i )->log_write ();
                 }
@@ -204 +206 @@
         }
 #endif
-        for (int i=0;i<Dls.length(); i++){delete Dls(i);}
+        for (int i=0;i<Dls.length(); i++){delete Dls(i); delete Dlsc(i);}
 }

applications/bdmtoolbox/mex/merger.cpp

@@ -58 +58 @@
 #endif
         // Sources
-        Array<shared_ptr<mpdf> > Sources;
-        //abuse Mer to store sources
-        Setting& _Sources = Cfg.lookup ( "Sources" );
-        int Slen = _Sources.getLength();
-        Sources.set_size ( Slen );
-        for ( int i = 0; i < Slen; i++ ) {
-                try {
-                        shared_ptr<mpdf> mtmp = UI::build<mpdf> ( _Sources, i );
-                        Sources ( i ) = mtmp;
-                } catch ( UIException ) {
-                        // it is not mpdf - see if it is epdf
-                        try {
-                                shared_ptr<epdf> etmp = UI::build<epdf> ( _Sources, i );
-                                if ( etmp ) {
-                                        Sources ( i ) = new mepdf ( etmp ); // hopefully OK
-                                }
-                        } catch ( UIException &e ) {
-                                it_error ( "No mpdfs or epdfs found! " + string ( e.what() ) );
-                        } catch ( std::exception e ) {
-                                it_error ( "Error in UI at " + _Sources[i].getPath() );
-                        }
-                } catch ( std::exception &e ) {
-                        it_error ( "Error in UI at " + _Sources[i].getPath() );
-                }
-        }
-
+        Array<shared_ptr<mpdf> >  Sources;
+        UI::get(Sources, Cfg, "Sources", UI::compulsory);
         shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );
 
         // Support
-        try {
-                shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> ( Cfg, "Support" );
+        try{
+        shared_ptr<rectangular_support> RecSup = UI::build<rectangular_support> ( Cfg, "Support" ,UI::optional);
+        if(RecSup){
                 Merger->set_support ( *RecSup );
-        } catch ( UIException &e ) {
-                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support" );
-                Merger->set_support ( *DisSup );
+        } 
+        } catch (UIException &e) {
+                shared_ptr<discrete_support> DisSup = UI::build<discrete_support> ( Cfg, "Support", UI::optional );
+                if (DisSup){
+                        Merger->set_support ( *DisSup );
+                } else{bdm_error("Support not defined");}
         }
 // COMPUTE RESULTS

library/bdm/base/bdmbase.h

@@ -594 +594 @@
                 }
         }
+        void log_write() const {
+                if (log_level>0) {
+                        logrec->L.logit( logrec->ids(0), mean() );
+                }
+                if (log_level>2) {
+                        vec lb; vec ub;
+                        qbounds(lb,ub);
+                        logrec->L.logit( logrec->ids(1), lb );
+                        logrec->L.logit( logrec->ids(2), ub );
+                }
+        }
         //!@}
 
@@ -951 +962 @@
 public:
         //! default constructors
-                DS() : Drv(), Urv(),Yrv() {log_level=1;};
+        DS() : dtsize(0),utsize(0),ytsize(0),Drv(), Urv(),Yrv() {log_level=1;};
 
         //! Returns maximum number of provided data, by default it is set to maximum allowed length, shorter DS should overload this method! See, MemDS.max_length().
@@ -989 +1000 @@
                 if (log_level >0){
                         logrec->ids.set_size(2);
-                        logrec->ids(0) = logrec->L.add ( Yrv, "" );
-                        logrec->ids(1) = logrec->L.add ( Urv, "" );
+                        logrec->ids(0) = logrec->L.add ( Yrv, prefix );
+                        logrec->ids(1) = logrec->L.add ( Urv, prefix );
                 }
         }
@@ -1194 +1205 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                shared_ptr<RV> r = UI::build<RV> ( set, "drv", UI::optional );
+                shared_ptr<RV> r = UI::build<RV> ( set, "yrv", UI::optional );
                 if ( r ) {
                         set_yrv ( *r );
                 }
+                shared_ptr<RV> r2 = UI::build<RV> ( set, "rvc", UI::optional );
+                if ( r2 ) {
+                        rvc =   *r2;
+                }
+                shared_ptr<RV> r3 = UI::build<RV> ( set, "rv", UI::optional );
+                if ( r3 ) {
+                        set_rv(*r3);
+                }
+                
                 string opt;
                 if ( UI::get ( opt, set, "options", UI::optional ) ) {

library/bdm/base/loggers.h

@@ -36 +36 @@
 public:
         //! convenience constructor
-        memlog ( int maxlen0, string itf = "" ) :logger("."), maxlen ( maxlen0 ), ind ( 0 ), vectors ( 0 ), itfilename ( itf ) {}
+        memlog ( int maxlen0, string itf = "" ) :logger("_"), maxlen ( maxlen0 ), ind ( 0 ), vectors ( 0 ), itfilename ( itf ) {}
 
         //!Default constructor
-        memlog() : logger("."), maxlen ( 0 ), ind ( 0 ), vectors ( 0 ) {}
+        memlog() : logger("_"), maxlen ( 0 ), ind ( 0 ), vectors ( 0 ) {}
 
         //! Initialize storage

library/bdm/mex/mex_BM.h

@@ -80 +80 @@
                         mxArray *in[2];
                         in[0] = data;
-                        in[1] = mxCreateDoubleMatrix(dt.size(), 1, mxREAL);
-                        vec2mxArray(dt, in[1]);
+                        in[1] = mxCreateDoubleMatrix(yt.size(), 1, mxREAL);
+                        vec2mxArray(yt, in[1]);
                         mexCallMATLAB(1, &tmp, 2, in, (name+"_bayes").c_str());
                         old = data;

library/bdm/mex/mex_datasource.h

@@ -91 +91 @@
         \code
         system={
-                type="mexDS";
+                class="mexDS";
                 step_name="";              // name of function to call
                 input_name="";             // name of workspace variable where inputs are written
-                rv_out = {class='RV',...}  // identification of outputs
-                rv_in = {class='RV',...}   // identification of inputs
+                yrv = {class='RV',...}  // identification of outputs
+                urv = {class='RV',...}   // identification of inputs
                 };
         \endcode
@@ -106 +106 @@
                 UI::get(input_name, set, "input_name", UI::compulsory);
                 
-                shared_ptr<RV> ry = UI::build<RV> ( set, "rv_out", UI::compulsory );
-                shared_ptr<RV> ru = UI::build<RV> ( set, "rv_in", UI::compulsory);
+                shared_ptr<RV> ry = UI::build<RV> ( set, "yrv", UI::compulsory );
+                shared_ptr<RV> ru = UI::build<RV> ( set, "urv", UI::compulsory);
 
-                dtsize=ry->_dsize();
+                ytsize=ry->_dsize();
                 utsize=ru->_dsize();
-
+                dtsize = ytsize+utsize;
+                
                 set_drv(*ry, *ru);
+                validate();
         }
         
         void step() {
                 mxArray* tmp;
-                mxArray* tmp2;
+                mxArray* dummy=NULL;
                 // write inputs to variable input_name
                 mxArray* mxinp= mexGetVariable ( "global", input_name.c_str()) ;
+                if (mxinp){
+                        if((int)mxGetM(mxinp)!=utsize || (int)mxGetN(mxinp)!=utsize) {
+                                // mxinp is invalid - create new one
+                                mxDestroyArray(mxinp);
+                                mxinp=mxCreateDoubleMatrix(utsize,1,mxREAL);
+                        }
+                        
+                } else {
+                        mxinp=mxCreateDoubleMatrix(utsize,1,mxREAL);
+                }
                 vec2mxArray(ut, mxinp);
+                mexPutVariable("global",input_name.c_str(),mxinp);
                 // call function step_name
-                mexCallMATLAB(1, &tmp, 0, (mxArray **) &tmp2, step_name.c_str());
+                mexCallMATLAB(1, &tmp, 0, (mxArray **) &dummy, step_name.c_str());
                 // save its results
-                dt=mxArray2vec(tmp);
+                bdm_assert_debug((int)mxGetM(tmp)==ytsize || (int)mxGetN(tmp)==ytsize,"mexDS.step() expected return vector of length " + num2str(dtsize) +
+                "got vector " + num2str((int)mxGetM(tmp)) + "x" + num2str((int)mxGetN(tmp)));
+                //write  y
+                dt.set_subvector(0,mxArray2vec(tmp));
+                //write u
+                dt.set_subvector(ytsize,ut);
         }
-        void write(const vec &ut0){ ut=ut0;}
-        void getdata(vec &dt_out) const {dt_out = dt;   }
+        void write(const vec &ut0){ 
+                bdm_assert_debug(ut0.length()==ut.length(),"mexDS: Incompatible input vector");
+                ut=ut0;
+        }
+        void getdata(vec &dt_out) const {
+                bdm_assert_debug(dt_out.length()==dt.length(),"mexDS: Incompatible output vector");
+                dt_out = dt;    
+        }
 
+        void validate() {
+                dt=zeros(dtsize);
+                ut=zeros(utsize);
+        }
 
         // TODO dodelat void to_setting( Setting &set ) const;

library/bdm/mex/mex_logger.h

@@ -62 +62 @@
                         istart = 0;
                         for ( int j = 0; j < entries ( i ).length(); j++ ) { // same for as in add!!!
-                                vec_name = names ( i ) + entries ( i ).name ( j );
+                                vec_name = names ( i ) +prefix_sep()+ entries ( i ).name ( j );
                                 iend = istart + entries ( i ).size ( j ) - 1;
                                 M = vectors ( i ).get_cols ( istart, iend );