Changeset 678

Timestamp:

10/22/09 15:18:50 (15 years ago)

Author:

smidl

Message:

finalizing transition mpdf->epdf

Location:

library/bdm

Files:

• base/bdmbase.h (modified) (8 diffs)
• stat/exp_family.cpp (modified) (1 diff)
• stat/exp_family.h (modified) (3 diffs)

library/bdm/base/bdmbase.h

@@ -393 +393 @@
         RV rvc;
 
-        //! TODO
+        //! dimension of random variable
         int dim;
 
-        //! TODO
+        //! random variable
         RV rv;
 
@@ -479 +479 @@
         }
 
-        bool isnamed() {
+        bool isnamed() const {
                 return ( dim == rv._dsize() ) && ( dimc == rvc._dsize() );
         }
@@ -488 +488 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 class epdf : public mpdf {
-protected:
-        //! dimension of the random variable
-        int dim;
-        //! Description of the random variable
-        RV rv;
 
 public:
@@ -506 +501 @@
          All internal data structures are constructed as empty. Their values (including sizes) will be set by method \c set_parameters(). This way references can be initialized in constructors.
         @{*/
-        epdf() : dim ( 0 ), rv() {};
-        epdf ( const epdf &e ) : dim ( e.dim ), rv ( e.rv ) {};
-        epdf ( const RV &rv0 ) : dim ( rv0._dsize() ) {
-                set_rv ( rv0 );
-        };
+        epdf() {};
+        epdf ( const epdf &e ) : mpdf(e) {};
         void set_parameters ( int dim0 ) {
                 dim = dim0;
@@ -574 +566 @@
         //! @{
 
-        //!Name its rv
-        void set_rv ( const RV &rv0 ) {
-                rv = rv0;
-        }
-
-        //! True if rv is assigned
-        bool isnamed() const {
-                bool b = ( dim == rv._dsize() );
-                return b;
-        }
-
-        //! Return name (fails when isnamed is false)
-        const RV& _rv() const {
-                //bdm_assert_debug ( isnamed(), "" );
-                return rv;
-        }
         //! store values of the epdf on the following levels:
         //!  #1 mean
@@ -615 +591 @@
         //! @{
 
-        //! Size of the random variable
-        int dimension() const {
-                return dim;
-        }
         //! Load from structure with elements:
         //!  \code
@@ -633 +605 @@
         }
 
-
-/*! \brief Unconditional mpdf, allows using epdf in the role of mpdf.
-
-*/
-
-
-/// MEPDF BEGINS HERE TODO
-        //! empty
         vec samplecond ( const vec &cond ) {
                 return sample();
@@ -683 +647 @@
         //! Efficient version of samplecond
         virtual mat samplecond_m ( const vec &cond, int N );
+        
+        void validate() {
+                iepdf.validate();
+                if (rv._dsize()< iepdf._rv()._dsize()) {rv=iepdf._rv();};
+                dim = iepdf.dimension();
+        }
 };
 

library/bdm/stat/exp_family.cpp

@@ -261 +261 @@
         iepdf.set_parameters ( k * ones ( beta0.length() ), beta0 );
         dimc = iepdf.dimension();
+        dim = iepdf.dimension();
 }
 

library/bdm/stat/exp_family.h

@@ -408 +408 @@
                 }
                 void validate() { 
-                        iepdf.validate();
+                        mpdf_internal<eDirich>::validate();
                         bdm_assert(_beta.length()==betac.length(),"beta0 and betac are not compatible");
                         if (_rv()._dsize()>0){
@@ -734 +734 @@
                 };
                 void validate() {
+                        mpdf_internal<TEpdf<sq_T> >::validate();
                         bdm_assert (A.rows() == mu_const.length(), "mlnorm: A vs. mu mismatch");
                         bdm_assert (A.rows() == _R().rows(), "mlnorm: A vs. R mismatch");
@@ -895 +896 @@
                         UI::get (k, set, "k", UI::compulsory);
                         set_parameters (k, betatmp);
+                        validate();
+                }
+                void validate() {
+                        mpdf_internal<egamma>::validate();
+                        
+                        dim = _beta.length();
+                        dimc = _beta.length();
                 }
 };