Changeset 693 for library/bdm/base/bdmbase.h

Timestamp:

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

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Files:

• library/bdm/base/bdmbase.h (modified) (16 diffs)

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 );