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

Timestamp:

03/04/10 16:41:30 (14 years ago)

Author:

smidl

Message:

changes in Loggers!

Files:

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

library/bdm/base/bdmbase.h

@@ -26 +26 @@
 
 namespace bdm {
+
 //! Structure of RV, i.e. RVs expanded into a flat list of IDs, used for debugging.
 class str {
@@ -346 +347 @@
 
 
+
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv
-class fnc : public root {
+class fnc : public root {       
 protected:
         //! Length of the output vector
@@ -490 +492 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 class epdf : public pdf {
+        LOG_LEVEL(epdf,jedna,dva,tri,deset);
 
 public:
@@ -505 +508 @@
         epdf() {};
         epdf ( const epdf &e ) : pdf ( e ) {};
-                
+        
+        
         //!@}
 
@@ -887 +891 @@
 
 class DS : public root {
+        LOG_LEVEL(DS,jednicka);
 protected:
         //! size of data returned by \c getdata()
@@ -903 +908 @@
         //! default constructors
         DS() : dtsize ( 0 ), utsize ( 0 ), ytsize ( 0 ), Drv(), Urv(), Yrv() {
-                log_level = 1;
+                log_level[jednicka] = true;
         };
 
@@ -971 +976 @@
 \f]
 
-
 */
 
 class BM : public root {
+        LOG_LEVEL(BM,full,likelihood,bounds);
+
 protected:
         //! Random variable of the data (optional)
@@ -995 +1001 @@
 
         BM() : yrv(), dimy ( 0 ), rvc(), dimc ( 0 ), ll ( 0 ), evalll ( true ) { };
-//      BM ( const BM &B ) :  yrv ( B.yrv ), dimy(B.dimy), rvc ( B.rvc ),dimc(B.dimc), ll ( B.ll ), evalll ( B.evalll ) {}
+        //      BM ( const BM &B ) :  yrv ( B.yrv ), dimy(B.dimy), rvc ( B.rvc ),dimc(B.dimc), ll ( B.ll ), evalll ( B.evalll ) {}
         //! \brief Copy function required in vectors, Arrays of BM etc. Have to be DELETED manually!
         //! Prototype: \code BM* _copy() const {return new BM(*this);} \endcode
-        virtual BM* _copy() const {             return NULL;    }; // TODO NEBUDE TU TAKY LEPSI BDM_ERROR??!
+        virtual BM* _copy() const NOT_IMPLEMENTED(NULL);
         //!@}
 
@@ -1089 +1095 @@
         //!@{
 
-        //! Set boolean options from a string, recognized are: "logbounds,logll"
-        virtual void set_options ( const string &opt );
-
         //! Add all logged variables to a logger
         //! Log levels two digits: xy where
@@ -1116 +1119 @@
                 }
 
-                string opt;
-                if ( UI::get ( opt, set, "options", UI::optional ) ) {
-                        set_options ( opt );
-                }
+                UI::get ( log_level, set, "log_level", UI::optional );
+
         }
 
@@ -1127 +1128 @@
                 UI::save( &rvc, set, "rvc" );           
                 UI::save( &posterior()._rv(), set, "rv" );
-
-                string opt;
-                switch( posterior()._log_level() )
-                {
-                case 2:
-                        opt = "logbounds ";
-                        break;
-                case 10:
-                        opt = "logfull ";
-                        break;
-                default:
-                        opt = "";
-                        break;
+                UI::save( log_level, set );
+        }
+
+        void validate()
+        {
+                if ( log_level[full] ) {
+                        const_cast<epdf&> ( posterior() ).log_level[epdf::deset] = true;
+                } else {
+                        if ( log_level[bounds] ) {
+                                const_cast<epdf&> ( posterior() ).log_level[epdf::dva] = true;
+                        } else {
+                                const_cast<epdf&> ( posterior() ).log_level[epdf::jedna] = true;;
+                        }
+                        if ( log_level[likelihood] ) {
+                                // TODO testovat tedy likelyhood misto 1.. log_level = 1;
+                        }
                 }
-                if( log_level == 1 ) opt = opt + "logll";
-                if( !opt.empty() )
-                        UI::save( opt, set, "options" );
         }
 };