Changeset 850 for library/bdm/base/bdmbase.cpp

Timestamp:

03/04/10 16:41:30 (14 years ago)

Author:

smidl

Message:

changes in Loggers!

Files:

• library/bdm/base/bdmbase.cpp (modified) (8 diffs)

library/bdm/base/bdmbase.cpp

@@ -461 +461 @@
 
         // log full data
-        if ( log_level == 10 ) {
+        if ( log_level[deset] ) {
                 logrec->ids.set_size ( 1 );
                 logrec->ids ( 0 ) = logrec->L.add_setting ( prefix );
@@ -467 +467 @@
                 // log only
                 logrec->ids.set_size ( 3 );
-                if ( log_level > 0 ) {
+                if ( log_level.any() ) {
                         logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "mean" );
-                }
-                if ( log_level > 1 ) {
-                        logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "lb" );
-                        logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "ub" );
+                        if ( !log_level[jedna]  ) {
+                                logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "lb" );
+                                logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "ub" );
+                        }
                 }
         }
@@ -478 +478 @@
 
 void epdf::log_write() const {
-        if ( log_level == 10 ) {
+        if ( log_level[deset] ) {
                 UI::save(this,  logrec->L.log_to_setting ( logrec->ids ( 0 ) ) );
         } else {
-                if ( log_level > 0 ) {
+                if ( log_level.any() ) {
                         logrec->L.log_vector ( logrec->ids ( 0 ), mean() );
-                }
-                if ( log_level > 1 ) {
-                        vec lb;
-                        vec ub;
-                        qbounds ( lb, ub );
-                        logrec->L.log_vector ( logrec->ids ( 1 ), lb );
-                        logrec->L.log_vector ( logrec->ids ( 2 ), ub );
+                        if ( !log_level[jedna]  ) {
+                                vec lb;
+                                vec ub;
+                                qbounds ( lb, ub );
+                                logrec->L.log_vector ( logrec->ids ( 1 ), lb );
+                                logrec->L.log_vector ( logrec->ids ( 2 ), ub );
+                        }
                 }
         }
@@ -533 +533 @@
         root::log_register ( L, prefix );
         //we know that
-        if ( log_level > 0 ) {
+        if ( log_level.any() ) {
                 logrec->ids.set_size ( 2 );
                 logrec->ids ( 0 ) = logrec->L.add_vector ( Yrv, prefix );
@@ -541 +541 @@
 
 void DS::log_write ( ) const {
-        if ( log_level > 0 ) {
+        if ( log_level.any() ) {
                 vec tmp ( Yrv._dsize() + Urv._dsize() );
                 getdata ( tmp );
@@ -551 +551 @@
 }
 
-void BM::set_options ( const string &opt ) {
-        if ( opt.find ( "logfull" ) != string::npos ) {
-                const_cast<epdf&> ( posterior() ).set_log_level ( 10 ) ;
-        } else {
-                if ( opt.find ( "logbounds" ) != string::npos ) {
-                        const_cast<epdf&> ( posterior() ).set_log_level ( 2 ) ;
-                } else {
-                        const_cast<epdf&> ( posterior() ).set_log_level ( 1 ) ;
-                }
-                if ( opt.find ( "logll" ) != string::npos ) {
-                        log_level = 1;
-                }
-        }
-}
-
 void BM::log_register ( logger &L, const string &prefix ) {
         root::log_register ( L, prefix );
@@ -571 +556 @@
         const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.prefix_sep() + "apost" );
 
-        if ( ( log_level ) > 0 ) {
+        if ( log_level.any() ) {
                 logrec->ids.set_size ( 1 );
-                logrec->ids ( 0 ) = L.add_vector ( RV ( "", 1 ), prefix + L.prefix_sep() + "ll" );
+                logrec->ids ( likelihood ) = L.add_vector ( RV ( "", 1 ), prefix + L.prefix_sep() + "ll" );
         }
 }
@@ -579 +564 @@
 void BM::log_write ( ) const {
         posterior().log_write();
-        if ( log_level > 0 ) {
-                logrec->L.logit ( logrec->ids ( 0 ), ll );
+        if ( log_level.any() ) {
+                logrec->L.logit ( logrec->ids ( likelihood ), ll );
         }
 }