Changeset 907 for library/bdm/base/user_info.h

Timestamp:

04/19/10 12:44:57 (14 years ago)

Author:

mido

Message:

LOG LEVEL improved and hopefully finished

Files:

• library/bdm/base/user_info.h (modified) (12 diffs)

library/bdm/base/user_info.h

@@ -304 +304 @@
         //! This method converts a Setting into a real scalar   
         static void from_setting ( double &real, 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 )
-        {
-                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)  ) 
-                                {
-                                        log_level.values[j] = true;
-                                        break;
-                                } 
-                        }
-        }
+        //! This method converts a Setting into a log_level variant and initialize options properly
+        static void from_setting ( log_level_base &log_level, const Setting &element );
 
         //! This method converts a Setting into a class T descendant
@@ -374 +357 @@
 
         //! This method converts a Setting into a descendant of class
-        //! T, wrapped in an instance of shared_ptr<T> .
+        //! T, wrapped in an instance of bdm::shared_ptr<T> .
         template<class T>
-        static void from_setting ( shared_ptr<T> &instance, const Setting &element ) {
+        static void from_setting ( bdm::shared_ptr<T> &instance, const Setting &element ) {
                 T *tmp_inst = 0;
                 from_setting ( tmp_inst, element );
@@ -398 +381 @@
         }
 
-
         //! This is dummy version of the from_setting method for other, unsupported types. It just throws an exception.
         //!
         //! At the moment, this is the only way how to compile the library without obtaining the compiler error c2665.
         //! The exception can help to find the place where the template is misused and also to correct it.
-        template<class T> static void from_setting ( T &variable_to_load, const Setting &element ) {
-                std::string msg = "UIException: from_setting is not implemented for type ";
+//      template<class T> static void from_setting ( T &variable_to_load, const Setting &element ) {
+//              std::string msg = "UIException: from_setting is not implemented for type ";
 //              try{
-                        variable_to_load.from_setting(element);
+//                      variable_to_load.from_setting(element);
 /*              } catch (...){
                 msg += typeid ( T ).name();
@@ -412 +394 @@
                 throw UISettingException ( msg, element );
                 }*/
-        }
+//      }
 
 
@@ -432 +414 @@
         //! The new instance of type T* is constructed and initialized with values stored in the Setting element[name]
         //!
-        //! If there is not any sub-element named #name and settingPresence is #optional, an empty shared_ptr<T> is returned. When settingPresence is #compulsory, the returned shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
+        //! If there is not any sub-element named #name and settingPresence is #optional, an empty bdm::shared_ptr<T> is returned. When settingPresence is #compulsory, the returned bdm::shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
         template<class T>
-        static shared_ptr<T> build ( const Setting &element, const string &name, SettingPresence settingPresence = optional ) {
+        static bdm::shared_ptr<T> build ( const Setting &element, const string &name, SettingPresence settingPresence = optional ) {
                 if ( !element.exists ( name ) ) {
                         if ( settingPresence == optional )
-                                return shared_ptr<T>();
+                                return bdm::shared_ptr<T>();
                         else
                                 throw UISettingException ( "UIException: the compulsory Setting named \"" + name + "\" is missing.", element );
                 }
 
-                shared_ptr<T> instance;
+                bdm::shared_ptr<T> instance;
                 from_setting<T> ( instance, to_child_setting ( element, name ) );
                 return instance;
@@ -449 +431 @@
         //! The new instance of type T* is constructed and initialized with values stored in the Setting element[index]
         //!
-        //! If there is not any sub-element indexed by #index, and settingPresence is #optional, an empty shared_ptr<T> is returned. When settingPresence is #compulsory, the returned shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
+        //! If there is not any sub-element indexed by #index, and settingPresence is #optional, an empty bdm::shared_ptr<T> is returned. When settingPresence is #compulsory, the returned bdm::shared_ptr<T> is never empty (an exception is thrown when the object isn't found).
         template<class T>
-        static shared_ptr<T> build ( const Setting &element, const int index, SettingPresence settingPresence = optional ) {
+        static bdm::shared_ptr<T> build ( const Setting &element, const int index, SettingPresence settingPresence = optional ) {
                 if ( element.getLength() <= index ) {
                         if ( settingPresence == optional )
-                                return shared_ptr<T>();
+                                return bdm::shared_ptr<T>();
                         else {
                                 stringstream stream;
@@ -462 +444 @@
                 }
 
-                shared_ptr<T> instance;
+                bdm::shared_ptr<T> instance;
                 from_setting<T> ( instance, to_child_setting ( element, index ) );
                 return instance;
@@ -471 +453 @@
 //! Handy in mex files. Use with care.
         template<class T>
-        static shared_ptr<T> build ( const Setting &element, SettingPresence settingPresence = optional ) {
-                shared_ptr<T> instance;
+        static bdm::shared_ptr<T> build ( const Setting &element, SettingPresence settingPresence = optional ) {
+                bdm::shared_ptr<T> instance;
                 from_setting<T> ( instance,  element );
                 return instance;
@@ -545 +527 @@
                 if ( element.getLength() <= index ) {
                         if ( settingPresence == optional )
-                                return shared_ptr<T>();
+                                return bdm::shared_ptr<T>();
                         else {
                                 stringstream stream;
@@ -590 +572 @@
         }
 
-        template< class T> static void save ( const shared_ptr<T> &instance, Setting &element, const string &name = "" ) {
+        template< class T> static void save ( const bdm::shared_ptr<T> &instance, Setting &element, const string &name = "" ) {
                 save<T> ( instance.get(), element, name );
         }
@@ -603 +585 @@
         }
 
-        // The only difference from classical UserInfo approach to log_level_template is the fact
+        //! A matrix(of type mat) is stored in the new child Setting appended to the passed element
+        static void save ( const mat &matrix, Setting &element, const string &name = "" );
+
+        //! An integer vector (of type ivec) is stored in the new child Setting appended to the passed element
+        static void save ( const ivec &vec, Setting &element, const string &name = "" );
+
+        //! A double vector (of type vec) is stored in the new child Setting appended to the passed element
+        static void save ( const vec &vector, Setting &element, const string &name = "" );
+
+        //! A string is stored in the new child Setting appended to the passed element
+        static void save ( const string &str, Setting &element, const string &name = "" );
+
+        //! An integer is stored in the new child Setting appended to the passed element
+        static void save ( const int &integer, Setting &element, const string &name = "" );
+
+        //! A double is stored in the new child Setting appended to the passed element
+        static void save ( const double &real, Setting &element, const string &name = "" );
+
+// 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
@@ -609 +609 @@
         // 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;
-                if( element.exists( name ) ) 
-                {
-                        list = &element[name];
-                        assert_type ( *list, Setting::TypeString );
-                        string_to_write = ( const char* ) *list;
-                }
-                else
-                        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;
-        }
-
-
-        //! A matrix(of type mat) is stored in the new child Setting appended to the passed element
-        static void save ( const mat &matrix, Setting &element, const string &name = "" );
-
-        //! An integer vector (of type ivec) is stored in the new child Setting appended to the passed element
-        static void save ( const ivec &vec, Setting &element, const string &name = "" );
-
-        //! A double vector (of type vec) is stored in the new child Setting appended to the passed element
-        static void save ( const vec &vector, Setting &element, const string &name = "" );
-
-        //! A string is stored in the new child Setting appended to the passed element
-        static void save ( const string &str, Setting &element, const string &name = "" );
-
-        //! An integer is stored in the new child Setting appended to the passed element
-        static void save ( const int &integer, Setting &element, const string &name = "" );
-
-        //! A double is stored in the new child Setting appended to the passed element
-        static void save ( const double &real, Setting &element, const string &name = "" );
+        static void save ( const log_level_base &log_level, Setting &element, const string &name = "log_level"  );
+
         //!@}