Changeset 1020

Timestamp:

05/28/10 22:50:46 (14 years ago)

Author:

smidl

Message:

DEBUG macro for conditional output + new class

Files:

• applications/bdmtoolbox/mex/estimator.cpp (modified) (1 diff)
• library/bdm/base/bdmbase.h (modified) (3 diffs)
• library/bdm/bdmerror.h (modified) (1 diff)
• library/bdm/stat/emix.h (modified) (1 diff)
• library/bdm/stat/exp_family.h (modified) (1 diff)

applications/bdmtoolbox/mex/estimator.cpp

@@ -95 +95 @@
 
         //DBG
-        Cfg.writeFile ( "estimator.cfg" );
+        DEBUG(  Cfg.writeFile ( "estimator.cfg" );)
 
 #else

library/bdm/base/bdmbase.h

@@ -76 +76 @@
 }
 \enddot
+
+RV name may be empty string! In that case, it is not a valid name but only a size holder. It will fail in comparison.
 */
 
@@ -1023 +1025 @@
         protected:
                 datalink_part dl;
+                int vecfromlen;
         public:
                 void update(const vec &v1){
                         bdm_assert_debug(length()==dl._downsize(),"vec_from_vec incompatible");
-                        bdm_assert_debug(v1.length()>=dl._upsize(),"vec_from_vec incompatible");//does not guarantee anything!
+                        bdm_assert_debug(v1.length()==vecfromlen,"This vec was connected to vec of length "+num2str(vecfromlen)+
+                        ", but vec of length "+num2str(v1.length())+" was obtained"  );
                         dl.filldown(v1,*this);
                 };
-                void connect(const RV &vecrv, const RV & vec1){dl.set_connection(vecrv,vec1);set_length(vecrv._dsize());};
+                void connect(const RV &vecrv, const RV & vec1){
+                        bdm_assert(vecrv._dsize()==length(),"Description of this vector, "+ vecrv.to_string() +" does not math it length: " + num2str(length()));
+                        dl.set_connection(vecrv,vec1);
+                        bdm_assert(dl._downsize()==length(), "Rv of this vector, "+vecrv.to_string() +" was not found in given rv: "+vec1.to_string());
+                };
 };
 
@@ -1252 +1260 @@
 class BM : public root {
         //! \var log_level_enums logfull
-        //! TODO DOPLNIT
+        //! log full description of posterior in descriptive structure
 
         //! \var log_level_enums logevidence
-        //! TODO DOPLNIT
+        //! log value of eveidence in each step
         
         //! \var log_level_enums logbounds
-        //! TODO DOPLNIT        
+        //! log lower and upper bounds of estimates
         LOG_LEVEL(BM,logfull,logevidence,logbounds);
 

library/bdm/bdmerror.h

@@ -48 +48 @@
 #endif // if defined(NDEBUG)
 
+#if defined(NDEBUG)
+//! DO argument if in DEBUG model
+#define DEBUG(command) ((void) 0)
+#else
+//! DO argument if in DEBUG model
+#define DEBUG(command) command
+#endif // if defined(NDEBUG)
+
 //! Unconditionally throw std::runtime_error
 #define bdm_error(s) \

library/bdm/stat/emix.h

@@ -476 +476 @@
 UIREGISTER(ProdBM);
 
+//! \brief class for on-line model selection 
+class ModelComparator: public ProdBM{
+        protected:
+                multiBM weights;
+        public:
+                void bayes(const vec &yt, const vec &cond){
+                        vec w_nn(no_bms());
+                        for (int i=0; i<no_bms(); i++){
+                                bm(i)->bayes(yt,cond);
+                                w_nn(i) += bm(i)->_ll();
+                        }
+                        vec w=exp(w_nn-max(w_nn));
+                        weights.bayes(w/sum(w));
+                }
+                void validate(){
+                        ProdBM::validate();
+                        weights.validate();
+                }
+                void from_setting(const Setting& set){
+                        ProdBM::from_setting(set);
+                        UI::get(weights.frg, set, "frg",UI::optional);
+                }
+                void to_setting(Setting& set) const{
+                        ProdBM::to_setting(set);
+                        UI::save(weights.frg, set, "frg");
+                }
+};
+
 }
 #endif //MX_H

library/bdm/stat/exp_family.h

@@ -76 +76 @@
 //! Estimator for Exponential family
 class BMEF : public BM {
-protected:
+        public:
         //! forgetting factor
         double frg;
+        protected:
         //! cached value of lognc() in the previous step (used in evaluation of \c ll )
         double last_lognc;