Changeset 966 for applications/bdmtoolbox

Timestamp:

05/21/10 00:44:35 (14 years ago)

Author:

smidl

Message:

Check connections between DS and Est

Files:

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

applications/bdmtoolbox/mex/estimator.cpp

@@ -151 +151 @@
         Array<datalink_buffered*> Dls_buf (0);
         for ( int i=0; i<Es.length(); i++ ) {
+                //check if they are properly named
+                bdm_assert(Es(i)->_yrv()._dsize() == Es(i)->dimensiony(), "Estimator["+num2str(i)+"] does not name yrv properly."
+                "size(yrv)="+num2str(Es(i)->_yrv()._dsize() ) + ", declared dimension of y="+num2str(Es(i)->dimensiony()));
+                bdm_assert(Es(i)->_rvc()._dsize() == Es(i)->dimensionc(), "Estimator["+num2str(i)+"] does not name rvc properly."
+                "size(rvc)="+num2str(Es(i)->_rvc()._dsize() ) + ", declared dimension of rvc="+num2str(Es(i)->dimensionc()));
                 //connect actual data
                 Dls ( i ) = new datalink ( Es ( i )->_yrv(),Ds->_drv() ); //datalink between a datasource and estimator
@@ -165 +170 @@
                         Dlsc(i)->set_connection ( Es ( i )->_rvc(),Ds->_drv() ); //datalink between a datasource and estimator
                         
+                        bdm_assert_debug(Dlsc(i)->_downsize() == Es ( i )->_rvc()._dsize(), "Data required by Est[" + num2str(i) + "], " + 
+                        Es(i)->_rvc().to_string() + ", are not available in DS drv:" + Ds->_drv().to_string(););
                 } else {
                         Dlsc ( i ) = new datalink ( Es ( i )->_rvc(),Ds->_drv() ); //datalink between a datasource and estimator