Changeset 686 for applications/pmsm/pmsm_estim.cpp

Timestamp:

10/29/09 23:24:04 (15 years ago)

Author:

smidl

Message:

pmsm using new syntax for bayes

Files:

• applications/pmsm/pmsm_estim.cpp (modified) (3 diffs)

applications/pmsm/pmsm_estim.cpp

@@ -44 +44 @@
         vec dt=zeros ( pDS->_drv()._dsize() );   //data variable
         Array<datalink*> Dls(nE); 
+        Array<datalink*> Dlsc(nE); 
         for (int i=0; i<nE; i++){
-                Dls(i)=new datalink( Es(i)->_drv(),pDS->_drv() ); //datalink between a datasource and estimator
+                Dls(i)=new datalink( Es(i)->_yrv(),pDS->_drv() ); //datalink between a datasource and estimator
+                Dlsc(i)=new datalink( Es(i)->_rvc(),pDS->_drv() ); //datalink between a datasource and estimator
         }
         
@@ -57 +59 @@
                 // Estimators
                 for (int i=0; i<nE; 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 ();
@@ -69 +71 @@
         for (int i=0; i<nE; i++){
                 delete Dls(i);
+                delete Dlsc(i);
         }
         return 0;