Changeset 679 for library/bdm/estim/particles.cpp

Timestamp:

10/23/09 00:05:25 (15 years ago)

Author:

smidl

Message:

Major changes in BM -- OK is only test suite and tests/tutorial -- the rest is broken!!!

Files:

• library/bdm/estim/particles.cpp (modified) (3 diffs)

library/bdm/estim/particles.cpp

@@ -46 +46 @@
 }
 
-void PF::bayes ( const vec &dt ) {
-        vec yt=dt.left(obs->dimension());
-        vec ut=dt.get(obs->dimension(),dt.length()-1);
+void PF::bayes( const vec &yt, const vec &cond ) {
+        const vec &ut=cond; //todo
         
         int i;
@@ -74 +73 @@
 // }
 
-void MPF::bayes ( const vec &dt ) {     
+void MPF::bayes ( const vec &yt, const vec &cond ) {    
         // follows PF::bayes in most places!!!  
         int i;
@@ -85 +84 @@
         #pragma parallel for
         for ( i = 0; i < n; i++ ) {
-                BMs(i) -> condition(pf->posterior()._sample(i));
-                BMs(i) -> bayes(dt);
+                BMs(i) -> bayes(this2bm.pushdown(yt), this2bm.get_cond(yt,cond));
                 lls ( i ) += BMs(i)->_ll();
         }