Changeset 685 for applications/bdmtoolbox

Timestamp:

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

Author:

smidl

Message:

mex tutorial cleanup + working mexDS

Location:

applications/bdmtoolbox/mex

Files:

• RV.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RV.m)
• RVjoin.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RVjoin.m)
• RVtimes.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/RVtimes.m)
• epdf2mpdf.m (moved) (moved from applications/bdmtoolbox/tutorial/userguide/epdf2mpdf.m)
• estimator.cpp (modified) (5 diffs)
• merger.cpp (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