Changeset 870 for library/bdm/base

Timestamp:

03/18/10 19:13:02 (14 years ago)

Author:

mido

Message:

LOG_LEVEL final cut (or rather semifinal? I hope to improve work with ids soon)
and also it rests to adapt applications, work is in progress

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (1 diff)
• bdmbase.h (modified) (4 diffs)
• user_info.h (modified) (4 diffs)

library/bdm/base/bdmbase.cpp

@@ -563 +563 @@
         }
         
-        if (log_level[bounds]){
+        if (log_level[logbounds]){
                 prior().log_level[epdf::loglb]=true;
                 prior().log_level[epdf::logub]=true;
         }
-        if (log_level[full]){
+        if (log_level[logfull]){
                 prior().log_level[epdf::logfull]=true;
         }

library/bdm/base/bdmbase.h

@@ -492 +492 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 class epdf : public pdf {
-        LOG_LEVEL(epdf, logmean, loglb, logub, logfull);
+        //! \var log_level_enums logmean
+        //! TODO DOPLNIT        
+        
+        //! \var log_level_enums loglb
+        //! TODO DOPLNIT
+        
+        //! \var log_level_enums logub
+        //! TODO DOPLNIT
+        
+        //! \var log_level_enums logfull
+        //! TODO DOPLNIT
+        LOG_LEVEL(epdf,logmean,loglb,logub,logfull);
 
 public:
@@ -895 +906 @@
 
 class DS : public root {
+        //! \var log_level_enums dt
+        //! TODO DOPLNIT
         LOG_LEVEL(DS, dt);
+
 protected:
         //! size of data returned by \c getdata()
@@ -983 +997 @@
 
 class BM : public root {
-        LOG_LEVEL(BM, full, likelihood, bounds);
+        //! \var log_level_enums logfull
+        //! TODO DOPLNIT
+
+        //! \var log_level_enums logevidence
+        //! TODO DOPLNIT
+        
+        //! \var log_level_enums logbounds
+        //! TODO DOPLNIT        
+        LOG_LEVEL(BM,logfull,logevidence,logbounds);
 
 protected:
@@ -1145 +1167 @@
         void validate()
         {
-                if ( log_level[full] ) {
+                if ( log_level[logfull] ) {
                         const_cast<epdf&> ( posterior() ).log_level[epdf::logfull] = true;
                 } else {
-                        if ( log_level[bounds] ) {
+                        if ( log_level[logbounds] ) {
                                 const_cast<epdf&> ( posterior() ).log_level[epdf::loglb] = true;
                         } else {
                                 const_cast<epdf&> ( posterior() ).log_level[epdf::logmean] = true;;
                         }
-                        if ( log_level[likelihood] ) {
-                                // TODO testovat tedy likelyhood misto 1.. log_level = 1;
+                        if ( log_level[logevidence] ) {
                         }
                 }

library/bdm/base/user_info.h

@@ -305 +305 @@
         static void from_setting ( double &real, const Setting &element );
 
-        //! This method converts a Setting into a specific logged_options<T> variant and initialize options properly
-        template< class T> static void from_setting ( logged_options<T> &options, const Setting &element )
+        //! This method converts a Setting into a specific log_level_template<T> variant and initialize options properly
+        template< class T> static void from_setting ( log_level_template<T> &log_level, const Setting &element )
         {
-                options.values.reset();
-                Array<string> true_options;
-                UI::get( true_options, element );
-                for( int i = 0; i < true_options.length(); i++ )
-                        for( int j = 0; j < options.names().length(); j++ ){
-                                if( true_options(i) == options.names()(j)  ) 
+                string raw_log_level;
+                UI::get( raw_log_level, element );
+                Array<string> loaded_log_level = log_level_template<T>::string2Array( raw_log_level );
+                
+                log_level.values.reset();
+
+                for( int i = 0; i < loaded_log_level.length(); i++ )
+                        for( int j = 0; j < log_level.names().length(); j++ ){
+                                if( loaded_log_level(i) == log_level.names()(j)  ) 
                                 {
-                                        options.values[j] = true;
+                                        log_level.values[j] = true;
                                         break;
                                 } 
@@ -324 +327 @@
         template<class T> static void from_setting ( T* &instance, const Setting &element ) {
                 const SettingResolver link ( element );
-                assert_type ( link.result, Setting::TypeGroup );
+                assert_type( link.result, Setting::TypeGroup );
 
                 // we get a value stored in the "class" attribute
@@ -600 +603 @@
         }
 
-        // The only difference from classical UserInfo approach to logged_options is the fact
-        // that the actual element related to logged_options could possibly exists yet. In this case, 
+        // The only difference from classical UserInfo approach to log_level_template is the fact
+        // that the actual UI element related to log_level_template could possibly exists yet. In this case, 
         // we do not want to throw an exception like in the case of any other type being loaded
-        // from Setting. Here, we rather add our options into this existig element. This way, it is 
-        // possible that more instances of logged_options class (all contained in one wrapping instance of
-        // a particular class!) can be stored in only one line in a configuration file
-        template< class T> static void save ( const logged_options<T> &options, Setting &element, const string &name = "options"  ) {
+        // from Setting. We rather fill the current log_level into this existig element. This way, it is 
+        // possible that more instances of log_level_template class (templated with different classes)
+        // can be stored in only one line in a configuration file
+        template< class T> static void save ( const log_level_template<T> &log_level, Setting &element, const string &name = "log_level"  ) {
                 assert_type ( element, Setting::TypeGroup );
+
+                string string_to_write;
 
                 Setting *list;
@@ -613 +618 @@
                 {
                         list = &element[name];
-                        assert_type ( *list, Setting::TypeList );
+                        assert_type ( *list, Setting::TypeString );
+                        string_to_write = ( const char* ) *list;
                 }
                 else
-                        list = &element.add ( name, Setting::TypeList ); 
-
-                Array<string> true_options;
-                int true_options_count = 0;
-                true_options.set_length( options.values.size() );
-                for( unsigned int i = 0; i < options.values.size(); i++ )
-                        if( options.values[i] ) 
-                                true_options( true_options_count++ ) = options.names()(i);
-                save( true_options, *list, name );
+                        list = &element.add ( name, Setting::TypeString ); 
+
+                for( unsigned int i = 0; i < log_level.values.size(); i++ )
+                        if( log_level.values[i] ) // a jeste zkontrolovat zda to jmeno uz neni obsazeno? 
+                        {
+                                if( string_to_write.length() > 0 )
+                                        string_to_write = string_to_write + ',';
+                                string_to_write = string_to_write + log_level.names()(i);
+                        }
+                        
+                *list = string_to_write;
         }