Changeset 686 for library/bdm/estim

Timestamp:

10/29/09 23:24:04 (15 years ago)

Author:

smidl

Message:

pmsm using new syntax for bayes

Location:

library/bdm/estim

Files:

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

library/bdm/estim/kalman.cpp

@@ -244 +244 @@
 
 void EKFCh::from_setting ( const Setting &set ) {
+        BM::from_setting(set);
         shared_ptr<diffbifn> IM = UI::build<diffbifn> ( set, "IM", UI::compulsory );
         shared_ptr<diffbifn> OM = UI::build<diffbifn> ( set, "OM", UI::compulsory );
@@ -267 +268 @@
         UI::get ( dR, set, "dR", UI::compulsory );
         set_parameters ( IM, OM, diag ( dQ ), diag ( dR ) );
-
-        //connect
-        shared_ptr<RV> drv = UI::build<RV> ( set, "drv", UI::compulsory );
-        set_yrv ( *drv );
-        shared_ptr<RV> rv = UI::build<RV> ( set, "rv", UI::compulsory );
-        set_rv ( *rv );
-
-        string options;
-        if ( UI::get ( options, set, "options" ) )
-                set_options ( options );
 }
 

library/bdm/estim/kalman.h

@@ -246 +246 @@
                         return est._R().to_mat();
                 }
-                void from_setting (const Setting &set) {
+                void from_setting (const Setting &set) {                        
+                        BM::from_setting(set);
                         shared_ptr<diffbifn> IM = UI::build<diffbifn> ( set, "IM", UI::compulsory );
                         shared_ptr<diffbifn> OM = UI::build<diffbifn> ( set, "OM", UI::compulsory );
@@ -270 +271 @@
                         UI::get ( dR, set, "dR", UI::compulsory );
                         set_parameters ( IM, OM, diag ( dQ ), diag ( dR ) );
-                        
-                        //connect
-                        shared_ptr<RV> drv = UI::build<RV> ( set, "drv", UI::compulsory );
-                        set_yrv ( *drv );
-                        shared_ptr<RV> rv = UI::build<RV> ( set, "rv", UI::compulsory );
-                        set_rv ( *rv );
-                        
+                                                
                         string options;
                         if ( UI::get ( options, set, "options" ) )

library/bdm/estim/particles.h

@@ -131 +131 @@
                 u.add(obs_u); // join both u, and check if they do not overlap
 
-                set_yrv(concat(obs->_rv(),u) );
+                set_yrv(obs->_rv() );
+                rvc = u;
         }
         //! auxiliary function reading parameter 'resmethod' from configuration file