Changeset 728 for library/bdm/base/bdmbase.h

Timestamp:

11/17/09 00:54:28 (15 years ago)

Author:

smidl

Message:

logger now has ability to store settings - used in estimator. New mexfunction epdf_mean

Files:

• library/bdm/base/bdmbase.h (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -611 +611 @@
                 };
                 root::log_register(L,prefix);
-                logrec->ids.set_size(3);
-                if (log_level >0){
-                        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" );
+                
+                // log full data
+                if (log_level==10) {
+                        logrec->ids.set_size(1);
+                        logrec->ids(0) = logrec->L.add_setting(prefix);
+                } else {
+                        // log only 
+                        logrec->ids.set_size(3);
+                        if (log_level >0){
+                                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" );
+                        }
                 }
         }
         void log_write() const {
-                if (log_level>0) {
-                        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==10){
+                        to_setting(logrec->L.log_to_setting(logrec->ids(0)));
+                } else {
+                        if (log_level>0) {
+                                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 );
+                        }
                 }
         }
@@ -1207 +1219 @@
         //! Set boolean options from a string, recognized are: "logbounds,logll"
         virtual void set_options ( const string &opt ) {
-                if ( opt.find ( "logstat" ) != string::npos ) {
-                        const_cast<epdf&>(posterior()).set_log_level(3) ;
+                if ( opt.find ( "logfull" ) != string::npos ) {
+                        const_cast<epdf&>(posterior()).set_log_level(10) ;
                 } else {
                         if ( opt.find ( "logbounds" ) != string::npos ) {