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

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.h (modified) (8 diffs)

library/bdm/estim/particles.h

@@ -93 +93 @@
                 return eff < ( res_threshold*n );
         }
-        void bayes ( const vec &dt );
+        void bayes ( const vec &yt, const vec &cond );
         //!access function
         vec& __w() { return _w; }
@@ -131 +131 @@
                 u.add(obs_u); // join both u, and check if they do not overlap
 
-                set_drv(concat(obs->_rv(),u) );
+                set_yrv(concat(obs->_rv(),u) );
         }
         //! auxiliary function reading parameter 'resmethod' from configuration file
@@ -296 +296 @@
         mpfepdf jest;
 
-        //! Log means of BMs
-        bool opt_L_mea;
-
+        //! datalink from global yt and cond (Up) to BMs yt and cond (Down)
+        datalink_m2m this2bm;
+        //! datalink from global yt and cond (Up) to PFs yt and cond (Down)
+        datalink_m2m this2pf;
+        
 public:
         //! Default constructor.
@@ -320 +322 @@
         };
 
-        void bayes ( const vec &dt );
+        void bayes ( const vec &yt, const vec &cond );
         const epdf& posterior() const {
                 return jest;
@@ -328 +330 @@
         void set_options ( const string &opt ) {
                 BM::set_options(opt);
-                opt_L_mea = ( opt.find ( "logmeans" ) != string::npos );
         }
 
@@ -352 +353 @@
 
                 pf = new PF;
-                // rpior must be set before BM
+                // prior must be set before BM
                 pf->prior_from_set(set);
                 pf->resmethod_from_set(set);
                 pf->set_model(par,obs);
-                
+                                
                 shared_ptr<BM> BM0 =UI::build<BM>(set,"BM",UI::compulsory);
                 set_BM(*BM0);
@@ -367 +368 @@
                 //find potential input - what remains in rvc when we subtract rv
                 RV u = par->_rvc().remove_time().subt( par->_rv() );            
-                set_drv(concat(BM0->_drv(),u) );
+                set_yrv(concat(BM0->_yrv(),u) );
                 validate();
         }
@@ -377 +378 @@
                 }
                 jest.read_parameters();
-                for ( int i = 0; i < pf->__w().length(); i++ ) {
-                        BMs ( i )->condition ( pf->posterior()._sample ( i ) );
-                }
+                this2bm.set_connection(BMs(0)->_yrv(), BMs(0)->_rvc(), yrv, rvc);
+                this2bm.set_connection(pf->_yrv(), pf->_rvc(), yrv, rvc);
         }