Changeset 915

Timestamp:

04/23/10 16:46:05 (15 years ago)

Author:

mido

Message:

optional parameter enum_subindex added to all the methods related to logging

Location:

library/bdm

Files:

• base/bdmbase.cpp (modified) (1 diff)
• base/bdmbase.h (modified) (8 diffs)
• bdmroot.h (modified) (1 diff)

library/bdm/base/bdmbase.cpp

@@ -432 +432 @@
 }
 
-
-string logger::remove_log_prefix_if_possible( string name_with_prefix )
-{
-        string possible_log_prefix = name_with_prefix.substr(0,3);
-        if( possible_log_prefix == "log" )
-                return name_with_prefix.substr(3,name_with_prefix.length()-3);
-        else return name_with_prefix;
-}
-
 void epdf::log_register ( logger &L, const string &prefix ) {
         root::log_register ( L, prefix );

library/bdm/base/bdmbase.h

@@ -305 +305 @@
 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();
+                if( ids(log_level_enum).length() < enum_subindex )
+                        ids(log_level_enum).set_size( enum_subindex );
+                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_len > 0 )
+                        stream << "[" << enum_subindex << "]";
+                
+                return stream.str();
+        }
+
         log_level_intermediate( ) {
-                ids.set_size( names().length() );
-                ids = -1;
+                int len = names().length();
+                ids.set_size( len );
+                for( int i = 0; i<len; i++ )
+                {
+                        ids(i).set_size ( 1 );
+                        ids(i) = -1;
+                }
         }
 
@@ -340 +368 @@
 */
 class logger : public root {
-private:
-        //! this method removes a "log" prefix from a string, i.e., it transforms "logevidence" to "evidence"
-        //!
-        //! for other cases, it keeps string unchanged
-        static string remove_log_prefix_if_possible( string name_with_prefix );
 protected:
         //! RVs of all logged variables.
@@ -392 +415 @@
         //! 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_intermediate<T> &log_level, enum T::log_level_enums const log_level_enum, const RV &rv, const string &prefix )
+        //! 
+        //! 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 )
         {
                 if( !log_level.registered_logger )
@@ -403 +428 @@
                 
                 int id = entries.length();
-                string adjusted_name = remove_log_prefix_if_possible( log_level.names()(log_level_enum) );
+                string adjusted_name = log_level.store_id_and_give_name( log_level_enum, enum_subindex, id );
+
                 names = concat ( names, prefix + separator + adjusted_name ); // diff
                 entries.set_length ( id + 1, true );
                 entries ( id ) = rv;
-                log_level.ids(log_level_enum) = id; 
         }
 
@@ -417 +442 @@
         //! 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 ) {
+        //!
+        //!
+        //! 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 ) {
                 if( !log_level.registered_logger )
                         log_level.registered_logger = this;
@@ -424 +452 @@
 
                 Setting &root = setting_conf.getRoot(); 
-                int id = root.getLength(); //root must be group!!
+                int id = root.getLength(); //root must be group!!                       
+                string adjusted_name = log_level.store_id_and_give_name( log_level_enum, enum_subindex, id );
                 settings.set_length ( id + 1, true );                   
-                string adjusted_name = remove_log_prefix_if_possible( log_level.names()(log_level_enum) );
                 settings ( id ) = &root.add ( prefix + separator + adjusted_name, Setting::TypeList );          
-                log_level.ids(log_level_enum) = id; 
         }
 
@@ -447 +474 @@
 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
+        //!
+        //! parameter \c enum_subindex identifies the precise position of vector in the case there is more vectors registered to with this enum
+        void store( const enum T::log_level_enums log_level_enum, const vec &vect, int enum_subindex = 0 ) const
         {
                 bdm_assert_debug( this->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.");
-                this->registered_logger->log_vector( ids( log_level_enum ), vect );
+                bdm_assert_debug( ids( log_level_enum )( enum_subindex ) >= 0, "This particular vector was not added to logger! Use logger::add_vector(...) method.");
+                this->registered_logger->log_vector( ids( log_level_enum )( enum_subindex ), 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
+        //!
+        //! parameter \c enum_subindex identifies the precise position of double in the case there is more doubles registered to with this enum
+        void store( const enum T::log_level_enums log_level_enum, const double &dbl, int enum_subindex = 0 ) const
         {
                 bdm_assert_debug( this->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.");
-                this->registered_logger->log_double( ids( log_level_enum ), dbl );
+                bdm_assert_debug( ids( log_level_enum )( enum_subindex ) >= 0, "This particular double was not added to logger! Use logger::add_vector(...) method.");
+                this->registered_logger->log_double( ids( log_level_enum )( enum_subindex ), dbl );
         }
 
         //! This method stores a Setting obtained by call of UI::save( data, .. ) to the proper place in registered logger 
+        //!
+        //! parameter \c enum_subindex identifies the precise position of setting in the case there is more settings registered to with this enum
         //!
         //! 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.
@@ -470 +503 @@
         //! 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
+        template<class U> void store( const enum T::log_level_enums log_level_enum, const U data, int enum_subindex = 0 ) const
         {                       
                 bdm_assert_debug( this->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.");
-                this->registered_logger->log_setting( ids( log_level_enum ), data);
+                bdm_assert_debug( ids( log_level_enum )(enum_subindex ) >= 0, "This particular vector was not added to logger! Use logger::add_setting(...) method.");
+                this->registered_logger->log_setting( ids( log_level_enum )( enum_subindex ), data);
         }
 };

library/bdm/bdmroot.h

@@ -59 +59 @@
         bitset<32> values;
         
-        //! vector of log IDs - one element for each entry
-        ivec ids;
+        //! vector of vectors of log IDs - one element for each entry and multiple entries can be stored on the position of one enum
+        Vec<ivec> ids;
 
         //! internal pointer to the logger to which this log_level is registered