Changeset 889

Timestamp:

03/30/10 00:01:05 (15 years ago)

Author:

mido

Message:

redesign of logger::add_vector, and a few small patches.. however, applications WERE NOT ADJUSTED yet

Location:

library/bdm

Files:

• base/bdmbase.cpp (modified) (4 diffs)
• base/bdmbase.h (modified) (4 diffs)
• estim/kalman.h (modified) (1 diff)
• stat/exp_family.cpp (modified) (1 diff)
• stat/exp_family.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -426 +426 @@
 }
 
-int logger::add_vector ( const RV &rv, string prefix ) {
+int logger::add_vector ( const RV &rv, const string &prefix, const string &name ) {
         int id;
         if ( rv._dsize() > 0 ) {
                 id = entries.length();
                 names = concat ( names, prefix ); // diff
+                if( name.length() > 0 )
+                {
+                        concat( names, separator );
+                        concat( names, name );
+                }
                 entries.set_length ( id + 1, true );
                 entries ( id ) = rv;
@@ -468 +473 @@
                 logrec->ids.set_size ( 3 );
                 if ( log_level[logmean] ) {
-                        logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "mean" );
+                        logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix, "mean" );
                 }
                 if ( log_level[loglbound]  ) {
-                        logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "lb" );
+                        logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix, "lb" );
                 }       
                 if ( log_level[logubound]  ) {
-                        logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "ub" );
+                        logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix, "ub" );
                 }
         
@@ -561 +566 @@
         if ( log_level.any() ) {
                 logrec->ids.set_size ( 1 );
-                logrec->ids ( 0) = L.add_vector ( RV ( "", 1 ), prefix + L.prefix_sep() + "ll" );
+                logrec->ids ( 0) = L.add_vector ( RV ( "", 1 ), prefix, "ll" );
         }
         
@@ -571 +576 @@
                 prior().log_level[epdf::logfull]=true;
         }
-        const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.prefix_sep() + "apost" );
+        const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.separator + "apost" );
 }
 

library/bdm/base/bdmbase.h

@@ -306 +306 @@
         //! Names of logged quantities, e.g. names of algorithm variants
         Array<string> names;
-        //!separator of prefixes of entries
-        const string separator;
         //! Root Setting for storing Settings
         Config setting_conf;
@@ -316 +314 @@
         logger ( const string separator0 ) : entries ( 0 ), names ( 0 ), separator ( separator0 ) {}
 
+        //!separator of prefixes of entries
+        //!
+        //! It is a constant string, thus it can be safely declared as public without creating any accessor method
+        const string separator;
+
+
         //! returns an identifier which will be later needed for calling the \c logit() function
         //! For empty RV it returns -1, this entry will be ignored by \c logit().
-        virtual int add_vector ( const RV &rv, string prefix = "" );
+        virtual int add_vector ( const RV &rv, const string &prefix, const string &name = "" );
 
         virtual int add_setting ( const string &prefix );
@@ -339 +343 @@
         //! Initialize the storage
         virtual void init() {};
-
-        //!separator of prefixes for this logger
-        const string& prefix_sep() {
-                return separator;
-        }
 };
 
@@ -512 +511 @@
 
         The following constructors should be supported for convenience:
-        \li constructor followed by calling \c set_parameters()
+        \li constructor followed by calling \c set_parameters() WHICH IS OBSOLETE (TODO)
         \li constructor accepting random variables calling \c set_rv()
 
-         All internal data structures are constructed as empty. Their values (including sizes) will be set by method \c set_parameters(). This way references can be initialized in constructors.
+         All internal data structures are constructed as empty. Their values (including sizes) will be 
+         set by method \c set_parameters() WHICH IS OBSOLETE (TODO). This way references can be initialized in constructors.
         @{*/
         epdf() {};

library/bdm/estim/kalman.h

@@ -422 +422 @@
 
 };
-
 UIREGISTER ( MultiModel );
 SHAREDPTR ( MultiModel );

library/bdm/stat/exp_family.cpp

@@ -302 +302 @@
                 logrec->ids.set_length ( 2 );
                 int th_dim = dimension() - dimx * ( dimx + 1 ) / 2;
-                logrec->ids ( 0 ) = L.add_vector ( RV ( "", th_dim ), prefix + logrec->L.prefix_sep() + "mean" );
-                logrec->ids ( 1 ) = L.add_vector ( RV ( "", th_dim * th_dim ), prefix + logrec->L.prefix_sep() + "variance" );
+                logrec->ids ( 0 ) = L.add_vector ( RV ( "", th_dim ), prefix, "mean" );
+                logrec->ids ( 1 ) = L.add_vector ( RV ( "", th_dim * th_dim ), prefix, "variance" );
         } else {
                 epdf::log_register ( L, prefix );

library/bdm/stat/exp_family.h

@@ -451 +451 @@
         rv = RV({'name'})         // description of RV
         rvc = RV({'name'})        // description of RV in condition
+        log_level = 'tri';                // set the level of logged details
         \endcode
+
+        \sa log_level_enums
         */
-
         void from_setting ( const Setting &set ) {
                 epdf::from_setting ( set );