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

Timestamp:

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

Author:

smidl

Message:

mex tutorial cleanup + working mexDS

Files:

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

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);}
 }