Changeset 850 for library/bdm/estim

Timestamp:

03/04/10 16:41:30 (14 years ago)

Author:

smidl

Message:

changes in Loggers!

Location:

library/bdm/estim

Files:

• arx.cpp (modified) (2 diffs)
• arx.h (modified) (1 diff)
• kalman.cpp (modified) (1 diff)
• kalman.h (modified) (2 diffs)
• particles.cpp (modified) (1 diff)
• particles.h (modified) (8 diffs)

library/bdm/estim/arx.cpp

@@ -225 +225 @@
         rvc = *rrv;
 
-        string opt;
-        if ( UI::get ( opt, set,  "options", UI::optional ) ) {
-                BM::set_options ( opt );
-        }
         int constant;
         if ( !UI::get ( constant, set, "constant", UI::optional ) ) {
@@ -265 +261 @@
         } else {
                 est.set_rv ( *rv_par );
-        }
-        //validate();
-}
-}
-
+        }       
+}
+
+}
+

library/bdm/estim/arx.h

@@ -131 +131 @@
 
         void validate() {
+                BMEF::validate();       
+
                 //if dimc not set set it from V
                 if ( dimc == 0 ) {

library/bdm/estim/kalman.cpp

@@ -429 +429 @@
         set_yrv ( A ( 0 )->_yrv() );
         //set_rv(A(0)->_rv());
-
-        string options;
-        if ( set.lookupValue ( "options", options ) )
-                set_options ( options );
-}
-
-}
+}
+
+}

library/bdm/estim/kalman.h

@@ -293 +293 @@
                 set_parameters ( IM, OM, diag ( dQ ), diag ( dR ) );
 
-                string options;
-                if ( UI::get ( options, set, "options" ) )
-                        set_options ( options );
 //                      pfxu = UI::build<diffbifn>(set, "IM", UI::compulsory);
 //                      phxu = UI::build<diffbifn>(set, "OM", UI::compulsory);
@@ -318 +315 @@
 //                      phxu->dfdu_cond(mu0, zeros(pfxu->_dimu()), C,true);
 //
-                validate();
-        }
+        }
+
         void validate() {
+                KalmanFull::validate();
+
                 // check stats and IM and OM
         }

library/bdm/estim/particles.cpp

@@ -233 +233 @@
         pf->prior_from_set ( set );
         pf->resmethod_from_set ( set );
-        
-        string opt;
-        if ( UI::get ( opt, set, "options", UI::optional ) ) {
-                set_options ( opt );
-        }
-        
+                
         // read functions g and h
         g=UI::build<fnc>(set,"g");

library/bdm/estim/particles.h

@@ -26 +26 @@
 
 class PF : public BM {
+        //! Introduces two new options:
+        //! \li weights - meaning that all weightes will be logged
+        //! \li samples - all samples will be also logged
+        LOG_LEVEL(PF,weights,samples);
+
 protected:
         //!number of particles;
@@ -73 +78 @@
         };
         void set_statistics ( const eEmp &epdf0 ) {
-                bdm_assert_debug ( epdf0._rv().equal ( par->_rv() ), "Incompatibel input" );
+                bdm_assert_debug ( epdf0._rv().equal ( par->_rv() ), "Incompatible input" );
                 est = epdf0;
         };
         //!@}
+
         //! Set posterior density by sampling from epdf0
-        //! Extends original BM::set_options by two more options:
-        //! \li logweights - meaning that all weightes will be logged
-        //! \li logsamples - all samples will be also logged
-        void set_options ( const string &opt ) {
-                BM::set_options ( opt );
-        }
         //! bayes I - generate samples and add their weights to lls
         virtual void bayes_gensmp ( const vec &ut );
@@ -187 +187 @@
 
         void validate() {
+                BM::validate();
                 bdm_assert ( par, "PF::parameter_pdf not specified." );
                 n = _w.length();
@@ -220 +221 @@
 
 class MPF : public BM  {
+        //! Introduces new option 
+        //! \li means - meaning TODO
+        LOG_LEVEL(MPF,means);
 protected:
         //! particle filter on non-linear variable
@@ -291 +295 @@
                 return jest;
         }
-        //! Extends options understood by BM::set_options by option
-        //! \li logmeans - meaning
-        void set_options ( const string &opt ) {
-                BM::set_options ( opt );
-        }
 
         //!Access function
@@ -323 +322 @@
         */
         void from_setting ( const Setting &set ) {
+                BM::from_setting( set );
+
                 shared_ptr<pdf> par = UI::build<pdf> ( set, "parameter_pdf", UI::compulsory );
 
@@ -334 +335 @@
                 set_BM ( *BM0 );
 
-                string opt;
-                if ( UI::get ( opt, set, "options", UI::optional ) ) {
-                        set_options ( opt );
-                }
                 //set drv
                 //??set_yrv(concat(BM0->_yrv(),u) );
@@ -350 +347 @@
 
         void validate() {
+                BM::validate();
                 try {
                         pf->validate();