Show
Ignore:
Timestamp:
11/04/09 22:54:58 (15 years ago)
Author:
smidl
Message:

Making tutorial/userguide example work again (changes of mpdf and bayes)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • library/bdm/estim/particles.cpp

    r679 r700  
    7878        int n=pf->__w().length(); 
    7979        vec &lls = pf->_lls(); 
     80        Array<vec> &samples=pf->__samples(); 
    8081         
    8182        // generate samples - time step 
     
    8485        #pragma parallel for 
    8586        for ( i = 0; i < n; i++ ) { 
    86                 BMs(i) -> bayes(this2bm.pushdown(yt), this2bm.get_cond(yt,cond)); 
     87                vec bm_cond(BMs(i)->dimensionc()); 
     88                this2bm.fill_cond(yt,cond, bm_cond); 
     89                pf2bm.filldown(samples(i), bm_cond); 
     90                BMs(i) -> bayes(this2bm.pushdown(yt), bm_cond); 
    8791                lls ( i ) += BMs(i)->_ll(); 
    8892        }