Changeset 970 for library/bdm/stat/exp_family.cpp

Timestamp:

05/23/10 11:39:58 (14 years ago)

Author:

smidl

Message:

Student + arx corrections

Files:

• library/bdm/stat/exp_family.cpp (modified) (1 diff)

library/bdm/stat/exp_family.cpp

@@ -298 +298 @@
 
 void egiw::log_register ( bdm::logger& L, const string& prefix ) {
-        if ( log_level[logmean] || log_level[logvariance] ) { 
-                root::log_register ( L, prefix );
-                int th_dim = dimension() - dimx * ( dimx + 1 ) / 2;
-
-                if ( log_level[logmean] )
-                        L.add_vector( log_level, logmean, RV ( th_dim ), prefix ); 
-                if ( log_level[logvariance] )
-                        L.add_vector( log_level, logvariance, RV ( th_dim * th_dim ), prefix );
-        } else {
-                epdf::log_register ( L, prefix );
+        epdf::log_register ( L, prefix );
+        if ( log_level[logvartheta] ) { 
+                int th_dim = dim - dimx*dimx; // dimension - dimension of cov
+                L.add_vector( log_level, logvartheta, RV ( th_dim ), prefix ); 
         }
 }
 
 void egiw::log_write() const {
-        if ( log_level[logmean] || log_level[logvariance] ) { 
+        epdf::log_write();
+        if ( log_level[logvartheta] ) { 
                 mat M;
                 ldmat Lam;
                 ldmat Vz;
                 factorize ( M, Vz, Lam );
-                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();
+                if( log_level[logvartheta] )
+                        log_level.store( logvartheta, cvectorize ( est_theta_cov().to_mat() ) );
         }
 }