Changeset 345

Timestamp:

05/20/09 23:15:05 (16 years ago)

Author:

mido

Message:

dodelano user_info, castecne predelano podle stabni kultury, zbyva otestovat a udelat dokumentaci

Files:

• bdm/CMakeLists.txt (modified) (1 diff)
• bdm/stat/libBM.h (modified) (1 diff)
• bdm/user_info.cpp (moved) (moved from bdm/uibuilder.cpp) (4 diffs)
• bdm/user_info.h (moved) (moved from bdm/uibuilder.h) (17 diffs)
• library/mex/mexparse.h (modified) (1 diff)
• tests/UI/CMakeLists.txt (modified) (1 diff)
• tests/UI/testUI.cfg (moved) (moved from tests/UI/UIbuilder_test.cfg) (1 diff)
• tests/UI/testUI.cpp (moved) (moved from tests/UI/UIbuilder_test.cpp) (7 diffs)
• tests/UI/testUI_ex.cfg (moved) (moved from tests/UI/UIbuilder_test_ex.cfg)

bdm/CMakeLists.txt

@@ -4 +4 @@
 SET(BdmStat stat/libDS.cpp stat/libDS.h stat/libFN.cpp stat/libFN.h stat/libBM.cpp stat/libBM.h stat/libEF.cpp stat/libEF.h stat/loggers.cpp stat/loggers.h stat/emix.cpp stat/emix.h)
 SET(BdmEstim estim/libKF.cpp estim/libKF.h estim/libPF.cpp estim/libPF.h estim/arx.cpp estim/arx.h estim/mixef.cpp estim/mixef.h estim/merger.cpp)
-SET(BdmUI libconfig/libconfigcpp.cc libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c uibuilder.cpp uibuilder.h )
+SET(BdmUI libconfig/libconfigcpp.cc libconfig/grammar.c libconfig/libconfig.c libconfig/scanner.c user_info.cpp user_info.h )
 
 # Normal BDM library

bdm/stat/libBM.h

@@ -42 +42 @@
 
         //! This method arrange instance properties according the data stored in the Setting structure
-        virtual void FromSetting( const Setting &root )
+        virtual void from_setting( const Setting &root )
         {
         }
 
         //! This method save all the instance properties into the Setting structure 
-        virtual void ToSetting( Setting &root ) 
+        virtual void to_setting( Setting &root ) 
         {       
         }

bdm/user_info.cpp

@@ -11 +11 @@
 //
 
-#include "uibuilder.h"
+#include "user_info.h"
 
 namespace bdm {
 
-UI::StringToUIMap::MappedString2UI& UI::StringToUIMap::privateMap()
+UI::Class_To_UI::Class_To_UI_Map& UI::Class_To_UI::private_map()
 {
-        static MappedString2UI var;
+        static Class_To_UI_Map var;
         return var;
 }
 
-void UI::StringToUIMap::Add( const string &className, pUI pInstance )
+void UI::Class_To_UI::add_class( const string &class_name, UI* ui )
 {
-        privateMap().insert( make_pair( className, pInstance ) );
+        private_map().insert( make_pair( class_name, ui ) );
 }
 
-UI::pUI UI::StringToUIMap::Retrieve( const string &className )
+UI* UI::Class_To_UI::retrieve_ui( const string &class_name )
 {
-        MappedString2UI::const_iterator iter = privateMap().find( className );
-        if( iter == privateMap().end()) return NULL;
+        Class_To_UI_Map::const_iterator iter = private_map().find( class_name );
+        if( iter == private_map().end()) return NULL;
         else return iter->second;
 }       
@@ -36 +36 @@
 
 
-UIFile::UIFile ( const string &file_name ) : fileName( file_name )
+UI_File::UI_File ( const string &file_name ) : file_name( file_name )
 {
-        Config::setAutoConvert( true );
+        setAutoConvert( true );
 }
 
 //! loads root element from a file
-void UIFile::Load() 
+void UI_File::load() 
 {
         try
         {
-                Config::readFile( fileName.c_str()  );
+                readFile( file_name.c_str()  );
         }
         catch ( FileIOException f ) 
         {
-                it_error ( "UI: file " + fileName + " not found." );
+                it_error ( "UI error: file " + file_name + " not found." );
         }
         catch ( ParseException& P ) 
         {
                 stringstream msg;
-                msg << "UI: parsing error """ << P.getError() << """ in file " << fileName << " on line " <<  P.getLine() << ".";
+                msg << "UI error: parsing ui_error """ << P.getError() << """ in file " << file_name << " on line " <<  P.getLine() << ".";
                 it_error ( msg.str() );
         }       
@@ -61 +61 @@
 
 
-//! Save UserInfo to the file (typically with an XML extension)
-void UIFile::Save()
+//! save UserInfo to the file (typically with an XML extension)
+void UI_File::save()
 {
         try
         {
-                Config::writeFile ( fileName.c_str()  );
+                writeFile ( file_name.c_str()  );
         }
         catch ( FileIOException f ) 
         {
-                it_error( "UI: file " + fileName + " is inacessible." );
+                it_error( "UI error: file " + file_name + " is inacessible." );
         }               
 }       
 
-UIFile::operator Setting&()
+UI_File::operator Setting&()
 {
         return getRoot();
@@ -80 +80 @@
 
 }
-/*
-#include "uibuilder.h"
 
-namespace bdm {
-
-//! global map of UIbulder names to instances of UIbuilders. Created by UIREGISTER macro
-UIbuilder::UImap UIbuilder::__uimap__;
-
-bdmroot* UIexternal::build ( Setting &S ) const {
-        Config C;
-        bdmroot* tmp;
-        try {
-                C.readFile ( ( const char* ) S["filename"] );
-        }
-        catch ( ... ) {
-                it_error ( "File " + string ( ( const char* ) S["filename"] ) + " not found or broken" );
-        }
-        try {
-                Setting& remS=C.lookup ( ( const char* ) S["path"] );
-                UIbuilder::build( remS,tmp );
-        }
-        catch ( ... ) {
-                it_error ( "External field " + string ( S.getPath() ) + " not valid" );
-        }
-        return tmp;
-};
-UIREGISTER ( UIexternal );
-
-bdmroot* UIinternal::build ( Setting &S ) const {
-        bdmroot* tmp;
-        try {
-                Setting* Stmp = &S;
-                do {Stmp=& ( Stmp->getParent() );}
-                while ( !Stmp->isRoot() );
-                Setting& intS=Stmp->lookup ( ( const char* ) S["path"] );
-                UIbuilder::build( intS,tmp );
-        }
-        catch ( ... ) {
-                it_error ( "Internal field " + string ( S.getPath() ) + " not valid" );
-        }
-        return tmp;
-};
-UIREGISTER ( UIinternal );
-
-void UI_DBG ( Setting &S, const string &spc ) {
-        const char *Name=S.getName();
-        if ( Name!=NULL ) {cout << spc << std::string ( Name );};
-        Setting::Type T=S.getType();
-        switch ( T ) {
-                case Setting::TypeArray:
-                        cout << endl;
-                        for ( int i=0;i<S.getLength();i++ ) {UI_DBG ( S[i], spc+" " );};
-                        break;
-                case Setting::TypeList:
-                        cout << endl;
-                        for ( int i=0;i<S.getLength();i++ ) {UI_DBG ( S[i], spc+" " );};
-                        break;
-                case Setting::TypeGroup:
-                        cout << endl;
-                        for ( int i=0;i<S.getLength();i++ ) {UI_DBG ( S[i], spc+" " );}
-                        break;
-                case Setting::TypeInt:
-                        cout << " = ";
-                        cout << int ( S ) <<endl;
-                        break;
-                case Setting::TypeFloat:
-                        cout << " = ";
-                        cout << double ( S ) <<endl;
-                        break;
-                case Setting::TypeString:
-                        cout << " = ";
-                        cout << ( const char* ) ( S ) <<endl;
-                        break;
-                case Setting::TypeBoolean:
-                        cout << " = ";
-                        cout << bool ( S ) <<endl;
-                        break;
-                default: {cout << "?";};
-        }
-}
-
-}
-//UIexternal* UIexternal_instance =new UIexternal();
-*/

bdm/user_info.h

@@ -20 +20 @@
 using namespace libconfig;
 
-#define UIREGISTER(className) template<> ParticularUI<className>& ParticularUI<className>::ui = ParticularUI<className>(#className)
+#define UIREGISTER(class_name) template<> Particular_UI<class_name>& Particular_UI<class_name>::ui = Particular_UI<class_name>(#class_name)
 
 #define ASSERT_UITYPE(S,Type) it_assert_debug(S.getType()==Setting::Type, string("Wrong setting type, see input path \"")+string(S.getPath())+string("\""))
@@ -37 +37 @@
         CAudi audi;
         RootElement root("cars.xml");
-        UserInfo::Save( audi, root, "TT");
-        root.Save();
+        UserInfo::save( audi, root, "TT");
+        root.save();
 \endcode
 
@@ -44 +44 @@
 \code
         RootElement root("cars.xml");
-        root.Load();
-        UserInfo::Build<T>(root,"TT");
+        root.load();
+        UserInfo::build<T>(root,"TT");
 \endcode
 */
 
-class UIFile : public Config
+class UI_File : public Config
 {
 private:
-        const string fileName;
+        const string file_name;
 
 public:
         //! attach new RootElement instance to a file (typically with an XML extension)
-        UIFile( const string &file_name );
+        UI_File( const string &file_name );
 
         //! loads root element from a file
-        void Load();
-
-        //! Save UserInfo to the file (typically with an XML extension)
-        void Save ();
+        void load();
+
+        //! save UserInfo to the file (typically with an XML extension)
+        void save();
 
         operator Setting&();
@@ -69 +69 @@
 
 /*!
-@brief UserInfo is an abstract is for internal purposes only. Use CompoundUserInfo<T> or ParticularUI<T> instead.
+@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'.
+static methods 'build' and 'save'.
 
 
@@ -85 +85 @@
 {
 private:
-        //! just a typedef shortuct for a constant pointer to UI
-        typedef UI* pUI;
-
         //! static class encalupsating map of names to related UserInfos
         //! 
         //! The key property of this class is that it initilaized the internal map immediately
         //! when it is used for a first time.
-        class StringToUIMap
+        class Class_To_UI
         {
         private:
                 //! Type definition of mapping which transforms type names to the related user infors
-                typedef map< const string, pUI > MappedString2UI;
-
-                //! immediately initialized instance of type MappedString2UI
-                static MappedString2UI& privateMap();
+                typedef map< const string, UI* > Class_To_UI_Map;
+
+                //! immediately initialized instance of type Class_To_UI_Map
+                static Class_To_UI_Map& private_map();
 
         public:
                 //! add a pair key-userinfo into the internal map
-                static void Add( const string &className, pUI pInstance );
+                static void add_class( const string &class_name, UI* ui );
 
                 //! search for an userinfo related to the passed key within the internal map
-                static pUI Retrieve( const string &className );
+                static UI* retrieve_ui( const string &class_name );
         };
                                 
         //! internal method assembling a typeless instance from components obtained by the 'AssemblyComponentsFromSetting()' method
-        virtual bdmroot* New() = 0;
+        virtual bdmroot* new_instance() = 0;
         
         //! type name defined by user
-        const string className;
-
-protected:
-
-        //! default constructor 
-        UI( const string& className ) : className ( className )
-        {       
-                StringToUIMap::Add( className, this );
-        }
-
-        //! Virtual destructor for future use;
-        virtual ~UI(){};
-
-private:
+        const string class_name;
 
         //! 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 className
+        //! 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.
-        template<class T> static void ToSetting( T &instance, Setting &element )
-        {
-                string &className = ParticularUI<T>::ui.className;
+        template<class T> static void to_setting( const T &instance, Setting &root )
+        {
+                const string &class_name = Particular_UI<T>::ui.class_name;
                         
                 // add attribute "class" 
                 Setting &type = root.add( "class", Setting::TypeString );
-                type = className;
+                type = class_name;
         
                 try
                 {
                         // instance disassembling 
-                        instance.ToSetting( root );
+                        instance.to_setting( root );
                 }
                 catch(SettingException xcptn)
                 {
-                        it_error ( "UI: the method " + className + ".ToSetting(Setting&) has thrown an exception when filling the setting " + xcptn.getPath() + ". Try to correct this method." );
+                        it_error ( "UI error: the method " + class_name + ".to_setting(Setting&) has thrown an exception when filling the setting " + xcptn.getPath() + ". Try to correct this method." );
                 }       
         }
 
-        template<class T> static T* FromSetting( const Setting &element )
+        template<class T> static T* from_setting( const Setting &element )
         {                       
-                RevealIfLinked revealed_link( element );
-                const Setting &root = revealed_link.root();
+                const Link_Expander link_expander( element );
+                const Setting &root = link_expander.root();
 
                 ASSERT_UITYPE(root,TypeGroup);
 
                 // we get a velue stored in the "class" attribute 
-                string className;
-                if( !root.lookupValue( "class", className ) )
-                {
-                        stringstream msg;
-                        msg << "UI: the class identifier is missing within the setting """ << root.getPath() <<  """. Check line " 
-                                << root.getSourceLine() << ".";
-                        it_error ( msg.str() );
-                }
-
+                string class_name;
+                if( !root.lookupValue( "class", class_name ) )
+                        ui_error( "the obligatory ""class"" identifier is missing", root );
         
                 // and finally we find a UserInfo related to this type
-                pUI pRelatedUI = StringToUIMap::Retrieve( className );
-                if( !pRelatedUI)
-                        it_error ( "UI: class " + className + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." );
+                UI* related_UI = Class_To_UI::retrieve_ui( class_name );
+                if( !related_UI)
+                        it_error ( "UI error: class " + class_name + " was not properly registered. Use the macro ""UIREGISTER([class name]);"" within your code." );
                 
-                bdmroot* pTypelessInstance = pRelatedUI->New();
-
-                T* pInstance = NULL;
+                bdmroot* typeless_instance = related_UI->new_instance();
+
+                T* ui = NULL;
                 try
                 {
-                        pInstance = (T*) pTypelessInstance ;
+                        ui = (T*) typeless_instance ;
                 }
                 catch(...)
                 {
-                        it_error ( "UI: class " + className + " is not a descendant of the desired output class. Try to call the UI::Build function with a different type parameter." );
+                        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." );
                 }
                 
@@ -188 +166 @@
                 {
                         // instance assembling 
-                        pInstance->FromSetting( root );
+                        ui->from_setting( root );
                 }
                 catch(SettingException xcptn)
                 {
-                        string msg = "UI: the method " + className + ".FromSetting(Setting&) has thrown an exception when parsing the setting " + xcptn.getPath() + ". Try to correct this method.";
-                        it_error ( msg );
-                }
-                return pInstance;
+                        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." );
+                }
+                return ui;
         }       
 
-
-
-public:
 
         // 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
-        class RevealIfLinked    
+        class Link_Expander     
         {
         private:
-                UIFile *file;
-                const Setting * result;
+                UI_File *file;
+                const Setting *result;
 
         public:
 
-                RevealIfLinked( const Setting &element )
+                Link_Expander( const Setting &potential_link )
                 {
                         file = NULL;
-                        result = &element;
-
-                        if( element.getType() !=  Setting::TypeString )
+                        result = &potential_link;
+
+                        if( potential_link.getType() !=  Setting::TypeString )
                                 return;
 
-                        string link = (string) element;
+                        string link = (string) potential_link;
                         size_t aerobase = link.find('@');
                         if( aerobase != string::npos )
                         {
                                 string file_name = link.substr( aerobase + 1, link.length() );
-                                file = new UIFile( file_name );
-                                file->Load();
-                                // TODO OSETRIT FALSE, vyhodit iterr
-
+                                file = new UI_File( file_name );
+                                file->load();
                                 result = &(Setting&)(*file);
-
                                 link = link.substr( 0, aerobase );
                         }
@@ -238 +209 @@
 
                         if( !result->exists( link ) )
-                        {
-                                // vyhodi chybu v pripade chyby
-                                printf("");
-                        }
+                                ui_error( "linked Setting was not found", potential_link );
+
                         result = &(*result)[link];
-                        return;
-                }
-
-                ~RevealIfLinked()
+                }
+
+                ~Link_Expander()
                 {
                         if( file ) delete file;
                 }
-
                 
-                const Setting& root()
+                const Setting& root() const
                 {
                         return *result;
@@ -258 +225 @@
         };
 
-        private:
-                static const Setting* ToChildSetting( const Setting &element, const int index )
+                static const Setting* to_child_setting( const Setting &element, const int index )
                 {
                         if( !element.isAggregate())
@@ -270 +236 @@
                 }
 
-                static const Setting* ToChildSetting( const Setting &element, const string &name )
+                static const Setting* to_child_setting( const Setting &element, const string &name )
                 {
                         if( !element.isGroup() )
@@ -281 +247 @@
                 }
 
-                static Setting& ToChildSetting( Setting &element, const int index )
+                static Setting& to_child_setting( Setting &element, const int index )
                 {
                         if( !element.isAggregate())
-                        {
-                                // TODO CO ZA TYP? ASI NE GROUP, COZ..
-                        }
+                                ui_error( "it is not possible to index non-agregate element by integers", element );
+
                         if( element.getLength() <= index )
-                        {
-                                stringstream msg;
-                                msg << "UI: there is not any child with index " << index << " in the parsed setting " 
-                                        << element.getPath() <<  ", check line " << element.getSourceLine() << ".";
-
-                                it_error ( msg.str() );
-                        }
+                                ui_error( "there is not any child with index " + index, element );
+
                         return element[index];
                 }
 
-                static Setting& ToChildSetting( Setting &element, const string &name )
+                static Setting& to_child_setting( Setting &element, const string &name )
                 {
                         ASSERT_UITYPE(element,TypeGroup);
                         if( !element.exists( name ) )
-                        {
-                                stringstream msg;
-                                msg << "UI: there is not any child named """ << name << """ in the parsed setting " 
-                                        << element.getPath() <<  ", check line " << element.getSourceLine() << ".";
-
-                                it_error ( msg.str() );
-                        }
+                                ui_error( "there is not any child named """ + name, element );
                         return element[name];
                 }
 
         //! This methods tries to build a new double matrix 
-        static bool FromSetting( mat& matrix, const Setting &root )
-        {
-                ASSERT_UITYPE(root,TypeList);
-                if( root.getLength() != 3 )
-                {
-                        stringstream msg;
-                        msg << "UI: the setting " << root.getPath() <<  """ supposed to represent a matrix element has wrong syntax"". Check line " 
-                                << root.getSourceLine() << ".";
-                        it_error ( msg.str() );
-                }
-
-                Setting &cols_setting = root[0];
-                Setting &rows_setting = root[1];
-                Setting &values = root[2];
-
-                ASSERT_UITYPE(cols_setting,TypeInt);
-                ASSERT_UITYPE(rows_setting,TypeInt);
-                ASSERT_UITYPE(values,TypeArray);
-
-                int cols = cols_setting;
-                int rows = rows_setting;
-                
-                if( values.getLength() != cols * rows )
-                {
-                        stringstream msg;
-                        msg << "UI: the lenght of array containing matrix values within setting " << root.getPath() <<  """ is improper, check line " 
-                                << root.getSourceLine() << ".";
-                        it_error ( msg.str() );
-                }
-
-                matrix.set_size( rows, cols );
-
-                if( cols == 0 || rows == 0 )
-                        return true;
-
-                if( !values[0].isNumber() )
-                {
-                        stringstream msg;
-                        msg << "UI: the array containing matrix values within setting " << root.getPath() <<  """ has to contain numeric values only! Check line " 
-                                << root.getSourceLine() << ".";
-                        it_error ( msg.str() );
-                }
-
-                // Build matrix row-wise
-                int k = 0;
-                for( int i=0;i<rows;i++ ) 
-                        for( int j=0; j<cols; j++)
-                                matrix(i,j) = values[k++];
-
-                return true;
+        static void from_setting( mat& matrix, const Setting &element )
+        {
+                const Link_Expander link_expander( element );
+                const Setting &root = link_expander.root();
+
+                if( root.isNumber() )
+                {
+                        matrix.set_size( 1, 1 );
+                        matrix(0,0) = root;
+                        return;
+                }
+
+                if( root.isList() )
+                {
+                        if( root.getLength() != 3 )
+                                ui_error( "the setting supposed to represent a matrix element has wrong syntax", root );
+
+                        Setting &cols_setting = root[0];
+                        Setting &rows_setting = root[1];
+                        Setting &elements = root[2];
+
+                        ASSERT_UITYPE(cols_setting,TypeInt);
+                        ASSERT_UITYPE(rows_setting,TypeInt);
+                        ASSERT_UITYPE(elements,TypeArray);
+
+                        int cols = cols_setting;
+                        int rows = rows_setting;
+                                                
+                        if( cols < 0 | rows < 0 )
+                                ui_error( "the dimensions of a matrix has to be non-negative", root );
+
+                        if( elements.getLength() != cols * rows )
+                                ui_error( "the count of the matrix elements is incompatible with matrix dimension", elements );
+
+                        matrix.set_size( rows, cols );
+
+                        if( cols == 0 || rows == 0 )
+                                return;
+
+                        if( !elements[0].isNumber() )
+                                ui_error( "matrix elements have to be numbers", elements[0] );
+
+                        // build matrix row-wise
+                        int k = 0;
+                        for( int i=0;i<rows;i++ ) 
+                                for( int j=0; j<cols; j++)
+                                        matrix(i,j) = elements[k++];
+                        return;
+                }
+
+                ui_error( "only numeric types or TypeList are supported as matrix values", root );
         }
 
         //! This methods tries to save a double matrix 
-        static void ToSetting( mat &matrix, Setting &root )
+        static void to_setting( const mat &matrix, Setting &root )
         {
                 Setting &cols = root.add( Setting::TypeInt );
@@ -374 +329 @@
                 rows = matrix.rows();
 
-                Setting &values = root.add( Setting::TypeArray );
-
-                // Build matrix row-wise
+                Setting &elements = root.add( Setting::TypeArray );
+
+                // build matrix row-wise
                 for( int i=0; i<matrix.rows(); i++ ) 
                         for( int j=0; j<matrix.cols(); j++)
                         {
-                                Setting &newField = values.add(Setting::TypeFloat);
+                                Setting &newField = elements.add(Setting::TypeFloat);
                                 newField = matrix(i,j);
                         }
@@ -386 +341 @@
 
         //! This methods tries to build a new integer vector
-        static bool FromSetting( ivec &vec, const Setting &root )
-        {
-                ASSERT_UITYPE(root,TypeArray);
-
-                int len = root.getLength();
-                vec.set_length( len );
-                if( len == 0 ) return true;
-                ASSERT_UITYPE(root[0],TypeInt);
-
-                for( int i=0; i < len; i++ ) 
-                        vec(i) = root[i];
-                
-                return true;
+        static void from_setting( ivec &vec, const Setting &element )
+        {
+                const Link_Expander link_expander( element );
+                const Setting &root = link_expander.root();
+
+                if( root.isNumber() )
+                {
+                        ASSERT_UITYPE(root,TypeInt);
+                        vec.set_length( 1 );
+                        vec(0) = root;
+                        return;
+                }
+
+                if( root.isList() )
+                {
+                        if( root.getLength() != 3 )
+                                ui_error( "the setting supposed to represent a matrix element has wrong syntax", root );
+
+                        Setting &cols_setting = root[0];
+                        Setting &rows_setting = root[1];
+                        Setting &elements = root[2];
+
+                        ASSERT_UITYPE(cols_setting,TypeInt);
+                        ASSERT_UITYPE(rows_setting,TypeInt);
+                        ASSERT_UITYPE(elements,TypeArray);
+
+                        int cols = cols_setting;
+                        int rows = rows_setting;
+                        
+                        if( cols < 0 | rows < 0)
+                                ui_error( "the dimensions of a matrix has to be non-negative", root );
+
+                        if( elements.getLength() != cols * rows )
+                                ui_error( "the count of the matrix elements is incompatible with matrix dimension", elements );
+
+                        if( cols != 1 & rows !=1)
+                                ui_error( "the vector length is invalid, it seems to be rather a matrix", elements );
+                        
+                        int len = rows * cols;
+                        vec.set_length ( len );
+                        if( len == 0 ) return;
+
+                        ASSERT_UITYPE(elements[0],TypeInt);
+                        for( int i=0; i<len; i++ ) 
+                                vec(i) = elements[i];
+                        return;
+                }
+
+                if( root.isArray() )
+                {       
+                        int len = root.getLength();
+                        vec.set_length( len );
+                        if( len == 0 ) return;
+
+                        ASSERT_UITYPE(root[0],TypeInt);
+                        for( int i=0; i < len; i++ ) 
+                                vec(i) = root[i];
+                        return;
+                }
+
+                ui_error( "only numeric types, TypeArray or TypeList are supported as vector values", root );
         }
 
         //! This methods tries to save an integer vector
-        static void ToSetting( ivec &vec, Setting &root )
+        static void to_setting( const ivec &vec, Setting &root )
         {
                 for( int i=0; i<vec.length(); i++ ) 
@@ -412 +415 @@
 
         //! This methods tries to build a new array of strings 
-        static bool FromSetting( Array<string> &string_array, const Setting &root)
-        {
-                ASSERT_UITYPE(root,TypeArray);
-
-                int len = root.getLength();
-                string_array.set_length( len );
-                if( len == 0 ) return true;
-                ASSERT_UITYPE(root[0],TypeString);
-
-                for( int i=0; i < len; i++ ) 
-                        string_array(i) = (string)root[i];
-
-                return true;
+        static void from_setting( Array<string> &string_array, const Setting &element )
+        {
+                const Link_Expander link_expander( element );
+                const Setting &root = link_expander.root();
+
+                if( root.getType() == Setting::TypeString )
+                {
+                        string_array.set_length( 1 );
+                        string_array(0) = (string)root;
+                        return;
+                }
+
+                if( root.isArray() )
+                {
+                        int len = root.getLength();
+                        string_array.set_length( len );
+                        if( len == 0 ) return;
+
+                        ASSERT_UITYPE(root[0],TypeString);
+                        for( int i=0; i < len; i++ ) 
+                                string_array(i) = (string)root[i];
+                        return;
+                }
+
+                ui_error( "only TypeString or TypeArray are supported as vector of string values", root );
         }
 
         //! This methods tries to save an array of strings
-        static void ToSetting( Array<string> &string_array, Setting &root )
+        static void to_setting( const Array<string> &string_array, Setting &root )
         {
                 for( int i=0; i<string_array.length(); i++ ) 
@@ -437 +452 @@
         }
 
+protected:
+
+        //! default constructor 
+        UI( const string& class_name ) : class_name ( class_name )
+        {       
+                Class_To_UI::add_class( class_name, this );
+        }
+
+        //! Virtual destructor for future use;
+        virtual ~UI(){};
+
 public: 
 
+        static void ui_error( string message, const Setting &element )
+        {
+                stringstream error_message;
+                error_message << "UI ui_error: " << message << "! Check path """ << element.getPath() << """, source line " << element.getSourceLine() << ".";
+                it_error ( error_message.str() );
+        }
+
         //! 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 className within a child nodes of the passed element.
-        //! If an error occurs, it returns a NULL pointer.
+        //! according to a data stored in a DOMNode named class_name within a child nodes of the passed element.
+        //! If an ui_error occurs, it returns a NULL pointer.
 
         //! Prototype of a UI builder. Return value is by the second argument since it type checking via \c dynamic_cast.
-        template<class T> static T* Build( Setting &element, const int index )
-        {
-                return FromSetting<T>( ToChildSetting( element, index ) );
-        }
-
-        template<class T> static T* Build( Setting &element, const string &name )
+        template<class T> static T* build( Setting &element, const int index )
+        {
+                return from_setting<T>( to_child_setting( element, index ) );
+        }
+
+        template<class T> static T* build( Setting &element, const string &name )
         {                       
-                return FromSetting<T>( ToChildSetting( element, name ) );
+                return from_setting<T>( to_child_setting( element, name ) );
         }
 
         //! 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 className
+        //! 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.
-        template<class T> static void Save( T &instance, Setting &element )
-        {
-                Setting &root = element.add( Setting::TypeGroup );              
-                ToSetting( instance, root );
-        }
-
-        //! 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 className
-        //! and connecti it to the passed Setting as a new child node.
-        template<class T> static void Save( T &instance, Setting &element, const string &name )
-        {
-                Setting &root = element.add( name, Setting::TypeGroup );                
-                ToSetting( instance, root );
+        template<class T> static void save( T &instance, Setting &element, const string &name = "")
+        {
+                Setting &root = (name == "") ? element.add( Setting::TypeGroup )                                                        
+                                                                         : element.add( name, Setting::TypeGroup );             
+                to_setting( instance, root );
         }
 
         //! This methods tries to build a new double matrix 
-        static bool Get( mat& matrix, const Setting &element, const string &name )
-        {
-                const Setting *root = ToChildSetting( element, name );
+        static bool get( mat& matrix, const Setting &element, const string &name )
+        {
+                const Setting *root = to_child_setting( element, name );
                 if( !root ) return false;                               
-                return FromSetting( matrix, *root );
+                from_setting( matrix, *root );
+                return true;
         }
 
         //! This methods tries to build a new double matrix 
-        static bool Get( mat& matrix, const Setting &element, const int index )
-        {
-                const Setting *root = ToChildSetting( element, index );
+        static bool get( mat& matrix, const Setting &element, const int index )
+        {
+                const Setting *root = to_child_setting( element, index );
                 if( !root ) return false;                               
-                return FromSetting( matrix, *root );
+                from_setting( matrix, *root );
+                return true;
         }
 
         //! This methods tries to save a double matrix 
-        static void Save( mat &matrix, Setting &element, const string &name )
-        {
-                Setting &root = element.add( name, Setting::TypeList );         
-                ToSetting( matrix, root );
-        }
-
-        //! This methods tries to save a double matrix 
-        static void Save( mat &matrix, Setting &element )
-        {
-                Setting &root = element.add( Setting::TypeList );               
-                ToSetting( matrix, root );
-        }
-
+        static void save( mat &matrix, Setting &element, const string &name = "" )
+        {
+                Setting &root = (name == "") ? element.add( Setting::TypeList )                                                 
+                                                                         : element.add( name, Setting::TypeList );              
+                to_setting( matrix, root );
+        }
 
         //! This methods tries to build a new double vec 
-        static bool Get( ivec& vec, const Setting &element, const string &name )
-        {
-                const Setting *root = ToChildSetting( element, name );
+        static bool get( ivec& vec, const Setting &element, const string &name )
+        {
+                const Setting *root = to_child_setting( element, name );
                 if( !root ) return false;                               
-                return FromSetting( vec, *root );
+                from_setting( vec, *root );
+                return true;
         }
 
         //! This methods tries to build a new double vec 
-        static bool Get( ivec& vec, const Setting &element, const int index )
-        {
-                const Setting *root = ToChildSetting( element, index );
+        static bool get( ivec& vec, const Setting &element, const int index )
+        {
+                const Setting *root = to_child_setting( element, index );
                 if( !root ) return false;                               
-                return FromSetting( vec, *root );
+                from_setting( vec, *root );
+                return true;
         }
 
         //! This methods tries to save a double vec 
-        static void Save( ivec &vec, Setting &element, const string &name )
-        {
-                Setting &root = element.add( name, Setting::TypeArray );                
-                ToSetting( vec, root );
-        }
-
-        //! This methods tries to save a double vec 
-        static void Save( ivec &vec, Setting &element)
-        {
-                Setting &root = element.add( Setting::TypeArray );              
-                ToSetting( vec, root );
-        }
-
+        static void save( ivec &vec, Setting &element, const string &name = "" )
+        {
+                Setting &root = (name == "") ? element.add( Setting::TypeArray )                                                        
+                                                                         : element.add( name, Setting::TypeArray );             
+                to_setting( vec, root );
+        }
 
         //! This methods tries to build a new double string_array 
-        static bool Get( Array<string> &string_array, const Setting &element, const string &name )
-        {
-                const Setting *root = ToChildSetting( element, name );
+        static bool get( Array<string> &string_array, const Setting &element, const string &name )
+        {
+                const Setting *root = to_child_setting( element, name );
                 if( !root ) return false;                               
-                return FromSetting( string_array, *root );
+                from_setting( string_array, *root );
+                return true;
         }
 
         //! This methods tries to build a new double string_array 
-        static bool Get( Array<string> &string_array, const Setting &element, const int index )
-        {
-                const Setting *root = ToChildSetting( element, index );
+        static bool get( Array<string> &string_array, const Setting &element, const int index )
+        {
+                const Setting *root = to_child_setting( element, index );
                 if( !root ) return false;                               
-                return FromSetting( string_array, *root );
+                from_setting( string_array, *root );
+                return true;
         }
 
         //! This methods tries to save a double string_array 
-        static void Save( Array<string> &string_array, Setting &element, const string &name )
-        {
-                Setting &root = element.add( name, Setting::TypeArray );                
-                ToSetting( string_array, root );
-        }
-
-        //! This methods tries to save a double string_array 
-        static void Save( Array<string> &string_array, Setting &element )
-        {
-                Setting &root = element.add( Setting::TypeArray );              
-                ToSetting( string_array, root );
-        }
-
-
+        static void save( Array<string> &string_array, Setting &element, const string &name = "" )
+        {
+                Setting &root = (name == "") ? element.add( Setting::TypeArray )                                                        
+                                                                         : element.add( name, Setting::TypeArray );             
+                to_setting( string_array, root );
+        }
 };
 
@@ -573 +582 @@
 own userinfo class prepared).
 */
-template<typename T> class ParticularUI : private UI
+template<typename T> class Particular_UI : private UI
 {
-        // to permit acces to the ParticularUI<T>::ui to the UI class
+        // to permit acces to the Particular_UI<T>::ui to the UI class
         friend UI;
 
         //! default constructor, which is intentionally declared as private
-        ParticularUI<T>( const string &className) : UI( className ) 
+        Particular_UI<T>( const string &class_name) : UI( class_name ) 
         {       
         };
@@ -585 +594 @@
         //! the only instance of this class (each type T has its own instance)
         //! which is used as a factory for processing related UI
-        static ParticularUI<T>& ui;     
-
-        bdmroot* New()
+        static Particular_UI<T>& ui;    
+
+        bdmroot* new_instance()
         {
                 return new T();
@@ -617 +626 @@
 /
 
-
-//! [Debugging] Print values in current S to cout
-void UI_DBG ( Setting &S, const string &spc );
-
-
-/*
-//! Auxiliary function allowing recursivity in S (too complex, remove?)
-template<class T>
-void UIcall ( Setting &S, void ( *func ) ( Setting&, T ), T Tmp ) {
-        ASSERT_UITYPE ( S,TypeGroup );
-        // Check if field "class" is present, if not it is not a valid UI
-        it_assert_debug ( S.exists ( "class" ), string ( S.getPath() ) +" is not a valid UI!" );
-
-        const string typ=S["class"];
-        if ( typ=="internal" ) {
-                try {
-                        Setting* Stmp = &S;
-                        do {Stmp=& ( Stmp->getParent() );}
-                        while ( !Stmp->isRoot() );
-                        Setting& intS=Stmp->lookup ( ( const char* ) S["path"] );
-                        func ( intS, Tmp ); // <======== calling func
-                        return;
-                }
-                catch ( ... ) {
-                        it_error ( "Internal field " + string ( S.getPath() ) + " not valid" );
-                }
-        }
-        if ( typ=="external" ) {
-                UIFile C ( S["filename"] );
-                try {
-                        func ( C.lookup ( ( const char* ) S["path"] ), Tmp );
-                }
-                catch ( ... ) {
-                        it_error ( "External field " + string ( S.getPath() ) + " not valid" );
-                }
-                return;
-        }
-
-        // v======================= calling final func
-        func ( S, Tmp );
-};
-
-}
-
 */
 

library/mex/mexparse.h

@@ -27 +27 @@
                         child = val(0,0);
                 } else {
-                        Setting &child = (key=="") ? setting.add(Setting::TypeGroup)
-                                                   : setting.add(key, Setting::TypeGroup);
-                        Setting &elements = child.add("elements", Setting::TypeArray);
-                        Setting &cols = child.add("cols", Setting::TypeInt);
+                        Setting &child = (key=="") ? setting.add(Setting::TypeList)
+                                                   : setting.add(key, Setting::TypeList);
+                        Setting &cols = child.add( Setting::TypeInt );
+                        Setting &rows = child.add( Setting::TypeInt );
+                        Setting &elements = child.add( Setting::TypeArray );
                         cols = val.cols();
+                        rows = val.rows();
                         for (int i=0; i<val.rows(); i++) {
                                 for (int j=0; j<val.cols(); j++) {

tests/UI/CMakeLists.txt

@@ -1 @@
-EXEC(UIbuilder_test)
+EXEC(testUI)

tests/UI/testUI.cfg

@@ -23 +23 @@
 };
 elisky : "jardovo";
-kati : "skubankovo@UIbuilder_test_ex.cfg";
+kati : "skubankovo@testUI_ex.cfg";

tests/UI/testUI.cpp

@@ -1 @@
-#include <uibuilder.h>
+#include <user_info.h>
 #include <string>
 
@@ -23 +23 @@
         }
 
-        virtual void FromSetting( const Setting &root )
+        virtual void from_setting( const Setting &root )
         {
                 root.lookupValue( "year", year );
@@ -29 +29 @@
         }
 
-        virtual void ToSetting( Setting &root ) 
+        virtual void to_setting( Setting &root ) 
         {       
                 Setting &year_setting = root.add("year", Setting::TypeInt );
@@ -55 +55 @@
         }
 
-        virtual void FromSetting( const Setting &root ) 
+        virtual void from_setting( const Setting &root ) 
         {       
-                Transport::FromSetting( root );
+                Transport::from_setting( root );
 
                 root.lookupValue( "kilometers", kilometers );
         }
 
-        virtual void ToSetting( Setting &root ) 
+        virtual void to_setting( Setting &root ) 
         {       
-                Transport::ToSetting( root );
+                Transport::to_setting( root );
 
                 Setting &kilometers_setting = root.add("kilometers", Setting::TypeInt );
@@ -100 +100 @@
         }
 
-        void FromSetting( const Setting &root ) 
+        void from_setting( const Setting &root ) 
         {       
-                Transport::FromSetting( root );
+                Transport::from_setting( root );
 
                 root.lookupValue( "electricLights", electricLights );
 
-                UI::Get( matr, root, "matr" );
+                UI::get( matr, root, "matr" );
         }
 
-        void ToSetting( Setting &root ) 
+        void to_setting( Setting &root ) 
         {       
-                Transport::ToSetting( root );
+                Transport::to_setting( root );
 
                 Setting &electricLights_setting = root.add("electricLights", Setting::TypeBoolean );
                 electricLights_setting = electricLights;
 
-                UI::Save( matr, root, "matr" );
+                UI::save( matr, root, "matr" );
         }
 
@@ -138 +138 @@
         Bike author( 1996, "author", true );
 
-        UIFile root("UIbuilder_test.cfg");      
-        UI::Save( audi, root, "pepikovo");
-        UI::Save( liaz, root, "jardovo"); 
-        UI::Save( author, root, "ondrejovo");
-        root.Save();
+        UI_File root("testUI.cfg");     
+        UI::save( audi, root, "pepikovo");
+        UI::save( liaz, root, "jardovo"); 
+        UI::save( author, root, "ondrejovo");
+        root.save();
 
         cout << "all the transport means were saved correctly" << endl;                         
@@ -149 +149 @@
         
         //////////////////////////////////// LOADING ////////////////////////////////
-        UIFile root("UIbuilder_test.cfg");      
-        root.Load();
-        Transport *pepikovo = UI::Build<Transport>( root, "pepikovo");  
+        UI_File root("testUI.cfg");     
+        root.load();
+        Transport *pepikovo = UI::build<Transport>( root, "pepikovo");  
         cout << "pepikovo: " << pepikovo->ToString() << endl;           
-        Transport *jardovo = UI::Build<Transport>( root, "jardovo");    
+        Transport *jardovo = UI::build<Transport>( root, "jardovo");    
         cout << "jardovo: " << jardovo->ToString() << endl;             
-        Transport *ondrejovo = UI::Build<Transport>( root, "ondrejovo");        
+        Transport *ondrejovo = UI::build<Transport>( root, "ondrejovo");        
         cout << "ondrejovo: " << ondrejovo->ToString() << endl;         
-        Transport *elisky = UI::Build<Transport>( root, "elisky");      
+        Transport *elisky = UI::build<Transport>( root, "elisky");      
         cout << "elisky: " << elisky->ToString() << endl;               
-        Transport *kati = UI::Build<Transport>( root, "kati");  
+        Transport *kati = UI::build<Transport>( root, "kati");  
         cout << "kati: " << kati->ToString() << endl;           
         getchar();