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

Timestamp:

05/14/10 12:16:00 (14 years ago)

Author:

mido

Message:

the functionality of user info was improved, it supports an initialization of root descendant via UI::get directly, however it is save only for static attributes, for dynamically allocated attributes UI::build should be called to handle with intahrence issues

Files:

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

library/bdm/base/bdmbase.h

@@ -296 +296 @@
 RV concat ( const RV &rv1, const RV &rv2 );
 
-
-//! This class stores a details that will be logged to a logger
-//!
-//! 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:
-        //! this method adds new id to its proper position and return the name of this position
-        string store_id_and_give_name( enum T::log_level_enums const log_level_enum,  int enum_subindex, int id ) {
-//              int ids_len = ids(log_level_enum).length(); <== compiler suggest to remove
-                if( ids(log_level_enum).length() <= enum_subindex )
-                        ids(log_level_enum).set_size( enum_subindex+1, true );
-                ids(log_level_enum)(enum_subindex) = id; 
-
-                // here we remove a "log" prefix from name, i.e., for instance it transforms "logevidence" to "evidence"
-                ostringstream stream;
-                string name_with_prefix = names()(log_level_enum);
-                string possible_log_prefix = name_with_prefix.substr(0,3);
-                if( possible_log_prefix == "log" )
-                        stream << name_with_prefix.substr(3,name_with_prefix.length()-3);
-                else 
-                        stream << name_with_prefix;
-
-                // add number to name only in the case there are more registered vectors with the same log_level_enum
-                if( ids(log_level_enum).length() > 1 )
-                        stream << "*" << enum_subindex;
-                
-                return stream.str();
-        }
-
-        log_level_intermediate( ) {
-                int len = names().length();
-                ids.set_size( len );
-                for( int i = 0; i<len; i++ )
-                {
-                        ids(i).set_size ( 1 );
-                        ids(i) = -1;
-                }
-        }
-
-        //! string equivalents of the used enumerations which are filled with a help of #LOG_LEVEL macro within class T
-        const Array<string> &names() const
-        {
-                return T::log_level_names();
-        }
-
-        //! 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
-        bool operator [] (const enum T::log_level_enums &log_level_enum ) const
-        {
-                return values[log_level_enum];
-        }
-
-        //! operator for setting an individual field of log_level 
-        //!
-        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
-        bitset<32>::reference operator [] (const enum T::log_level_enums &log_level_enum )
-        {
-                return values[log_level_enum];
-        }
-};
-
-
 /*!
 @brief Class for storing results (and semi-results) of an experiment
@@ -417 +351 @@
         //! 
         //! passing the last parameter \c enum_subindex one can store multiple vectors in the position of one enum
-        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, int enum_subindex = 0 )
+        template<class T> void add_vector ( log_level_base<T> &log_level, enum T::log_level_enums const log_level_enum, const RV &rv, const string &prefix, int enum_subindex = 0 )
         {
                 if( !log_level.registered_logger )
@@ -439 +373 @@
         //! It also sets a pointer to logger or justify it is correctly assigned from previous call to this procedure 
         //!
-        //! To allow both arguments log_level and log_level_enum be templated, it was necessary to declare log_level_intermediate<T> class.
+        //! To allow both arguments log_level and log_level_enum be templated, it was necessary to declare log_level_base<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. 
@@ -445 +379 @@
         //!
         //! passing the last parameter \c enum_subindex one can store multiple settings in the position of one enum
-        template<class T> void add_setting ( log_level_intermediate<T> &log_level, enum T::log_level_enums const log_level_enum,  const string &prefix, int enum_subindex = 0 ) {
+        template<class T> void add_setting ( log_level_base<T> &log_level, enum T::log_level_enums const log_level_enum,  const string &prefix, int enum_subindex = 0 ) {
                 if( !log_level.registered_logger )
                         log_level.registered_logger = this;
@@ -471 +405 @@
 
 //! This class stores a details that will be logged to a logger
-template<class T> class log_level_template : public log_level_intermediate<T> {
+template<class T> class log_level_template : public log_level_base<T> {
 public:
         //! This method stores a vector to the proper place in registered logger 
@@ -499 +433 @@
         //! 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>
+        //! This way, it would not be necessary to declare log_level_base<T> class and we could declare log_level_template<T>
         //! before the logger class itself with a mere foroward declaration of logger. 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.)
+        //! implies that forward declaration is not enough and we are lost in a circle. And just by cutting this circle we obtains log_level_base<T> class. 
         template<class U> void store( const enum T::log_level_enums log_level_enum, const U data, int enum_subindex = 0 ) const
         {                       
@@ -526 +459 @@
   \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; }
+#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_base<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_base<classname>::string2Array( #__VA_ARGS__ ); return log_level_names; }