Show
Ignore:
Timestamp:
01/11/10 22:55:57 (14 years ago)
Author:
mido
Message:

abstract methods restored wherever they are meaningful
macros NOT_IMPLEMENTED and NOT_IMPLEMENTED_VOID defined to make sources shorter
emix::set_parameters and mmix::set_parameters removed, corresponding acces methods created and the corresponding validate methods improved appropriately
some compilator warnings were avoided
and also a few other things cleaned up

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • library/bdm/estim/kalman.h

    r744 r766  
    154154                bdm_assert ( est.dimension(), "Statistics and model parameters mismatch" ); 
    155155        } 
     156 
     157        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0); 
     158 
     159        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL); 
     160         
     161        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL); 
    156162}; 
    157163/*! 
     
    165171        //! Here dt = [yt;ut] of appropriate dimensions 
    166172        void bayes ( const vec &yt, const vec &cond = empty_vec ); 
    167         BM* _copy_() const { 
     173 
     174        virtual KalmanFull* _copy() const { 
    168175                KalmanFull* K = new KalmanFull; 
    169176                K->set_parameters ( A, B, C, D, Q, R ); 
     
    192199public: 
    193200        //! copy constructor 
    194         BM* _copy_() const { 
     201        virtual KalmanCh* _copy() const { 
    195202                KalmanCh* K = new KalmanCh; 
    196203                K->set_parameters ( A, B, C, D, Q, R ); 
     
    335342public: 
    336343        //! copy constructor duplicated - calls different set_parameters 
    337         BM* _copy_() const { 
     344        EKFCh* _copy() const { 
    338345                return new EKFCh(*this); 
    339346        } 
     
    422429        // TODO dodelat void to_setting( Setting &set ) const; 
    423430 
     431        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0);  
     432 
     433        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL);  
     434 
     435        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL);  
    424436}; 
    425437