Changeset 863 for library

Timestamp:

03/12/10 13:34:17 (14 years ago)

Author:

smidl

Message:

Correction to new log_level -- FIXME - wrong parsing of array<string> in LOG_LEVEL

Location:

library/bdm

Files:

• base/bdmbase.cpp (modified) (4 diffs)
• base/user_info.h (modified) (2 diffs)
• bdmroot.h (modified) (1 diff)
• estim/kalman.h (modified) (2 diffs)
• mex/mex_BM.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -461 +461 @@
 
         // log full data
-        if ( log_level[deset] ) {
+        if ( log_level[logfull] ) {
                 logrec->ids.set_size ( 1 );
                 logrec->ids ( 0 ) = logrec->L.add_setting ( prefix );
@@ -467 +467 @@
                 // log only
                 logrec->ids.set_size ( 3 );
-                if ( log_level.any() ) {
+                if ( log_level[logmean] ) {
                         logrec->ids ( 0 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "mean" );
-                        if ( !log_level[jedna]  ) {
-                                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" );
-                        }
-                }
+                }
+                if ( log_level[loglb]  ) {
+                        logrec->ids ( 1 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "lb" );
+                }       
+                if ( log_level[logub]  ) {
+                        logrec->ids ( 2 ) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep() + "ub" );
+                }
+        
         }
 }
 
 void epdf::log_write() const {
-        if ( log_level[deset] ) {
+        if ( log_level[logfull] ) {
                 UI::save(this,  logrec->L.log_to_setting ( logrec->ids ( 0 ) ) );
         } else {
-                if ( log_level.any() ) {
+                if ( log_level[logmean] ) {
                         logrec->L.log_vector ( logrec->ids ( 0 ), mean() );
-                        if ( !log_level[jedna]  ) {
+                }
+                if ( log_level[loglb] || log_level[logub] ) {
                                 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[loglb])
+                                        logrec->L.log_vector ( logrec->ids ( 1 ), lb );
+                                if (log_level[logub])
+                                        logrec->L.log_vector ( logrec->ids ( 2 ), ub );
                         }
                 }
         }
-}
+
 
 void datalink_buffered::set_connection ( const RV &rv, const RV &rv_up ) {
@@ -552 +558 @@
         root::log_register ( L, prefix );
 
-        const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.prefix_sep() + "apost" );
-
         if ( log_level.any() ) {
                 logrec->ids.set_size ( 1 );
-                logrec->ids ( likelihood ) = L.add_vector ( RV ( "", 1 ), prefix + L.prefix_sep() + "ll" );
-        }
+                logrec->ids ( 0) = L.add_vector ( RV ( "", 1 ), prefix + L.prefix_sep() + "ll" );
+        }
+        
+        if (log_level[bounds]){
+                prior().log_level[epdf::loglb]=true;
+                prior().log_level[epdf::logub]=true;
+        }
+        if (log_level[full]){
+                prior().log_level[epdf::logfull]=true;
+        }
+        const_cast<epdf&> ( posterior() ).log_register ( L, prefix + L.prefix_sep() + "apost" );
 }
 
@@ -563 +576 @@
         posterior().log_write();
         if ( log_level.any() ) {
-                logrec->L.logit ( logrec->ids ( likelihood ), ll );
+                logrec->L.logit ( logrec->ids ( 0 ), ll );
         }
 }

library/bdm/base/user_info.h

@@ -312 +312 @@
                 UI::get( true_options, element );
                 for( int i = 0; i < true_options.length(); i++ )
-                        for( int j = 0; j < options.names().length(); j++ )
+                        for( int j = 0; j < options.names().length(); j++ ){
                                 if( true_options(i) == options.names()(j)  ) 
                                 {
@@ -318 +318 @@
                                         break;
                                 } 
+                        }
         }
 

library/bdm/bdmroot.h

@@ -76 +76 @@
 
 // MUZEME INTERNE POUZIVAT ENUMY, A KLIDNE MENIT JEJICH PORADI, DIKY TOMUHLE MAKRU SE VZDY NAMAPUJI NA TY SPRAVNE STRINGY 
-#define LOG_LEVEL(CLASSNAME,...) private: friend class logged_options<CLASSNAME>; static const Array<string> &option_names() { static const Array<string> option_names( "{"#__VA_ARGS__"}" ); return option_names; }; public: enum possible_options { __VA_ARGS__ }; logged_options<CLASSNAME> log_level;
+#define LOG_LEVEL(CLASSNAME,...) private: friend class logged_options<CLASSNAME>; static const Array<string> &__option_names() { static const Array<string> option_names( "{"#__VA_ARGS__" }" ); return option_names; }; public: enum possible_options { __VA_ARGS__ }; logged_options<CLASSNAME> log_level;
 
 //forward declaration

library/bdm/estim/kalman.h

@@ -155 +155 @@
         }
 
-        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0);
-
-        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL);
-        
-        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL);
 };
 /*!
@@ -426 +421 @@
         void from_setting ( const Setting &set );
 
-        // TODO dodelat void to_setting( Setting &set ) const;
-
-        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0); 
-
-        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL); 
-
-        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL); 
 };
 

library/bdm/mex/mex_BM.h

@@ -99 +99 @@
         } //tohle by melo zustat!!
 
-        virtual double logpred ( const vec &yt ) const  NOT_IMPLEMENTED(0);
-
-        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL);
-
-        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL);
 };
 UIREGISTER ( mexBM );