Changeset 871 for library/bdm/base

Timestamp:

03/19/10 11:23:05 (14 years ago)

Author:

mido

Message:

adaptation of /applications to new version of LOG_LEVEL
also, a cosmetic change made in enumerations: logub -> logubound, loglb -> loglbound

Location:

library/bdm/base

Files:

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

library/bdm/base/bdmbase.cpp

@@ -470 +470 @@
                         logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "mean" );
                 }
-                if ( log_level[loglb]  ) {
+                if ( log_level[loglbound]  ) {
                         logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "lb" );
                 }       
-                if ( log_level[logub]  ) {
+                if ( log_level[logubound]  ) {
                         logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "ub" );
                 }
@@ -487 +487 @@
                         logrec->L.log_vector ( logrec->ids ( 0 ), mean() );
                 }
-                if ( log_level[loglb] || log_level[logub] ) {
+                if ( log_level[loglbound] || log_level[logubound] ) {
                                 vec lb;
                                 vec ub;
                                 qbounds ( lb, ub );
-                                if (log_level[loglb])
+                                if (log_level[loglbound])
                                         logrec->L.log_vector ( logrec->ids ( 1 ), lb );
-                                if (log_level[logub])
+                                if (log_level[logubound])
                                         logrec->L.log_vector ( logrec->ids ( 2 ), ub );
                         }
@@ -564 +564 @@
         
         if (log_level[logbounds]){
-                prior().log_level[epdf::loglb]=true;
-                prior().log_level[epdf::logub]=true;
+                prior().log_level[epdf::loglbound]=true;
+                prior().log_level[epdf::logubound]=true;
         }
         if (log_level[logfull]){

library/bdm/base/bdmbase.h

@@ -495 +495 @@
         //! TODO DOPLNIT        
         
-        //! \var log_level_enums loglb
+        //! \var log_level_enums loglbound
         //! TODO DOPLNIT
         
-        //! \var log_level_enums logub
+        //! \var log_level_enums logubound
         //! TODO DOPLNIT
         
         //! \var log_level_enums logfull
         //! TODO DOPLNIT
-        LOG_LEVEL(epdf,logmean,loglb,logub,logfull);
+        LOG_LEVEL(epdf,logmean,loglbound,logubound,logfull);
 
 public:
@@ -1171 +1171 @@
                 } else {
                         if ( log_level[logbounds] ) {
-                                const_cast<epdf&> ( posterior() ).log_level[epdf::loglb] = true;
+                                const_cast<epdf&> ( posterior() ).log_level[epdf::loglbound] = true;
                         } else {
                                 const_cast<epdf&> ( posterior() ).log_level[epdf::logmean] = true;;