Changeset 950 for library/bdm/estim

Timestamp:

05/18/10 21:19:38 (14 years ago)

Author:

smidl

Message:

Move logfull out of epdf.

Files:

• library/bdm/estim/particles.h (modified) (4 diffs)

library/bdm/estim/particles.h

@@ -98 +98 @@
                         bm = UI::build<BM> ( set, "bm", UI::compulsory );
                 }
+                
+                void to_setting(const Setting &set){
+                        if (BM::log_level[logfull]){
+                        }
+                }
                 void validate(){
                         est_emp.set_point(zeros(par->dimension()));
@@ -202 +207 @@
         //! all weightes will be logged
 
-        //! \var log_level_enums samples
-        //! all samples will be logged
-        LOG_LEVEL(PF,weights,samples);
+        //! \var log_level_enums menas
+        //! means of particles will be logged
+        LOG_LEVEL(PF,logweights,logmeans,logvars);
         
         class pf_mix: public emix_base{
@@ -300 +305 @@
         void from_setting ( const Setting &set ) {
                 BM::from_setting ( set );
+                UI::get ( log_level, set, "log_level", UI::optional );
                 
                 shared_ptr<BM> bm0 = UI::build<BM>(set, "particle",UI::compulsory);
@@ -320 +326 @@
                 BM::set_rv(bm0->_rv());
                 yrv=bm0->_yrv();
+        }
+        
+        void log_register ( bdm::logger& L, const string& prefix ){
+                BM::log_register(L,prefix);
+                if (log_level[logweights]){
+                        L.add_vector( log_level, logweights, RV ( particles.length()), prefix); 
+                }
+                if (log_level[logmeans]){
+                        for (int i=0; i<particles.length(); i++){
+                                L.add_vector( log_level, logmeans, RV ( particles(i)->dimension() ), prefix , i);
+                        }
+                }
+        };
+        void log_write ( ) const {
+                BM::log_write();
+                if (log_level[logweights]){
+                        log_level.store( logweights, w); 
+                }
+                if (log_level[logmeans]){
+                        for (int i=0; i<particles.length(); i++){
+                                 log_level.store( logmeans, particles(i)->posterior().mean(), i);
+                        }
+                }
+                
         }