Changeset 864

Timestamp:

03/12/10 13:42:07 (15 years ago)

Author:

smidl

Message:

log_level fixes + abstract fixes

Files:

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

library/bdm/base/bdmbase.h

@@ -492 +492 @@
 //! Probability density function with numerical statistics, e.g. posterior density.
 class epdf : public pdf {
-        LOG_LEVEL(epdf,jedna,dva,tri,deset);
+        LOG_LEVEL(epdf, logmean, loglb, logub, logfull);
 
 public:
@@ -552 +552 @@
                 ub = mea + 2 * std;
         };
+        //! Set statistics to match given input epdf. Typically it copies statistics from epdf of the same type and projects those form different types
+        //! \param pdf0 epdf to match
+        //! \param option placeholder for potential options
+        void set_statistics(const epdf *pdf0) NOT_IMPLEMENTED_VOID;
         //!@}
 
@@ -891 +895 @@
 
 class DS : public root {
-        LOG_LEVEL(DS,dt);
+        LOG_LEVEL(DS, dt);
 protected:
         //! size of data returned by \c getdata()
@@ -979 +983 @@
 
 class BM : public root {
-        LOG_LEVEL(BM,full,likelihood,bounds);
+        LOG_LEVEL(BM, full, likelihood, bounds);
 
 protected:
@@ -1022 +1026 @@
         //! This function evaluates only \f$ y_t \f$, condition is assumed to be the last used in bayes().
         //! See bdm::BM::predictor for conditional version.
-        virtual double logpred ( const vec &yt ) const = 0;
+        virtual double logpred ( const vec &yt ) const NOT_IMPLEMENTED(0.0);
 
         //! Matrix version of logpred
@@ -1034 +1038 @@
 
         //!Constructs a predictive density \f$ f(d_{t+1} |d_{t}, \ldots d_{0}) \f$
-        virtual epdf* epredictor() const = 0;
+        virtual epdf* epredictor() const NOT_IMPLEMENTED(NULL);
 
         //!Constructs conditional density of 1-step ahead predictor \f$ f(d_{t+1} |d_{t+h-1}, \ldots d_{t}) \f$
-        virtual pdf* predictor() const = 0;
+        virtual pdf* predictor() const NOT_IMPLEMENTED(NULL);
 
         //!@}
@@ -1059 +1063 @@
         int dimension() const {
                 return posterior().dimension();
+        }
+        //! access function
+        const RV& _rv() const {
+                return posterior()._rv();
         }
         //! access function
@@ -1090 +1098 @@
         //! return posterior density
         virtual const epdf& posterior() const = 0;
+        
+        epdf& prior() {return const_cast<epdf&>(posterior());}
+        //! set prior density -- same as posterior but writable
+        virtual void set_prior(const epdf *pdf0) NOT_IMPLEMENTED_VOID;
+        
         //!@}
 
@@ -1120 +1133 @@
 
                 UI::get ( log_level, set, "log_level", UI::optional );
-
         }
 
@@ -1134 +1146 @@
         {
                 if ( log_level[full] ) {
-                        const_cast<epdf&> ( posterior() ).log_level[epdf::deset] = true;
+                        const_cast<epdf&> ( posterior() ).log_level[epdf::logfull] = true;
                 } else {
                         if ( log_level[bounds] ) {
-                                const_cast<epdf&> ( posterior() ).log_level[epdf::dva] = true;
+                                const_cast<epdf&> ( posterior() ).log_level[epdf::loglb] = true;
                         } else {
-                                const_cast<epdf&> ( posterior() ).log_level[epdf::jedna] = true;;
+                                const_cast<epdf&> ( posterior() ).log_level[epdf::logmean] = true;;
                         }
                         if ( log_level[likelihood] ) {