Changeset 907 for library/bdm/estim
- Timestamp:
- 04/19/10 12:44:57 (14 years ago)
- Location:
- library/bdm/estim
- Files:
-
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
library/bdm/estim/kalman.cpp
r884 r907 120 120 vec &_yp = fy._mu(); 121 121 //TODO get rid of Q in qr()! 122 // mat Q;122 // mat Q; 123 123 124 124 //R and Q are already set in set_parameters() -
library/bdm/estim/kalman.h
r896 r907 139 139 set_statistics ( mu0, P0 ); 140 140 // Initial values 141 UI::get ( yrv,set, "yrv", UI::optional );142 UI::get ( rvc, set, "urv", UI::optional);143 s et_yrv ( concat ( yrv, rvc ));144 145 validate();141 shared_ptr<RV> yrv_ptr = UI::build<RV>( set, "yrv", UI::optional ); 142 if( !yrv_ptr ) yrv_ptr = new RV(); 143 shared_ptr<RV> rvc_ptr = UI::build<RV>( set, "urv", UI::optional ); 144 if( !rvc_ptr ) rvc_ptr = new RV(); 145 set_yrv ( concat ( *yrv_ptr, *rvc_ptr ) ); 146 146 } 147 147 //! validate object -
library/bdm/estim/particles.h
r900 r907 579 579 // void log_register( logger &L, const string &prefix ){ 580 580 // BM::log_register(L,prefix); 581 // logrec->ids.set_size ( 3 );582 // logrec->ids(1)= L.add_vector(RV("Q",dimension()*dimension()), prefix+L.prefix_sep()+"Q");583 // logrec->ids(2)= L.add_vector(RV("R",dimensiony()*dimensiony()), prefix+L.prefix_sep()+"R");581 // registered_logger->ids.set_size ( 3 ); 582 // registered_logger->ids(1)= L.add_vector(RV("Q",dimension()*dimension()), prefix+L.prefix_sep()+"Q"); 583 // registered_logger->ids(2)= L.add_vector(RV("R",dimensiony()*dimensiony()), prefix+L.prefix_sep()+"R"); 584 584 // 585 585 // }; … … 599 599 // 600 600 // } 601 // logrec->L.log_vector ( logrec->ids ( 1 ), cvectorize(mQ) );602 // logrec->L.log_vector ( logrec->ids ( 2 ), cvectorize(mR) );601 // registered_logger->L.log_vector ( registered_logger->ids ( 1 ), cvectorize(mQ) ); 602 // registered_logger->L.log_vector ( registered_logger->ids ( 2 ), cvectorize(mR) ); 603 603 // 604 604 // }