Changeset 950

Timestamp:

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

Author:

smidl

Message:

Move logfull out of epdf.

Files:

• applications/bdmtoolbox/tutorial/userguide/frg_estim.m (modified) (2 diffs)
• library/bdm/base/bdmbase.cpp (modified) (4 diffs)
• library/bdm/base/bdmbase.h (modified) (2 diffs)
• library/bdm/bdmroot.h (modified) (1 diff)
• library/bdm/estim/particles.h (modified) (4 diffs)

applications/bdmtoolbox/tutorial/userguide/frg_estim.m

@@ -32 +32 @@
 E.class = 'PF';
 E.particle = p;                    % ARX is the analytical part
-E.res_threshold = 1.0;             % resampling parameter
+E.res_threshold = 0.90;             % resampling parameter
 E.n = 100;                          % number of particles
 E.prior.class = 'eDirich';         % prior on non-linear part
 E.prior.beta  = [2 1]; % 
-E.log_level = 'logbounds';
+E.log_level = 'logbounds,logweights,logmeans';
 E.name = 'MPF';
 
@@ -59 +59 @@
 title('Forgetting factor')
 
+
+for i=1:E.n
+    

library/bdm/base/bdmbase.cpp

@@ -442 +442 @@
         };
 
-        if ( log_level[logfull] ) {
-                // log full data
-                L.add_setting ( log_level, logfull, prefix );
-        } else {
-                // log only
-
-                if ( log_level[logmean] )
-                        L.add_vector ( log_level, logmean, r, prefix );                 
-                if ( log_level[loglbound] )
-                        L.add_vector ( log_level, loglbound, r, prefix );
-                if ( log_level[logubound] )
-                        L.add_vector ( log_level, logubound, r, prefix );
-        }
+        // log only
+
+        if ( log_level[logmean] )
+                L.add_vector ( log_level, logmean, r, prefix );                 
+        if ( log_level[loglbound] )
+                L.add_vector ( log_level, loglbound, r, prefix );
+        if ( log_level[logubound] )
+                L.add_vector ( log_level, logubound, r, prefix );
 }
 
 void epdf::log_write() const {
-        if ( log_level[logfull] ) {
-                log_level.store( logfull, this );
-        } else {
-                if ( log_level[logmean] ) {
-                        log_level.store( logmean, mean() );
-                }
-                if ( log_level[loglbound] || log_level[logubound] ) {
-                                vec lb;
-                                vec ub;
-                                qbounds ( lb, ub );
-                                if (log_level[loglbound])
-                                        log_level.store( loglbound, lb );
-                                if (log_level[logubound])
-                                        log_level.store( logubound, ub );
-                        }
-                }
-        }
+        if ( log_level[logmean] ) {
+                log_level.store( logmean, mean() );
+        }
+        if ( log_level[loglbound] || log_level[logubound] ) {
+                vec lb;
+                vec ub;
+                qbounds ( lb, ub );
+                if (log_level[loglbound])
+                        log_level.store( loglbound, lb );
+                if (log_level[logubound])
+                        log_level.store( logubound, ub );
+        }
+}
+
 
 
@@ -558 +550 @@
         root::log_register ( L, prefix );
 
+        if ( log_level[logfull] ) {
+                // log full data
+                L.add_setting ( log_level, logfull, prefix + L.separator + "posterior" );
+        } 
+                
         if ( log_level[logevidence] )
                 L.add_vector ( log_level, logevidence, RV ( 1 ), prefix );      
@@ -565 +562 @@
                 prior().log_level[epdf::logubound]=true;
         }
-        if (log_level[logfull]){
-                prior().log_level[epdf::logfull]=true;
-        }
         const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.separator + "apost" );
 }
@@ -573 +567 @@
 void BM::log_write ( ) const {
         posterior().log_write();
-
+        if ( log_level[logfull] ) {
+                log_level.store( logfull, &posterior() );
+        } 
+                
         if( log_level[logevidence] ) 
                 log_level.store( logevidence, ll );

library/bdm/base/bdmbase.h

@@ -670 +670 @@
         //! \var log_level_enums logfull
         //! log full record of the density in the form of setting
-        LOG_LEVEL(epdf,logmean,loglbound,logubound,logfull);
+        LOG_LEVEL(epdf,logmean,loglbound,logubound);
 
 public:
@@ -1335 +1335 @@
         void validate()
         {
-                if ( log_level[logfull] ) {
-                        const_cast<epdf&> ( posterior() ).log_level[epdf::logfull] = true;
+                if ( log_level[logbounds] ) {
+                        const_cast<epdf&> ( posterior() ).log_level[epdf::loglbound] = true;
                 } else {
-                        if ( log_level[logbounds] ) {
-                                const_cast<epdf&> ( posterior() ).log_level[epdf::loglbound] = true;
-                        } else {
-                                const_cast<epdf&> ( posterior() ).log_level[epdf::logmean] = true;;
-                        }
-                        if ( log_level[logevidence] ) {
-                        }
+                        const_cast<epdf&> ( posterior() ).log_level[epdf::logmean] = true;;
                 }
         }

library/bdm/bdmroot.h

@@ -223 +223 @@
                 // add number to name only in the case there are more registered vectors with the same log_level_enum
                 if( ids(log_level_enum).length() > 1 )
-                        stream << "*" << enum_subindex;
+                        stream << "_" << enum_subindex;
                 
                 return stream.str();

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);
+                        }
+                }
+                
         }