Changeset 394

Timestamp:

06/22/09 13:10:28 (15 years ago)

Author:

mido

Message:

1) UI_File renamed to UIFile
2) part UI's documentation
3) stat/mixtures.h renamed to stat/emix.h and related changes applied

Files:

• applications/bdmtoolbox/estimator.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/estimator.cpp (modified) (1 diff)
• applications/bdmtoolbox/mex/merger.cpp (modified) (1 diff)
• applications/pmsm/TR2245/pmsm_wishart.cpp (modified) (1 diff)
• applications/pmsm/TR2245/unitsteps.cpp (modified) (1 diff)
• applications/pmsm/TR2245/wishart.cpp (modified) (1 diff)
• applications/pmsm/pmsm_estim.cpp (modified) (1 diff)
• library/bdm/CMakeLists.txt (modified) (1 diff)
• library/bdm/base/user_info.cpp (modified) (17 diffs)
• library/bdm/base/user_info.h (modified) (13 diffs)
• library/bdm/estim/mixtures.h (modified) (1 diff)
• library/bdm/stat/emix.cpp (moved) (moved from library/bdm/stat/mixtures.cpp) (1 diff)
• library/bdm/stat/emix.h (moved) (moved from library/bdm/stat/mixtures.h) (1 diff)
• library/tests/CMakeLists.txt (modified) (2 diffs)
• library/tests/emix_test.cpp (moved) (moved from library/tests/stat_mixtures_test.cpp) (1 diff)
• library/tests/emix_test.m (moved) (moved from library/tests/stat_mixtures_test.m)
• library/tests/enorm_test.cpp (modified) (1 diff)
• library/tests/mixtures_test.cpp (moved) (moved from library/tests/estim_mixtures_test.cpp)
• library/tests/testSmp.cpp (modified) (1 diff)
• library/tests/test_user_info.cpp (modified) (2 diffs)

applications/bdmtoolbox/estimator.cpp

@@ -64 +64 @@
         }
         fname = "arx_test.cfg";
-        UI_File F ( fname );
+        UIFile F ( fname );
 
         logger* L = UI::build<logger>( F, "logger");

applications/bdmtoolbox/mex/estimator.cpp

@@ -21 +21 @@
         
         printf("name: %s", fname.c_str());
-        UI_File F ( fname.c_str());
+        UIFile F ( fname.c_str());
 
         logger* L = UI::build<logger>( F, "logger");

applications/bdmtoolbox/mex/merger.cpp

@@ -5 +5 @@
 int main()
 {
-  UI_File Cfg("merger_mx.cfg");
+  UIFile Cfg("merger_mx.cfg");
         
         // Sources

applications/pmsm/TR2245/pmsm_wishart.cpp

@@ -26 +26 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "pmsm_wishart.cfg"; }
-        UI_File F ( fname );
+        UIFile F ( fname );
 
         double h = 1e-6;

applications/pmsm/TR2245/unitsteps.cpp

@@ -30 +30 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "unitsteps.cfg"; }
-        UI_File F ( fname );
+        UIFile F ( fname );
 
         double h = 1e-6;

applications/pmsm/TR2245/wishart.cpp

@@ -29 +29 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { fname = "unitsteps.cfg"; }
-        UI_File F ( fname );
+        UIFile F ( fname );
 
         double h = 1e-6;

applications/pmsm/pmsm_estim.cpp

@@ -18 +18 @@
         if ( argc>1 ) {fname = argv[1]; }
         else { cout << "Missing configuration file.\n Usage: \n $> estimator config_file.cfg"<<endl; abort(); }
-        UI_File F ( fname );
+        UIFile F ( fname );
 
         logger* L = UI::build <logger>( F, "logger" );

library/bdm/CMakeLists.txt

@@ -3 +3 @@
 SET(bdm_base base/bdmbase.cpp base/bdmbase.h base/datasources.cpp base/datasources.h base/loggers.cpp base/loggers.h)
 SET(bdm_math math/square_mat.cpp math/square_mat.h math/chmat.cpp math/chmat.h math/functions.cpp math/functions.h)
-SET(bdm_stat stat/exp_family.cpp stat/exp_family.h stat/mixtures.cpp stat/mixtures.h stat/merger.h stat/merger.cpp)
+SET(bdm_stat stat/exp_family.cpp stat/exp_family.h stat/emix.cpp stat/emix.h stat/merger.h stat/merger.cpp)
 SET(bdm_estim estim/kalman.cpp estim/kalman.h estim/particles.cpp estim/particles.h estim/arx.cpp estim/arx.h estim/mixtures.cpp estim/mixtures.h)
 SET(bdm_user_info base/libconfig/libconfigcpp.cc base/libconfig/grammar.c base/libconfig/libconfig.c base/libconfig/scanner.c base/user_info.cpp base/user_info.h )

library/bdm/base/user_info.cpp

@@ -15 +15 @@
 namespace bdm
 {
-///////////////////////// UI FILE /////////////////////////////////////////////
-
-UI_File::UI_File ()
-{
-    setAutoConvert( true );
-}
-
-//! loads root element from a file
-UI_File::UI_File ( const string &file_name )
+///////////////////////////// Class UIFile /////////////////////////////////////////////
+
+UIFile::UIFile()
+{
+}
+
+UIFile::UIFile ( const string &file_name )
 {
     try
     {
         readFile( file_name.c_str()  );
-        setAutoConvert( true );
+                // this flag has to be set AFTER each file load, that is why it is right here
+                setAutoConvert( true );
     }
     catch ( FileIOException f )
@@ -43 +42 @@
 
 
-//! save UserInfo to the file (typically with an XML extension)
-void UI_File::save(  const string &file_name )
+void UIFile::save(const string &file_name )
 {
     try
@@ -56 +54 @@
 }
 
-UI_File::operator Setting&()
+UIFile::operator Setting&()
 {
     return getRoot();
 }
-///////////////////////// INTERNAL MAPPED_UI /////////////////////////////////////////////
-
-UI::Mapped_UI::String_To_UI_Map& UI::Mapped_UI::mapped_strings()
-{
-    static String_To_UI_Map var;
+
+///////////////////////////// Class UI::MappedUI /////////////////////////////////////////////
+
+UI::MappedUI::StringToUIMap& UI::MappedUI::mapped_strings()
+{
+        // this way it is ensured that there is only one instance of StringTpUIMap, and 
+        // what is more, this declaration leaves its allocation/deallocation on the compiler
+    static StringToUIMap var;
     return var;
 }
 
-UI::Mapped_UI::Type_Info_To_String_Map& UI::Mapped_UI::mapped_type_infos()
-{
-    static Type_Info_To_String_Map var;
+UI::MappedUI::TypeInfoToStringMap& UI::MappedUI::mapped_type_infos()
+{
+        // this way it is ensured that there is only one instance of TypeInfoToStringMap, and 
+        // what is more, this declaration leaves its allocation/deallocation on the compiler
+    static TypeInfoToStringMap var;
     return var;
 }
 
-void UI::Mapped_UI::add_class( const string &class_name, const type_info * const class_type_info, const UI* const ui )
+void UI::MappedUI::add_class( const string &class_name, const type_info * const class_type_info, const UI* const ui )
 {
     pair< const string, const UI* const > new_pair = make_pair( class_name, ui );
@@ -81 +84 @@
 }
 
-const UI& UI::Mapped_UI::retrieve_ui( const string &class_name )
-{
-    String_To_UI_Map::const_iterator iter = mapped_strings().find( class_name );
+void UI::MappedUI::unregistered_class_error( const string &unregistered_class_name )
+{
+        stringstream msg;
+    msg << "UI error: class " + unregistered_class_name + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." << endl;
+
+        if( mapped_strings().size() )
+        {
+            StringToUIMap::const_iterator iter = mapped_strings().begin();
+                msg << "These classes are already registered: " << iter->first;
+                for(; iter != mapped_strings().end(); iter++)
+                        msg << ", " << iter->first;
+                msg << "." << endl;
+        }                       
+        else
+                msg << "There is not any registered class yet!" << endl;
+        
+    it_error ( msg.str() );             
+}
+
+const UI& UI::MappedUI::retrieve_ui( const string &class_name )
+{
+    StringToUIMap::const_iterator iter = mapped_strings().find( class_name );
     if ( iter == mapped_strings().end())
-                // TODO dat sem vypis seznamu registrovanych trid
-        it_error ( "UI error: class " + class_name + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." );
-    return *iter->second;
-}
-
-const string& UI::Mapped_UI::retrieve_class_name( const type_info * const class_type_info )
-{
-    Type_Info_To_String_Map::const_iterator iter = mapped_type_infos().find( class_type_info );
+                unregistered_class_error( class_name );
+            
+        return *iter->second;
+}
+
+const string& UI::MappedUI::retrieve_class_name( const type_info * const class_type_info )
+{
+    TypeInfoToStringMap::const_iterator iter = mapped_type_infos().find( class_type_info );
     if ( iter == mapped_type_infos().end())
-        it_error ( "UI error: class with RTTI name " + string(class_type_info->name()) + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." );
+                unregistered_class_error( "with RTTI name " + string(class_type_info->name()) );
     return iter->second;
 }
 
-///////////////////////// INTERNAL LINK EXPANDER /////////////////////////////////////////////
-
-UI::SettingResolver::SettingResolver( const Setting &potential_link ): result( initialize_reference( file, potential_link ) )
-{
-}
-
-const Setting& UI::SettingResolver::initialize_reference(UI_File *&file, const Setting &potential_link)
+///////////////////////////// Class UI::SettingResolver /////////////////////////////////////////////
+
+UI::SettingResolver::SettingResolver( const Setting &potential_link )
+        : result( initialize_reference( file, potential_link ) )
+{
+}
+
+const Setting& UI::SettingResolver::initialize_reference(UIFile *&file, const Setting &potential_link)
 {
         file = NULL;
@@ -118 +141 @@
     {
         string file_name = link.substr( aerobase + 1, link.length() );
-        file = new UI_File( file_name );
+        file = new UIFile( file_name );
         result = &(Setting&)(*file);
         link = link.substr( 0, aerobase );
@@ -130 +153 @@
 
     if ( !result->exists( link ) )
-        ui_error( "linked Setting was not found", potential_link );
+        ui_error( "linked setting was not found", potential_link );
 
     return (*result)[link];
@@ -140 +163 @@
 }
 
-///////////////////////// UI /////////////////////////////////////////////
+///////////////////////////// Class UI /////////////////////////////////////////////
 
 void UI::ui_error( string message, const Setting &element )
@@ -149 +172 @@
 }
 
-//! This methods - kvuli ukladani pole stringu, dat jen privatne?
-void UI::save( const string &str, Setting &element )
-{
-    Setting &set = element.add( Setting::TypeString );
+const Setting& UI::to_child_setting( const Setting &element, const int index )
+{
+    if ( !element.isList())
+        ui_error( "only TypeList elements could be indexed by integers", element );
+
+    if ( element.getLength() <= index )
+        ui_error( "there is not any child with index " + index, element );
+
+    return element[index];
+}
+
+const Setting& UI::to_child_setting( const Setting &element, const string &name )
+{
+    if ( !element.isGroup())
+        ui_error( "only TypeGroup elements could be indexed by strings", element );
+
+    if ( !element.exists( name ) )
+        ui_error( "there is not any child named """ + name, element );
+
+    return element[name];
+}
+
+void UI::save( const int &integer, Setting &element, const string &name)
+{
+    Setting &set = (name == "") ? element.add( Setting::TypeInt )
+                                            : element.add( name, Setting::TypeInt );
+    set = integer;
+}
+
+void UI::save( const double &real, Setting &element, const string &name)
+{
+    Setting &set = (name == "") ? element.add( Setting::TypeFloat )
+                                            : element.add( name, Setting::TypeFloat );
+    set = real;
+}
+
+void UI::save( const string &str, Setting &element, const string &name)
+{
+    Setting &set = (name == "") ? element.add( Setting::TypeString )
+                                            : element.add( name, Setting::TypeString );
     set = str;
 }
@@ -158 +217 @@
 void UI::save( const mat &matrix, Setting &element, const string &name)
 {
-
     Setting &set = (name == "") ? element.add( Setting::TypeList )
-                    : element.add( name, Setting::TypeList );
+                                            : element.add( name, Setting::TypeList );
 
     Setting &cols = set.add( Setting::TypeInt );
@@ -179 +237 @@
 }
 
-
-//! This methods tries to save a integer vector
 void UI::save( const ivec &vector, Setting &element, const string &name)
 {
-
     Setting &set = (name == "") ? element.add( Setting::TypeArray )
                     : element.add( name, Setting::TypeArray );
@@ -193 +248 @@
 }
 
-
-//! This methods tries to save a double vector
 void UI::save( const vec &vector, Setting &element, const string &name)
 {
@@ -205 +258 @@
     }
 }
-
-
-//! This methods tries to build a new double matrix
 
 void UI::from_setting( mat& matrix, const Setting &element )
@@ -274 +324 @@
 }
 
-//! This methods tries to build a new integer vector
 void UI::from_setting( ivec &vector, const Setting &element )
 {
@@ -301 +350 @@
                 Setting &elements = link.result[2];
         // ASSERT_UITYPE(elements[0],TypeInt); -- spolehame an autoconvert
-
 
         if ( matrix.cols() == 1 )
@@ -328 +376 @@
 }
 
-//! This methods tries to build a new double vector
 void UI::from_setting( vec &vector, const Setting &element )
 {
@@ -379 +426 @@
 }
 
-
 void UI::from_setting( string &str, const Setting &element )
 {
@@ -386 +432 @@
 }
 
-
-///////////////////////// UI FILE /////////////////////////////////////////////
-//! This methods tries to save an instance of type T (or some of its descendant types)
-//! and build DOM tree accordingly. Then, it creates a new DOMNode named according class_name
-//! and connecti it to the passed Setting as a new child node.
-const Setting& UI::to_child_setting( const Setting &element, const int index )
-{
-    if ( !element.isList())
-        ui_error( "only TypeList elements could be indexed by integers", element );
-
-    if ( element.getLength() <= index )
-        ui_error( "there is not any child with index " + index, element );
-
-    return element[index];
-}
-
-const Setting& UI::to_child_setting( const Setting &element, const string &name )
-{
-    ASSERT_UITYPE(element,TypeGroup);
-    if ( !element.exists( name ) )
-        ui_error( "there is not any child named """ + name, element );
-    return element[name];
-}
-
-
-}
-
+void UI::from_setting( int &integer, const Setting &element )
+{
+    ASSERT_UITYPE(element,TypeInt);
+    integer = element;
+}
+
+void UI::from_setting( double &real, const Setting &element )
+{
+    ASSERT_UITYPE(element,TypeFloat);
+    real = element;
+}
+
+}

library/bdm/base/user_info.h

@@ -17 +17 @@
 using namespace libconfig;
 
+namespace bdm
+{
+        
+/*!
+  \def UIREGISTER(class_name)
+  Macro for registration of class into map of UserInfos -- registered class is scriptable 
+
+  TODO napsat i to, ze UIREG musi byt v hacku..
+*/
 #ifndef BDMLIB 
-//!Macro for registration of classes into map of UserInfos -- registered class is scriptable 
-#define UIREGISTER(class_name) template<> const Particular_UI<class_name>& Particular_UI<class_name>::ui = Particular_UI<class_name>(#class_name) 
+#define UIREGISTER(class_name) template<> const ParticularUI<class_name>& ParticularUI<class_name>::ui = ParticularUI<class_name>(#class_name) 
 #else
 #define UIREGISTER(class_name)
 #endif
 
-#define ASSERT_UITYPE(S,Type) it_assert_debug(S.getType()==Setting::Type, string("Wrong setting type, see input path \"")+string(S.getPath())+string("\""))
-
-namespace bdm
-{
-        
-        //! exception used in UI::build if it fails it can be caught and handled - see merger_mex.h
+//!  macro assertting that the setting SET is of the SettingType TYPE
+#define ASSERT_UITYPE(SET,TYPE) it_assert_debug(SET.getType()==Setting::TYPE, string("Wrong setting type, see input path \"")+string(SET.getPath())+string("\""))
+
+//! exception used in UI::build if it fails it can be caught and handled - see merger_mex.h
 class UIbuildException : public std::invalid_argument {
         public:
                 UIbuildException() : std::invalid_argument("class name") { }
 };
-        
-class UI_File : public Config
-{
-private:
-        const string file_name;
-
-public:
-        //! create empty object prepared to store Settings
-        UI_File();
-
-        //! creates object and fills it from a file
-        UI_File( const string &file_name );
-
-        //! save UserInfo to the file 
-        void save(const string &file_name);
-
-        operator Setting&();
-};
 
 /*!
-@brief This class serves to load and/or save DOMElements into/from files
-stored on a hard-disk.
-
-Firstly, you associate new RootElement instance with some filename during a time of its 
-construtcion. Then, you save some object into the new RootElement instance,
-and save it into the file this way:
+@brief This class serves to load and/or save user-infos into/from 
+configuration files stored on a hard-disk.
+
+Firstly, save some user-infos into the new UIFile instance. Then, 
+call the save method with a filename as its only argument:
+
 \code
         CAudi audi;
-        RootElement root("cars.xml");
-        UserInfo::save( audi, root, "TT");
-        root.save();
+        UIFile file;
+        UI::save( audi, file, "TT");
+        file.save("cars.cfg");
 \endcode
 
-In the other way round, when loading object from a XML file, the appropriate code looks like this:
+In the other way round, when loading object from a configuration file, 
+the appropriate code looks like this:
+
 \code
-        RootElement root("cars.xml");
-        root.load();
-        UserInfo::build<T>(root,"TT");
+        UIFile file("cars.cfg");
+        CAudi *audi = UI::build<CAudi>(file,"TT");
 \endcode
 */
+class UIFile : public Config
+{
+public:
+        //! create empty file instance prepared to store Settings
+        UIFile();
+
+        //! creates instance and fills it from the configuration file file_name
+        UIFile( const string &file_name );
+
+        //! save all the stored Settings into the configuration file file_name
+        void save(const string &file_name);
+
+        //! this operator allows the ability of substituting Setting parameter by UIFile instance
+        operator Setting&();
+};
+
 
 
 /*!
-@brief UserInfo is an abstract is for internal purposes only. Use CompoundUserInfo<T> or Particular_UI<T> instead.
-The raison d'etre of this class is to allow pointers to its templated descendants. 
-
-Also, the main functions of the whole UserInfo library are included within this class, see
-static methods 'build' and 'save'.
-
+@brief UI is an abstract class and it is intended for internal purposes only
+
+This class exists mainly to allow pointers to its templated descendant ParticularUI<T>. Next, 
+it collects all the auxiliary functions useful to prepare some concret user-infos, see static 
+methods 'build', 'get' and 'save'. 
 */
 class UI 
 {
 private:
-        //! static class encalupsating map of names to related UserInfos
+        //! Atatic class encalupsating two maps, one mapping names to UI instances and the other mapping type_infos to class names
         //! 
-        //! The key property of this class is that it initilaized the internal map immediately
-        //! when it is used for a first time.
-        class Mapped_UI
+        //! The key property of this class is that it initilaize the internal map immediately
+        //! when it is used for a first time. Therefore, we do not have to care about the 
+        //! order of calls to UIREGISTER macro, which operates with both these mappings.
+        class MappedUI
         {
         private:
-                //! Type definition of mapping which transforms type names to the related user infors
-                typedef map< const string, const UI* const > String_To_UI_Map;
-
-                //! Type definition of mapping which transforms type names to the related user infors
-                typedef map< const type_info * const, const string > Type_Info_To_String_Map;
-
-                //! immediately initialized instance of type String_To_UI_Map
-                static String_To_UI_Map& mapped_strings();
-
-                //! immediately initialized instance of type String_To_UI_Map
-                static Type_Info_To_String_Map& mapped_type_infos();
+                //! Type definition of mapping which transforms class names to the related UI instances
+                typedef map< const string, const UI* const > StringToUIMap;
+
+                //! Type definition of mapping which transforms RTTI type_infos to the related class names
+                typedef map< const type_info * const, const string > TypeInfoToStringMap;
+
+                //! immediately initialized instance of type StringToUIMap
+                static StringToUIMap& mapped_strings();
+
+                //! immediately initialized instance of type TypeInfoToStringMap
+                static TypeInfoToStringMap& mapped_type_infos();
+
+                //! method for reporting a error when an attempt to operate with an unregistered class occures
+                static void unregistered_class_error( const string &unregistered_class_name );
 
         public:
@@ -110 +118 @@
                 static void add_class( const string &class_name, const type_info * const class_type_info, const UI* const ui );
 
-                //! search for an userinfo related to the passed key within the internal map
+                //! search for an userinfo related to the passed class name within the internal map
                 static const UI& retrieve_ui( const string &class_name );
 
-                //! search for an userinfo related to the passed key within the internal map
+                //! search for an class name related to the passed type_info within the internal map
                 static const string& retrieve_class_name( const type_info* const class_type_info );
         };
 
-
-
-
-        //! internal method assembling a typeless instance from components obtained by the 'AssemblyComponentsFromSetting()' method
+        //! Method assembling a typeless instance, it is implemented in descendant class ParticularUI<T>
         virtual root* new_instance() const = 0;
         
-        //! This methods tries to save an instance of type T (or some of its descendant types)
-        //! and build DOM tree accordingly. Then, it creates a new DOMNode named according class_name
-        //! and connecti it to the passed Setting as a new child node.
+        //! Method switching from the \a element to its child Setting according the passed \a index, it also does all the necessary error-checking 
         static const Setting& to_child_setting( const Setting &element, const int index );
 
+        //! Method switching from the \a element to its child Setting according the passed \a name, it also does all the necessary error-checking 
         static const Setting& to_child_setting( const Setting &element, const string &name );
 
-
-        //! \name Matematical Operations TODO
-        //!@{
-
-        //! This methods tries to build a new double matrix 
+        //! This methods converts a Setting into a matrix 
         static void from_setting( mat& matrix, const Setting &element );        
-        //! This methods tries to build a new integer vector
+        //! This methods converts a Setting into an integer vector
         static void from_setting( ivec &vector, const Setting &element );
-        // jednak kvuli pretypovani, apak taky proto, ze na string nefunguje link_expander..
+        //! This methods converts a Setting into a string
         static void from_setting( string &str, const Setting &element );
-        //! This methods tries to build a new templated array 
-
+        //! This methods converts a Setting into a real vector
         static void from_setting( vec &vector, const Setting &element );
-
+        //! This methods converts a Setting into a integer scalar 
+        static void from_setting( int &integer, const Setting &element );
+        //! This methods converts a Setting into a real scalar 
+        static void from_setting( double &real, const Setting &element );
+        //! This methods converts a Setting into a class T descendant
         template<class T> static void from_setting( T* &instance, const Setting &element )
         {                       
@@ -155 +158 @@
                         ui_error( "the obligatory ""class"" identifier is missing", link.result );
         
-                // and finally we find a UserInfo related to this type
-                const UI& related_UI = Mapped_UI::retrieve_ui( class_name );
+                // then we find a user-info related to this type
+                const UI& related_UI = MappedUI::retrieve_ui( class_name );
                 
                 root* typeless_instance = related_UI.new_instance();
@@ -168 +171 @@
 //              catch(...)
 //              {
+                        // TODO pouzit ui_error? 
 //                      it_error ( "UI error: class " + class_name + " is not a descendant of the desired output class. Try to call the UI::build function with a different type parameter." );
 //              }
@@ -177 +181 @@
                 catch(SettingException xcptn)
                 {
+                        // TODO pouzit ui_error? 
                         it_error ( "UI error: the method " + class_name + ".from_setting(Setting&) has thrown an exception when parsing the setting " + xcptn.getPath() + ". Try to correct this method." );
                 }
         }       
 
-
-        //! This methods tries to build a new templated array , 
-        // efektivne jen pro vect, mat a string, pro dalsi je nutne pridat from_setting metodu.. ale to asi necceme
+        //! This methods converts a Setting into a new templated array , 
+        // TODO efektivne jen pro vect, mat a string, pro dalsi je nutne pridat from_setting metodu.. ale to asi necceme
         template<class T> static void from_setting( Array<T> &array_to_load, const Setting &element )
         {
@@ -198 +202 @@
         }
 
-          //!@}
-
-
+        //! Method for reporting user-info errors related to some concrete Setting
         static void ui_error( string message, const Setting &element );
 
 protected:
-        //! default constructor 
+        //! Default constructor for internal use only, see \sa ParticularUI<T>
         UI( const string& class_name, const type_info * const class_type_info ) 
         {       
-                Mapped_UI::add_class( class_name, class_type_info, this );
-        }
-
-        //! Virtual destructor for future use;
-        virtual ~UI(){};
+                MappedUI::add_class( class_name, class_type_info, this );
+        }
 
 public: 
-        //! This methods tries to build a new instance of type T (or some of its descendant types)
-        //! according to a data stored in a DOMNode named class_name within a child nodes of the passed element.
-        //! If an error occurs, it returns a NULL pointer.
-
-        // vraci true, kdyz to byl platny link, jinak false.. v pripade chyby konci it_errorem..
-        // do elementu vrati setting prislusny po rozbaleni linku, jinak ponecha beze zmeny
+
+        /*!
+        @brief This class serves to expand links used in configuration file. 
+
+        TODO - napsat co dela, a hlavne proc je to takhle implementovany.. otevreny soubor!
+
+        ABSOLUTE PATH.. 
+
+        Firstly, save some user-infos into the new UIFile instance. Then, 
+        call the save method with a filename as its only argument:
+
+        \code
+                CAudi audi;
+                UIFile file;
+                UI::save( audi, file, "TT");
+                file.save("cars.cfg");
+        \endcode
+
+        */
         class SettingResolver   
         {
         private:
-                UI_File *file;
-
-                const Setting &initialize_reference( UI_File* &file, const Setting &potential_link);
+                //! If necessary, this pointer stores an addres of an opened UIFile, else it equals NULL
+                UIFile *file;
+
+                //! This method initialize result reference, i.e., it executes the main code of SettingResolver class
+                //!
+                //! This code could be also located directly in constructor. The only reason why we made this 
+                //! method is the keyword 'const' within the declaration of result reference (TODO funguje odkaz?). Such a reference
+                //! have to be intialized before any other constructor command, exactly in the way it is implemented now.
+                const Setting &initialize_reference( UIFile* &file, const Setting &potential_link);
 
         public:
+                //! Reference to a resolved link or to the original Setting in the case it does not contain a link
                 const Setting &result;
 
+                //! If potential_link contains a link to some other setting, it is resolved here. Anyway, the Setting reference result is prepared for use.
                 SettingResolver( const Setting &potential_link );
                 
+                //! An opened UIFile file is closed here if necessary.
                 ~SettingResolver();             
         };
 
-
-
-        //! Prototype of a UI builder. Return value is by the second argument since it type checking via \c dynamic_cast.
+        //TODO
+        //! \name Initialization of bdm::root descendant classes according the values stored in a Setting variable
+        //!@{
+        //! Return value is by the second argument since it type checking via \c dynamic_cast.
         template<class T> static T* build( const Setting &element, const int index )
         {
@@ -258 +280 @@
                 return instance;
         }
-
+        //!@}
+
+        //! \name Initialization of structures according the values stored in a Setting variable - TODO VYCET?!
+        //!@{
         //! This methods tries to build a new double matrix 
         template<class T> static void get( T &instance, const Setting &element, const string &name )
@@ -272 +297 @@
 
         //! This methods tries to build a new double matrix 
+        template<class T> static void get( T &instance, const Setting &element  )
+        {
+                from_setting( instance, element );
+        }
+
+        //! This methods tries to build a new double matrix 
         template<class T> static void get( Array<T> &array_to_load, const Setting &element, const string &name )
         {
@@ -282 +313 @@
                 from_setting( array_to_load, to_child_setting( element, index ) );
         }
+
+        //! This methods tries to build a new double matrix 
+        template<class T> static void get( Array<T> &array_to_load, const Setting &element  )
+        {
+                from_setting( array_to_load, element );
+        }
+        //!@}
 
         template< class T> static void save( const T * const instance, Setting &element, const string &name = "")
@@ -288 +326 @@
                                                                          : element.add( name, Setting::TypeGroup );             
 
-                const string &class_name = Mapped_UI::retrieve_class_name( &typeid(*instance) );
+                const string &class_name = MappedUI::retrieve_class_name( &typeid(*instance) );
                         
                 // add attribute "class" 
@@ -321 +359 @@
         static void save( const ivec &vec, Setting &element, const string &name = "" );
         
-        static void save( const vec &vector, Setting &element, const string &name);
-
-        private: 
+        static void save( const vec &vector, Setting &element, const string &name = "" );
         //! This methods tries to save a double vec 
-        static void save( const string &str, Setting &element); 
+        static void save( const string &str, Setting &element, const string &name = "" );
+
+        static void save( const int &integer, Setting &element, const string &name = "" );
+
+        static void save( const double &real, Setting &element, const string &name = "" );      
 
 };
@@ -335 +375 @@
 own userinfo class prepared).
 */
-template<typename T> class Particular_UI : private UI
+template<typename T> class ParticularUI : private UI
 {
         public:
 
         //! default constructor, which is intentionally declared as private
-        Particular_UI<T>( const string &class_name) : UI( class_name, &typeid(T) ) 
+        ParticularUI<T>( const string &class_name) : UI( class_name, &typeid(T) ) 
         {       cout << class_name << endl;
         };
@@ -346 +386 @@
         //! the only instance of this class (each type T has its own instance)
         //! which is used as a factory for processing related UI
-        static const Particular_UI<T>& ui;      
+        static const ParticularUI<T>& ui;       
 
         root* new_instance() const

library/bdm/estim/mixtures.h

@@ -11 +11 @@
 */
 
-#ifndef ESTIM_MIXTURES_H
-#define ESTIM_MIXTURES_H
+#ifndef MIXTURES_H
+#define MIXTURES_H
 
 
 #include "../math/functions.h"
 #include "../stat/exp_family.h"
-#include "../stat/mixtures.h"
+#include "../stat/emix.h"
 
 namespace bdm {

library/bdm/stat/emix.cpp

@@ -1 @@
-#include "mixtures.h"
+#include "emix.h"
 
 namespace bdm{

library/bdm/stat/emix.h

@@ -11 +11 @@
 */
 
-#ifndef STAT_MIXTURES_H
-#define STAT_MIXTURES_H
+#ifndef EMIX_H
+#define EMIX_H
 
 #define LOG2  0.69314718055995  

library/tests/CMakeLists.txt

@@ -19 +19 @@
 EXEC(enorm_test)
 EXEC(egiw_test)
-EXEC(stat_mixtures_test)
+EXEC(emix_test)
 EXEC(test0)
 EXEC(testResample)
@@ -29 +29 @@
 EXEC(merger_2d_test)
 EXEC(merger_iter_test)
-EXEC(estim_mixtures_test)
+EXEC(mixtures_test)
 
 EXEC(test_kalman)

library/tests/emix_test.cpp

@@ -1 +1 @@
 #include "stat/exp_family.h"
-#include "stat/mixtures.h"
+#include "stat/emix.h"
 using namespace bdm;
 

library/tests/enorm_test.cpp

@@ -1 +1 @@
 #include "stat/exp_family.h"
-#include "stat/mixtures.h"
+#include "stat/emix.h"
 using namespace bdm;
 

library/tests/testSmp.cpp

@@ -1 +1 @@
 
 #include "stat/exp_family.h"
-#include "stat/mixtures.h"
+#include "stat/emix.h"
 
 using namespace bdm;

library/tests/test_user_info.cpp

@@ -197 +197 @@
 {
   //////////////////////////////////// LOADING ////////////////////////////////
-  UI_File in("test_user_info_input.cfg");
+  UIFile in("test_user_info_input.cfg");
   Transport *pepikovo = UI::build<Transport>(in, "pepikovo");
   cout << "pepikovo: " << pepikovo->to_string() << endl;
@@ -216 +216 @@
   Car liaz(1989, "skoda", 1000);
   Bike author(2001, "noname", false);
-  UI_File out;
+  UIFile out;
 
   UI::save(&audi, out, "marty");