Changeset 338 for bdm/stat/libBM.h

Timestamp:

05/06/09 15:25:59 (15 years ago)

Author:

smidl

Message:

Multiple Models + changes in loggers

Files:

• bdm/stat/libBM.h (modified) (4 diffs)

bdm/stat/libBM.h

@@ -513 +513 @@
         //! log this vector
         virtual void logit ( int id, const vec &v ) =0;
+        //! log this double
+        virtual void logit ( int id, const double &d ) =0;
 
         //! Shifts storage position for another time step.
@@ -640 +642 @@
         //! @{
 
-        BM () :ll ( 0 ),evalll ( true ), LIDs ( 3 ), opt_L_bounds ( false ) {};
+        BM () :ll ( 0 ),evalll ( true ), LIDs ( 4 ), LFlags(4) {
+                LIDs=-1;/*empty IDs*/ LFlags=0; LFlags(0)=1;/*log only mean*/};
         BM ( const BM &B ) :  drv ( B.drv ), ll ( B.ll ), evalll ( B.evalll ) {}
         //! Copy function required in vectors, Arrays of BM etc. Have to be DELETED manually!
@@ -699 +702 @@
         //!@{
 
-        //! Set boolean options from a string
+        //! Set boolean options from a string recognized are: "logbounds,logll"
         virtual void set_options ( const string &opt ) {
-                opt_L_bounds= ( opt.find ( "logbounds" ) !=string::npos );
-        }
-        //! IDs of storages in loggers
+                LFlags(0)=1;
+                if ( opt.find ( "logbounds" ) !=string::npos ) {LFlags(1)=1; LFlags(2)=1;}
+                if ( opt.find ( "logll" ) !=string::npos ) {LFlags(3)=1;}
+        }
+        //! IDs of storages in loggers 4:[1=mean,2=lb,3=ub,4=ll]
         ivec LIDs;
 
-        //! Option for logging bounds
-        bool opt_L_bounds;
+        //! Flags for logging - same size as LIDs, each entry correspond to the same in LIDs
+        ivec LFlags;
         //! Add all logged variables to a logger
         virtual void log_add ( logger &L, const string &name="" ) {
@@ -716 +721 @@
 
                 // Add mean value
-                LIDs ( 0 ) =L.add ( r,name );
-                if ( opt_L_bounds ) {
-                        LIDs ( 1 ) =L.add ( r,name+"_lb" );
-                        LIDs ( 2 ) =L.add ( r,name+"_ub" );
-                }
+                if (LFlags(0)) LIDs ( 0 ) =L.add ( r,name );
+                if (LFlags(1)) LIDs ( 1 ) =L.add ( r,name+"_lb" );
+                if (LFlags(2)) LIDs ( 2 ) =L.add ( r,name+"_ub" );
+                if (LFlags(3)) LIDs ( 3 ) =L.add ( RV("ll",1,0),r.name(0)+name ); //TODO: "local" RV 
         }
         virtual void logit ( logger &L ) {
                 L.logit ( LIDs ( 0 ), posterior().mean() );
-                if ( opt_L_bounds ) {
+                if ( LFlags(1) || LFlags(2)) { //if one of them is off, its LID==-1 and will not be stored
                         vec ub,lb;
                         posterior().qbounds ( lb,ub );
-                        L.logit ( LIDs ( 1 ), lb );
+                        L.logit ( LIDs ( 1 ), lb ); 
                         L.logit ( LIDs ( 2 ), ub );
                 }
+                if (LFlags(3)) L.logit ( LIDs ( 3 ), ll );
         }
         //!@}