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

Timestamp:

04/19/10 12:44:57 (14 years ago)

Author:

mido

Message:

LOG LEVEL improved and hopefully finished

Files:

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

library/bdm/base/bdmbase.cpp

@@ -99 +99 @@
 }
 
+RV::RV ( int sz, int tm ) {
+        Array<string> A ( 1 );
+        A ( 0 ) = "";
+        init ( A, vec_1 ( sz ), vec_1 ( tm ) );
+}
+
 bool RV::add ( const RV &rv2 ) {
         if ( rv2.len > 0 ) { //rv2 is nonempty
@@ -426 +432 @@
 }
 
-int logger::add_vector ( const RV &rv, const string &prefix, const string &name ) {
-        int id;
-        if ( rv._dsize() > 0 ) {
-                id = entries.length();
-                if( name.length() > 0 ) {
-                        names = concat ( names, prefix + separator + name); // diff
-                } else {
-                        names = concat ( names, prefix ); // diff
-                }
-                entries.set_length ( id + 1, true );
-                entries ( id ) = rv;
-        } else {
-                id = -1;
-        }
-        return id; // identifier of the last entry
-}
-
-int logger::add_setting ( const string &prefix ) {
-        Setting &root = setting_conf.getRoot();
-        int id = root.getLength(); //root must be group!!
-        if ( prefix.length() > 0 ) {
-                settings.set_length ( id + 1, true );
-                settings ( id ) = &root.add ( prefix, Setting::TypeList );
-        } else {
-                id = -1;
-        }
-        return id;
+
+string logger::remove_log_prefix_if_possible( string name_with_prefix )
+{
+        string possible_log_prefix = name_with_prefix.substr(0,3);
+        if( possible_log_prefix == "log" )
+                return name_with_prefix.substr(3,name_with_prefix.length()-3);
+        else return name_with_prefix;
 }
 
 void epdf::log_register ( logger &L, const string &prefix ) {
+        root::log_register ( L, prefix );
+
         RV r;
         if ( isnamed() ) {
                 r = _rv();
         } else {
-                r = RV ( "", dimension() );
+                r = RV (  dimension() );
         };
-        root::log_register ( L, prefix );
-
-        // log full data
+
         if ( log_level[logfull] ) {
-                logrec->ids.set_size ( 1 );
-                logrec->ids ( 0 ) = logrec->L.add_setting ( prefix );
+                // log full data
+                registered_logger->add_setting ( log_level, logfull, prefix );
         } else {
                 // log only
-                logrec->ids.set_size ( 3 );
-                if ( log_level[logmean] ) {
-                        logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix, "mean" );
-                }
-                if ( log_level[loglbound]  ) {
-                        logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix, "lb" );
-                }       
-                if ( log_level[logubound]  ) {
-                        logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix, "ub" );
-                }
-        
+
+                if ( log_level[logmean] )
+                        registered_logger->add_vector ( log_level, logmean, r, prefix );                        
+                if ( log_level[loglbound] )
+                        registered_logger->add_vector ( log_level, loglbound, r, prefix );
+                if ( log_level[logubound] )
+                        registered_logger->add_vector ( log_level, logubound, r, prefix );
         }
 }
@@ -486 +468 @@
 void epdf::log_write() const {
         if ( log_level[logfull] ) {
-                UI::save(this,  logrec->L.log_to_setting ( logrec->ids ( 0 ) ) );
+                log_level.store( logfull, this );
         } else {
                 if ( log_level[logmean] ) {
-                        logrec->L.log_vector ( logrec->ids ( 0 ), mean() );
+                        log_level.store( logmean, mean() );
                 }
                 if ( log_level[loglbound] || log_level[logubound] ) {
@@ -496 +478 @@
                                 qbounds ( lb, ub );
                                 if (log_level[loglbound])
-                                        logrec->L.log_vector ( logrec->ids ( 1 ), lb );
+                                        log_level.store( loglbound, lb );
                                 if (log_level[logubound])
-                                        logrec->L.log_vector ( logrec->ids ( 2 ), ub );
+                                        log_level.store( logubound, ub );
                         }
                 }
@@ -543 +525 @@
 
         root::log_register ( L, prefix );
-        //we know that
-        if ( log_level.any() ) {
-                logrec->ids.set_size ( 1 );
-                logrec->ids ( 0 ) = logrec->L.add_vector ( Drv, prefix );
-        //      logrec->ids ( 1 ) = logrec->L.add_vector ( Urv, prefix );
-        }
+
+
+        if ( log_level[logdt] )
+                registered_logger->add_vector ( log_level, logdt, Drv, prefix );        
+        if ( log_level[logut] )
+                registered_logger->add_vector ( log_level, logut, Urv, prefix );
 }
 
 void DS::log_write ( ) const {
-        if ( log_level.any() ) {
+        if( log_level[logdt] ) {
                 vec tmp ( Drv._dsize());
                 getdata ( tmp );
                 // d is first in getdata
-                logrec->L.log_vector ( logrec->ids ( 0 ), tmp );
+                log_level.store( logdt, tmp );
+        }
+        if( log_level[logut] ) { 
+                bdm_warning("We are sorry, but DS::log_write() is not able to log \"ut\" at the moment, would you be so kind and code this functionality?");
+        }
+}
+
+
+void DS::from_setting ( const Setting &set ) {
+        shared_ptr<RV> r = UI::build<RV> ( set, "drv", UI::optional );
+        if ( r )        
+                set_drv ( *r, RV() );
+}
+
+void DS::validate() {
+        if( !Drv._dsize() && dtsize > 0 )
+        {
+                RV *r = new RV();
+                for ( int i = 0; i < dtsize; i++ ) {
+                        r->add ( RV ( "ch" + num2str ( i ), 1, 0 ) );
+                }
+                set_drv ( *r, RV() );
+                delete r;
         }
 }
@@ -563 +567 @@
         root::log_register ( L, prefix );
 
-        if ( log_level.any() ) {
-                logrec->ids.set_size ( 1 );
-                logrec->ids ( 0) = L.add_vector ( RV ( "", 1 ), prefix, "ll" );
-        }
-        
+        if ( log_level[logevidence] )
+                registered_logger->add_vector ( log_level, logevidence, RV ( 1 ), prefix );     
+
         if (log_level[logbounds]){
                 prior().log_level[epdf::loglbound]=true;
@@ -580 +582 @@
 void BM::log_write ( ) const {
         posterior().log_write();
-        if ( log_level.any() ) {
-                logrec->L.logit ( logrec->ids ( 0 ), ll );
-        }
+
+        if( log_level[logevidence] ) 
+                log_level.store( logevidence, ll );
 }