Changeset 910 for library

Timestamp:

04/20/10 21:16:56 (16 years ago)

Author:

mido

Message:

patch of LOG LEVELS

Location:

library/bdm

Files:

• base/bdmbase.cpp (modified) (3 diffs)
• base/bdmbase.h (modified) (7 diffs)
• base/datasources.cpp (modified) (3 diffs)
• base/datasources.h (modified) (2 diffs)
• bdmroot.h (modified) (7 diffs)
• stat/exp_family.cpp (modified) (1 diff)

library/bdm/base/bdmbase.cpp ¶

@@ -453 +453 @@
         if ( log_level[logfull] ) {
                 // log full data
-                registered_logger->add_setting ( log_level, logfull, prefix );
+                L.add_setting ( log_level, logfull, prefix );
         } else {
                 // log only
 
                 if ( log_level[logmean] )
-                        registered_logger->add_vector ( log_level, logmean, r, prefix );                        
+                        L.add_vector ( log_level, logmean, r, prefix );                 
                 if ( log_level[loglbound] )
-                        registered_logger->add_vector ( log_level, loglbound, r, prefix );
+                        L.add_vector ( log_level, loglbound, r, prefix );
                 if ( log_level[logubound] )
-                        registered_logger->add_vector ( log_level, logubound, r, prefix );
+                        L.add_vector ( log_level, logubound, r, prefix );
         }
 }
@@ -528 +528 @@
 
         if ( log_level[logdt] )
-                registered_logger->add_vector ( log_level, logdt, Drv, prefix );        
+                L.add_vector ( log_level, logdt, Drv, prefix ); 
         if ( log_level[logut] )
-                registered_logger->add_vector ( log_level, logut, Urv, prefix );
+                L.add_vector ( log_level, logut, Urv, prefix );
 }
 
@@ -568 +568 @@
 
         if ( log_level[logevidence] )
-                registered_logger->add_vector ( log_level, logevidence, RV ( 1 ), prefix );     
+                L.add_vector ( log_level, logevidence, RV ( 1 ), prefix );      
 
         if (log_level[logbounds]){

library/bdm/base/bdmbase.h ¶

@@ -298 +298 @@
 
 //! This class stores a details that will be logged to a logger
-template<class T> class log_level_template : public log_level_base {
-        //! this is necessary to allow logger to set ids vector appropriately and also to set registered_logger
-        friend class logger; 
-
-        //! vector of log IDs - one element for each entry
-        ivec ids;
-
-        //! internal pointer to the logger to which this log_level is registered
-        //! 
-        //! it is set to NULL at the beginning
-        logger * registered_logger;
-
-public:
-        //! default constructor
-        log_level_template() {
-                registered_logger = NULL;
-                ids.set_size(  T::log_level_names().length() );
+//!
+//! This is only the first part of the whole declaration, which has to be however separated into
+//! two different classes for allowing the compilation of source code. For more details
+//! see logger::add_setting(...) method and mainly log_level_template<T>::template<class U> void store( const enum T::log_level_enums log_level_enum, const U data ) const
+//! method. For the reason the second one is templated, it was necessary to declare this whole class. 
+template<class T> class log_level_intermediate : public log_level_base {
+public:
+        log_level_intermediate( ) {
+                ids.set_size( names().length() );
                 ids = -1;
         }
-
-        //! This method stores a vector to the proper place in registered logger 
-        void store( const enum T::log_level_enums log_level_enum, const vec &vect ) const
-        {
-                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! Use root::log_register(...) method.");
-                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular vector was not added to logger! Use logger::add_vector(...) method.");
-                registered_logger->log_vector( ids( log_level_enum ), vect );
-        }
-
-        //! This method stores a double to the proper place in registered logger 
-        void store( const enum T::log_level_enums log_level_enum, const double &dbl ) const
-        {
-                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! See root::log_register(...) method.");
-                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular double was not added to logger! Use logger::add_vector(...) method.");
-                registered_logger->log_double( ids( log_level_enum ), dbl );
-        }
-
-        //! This method stores a Setting obtained by call of UI::save( data, .. ) to the proper place in registered logger 
-        template<class U> void store( const enum T::log_level_enums log_level_enum, const U data ) const
-        {                       
-                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! See root::log_register(...) method.");
-                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular vector was not added to logger! Use logger::add_setting(...) method.");
-                registered_logger->log_setting( ids( log_level_enum ), data);
-        }
-
 
         //! string equivalents of the used enumerations which are filled with a help of #LOG_LEVEL macro within class T
@@ -349 +316 @@
         }
 
-        //! read only operator for testing  individual fields of log_level
+        //! read only operator for testing individual fields of log_level
         //!
         //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
@@ -365 +332 @@
         }
 };
-
-/*!
-  \def LOG_LEVEL(classname,...)
-  \brief Macro for defining a log_level attribute with a specific set of enumerations related to a specific class 
-
-  This macro has to be called within a class declaration. Its argument \a classname has to correspond to that wrapping class.
-  This macro defines a log_level instance which can be modified either directly or by the means of #UI class.
-
-  One of the main purposes of this macro is to allow variability in using enumerations. By relating them to their names through
-  an array of strings, we are no more dependant on their precise ordering. What is more, we can add or remove any without harming 
-  any applications which are using this library.
-
-  \todo Write a more detailed explanation including also examples
-
-  \ref ui
-*/
-#define LOG_LEVEL(classname,...) public: enum log_level_enums { __VA_ARGS__ }; log_level_template<classname> log_level; private: friend class log_level_template<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_base::string2Array( #__VA_ARGS__ ); return log_level_names; }
 
 
@@ -442 +392 @@
         //! It also sets a pointer to logger or justify it is correctly assigned from previous call to this procedure 
         //! Entries with empty RV will be ignored 
-        template<class T> void add_vector ( log_level_template<T> &log_level, enum T::log_level_enums const log_level_enum, const RV &rv, const string &prefix )
+        template<class T> void add_vector ( log_level_intermediate<T> &log_level, enum T::log_level_enums const log_level_enum, const RV &rv, const string &prefix )
         {
                 if( !log_level.registered_logger )
@@ -448 +398 @@
                 else
                         bdm_assert_debug ( log_level.registered_logger == this, "This log_level is already registered to another logger!");
-
 
                 if ( rv._dsize() == 0 ) 
@@ -464 +413 @@
         //!
         //! It also sets a pointer to logger or justify it is correctly assigned from previous call to this procedure 
-        template<class T> void add_setting ( log_level_template<T> &log_level, enum T::log_level_enums const log_level_enum,  const string &prefix ) {
+        //!
+        //! To allow both arguments log_level and log_level_enum be templated, it was necessary to declare log_level_intermediate<T> class.
+        //! This way we check compatibility of the passed log_level and log_level_enum, which would be impossible using just log_level_base class
+        //! here. 
+        template<class T> void add_setting ( log_level_intermediate<T> &log_level, enum T::log_level_enums const log_level_enum,  const string &prefix ) {
                 if( !log_level.registered_logger )
                         log_level.registered_logger = this;
@@ -489 +442 @@
         virtual void init() {};
 };
+
+//! This class stores a details that will be logged to a logger
+template<class T> class log_level_template : public log_level_intermediate<T> {
+public:
+        //! This method stores a vector to the proper place in registered logger 
+        void store( const enum T::log_level_enums log_level_enum, const vec &vect ) const
+        {
+                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! Use root::log_register(...) method.");
+                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular vector was not added to logger! Use logger::add_vector(...) method.");
+                registered_logger->log_vector( ids( log_level_enum ), vect );
+        }
+
+        //! This method stores a double to the proper place in registered logger 
+        void store( const enum T::log_level_enums log_level_enum, const double &dbl ) const
+        {
+                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! See root::log_register(...) method.");
+                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular double was not added to logger! Use logger::add_vector(...) method.");
+                registered_logger->log_double( ids( log_level_enum ), dbl );
+        }
+
+        //! This method stores a Setting obtained by call of UI::save( data, .. ) to the proper place in registered logger 
+        //!
+        //! If this method was not templated, we could store whole body of this class in cpp file without explicitly touching registered_logger->log_setting(...) here.
+        //! (it would not be straightforward, though, still there are some enums which had to be converted into integers but it could be done without loosing type control)
+        //! This way, it would not be necessary to declare log_level_intermediate<T> class and we could declare log_level_template<T>
+        //! before the log_level class itself with a mere foroward declaration of log_level. In our case, however, touching of registered_logger->log_setting
+        //! implies that friend declaration is not enough and we are lost in a circle. And just by cutting this circle we obtains log_level_intermediate<T> class. 
+        //! Howg.)
+        template<class U> void store( const enum T::log_level_enums log_level_enum, const U data ) const
+        {                       
+                bdm_assert_debug( registered_logger != NULL, "You have to register instance to a logger first! See root::log_register(...) method.");
+                bdm_assert_debug( ids( log_level_enum ) >= 0, "This particular vector was not added to logger! Use logger::add_setting(...) method.");
+                registered_logger->log_setting( ids( log_level_enum ), data);
+        }
+};
+
+/*!
+  \def LOG_LEVEL(classname,...)
+  \brief Macro for defining a log_level attribute with a specific set of enumerations related to a specific class 
+
+  This macro has to be called within a class declaration. Its argument \a classname has to correspond to that wrapping class.
+  This macro defines a log_level instance which can be modified either directly or by the means of #UI class.
+
+  One of the main purposes of this macro is to allow variability in using enumerations. By relating them to their names through
+  an array of strings, we are no more dependant on their precise ordering. What is more, we can add or remove any without harming 
+  any applications which are using this library.
+
+  \todo Write a more detailed explanation including also examples
+
+  \ref ui
+*/
+#define LOG_LEVEL(classname,...) public: enum log_level_enums { __VA_ARGS__ }; log_level_template<classname> log_level; private: friend class log_level_template<classname>; friend class log_level_intermediate<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_base::string2Array( #__VA_ARGS__ ); return log_level_names; }
+
 
 //! Class representing function \f$f(x)\f$ of variable \f$x\f$ represented by \c rv

library/bdm/base/datasources.cpp ¶

@@ -42 +42 @@
         dtsize = Data.rows();
         utsize = 0;
+        // DS::validate() has to be called after the dtsize attribute is set to proper value
         DS::validate();
 }
-
 
 void FileDS::from_setting ( const Setting & set ) {
@@ -76 +76 @@
 }
 
-void CsvFileDS::validate() {
-        // TODO NASTASVIT DSIZE, OKOMENTOVAT PRO VOLAM DS::VALIDATE AZ PAK
-}
-
 void ITppFileDS::from_setting ( const Setting & set ) {
         FileDS::from_setting ( set );
@@ -89 +85 @@
         it << Name ( varname );
         it >> Data;
-}
-
-void ITppFileDS::validate() {
-        // TODO NASTASVIT DSIZE, OKOMENTOVAT PRO VOLAM DS::VALIDATE AZ PAK
 }
 

library/bdm/base/datasources.h ¶

@@ -128 +128 @@
 
         // TODO dodelat void to_setting( Setting &set ) const;
-
-        void validate(); 
-};
-
+};
 UIREGISTER ( ITppFileDS );
 SHAREDPTR ( ITppFileDS );
@@ -145 +142 @@
 public:
         void from_setting ( const Setting & set );
-
-        void validate();
 };
 

library/bdm/bdmroot.h ¶

@@ -38 +38 @@
 void UI_DBG (const Setting &S, const string &spc, ostream &out );
 
-//forward declaration
+
+//! Forward class declaration
 class logger;
 
@@ -45 +46 @@
 //! the existence of this class is forced by the necessity of passing log_levels to user_info methods, however, the main functionality
 //! is located in \c log_level_template class
-class log_level_base
-{
+class log_level_base {
 private:
         // UserInfo class have to be able to read all the internal 
@@ -52 +52 @@
         friend class UI;
 
+        //! this is necessary to allow logger to set ids vector appropriately and also to set registered_logger
+        friend class logger; 
+
 protected:
         //! boolean flags related indicating which details will be logged to a logger
         bitset<32> values;
         
+        //! vector of log IDs - one element for each entry
+        ivec ids;
+
+        //! internal pointer to the logger to which this log_level is registered
+        //! 
+        //! it is set to NULL at the beginning
+        logger * registered_logger;
+
 public:
+        //! default constructor
+        log_level_base() {
+                registered_logger = NULL;
+        }
+
 
         //! a general utility transforming a comma-separated sequence of strings into an instance of Array<strings>
@@ -64 +80 @@
         virtual const Array<string> &names() const = 0;
 };
-
 
 //! Root class of BDM objects
@@ -73 +88 @@
 
 protected:
-        //!remember which logger is registered
-        logger * registered_logger;
 
         /*!     
@@ -157 +170 @@
         
         //!default constructor
-        root() : registered_logger ( NULL ) {};
+        root() {};
 
         //! make sure this is a virtual object
@@ -172 +185 @@
                 return os.str();
         }
-        //! Register itself in a logger, i.e. allocate space for data from this class
-        //! The level of details (parameter \c level ) is individual for each class.
+        //! Register log levels of each inheritance layer to a logger, i.e. allocate space for data from this class
         virtual void log_register ( logger &L, const string &prefix ) {
-                registered_logger = &L;
         }
 

library/bdm/stat/exp_family.cpp ¶

@@ -303 +303 @@
 
                 if ( log_level[logmean] )
-                        registered_logger->add_vector( log_level, logmean, RV ( th_dim ), prefix ); 
+                        L.add_vector( log_level, logmean, RV ( th_dim ), prefix ); 
                 if ( log_level[logvariance] )
-                        registered_logger->add_vector( log_level, logvariance, RV ( th_dim * th_dim ), prefix );
+                        L.add_vector( log_level, logvariance, RV ( th_dim * th_dim ), prefix );
         } else {
                 epdf::log_register ( L, prefix );