Changeset 727

Timestamp:

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

Author:

smidl

Message:

Logger change. Loggers can now store settings.

Unit Tests and fixes.

Files:

• applications/dual/src/iterativemc.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (8 diffs)
• library/bdm/base/loggers.h (modified) (2 diffs)
• library/bdm/stat/exp_family.h (modified) (2 diffs)
• library/tests/mat_checks.h (modified) (1 diff)
• library/tests/testsuite/epdf_test.cpp (modified) (1 diff)
• library/tests/testsuite/logger_test.cpp (modified) (3 diffs)
• library/tests/testsuite/logger_test_dirfile_format.matrix (modified) (1 diff)
• library/tests/testsuite/memlog_setting.cfg.check (added)

applications/dual/src/iterativemc.cpp

@@ -91 +91 @@
         RV y("y",1); // name random variable
         RV u("u",1); // name random variable
-        int L_yt=L->add(y,"S");
-        int L_ut=L->add(u,"S");
+        int L_yt=L->add_vector(y,"S");
+        int L_ut=L->add_vector(u,"S");
         C->log_register(*L,"C");
         L->init();

library/bdm/base/bdmbase.h

@@ -319 +319 @@
                 //!separator of prefixes of entries
                 const string separator;
+                //! Root Setting for storing Settings
+                Config setting_conf;
+                //! list of Settings for specific ids
+                Array<Setting*> settings;
         public:
                 //!Default constructor
@@ -325 +329 @@
                 //! returns an identifier which will be later needed for calling the \c logit() function
                 //! For empty RV it returns -1, this entry will be ignored by \c logit().
-                virtual int add ( const RV &rv, string prefix = "" ) {
+                virtual int add_vector ( const RV &rv, string prefix = "" ) {
                         int id;
                         if ( rv._dsize() > 0 ) {
@@ -337 +341 @@
                         return id; // identifier of the last entry
                 }
+                virtual int add_setting(const string &prefix){
+                        Setting &root=setting_conf.getRoot();
+                        int id=root.getLength(); //root must be group!!
+                        if (prefix.length()>0){
+                                settings.set_length(id+1,true);
+                                settings(id) = &root.add(prefix, Setting::TypeList);
+                        } else {id=-1;}
+                        return id;
+                }
                 
                 //! log this vector
-                virtual void logit ( int id, const vec &v ) {
+                virtual void log_vector ( int id, const vec &v ) {
                         bdm_error ( "Not implemented" );
                 };
+                
+                virtual Setting & log_to_setting (int id){
+                        return settings(id)->add(Setting::TypeGroup);
+                }
+                
                 //! log this double
                 virtual void logit ( int id, const double &d ) {
@@ -595 +613 @@
                 logrec->ids.set_size(3);
                 if (log_level >0){
-                        logrec->ids(0) = logrec->L.add ( r, prefix + logrec->L.prefix_sep()+ "mean" );
+                        logrec->ids(0) = logrec->L.add_vector ( r, prefix + logrec->L.prefix_sep()+ "mean" );
                 }
                 if (log_level >1){
-                        logrec->ids(1) = logrec->L.add ( r, prefix + logrec->L.prefix_sep()+ "lb" );
-                        logrec->ids(2) = logrec->L.add ( r, prefix + logrec->L.prefix_sep()+ "ub" );
+                        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.logit( logrec->ids(0), mean() );
+                        logrec->L.log_vector( logrec->ids(0), mean() );
                 }
                 if (log_level>1) {
                         vec lb; vec ub;
                         qbounds(lb,ub);
-                        logrec->L.logit( logrec->ids(1), lb );
-                        logrec->L.logit( logrec->ids(2), ub );
+                        logrec->L.log_vector( logrec->ids(1), lb );
+                        logrec->L.log_vector( logrec->ids(2), ub );
                 }
         }
@@ -1013 +1031 @@
                 if (log_level >0){
                         logrec->ids.set_size(2);
-                        logrec->ids(0) = logrec->L.add ( Yrv, prefix );
-                        logrec->ids(1) = logrec->L.add ( Urv, prefix );
+                        logrec->ids(0) = logrec->L.add_vector ( Yrv, prefix );
+                        logrec->ids(1) = logrec->L.add_vector ( Urv, prefix );
                 }
         }
@@ -1023 +1041 @@
                         getdata ( tmp );
                         // d is first in getdata
-                        logrec->L.logit ( logrec->ids(0), tmp.left ( Yrv._dsize() ) );
+                        logrec->L.log_vector ( logrec->ids(0), tmp.left ( Yrv._dsize() ) );
                         // u follows after d in getdata
-                        logrec->L.logit ( logrec->ids(1), tmp.mid ( Yrv._dsize(), Urv._dsize() ) );
+                        logrec->L.log_vector ( logrec->ids(1), tmp.mid ( Yrv._dsize(), Urv._dsize() ) );
                 }
         }
@@ -1189 +1207 @@
         //! Set boolean options from a string, recognized are: "logbounds,logll"
         virtual void set_options ( const string &opt ) {
-                if ( opt.find ( "logbounds" ) != string::npos ) {
-                        const_cast<epdf&>(posterior()).set_log_level(2) ;
+                if ( opt.find ( "logstat" ) != string::npos ) {
+                        const_cast<epdf&>(posterior()).set_log_level(3) ;
                 } else {
-                        const_cast<epdf&>(posterior()).set_log_level(1) ;
-                }
-                if ( opt.find ( "logll" ) != string::npos ) {
-                        log_level = 1;
+                        if ( opt.find ( "logbounds" ) != string::npos ) {
+                                const_cast<epdf&>(posterior()).set_log_level(2) ;
+                        } else {
+                                const_cast<epdf&>(posterior()).set_log_level(1) ;
+                        }
+                        if ( opt.find ( "logll" ) != string::npos ) {
+                                log_level = 1;
+                        }
                 }
         }
@@ -1210 +1232 @@
                 if ((log_level) > 0){
                         logrec->ids.set_size(1);
-                        logrec->ids(0) = L.add(RV("ll",1), prefix+L.prefix_sep()+"ll");
+                        logrec->ids(0) = L.add_vector(RV("",1), prefix+L.prefix_sep()+"ll");
                 }
         }

library/bdm/base/loggers.h

@@ -49 +49 @@
         }
 
-        void logit ( int id, const vec &v ) {
+        void log_vector ( int id, const vec &v ) {
                 bdm_assert ( id < vectors.length(), "Logger was not initialized, run init()." );
                 if ( id >= 0 ) {
@@ -67 +67 @@
         void finalize() {
                 if ( itfilename.length() > 0 ) itsave ( itfilename.c_str() );
+                if (settings.length()>0){
+                        setting_conf.writeFile("memlog_setting.cfg");
+                }
         };
 

library/bdm/stat/exp_family.h

@@ -293 +293 @@
                                 logrec->ids.set_length(2);
                                 int th_dim=dimension()-dimx*(dimx+1)/2;
-                                logrec->ids(0)=L.add(RV("",th_dim), prefix + logrec->L.prefix_sep() +"mean");
-                                logrec->ids(1)=L.add(RV("",th_dim*th_dim),prefix + logrec->L.prefix_sep() + "variance"); 
+                                logrec->ids(0)=L.add_vector(RV("",th_dim), prefix + logrec->L.prefix_sep() +"mean");
+                                logrec->ids(1)=L.add_vector(RV("",th_dim*th_dim),prefix + logrec->L.prefix_sep() + "variance"); 
                         } else {
                                 epdf::log_register(L,prefix);
@@ -305 +305 @@
                                 ldmat Vz;
                                 factorize(M,Vz,Lam);
-                                logrec->L.logit(logrec->ids(0), est_theta() );
-                                logrec->L.logit(logrec->ids(1), cvectorize(est_theta_cov().to_mat()));
+                                logrec->L.log_vector(logrec->ids(0), est_theta() );
+                                logrec->L.log_vector(logrec->ids(1), cvectorize(est_theta_cov().to_mat()));
                         } else {
                                 epdf::log_write();

library/tests/mat_checks.h

@@ -57 +57 @@
 inline itpp::vec make_close_tolerance ( const itpp::vec & variance, int nsamples ) {
         // simplify overloading for Visual Studio
-        return 2 * ( sqrt ( variance ) / sqrt ( static_cast<double> ( nsamples ) ) );
+        return 3 * ( sqrt ( variance ) / sqrt ( static_cast<double> ( nsamples ) ) );
 }
 

library/tests/testsuite/epdf_test.cpp

@@ -43 +43 @@
 
 TEST ( ewishart_test ) {
-        mat wM = "10.0 0.9; 0.9 1.0";
+        mat wM = "1.1 0.9; 0.9 1.0";
         eWishartCh eW;
         eW.set_parameters ( wM / 100, 100 );

library/tests/testsuite/logger_test.cpp

@@ -41 +41 @@
         memlog logger ( 100, ls );
 
-        int rid = logger.add ( r, "" );
-        int thid = logger.add ( th, "th" );
+        int pol = 11;
+        
+        int rid = logger.add_vector ( r, "" );
+        int thid = logger.add_vector ( th, "th" );
+        int polid = logger.add_setting("pols");
 
         logger.init();
 
         for ( int i = 0; i < 10; i++ ) {
-                logger.logit ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                logger.logit ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                logger.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
+                logger.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                UI::save(pol, logger.log_to_setting(polid), "polozka");
                 logger.step();
         }
@@ -55 +59 @@
 
         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" ) );
 }
 
@@ -68 +73 @@
         dirfilelog L ( "dirfilelog_files", 10 );
 
-        int rid = L.add ( r, "" );
-        int thid = L.add ( th, "th" );
+        int rid = L.add_vector ( r, "" );
+        int thid = L.add_vector ( th, "th" );
 
         L.init();
 
         for ( int i = 0; i < 150; i++ ) {
-                L.logit ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
-                L.logit ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
+                L.log_vector ( rid, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
+                L.log_vector ( thid, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
                 L.step();
         }

library/tests/testsuite/logger_test_dirfile_format.matrix

@@ -1 @@
-r.0 RAW d 1
-r.1 RAW d 1
-th.alog RAW d 1
-th.blog RAW d 1
+r_0 RAW d 1
+r_1 RAW d 1
+th_alog RAW d 1
+th_blog RAW d 1