Changeset 693 for library/bdm/base

Timestamp:

11/02/09 17:27:29 (15 years ago)

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Location:

library/bdm/base

Files:

• bdmbase.cpp (modified) (4 diffs)
• bdmbase.h (modified) (16 diffs)
• datasources.cpp (modified) (1 diff)
• datasources.h (modified) (10 diffs)

library/bdm/base/bdmbase.cpp

@@ -146 +146 @@
 }
 
-shared_ptr<mpdf> epdf::condition ( const RV &rv ) const {
+shared_ptr<pdf> epdf::condition ( const RV &rv ) const {
         bdm_warning ( "Not implemented" );
-        return shared_ptr<mpdf>();
+        return shared_ptr<pdf>();
 }
 
@@ -180 +180 @@
 }
 
-mat mpdf::samplecond_m ( const vec &cond, int N ) {
+mat pdf::samplecond_m ( const vec &cond, int N ) {
         mat M ( dimension(), N );
         for ( int i = 0; i < N; i++ ) {
@@ -189 +189 @@
 }
 
-void mpdf::from_setting ( const Setting &set ) {
+void pdf::from_setting ( const Setting &set ) {
         shared_ptr<RV> r = UI::build<RV> ( set, "rv", UI::optional );
         if ( r ) {
@@ -373 +373 @@
 }
 
-RV get_composite_rv ( const Array<shared_ptr<mpdf> > &mpdfs,
+RV get_composite_rv ( const Array<shared_ptr<pdf> > &pdfs,
                       bool checkoverlap ) {
         RV rv; //empty rv
         bool rvaddok;
-        for ( int i = 0; i < mpdfs.length(); i++ ) {
-                rvaddok = rv.add ( mpdfs ( i )->_rv() ); //add rv to common rvs.
-                // If rvaddok==false, mpdfs overlap => assert error.
-                bdm_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input mpdfs overlap in rv!" );
+        for ( int i = 0; i < pdfs.length(); i++ ) {
+                rvaddok = rv.add ( pdfs ( i )->_rv() ); //add rv to common rvs.
+                // If rvaddok==false, pdfs overlap => assert error.
+                bdm_assert_debug ( rvaddok || !checkoverlap, "mprod::mprod() input pdfs overlap in rv!" );
         }
 

library/bdm/base/bdmbase.h

@@ -386 +386 @@
 
 //! Conditional probability density, e.g. modeling \f$ f( x | y) \f$, where \f$ x \f$ is random variable, \c rv, and \f$ y \f$ is conditioning variable, \c rvc.
-class mpdf : public root {
+class pdf : public root {
 protected:
         //!dimension of the condition
@@ -403 +403 @@
         //! @{
 
-        mpdf() : dimc ( 0 ), rvc(), dim(0), rv() { }
-
-        mpdf ( const mpdf &m ) : dimc ( m.dimc ), rvc ( m.rvc ), dim( m.dim), rv( m.rv ) { }
+        pdf() : dimc ( 0 ), rvc(), dim(0), rv() { }
+
+        pdf ( const pdf &m ) : dimc ( m.dimc ), rvc ( m.rvc ), dim( m.dim), rv( m.rv ) { }
         
         //! copy of the current object - make sure to implement
-        virtual mpdf* _copy_() const {return new mpdf(*this);}
+        virtual pdf* _copy_() const {return new pdf(*this);}
         //!@}
 
@@ -467 +467 @@
         //! Load from structure with elements:
         //!  \code
-        //! { class = "mpdf_offspring",
+        //! { class = "pdf_offspring",
         //!   rv = {class="RV", names=(...),}; // RV describing meaning of random variable
         //!   rvc= {class="RV", names=(...),}; // RV describing meaning of random variable in condition
@@ -491 +491 @@
         //!@}
 };
-SHAREDPTR ( mpdf );
+SHAREDPTR ( pdf );
 
 //! Probability density function with numerical statistics, e.g. posterior density.
-class epdf : public mpdf {
+class epdf : public pdf {
 
 public:
@@ -509 +509 @@
         @{*/
         epdf() {};
-        epdf ( const epdf &e ) : mpdf(e) {};
+        epdf ( const epdf &e ) : pdf(e) {};
         void set_parameters ( int dim0 ) {
                 dim = dim0;
@@ -542 +542 @@
 
         //! Return conditional density on the given RV, the remaining rvs will be in conditioning
-        virtual shared_ptr<mpdf> condition ( const RV &rv ) const;
+        virtual shared_ptr<pdf> condition ( const RV &rv ) const;
 
         //! Return marginal density on the given RV, the remainig rvs are intergrated out
@@ -633 +633 @@
 SHAREDPTR ( epdf );
 
-//! Mpdf with internal epdf that is modified by function \c condition
+//! pdf with internal epdf that is modified by function \c condition
 template <class EPDF>
-class mpdf_internal: public mpdf {
+class pdf_internal: public pdf {
 protected :
         //! Internal epdf used for sampling
@@ -641 +641 @@
 public:
         //! constructor
-        mpdf_internal() : mpdf(), iepdf() {
+        pdf_internal() : pdf(), iepdf() {
 //              set_ep ( iepdf ); TODO!
         }
 
-        //! Update \c iepdf so that it represents this mpdf conditioned on \c rvc = cond
+        //! Update \c iepdf so that it represents this pdf conditioned on \c rvc = cond
         //! This function provides convenient reimplementation in offsprings
         virtual void condition ( const vec &cond ) {
@@ -896 +896 @@
 };
 
-//!DataLink is a connection between mpdf and its superordinate (Up)
+//!DataLink is a connection between pdf and its superordinate (Up)
 //! This class links
 class datalink_m2m: public datalink_m2e {
@@ -928 +928 @@
 
 
-//! \brief Combines RVs from a list of mpdfs to a single one.
-RV get_composite_rv ( const Array<shared_ptr<mpdf> > &mpdfs, bool checkoverlap = false );
+//! \brief Combines RVs from a list of pdfs to a single one.
+RV get_composite_rv ( const Array<shared_ptr<pdf> > &pdfs, bool checkoverlap = false );
 
 /*! \brief Abstract class for discrete-time sources of data.
@@ -1118 +1118 @@
         };
         //!Constructs conditional density of 1-step ahead predictor \f$ f(d_{t+1} |d_{t+h-1}, \ldots d_{t}) \f$
-        virtual mpdf* predictor() const {
+        virtual pdf* predictor() const {
                 bdm_error ( "Not implemented" );
                 return NULL;
@@ -1229 +1229 @@
 //! array of pointers to epdf
 typedef Array<shared_ptr<epdf> > epdf_array;
-//! array of pointers to mpdf
-typedef Array<shared_ptr<mpdf> > mpdf_array;
+//! array of pointers to pdf
+typedef Array<shared_ptr<pdf> > pdf_array;
 
 template<class EPDF>
-vec mpdf_internal<EPDF>::samplecond ( const vec &cond ) {
+vec pdf_internal<EPDF>::samplecond ( const vec &cond ) {
         condition ( cond );
         vec temp = iepdf.sample();
@@ -1240 +1240 @@
 
 template<class EPDF>
-mat mpdf_internal<EPDF>::samplecond_m ( const vec &cond, int N ) {
+mat pdf_internal<EPDF>::samplecond_m ( const vec &cond, int N ) {
         condition ( cond );
         mat temp ( dimension(), N );
@@ -1253 +1253 @@
 
 template<class EPDF>
-double mpdf_internal<EPDF>::evallogcond ( const vec &yt, const vec &cond ) {
+double pdf_internal<EPDF>::evallogcond ( const vec &yt, const vec &cond ) {
         double tmp;
         condition ( cond );
@@ -1261 +1261 @@
 
 template<class EPDF>
-vec mpdf_internal<EPDF>::evallogcond_m ( const mat &Yt, const vec &cond ) {
+vec pdf_internal<EPDF>::evallogcond_m ( const mat &Yt, const vec &cond ) {
         condition ( cond );
         return iepdf.evallog_m ( Yt );
@@ -1267 +1267 @@
 
 template<class EPDF>
-vec mpdf_internal<EPDF>::evallogcond_m ( const Array<vec> &Yt, const vec &cond ) {
+vec pdf_internal<EPDF>::evallogcond_m ( const Array<vec> &Yt, const vec &cond ) {
         condition ( cond );
         return iepdf.evallog_m ( Yt );

library/bdm/base/datasources.cpp

@@ -123 +123 @@
 
 void stateDS::from_setting ( const Setting &set ) {
-        IM = UI::build<mpdf> ( set, "IM", UI::compulsory );
-        OM = UI::build<mpdf> ( set, "OM", UI::compulsory );
+        IM = UI::build<pdf> ( set, "IM", UI::compulsory );
+        OM = UI::build<pdf> ( set, "OM", UI::compulsory );
 
         dt.set_length ( OM->dimension() );

library/bdm/base/datasources.h

@@ -145 +145 @@
 Still having only one density but allowing conditioning on either input or delayed values.
 */
-class MpdfDS :public DS {
+class PdfDS :public DS {
         protected:
                 //! internal pointer to epdf from which we samplecond
-                shared_ptr<mpdf> impdf;
+                shared_ptr<pdf> ipdf;
                 //! internal storage of data sample
                 vec yt;
@@ -165 +165 @@
                         ut2rgr.filldown ( ut,rgr );
                         yt2rgr.filldown ( yt,rgr );
-                        yt=impdf->samplecond ( rgr );
+                        yt=ipdf->samplecond ( rgr );
                         ut2rgr.step(ut); //u is now history
                 }
@@ -177 +177 @@
                 /*!
                 \code
-                class = "MpdfDS";
-                mpdf = {class="mpdf_offspring", ...};  // mpdf to simulate
+                class = "PdfDS";
+                pdf = {class="pdf_offspring", ...};  // pdf to simulate
                 --- optional ---
                 init_rv = {class="RV",names=...};      // define what rv to initialize - typically delayed values!
@@ -187 +187 @@
                 */
                 void from_setting ( const Setting &set ) {
-                        impdf=UI::build<mpdf> ( set,"mpdf",UI::compulsory );
+                        ipdf=UI::build<pdf> ( set,"pdf",UI::compulsory );
                         
-                        Yrv = impdf->_rv();
+                        Yrv = ipdf->_rv();
                         // get unique rvs form rvc
-                        RV rgrv0=impdf->_rvc().remove_time();
+                        RV rgrv0=ipdf->_rvc().remove_time();
                         // input is what in not in Yrv
                         Urv=rgrv0.subt(Yrv); 
                         set_drv(Yrv, Urv);
                         // connect input and output to rvc
-                        ut2rgr.set_connection(impdf->_rvc(), Urv); 
-                        yt2rgr.set_connection(impdf->_rvc(), Yrv); 
+                        ut2rgr.set_connection(ipdf->_rvc(), Urv); 
+                        yt2rgr.set_connection(ipdf->_rvc(), Yrv); 
                         
                         //set history - if given
@@ -212 +212 @@
                         }
 
-                        yt = zeros ( impdf->dimension() );
-                        rgr = zeros ( impdf->dimensionc() );
+                        yt = zeros ( ipdf->dimension() );
+                        rgr = zeros ( ipdf->dimensionc() );
                         ut = zeros(Urv._dsize());
 
@@ -225 +225 @@
                         ut2rgr.filldown ( ut,rgr );
                         yt2rgr.filldown ( yt,rgr );
-                        yt=impdf->samplecond ( rgr );
-                }
-};
-UIREGISTER ( MpdfDS );
+                        yt=ipdf->samplecond ( rgr );
+                }
+};
+UIREGISTER ( PdfDS );
 
 /*! Pseudovirtual class for reading data from files
@@ -307 +307 @@
         private:
                 //!conditional pdf of the state evolution \f$ f(x_t|x_{t-1}) \f$
-                shared_ptr<mpdf> IM;
+                shared_ptr<pdf> IM;
 
                 //!conditional pdf of the observations \f$ f(d_t|x_t) \f$
-                shared_ptr<mpdf> OM;
+                shared_ptr<pdf> OM;
 
         protected:
@@ -331 +331 @@
                 }
                 //! convenience constructor
-                stateDS ( const shared_ptr<mpdf> &IM0, const shared_ptr<mpdf> &OM0, int usize ) : IM ( IM0 ), OM ( OM0 ),
+                stateDS ( const shared_ptr<pdf> &IM0, const shared_ptr<pdf> &OM0, int usize ) : IM ( IM0 ), OM ( OM0 ),
                                 dt ( OM0->dimension() ), xt ( IM0->dimension() ),
                                 ut ( usize ), L_xt ( 0 ) { }
@@ -360 +360 @@
                         type = "stateDS";
                         //Internal model
-                        IM = { type = "mpdf"; //<-- valid offspring! e.g. "mlnorm"
+                        IM = { type = "pdf"; //<-- valid offspring! e.g. "mlnorm"
                                 rv = { //description of x_t
                                         names=["name1",...];
@@ -373 +373 @@
                                 };
                         //Observation model
-                        OM = { type = "mpdf-offspring";
+                        OM = { type = "pdf-offspring";
                                 rv = {}; //description of d_t
                                 rvu = {type="internal", path="system.IM.rvu"}; //description of u_t