Changeset 728

Timestamp:

11/17/09 00:54:28 (14 years ago)

Author:

smidl

Message:

logger now has ability to store settings - used in estimator. New mexfunction epdf_mean

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (2 diffs)
• applications/bdmtoolbox/mex/epdf_mean.cpp (added)
• applications/bdmtoolbox/mex/estimator.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (2 diffs)
• library/bdm/base/loggers.cpp (modified) (1 diff)
• library/bdm/base/loggers.h (modified) (3 diffs)
• library/bdm/base/user_info.cpp (modified) (2 diffs)
• library/bdm/base/user_info.h (modified) (1 diff)
• library/bdm/mex/config2mxstruct.h (modified) (3 diffs)
• library/bdm/mex/mex_logger.h (modified) (1 diff)
• library/bdm/stat/exp_family.h (modified) (1 diff)
• library/tests/testsuite/logger_test.cpp (modified) (2 diffs)
• library/tests/testsuite/memlog_test.cfg.check (moved) (moved from library/tests/testsuite/memlog_setting.cfg.check)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ +1 @@
+
+## SCENARIOS
 
 MEX(merger)
@@ -14 +16 @@
 MEX(config2mxstruct)
 MEX(mxstruct2config)
+
+## WRAPPERS
+
+MEX(epdf_mean)

applications/bdmtoolbox/mex/estimator.cpp

@@ -209 +209 @@
                 if ( n_output<1 ) mexErrMsgTxt ( "Wrong number of output variables!" );
                 output[0] = mL->toCell();
+                if (n_output>1) {
+                        UImxConfig UIc(mL->_setting_conf().getRoot());
+                        output[1]=UIc.mxconfig;
+                }
         }
 #endif

library/bdm/base/bdmbase.h

@@ -611 +611 @@
                 };
                 root::log_register(L,prefix);
-                logrec->ids.set_size(3);
-                if (log_level >0){
-                        logrec->ids(0) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "mean" );
-                }
-                if (log_level >1){
-                        logrec->ids(1) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "lb" );
-                        logrec->ids(2) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "ub" );
+                
+                // log full data
+                if (log_level==10) {
+                        logrec->ids.set_size(1);
+                        logrec->ids(0) = logrec->L.add_setting(prefix);
+                } else {
+                        // log only 
+                        logrec->ids.set_size(3);
+                        if (log_level >0){
+                                logrec->ids(0) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "mean" );
+                        }
+                        if (log_level >1){
+                                logrec->ids(1) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "lb" );
+                                logrec->ids(2) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "ub" );
+                        }
                 }
         }
         void log_write() const {
-                if (log_level>0) {
-                        logrec->L.log_vector( logrec->ids(0), mean() );
-                }
-                if (log_level>1) {
-                        vec lb; vec ub;
-                        qbounds(lb,ub);
-                        logrec->L.log_vector( logrec->ids(1), lb );
-                        logrec->L.log_vector( logrec->ids(2), ub );
+                if (log_level==10){
+                        to_setting(logrec->L.log_to_setting(logrec->ids(0)));
+                } else {
+                        if (log_level>0) {
+                                logrec->L.log_vector( logrec->ids(0), mean() );
+                        }
+                        if (log_level>1) {
+                                vec lb; vec ub;
+                                qbounds(lb,ub);
+                                logrec->L.log_vector( logrec->ids(1), lb );
+                                logrec->L.log_vector( logrec->ids(2), ub );
+                        }
                 }
         }
@@ -1207 +1219 @@
         //! Set boolean options from a string, recognized are: "logbounds,logll"
         virtual void set_options ( const string &opt ) {
-                if ( opt.find ( "logstat" ) != string::npos ) {
-                        const_cast<epdf&>(posterior()).set_log_level(3) ;
+                if ( opt.find ( "logfull" ) != string::npos ) {
+                        const_cast<epdf&>(posterior()).set_log_level(10) ;
                 } else {
                         if ( opt.find ( "logbounds" ) != string::npos ) {

library/bdm/base/loggers.cpp

@@ -49 +49 @@
 void memlog::from_setting ( const Setting &set ) {
         // TODO tady se natvrdo ocekava existence stringu, nejsou zadne defaulty.. je to tak OK?
-        string itfilename = ( const char* ) set["filename"];
-        maxlen = set["maxlen"];
+        UI::get(maxlen,  set,"maxlen",UI::compulsory);
+        UI::get(filename,set,"filename");
 }
 

library/bdm/base/loggers.h

@@ -32 +32 @@
         //! Storage
         Array<mat> vectors;
-        //! name of it file to save results
-        string itfilename;
+        //! name of  file to save results (IT file for vectors and cfg for settings)
+        string filename;
 public:
         //! convenience constructor
-        memlog ( int maxlen0, string itf = "" ) :logger("_"), maxlen ( maxlen0 ), ind ( 0 ), vectors ( 0 ), itfilename ( itf ) {}
+        memlog ( int maxlen0, string fn = "" ) :logger("_"), maxlen ( maxlen0 ), ind ( 0 ), vectors ( 0 ), filename ( fn ) {}
 
         //!Default constructor
@@ -66 +66 @@
         //!
         void finalize() {
-                if ( itfilename.length() > 0 ) itsave ( itfilename.c_str() );
-                if (settings.length()>0){
-                        setting_conf.writeFile("memlog_setting.cfg");
+                if ( filename.length() > 0 ) {
+                        itsave ( (filename+".it").c_str());
+                        if (settings.length()>0){
+                                setting_conf.writeFile( (filename+".cfg").c_str());
+                        }
                 }
+                
         };
 
@@ -80 +83 @@
         logger = {
                 class = "memlog";
-                filename = "file_name.it"; // resulting filename with results in it format
-                maxlen = 100;          // size of memory buffer
+                filename = "file_name"; // resulting filename with vectors in it format and setting in cfg
+                maxlen = 100;           // size of memory buffer
         }
         \endcode

library/bdm/base/user_info.cpp

@@ -198 +198 @@
                        : element.add ( name, Setting::TypeList );
 
+                                   Setting &tag= set.add ( Setting::TypeString );
+                                   tag ="matrix";
+                                   
         Setting &cols = set.add ( Setting::TypeInt );
         cols = matrix.cols();
@@ -260 +263 @@
                 Setting &elements = link.result[2 + data_offset];
 
-                assert_type ( cols_setting, Setting::TypeInt );
-                assert_type ( rows_setting, Setting::TypeInt );
-                assert_type ( elements, Setting::TypeArray );
+                // vvv ----- not working in matlab!!
+                //assert_type ( cols_setting, Setting::TypeInt );
+                //assert_type ( rows_setting, Setting::TypeInt );
+                //assert_type ( elements, Setting::TypeArray );
 
                 int cols = cols_setting;
                 int rows = rows_setting;
+                int elems = elements.getLength();
 
                 if ( cols < 0 || rows < 0 )
                         throw UISettingException ( "UIException: the dimensions of a matrix has to be non-negative.", link.result );
 
-                if ( elements.getLength() != cols * rows )
+                if ( elems != cols * rows )
                         throw UISettingException ( "UIException: the count of the matrix elements is incompatible with matrix dimension.", elements );
 

library/bdm/base/user_info.h

@@ -441 +441 @@
         }
 
+//! The new instance of type T* is constructed and initialized with values stored in the given Setting 
+//!
+//! 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;
+        from_setting<T> ( instance,  element  );
+        return instance;
+}
+
         //!@}
 

library/bdm/mex/config2mxstruct.h

@@ -31 +31 @@
         mxArray* array2mxvector ( const Setting &setting )  {
                 if ( !setting.isArray() ) mexErrMsgTxt ( "Given setting is not an array" );
-                double *elements = new double[setting.getLength() ];
+                mxArray *result = mxCreateDoubleMatrix ( 1, setting.getLength(), mxREAL );
+                double *elements = mxGetPr(result);
                 for ( int i = 0; i < setting.getLength(); i++ ) {
                         if ( setting.getType() == Setting::TypeInt ) { //TODO: tady je chyba -- zaporna cisla nejsou TypeInt
-                                elements[i] = setting[i];
+                                elements[i] = (int) setting[i];
                         } else {
-                                elements[i] = ( int ) setting[i];
+                                elements[i] =  setting[i];
                         }
                 }
-                vec &v = * ( new vec ( elements, setting.getLength() ) );
-                mxArray *result = mxCreateDoubleMatrix ( 1, setting.getLength(), mxREAL );
-                vec2mxArray ( v, result );
-                delete &v;
-                delete [] elements;
                 return result;
         }
@@ -49 +45 @@
         //! Convert libconfig's array to Matlab matrix
         mxArray* list2mxmatrix ( const Setting &setting )  {
-                if ( !setting.isList() || ( "matrix" != setting[0] ) )
+                if ( !setting.isList() || ( strcmp("matrix", setting[0])!=0 ) )
                         mexErrMsgTxt ( "Given setting is not a matrix" );
                 int rows = setting[1];
@@ -118 +114 @@
                         return result;
                 }
-                if ( ( setting[0].getType() == Setting::TypeString ) && ( "matrix" == setting[0] ) ) {
-                        return list2mxmatrix ( setting );
+                
+                if ( ( setting[0].getType() == Setting::TypeString )){
+                        string s=(setting[0]);
+                        if (s=="matrix") {
+                                return list2mxmatrix ( setting );
+                        }
                 }
                 mxArray *result = mxCreateCellMatrix ( 1, setting.getLength() );

library/bdm/mex/mex_logger.h

@@ -77 +77 @@
                 maxlen = root["maxlen"];
         }
+        Config& _setting_conf(){return setting_conf;}
 };
 UIREGISTER ( mexlog );

library/bdm/stat/exp_family.h

@@ -280 +280 @@
                 void to_setting ( Setting& set ) const{
                         epdf::to_setting(set);
+                        string s("egiw");
+                        UI::save(s,set,"class");
                         UI::save(dimx,set,"dimx");
                         UI::save(V.to_mat(),set,"V");

library/tests/testsuite/logger_test.cpp

@@ -36 +36 @@
         RV r = RV ( "{r }", "2" );
 
-        string ls ( "test_log.bin" );
+        string ls ( "memlog_test" );
         remove_all ( ls.c_str() );
 
@@ -58 +58 @@
         logger.finalize();
 
-        CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( ls.c_str() ) );
-        CHECK_EQUAL ( get_file_size ( "memlog_setting.cfg.check" ), get_file_size ( "memlog_setting.cfg" ) );
+        CHECK_EQUAL ( get_file_size ( "logger_test.matrix" ), get_file_size ( (ls+".it").c_str() ) );
+        CHECK_EQUAL ( get_file_size ( (ls+".cfg.check").c_str() ), get_file_size ( (ls+".cfg" ).c_str() ));
 }