Changeset 626

Timestamp:

09/18/09 00:17:06 (15 years ago)

Author:

smidl

Message:

Allow buffered datalinks in estimator

Files:

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

applications/bdmtoolbox/mex/estimator.cpp

@@ -124 +124 @@
                 };
         } else {
-                if ( Ds->max_length() < inf ) {
+                if ( Ds->max_length() < std::numeric_limits< int >::max() ) {
                         Ndat=Ds->max_length();
                 }
@@ -155 +155 @@
         vec dt=zeros ( Ds->_drv()._dsize() );   //data variable
         Array<datalink*> Dls ( Es.length() );
+        Array<datalink_buffered*> Dls_buf (0);
         for ( int i=0; i<Es.length(); i++ ) {
-                Dls ( i ) =new datalink ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+                if (Es ( i )->_drv().mint()<0){ //delayed values are required
+                        //add dl to list of buffered DS
+                        int ith_buf=Dls_buf.size();
+                        Dls_buf.set_size( ith_buf + 1);
+                        Dls_buf(ith_buf) = new datalink_buffered(); 
+                        Dls(i) = Dls_buf(ith_buf);
+                        Dls(i)->set_connection ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+                        
+                } else {
+                        Dls ( i ) = new datalink ( Es ( i )->_drv(),Ds->_drv() ); //datalink between a datasource and estimator
+                }
         }
 
@@ -167 +178 @@
                         Es ( i )->logit ( *L );
                 }
+                
                 L->step();
                 Ds->step();                                                     // simulator step
+                //update buffered fdat links
+                for (int i=0; i<Dls_buf.length(); i++){
+                        Dls_buf(i)->step(dt);
+                }
+                        
         }