Changeset 950 for library/bdm/base

Timestamp:

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

Author:

smidl

Message:

Move logfull out of epdf.

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (4 diffs)
• bdmbase.h (modified) (2 diffs)

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