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

Timestamp:

10/21/09 20:19:40 (15 years ago)

Author:

mido

Message:

experiment: epdf as a descendat of mpdf

Files:

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

library/bdm/base/bdmbase.h

@@ -326 +326 @@
 };
 
-class mpdf;
+class epdf;
+
+//! 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 {
+protected:
+        //!dimension of the condition
+        int dimc;
+        //! random variable in condition
+        RV rvc;
+
+        //! TODO
+        int dim;
+
+        //! TODO
+        RV rv;
+
+public:
+        //! \name Constructors
+        //! @{
+
+        mpdf() : dimc ( 0 ), rvc(), dim(0), rv() { }
+
+        mpdf ( const mpdf &m ) : dimc ( m.dimc ), rvc ( m.rvc ), rv( m.rv ), dim( m.dim) { }
+        //!@}
+
+        //! \name Matematical operations
+        //!@{
+
+        //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
+        virtual vec samplecond ( const vec &cond ) {
+                bdm_error ( "Not implemented" );
+                return vec();
+        }
+
+        //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
+        virtual mat samplecond_m ( const vec &cond, int N );
+
+        //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
+        virtual double evallogcond ( const vec &dt, const vec &cond ) {
+                bdm_error ( "Not implemented" );
+                return 0.0;
+        }
+
+        //! Matrix version of evallogcond
+        virtual vec evallogcond_m ( const mat &Dt, const vec &cond ) {
+                vec v ( Dt.cols() );
+                for ( int i = 0; i < Dt.cols(); i++ ) {
+                        v ( i ) = evallogcond ( Dt.get_col ( i ), cond );
+                }
+                return v;
+        }
+
+        //! Array<vec> version of evallogcond
+        virtual vec evallogcond_m ( const Array<vec> &Dt, const vec &cond ) {
+                bdm_error ( "Not implemented" );
+                return vec();
+        }
+
+        //! \name Access to attributes
+        //! @{
+
+        const RV& _rv() const {
+                return rv;
+        }
+        const RV& _rvc() const {
+                return rvc;
+        }
+
+        int dimension() const {
+                return dim;
+        }
+        int dimensionc() {
+                return dimc;
+        }
+
+        //! Load from structure with elements:
+        //!  \code
+        //! { class = "mpdf_offspring",
+        //!   rv = {class="RV", names=(...),}; // RV describing meaning of random variable
+        //!   rvc= {class="RV", names=(...),}; // RV describing meaning of random variable in condition
+        //!   // elements of offsprings
+        //! }
+        //! \endcode
+        //!@}
+        void from_setting ( const Setting &set );
+        //!@}
+
+        //! \name Connection to other objects
+        //!@{
+        void set_rvc ( const RV &rvc0 ) {
+                rvc = rvc0;
+        }
+        void set_rv ( const RV &rv0 ) {
+                rv = rv0;
+        }
+
+        bool isnamed() {
+                return ( dim == rv._dsize() ) && ( dimc == rvc._dsize() );
+        }
+        //!@}
+};
+SHAREDPTR ( mpdf );
 
 //! Probability density function with numerical statistics, e.g. posterior density.
-
-class epdf : public root {
+class epdf : public mpdf {
 protected:
         //! dimension of the random variable
@@ -456 +556 @@
         }
 
+
+/*! \brief Unconditional mpdf, allows using epdf in the role of mpdf.
+
+*/
+
+
+/// MEPDF BEGINS HERE TODO
+        //! empty
+        vec samplecond ( const vec &cond ) {
+                return sample();
+        }
+        double evallogcond ( const vec &val, const vec &cond ) {
+                return evallog ( val );
+        }
 };
 SHAREDPTR ( epdf );
-
-//! 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 {
-protected:
-        //!dimension of the condition
-        int dimc;
-        //! random variable in condition
-        RV rvc;
-private:
-        //! internal epdf, used only as cache to avoid virtual calls of \c _rv() and \c _dimension()
-        epdf* ep;
-
-protected:
-        //! set internal pointer \c ep to point to given \c iepdf
-        void set_ep ( epdf &iepdf ) {
-                ep = &iepdf;
-        }
-        //! set internal pointer \c ep to point to given \c iepdf
-        void set_ep ( epdf *iepdfp ) {
-                ep = iepdfp;
-        }
-
-public:
-        //! \name Constructors
-        //! @{
-
-        mpdf() : dimc ( 0 ), rvc(), ep ( NULL ) { }
-
-        mpdf ( const mpdf &m ) : dimc ( m.dimc ), rvc ( m.rvc ), ep ( m.ep ) { }
-        //!@}
-
-        //! \name Matematical operations
-        //!@{
-
-        //! Returns a sample from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-        virtual vec samplecond ( const vec &cond ) {
-                bdm_error ( "Not implemented" );
-                return vec();
-        }
-
-        //! Returns \param N samples from the density conditioned on \c cond, \f$x \sim epdf(rv|cond)\f$. \param cond is numeric value of \c rv
-        virtual mat samplecond_m ( const vec &cond, int N );
-
-        //! Shortcut for conditioning and evaluation of the internal epdf. In some cases,  this operation can be implemented efficiently.
-        virtual double evallogcond ( const vec &dt, const vec &cond ) {
-                bdm_error ( "Not implemented" );
-                return 0.0;
-        }
-
-        //! Matrix version of evallogcond
-        virtual vec evallogcond_m ( const mat &Dt, const vec &cond ) {
-                vec v ( Dt.cols() );
-                for ( int i = 0; i < Dt.cols(); i++ ) {
-                        v ( i ) = evallogcond ( Dt.get_col ( i ), cond );
-                }
-                return v;
-        }
-
-        //! Array<vec> version of evallogcond
-        virtual vec evallogcond_m ( const Array<vec> &Dt, const vec &cond ) {
-                bdm_error ( "Not implemented" );
-                return vec();
-        }
-
-        //! \name Access to attributes
-        //! @{
-
-        const RV& _rv() const {
-                return ep->_rv();
-        }
-        const RV& _rvc() const {
-                return rvc;
-        }
-
-        int dimension() const {
-                return ep->dimension();
-        }
-        int dimensionc() {
-                return dimc;
-        }
-
-        //! Load from structure with elements:
-        //!  \code
-        //! { class = "mpdf_offspring",
-        //!   rv = {class="RV", names=(...),}; // RV describing meaning of random variable
-        //!   rvc= {class="RV", names=(...),}; // RV describing meaning of random variable in condition
-        //!   // elements of offsprings
-        //! }
-        //! \endcode
-        //!@}
-        void from_setting ( const Setting &set );
-        //!@}
-
-        //! \name Connection to other objects
-        //!@{
-        void set_rvc ( const RV &rvc0 ) {
-                rvc = rvc0;
-        }
-        void set_rv ( const RV &rv0 ) {
-                ep->set_rv ( rv0 );
-        }
-        bool isnamed() {
-                return ( ep->isnamed() ) && ( dimc == rvc._dsize() );
-        }
-        //!@}
-};
-SHAREDPTR ( mpdf );
 
 //! Mpdf with internal epdf that is modified by function \c condition
@@ -575 +582 @@
         //! constructor
         mpdf_internal() : mpdf(), iepdf() {
-                set_ep ( iepdf );
+//              set_ep ( iepdf ); TODO!
         }
 
@@ -906 +913 @@
 };
 
-/*! \brief Unconditional mpdf, allows using epdf in the role of mpdf.
-
-*/
-class mepdf : public mpdf {
-        //! Internal shared pointer to epdf
-        shared_ptr<epdf> iepdf;
-public:
-        //!Default constructor
-        mepdf() { }
-        //! Set internal shared pointer
-        mepdf ( shared_ptr<epdf> em ) {
-                iepdf = em;
-                set_ep ( *iepdf.get() );
-                dimc = 0;
-        }
-
-        //! empty
-        vec samplecond ( const vec &cond ) {
-                return iepdf->sample();
-        }
-        double evallogcond ( const vec &val, const vec &cond ) {
-                return iepdf->evallog ( val );
-        }
-
-        //! Load from structure with elements:
-        //!  \code
-        //! { class = "mepdf",
-        //!   epdf = {class="epdf_offspring",...}
-        //! }
-        //! \endcode
-        //!@}
-        void from_setting ( const Setting &set );
-};
-UIREGISTER ( mepdf );
-SHAREDPTR ( mepdf );
 
 //! \brief Combines RVs from a list of mpdfs to a single one.
@@ -1209 +1181 @@
                 if ( LFlags ( 3 ) ) LIDs ( 3 ) = L.add ( RV ( "ll", 1 ), name );    //TODO: "local" RV
         }
-        //! Save results to the given logger, details of what is stored is configured by \c LIDs and \c options
         virtual void logit ( logger &L ) {
                 L.logit ( LIDs ( 0 ), posterior().mean() );