Changeset 907 for library/bdm/stat

Timestamp:

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

Author:

mido

Message:

LOG LEVEL improved and hopefully finished

Location:

library/bdm/stat

Files:

• exp_family.cpp (modified) (2 diffs)
• exp_family.h (modified) (2 diffs)

library/bdm/stat/exp_family.cpp

@@ -298 +298 @@
 
 void egiw::log_register ( bdm::logger& L, const string& prefix ) {
-        if ( log_level[tri] ) {
+        if ( log_level[logmean] || log_level[logvariance] ) { 
                 root::log_register ( L, prefix );
-                logrec->ids.set_length ( 2 );
                 int th_dim = dimension() - dimx * ( dimx + 1 ) / 2;
-                logrec->ids ( 0 ) = L.add_vector ( RV ( "", th_dim ), prefix, "mean" );
-                logrec->ids ( 1 ) = L.add_vector ( RV ( "", th_dim * th_dim ), prefix, "variance" );
+
+                if ( log_level[logmean] )
+                        registered_logger->add_vector( log_level, logmean, RV ( th_dim ), prefix ); 
+                if ( log_level[logvariance] )
+                        registered_logger->add_vector( log_level, logvariance, RV ( th_dim * th_dim ), prefix );
         } else {
                 epdf::log_register ( L, prefix );
@@ -310 +312 @@
 
 void egiw::log_write() const {
-        if ( log_level[tri] ) {
+        if ( log_level[logmean] || log_level[logvariance] ) { 
                 mat M;
                 ldmat Lam;
                 ldmat Vz;
                 factorize ( M, Vz, Lam );
-                logrec->L.log_vector ( logrec->ids ( 0 ), est_theta() );
-                logrec->L.log_vector ( logrec->ids ( 1 ), cvectorize ( est_theta_cov().to_mat() ) );
+                if( log_level[logmean] )
+                        log_level.store( logmean, est_theta() );
+                if( log_level[logvariance] )
+                        log_level.store( logvariance, cvectorize ( est_theta_cov().to_mat() ) );
         } else {
                 epdf::log_write();
         }
-
 }
 

library/bdm/stat/exp_family.h

@@ -102 +102 @@
                 BM::to_setting( set );
                 UI::save(frg, set, "frg");
-                // TODO DOPLNIT? ALE MOMENTALNE CHYBI FROM_SETTING PRO INSPIRACI
         } 
+
         void from_setting( const Setting &set) {
                 BM::from_setting(set);
                 if ( !UI::get ( frg, set, "frg" ) )
                         frg = 1.0;
-        
         }
 
@@ -349 +348 @@
 */
 class egiw : public eEF {
-        //! \var log_level_enums tri
+        //! \var log_level_enums logvariance
         //! TODO DOPLNIT
-        LOG_LEVEL(egiw,tri);
+
+        //! \var log_level_enums logmean
+        //! TODO DOPLNIT
+        LOG_LEVEL(egiw,logmean, logvariance);
 
 protected: