Changeset 170 for bdm/stat/libBM.h

Timestamp:

09/24/08 13:07:50 (16 years ago)

Author:

smidl

Message:

Mixtures of EF and related changes to libEF and BM

Files:

• bdm/stat/libBM.h (modified) (7 diffs)

bdm/stat/libBM.h

@@ -103 +103 @@
         //!access function
         std::string name ( int at ) {return names ( at );};
+        //!Assign unused ids to this rv 
+        void newids();
 };
 
@@ -144 +146 @@
         epdf ( const RV &rv0 ) :rv ( rv0 ) {};
 
-        //! Returns the required moment of the epdf
+//      //! Returns the required moment of the epdf
 //      virtual vec moment ( const int order = 1 );
+        
         //! Returns a sample, \f$x\f$ from density \f$epdf(rv)\f$
         virtual vec sample () const =0;
@@ -156 +159 @@
         virtual double evalpdflog ( const vec &val ) const =0;
 
+        //! Compute log-probability of multiple values argument \c val
+        virtual vec evalpdflog ( const mat &Val ) const {
+                vec x ( Val.cols() );
+                for ( int i=0;i<Val.cols();i++ ) {x ( i ) =evalpdflog( Val.get_col(i) ) ;}
+                return x;
+        }
+
         //! return expected value
         virtual vec mean() const =0;
@@ -162 +172 @@
         virtual ~epdf() {};
         //! access function, possibly dangerous!
-        RV& _rv() {return rv;}
+        const RV& _rv() const {return rv;}
+        //! modifier function - useful when copying epdfs
+        void _renewrv(const RV &in_rv){rv=in_rv;}
 };
 
@@ -270 +282 @@
 
         //!Default constructor
-        BM ( const RV &rv0 ) :rv ( rv0 ), ll ( 0 ),evalll ( true ) {//Fixme: test rv
+        BM ( const RV &rv0, double ll0=0,bool evalll0=true ) :rv ( rv0 ), ll ( ll0 ),evalll ( evalll0) {//Fixme: test rv
         };
+        //!Copy constructor
+        BM (const BM &B) : rv(B.rv), ll(B.ll), evalll(B.evalll) {}
 
         /*! \brief Incremental Bayes rule
@@ -278 +292 @@
         virtual void bayes ( const vec &dt ) = 0;
         //! Batch Bayes rule (columns of Dt are observations)
-        void bayes ( mat Dt );
+        virtual void bayesB (const mat &Dt );
         //! Returns a pointer to the epdf representing posterior density on parameters. Use with care!
-        virtual epdf& _epdf() =0;
-
+        virtual const epdf& _epdf() const =0;
+
+        //! Evaluates predictive log-likelihood of the given data record
+        //! I.e. marginal likelihood of the data with the posterior integrated out.
+        virtual double logpred(const vec &dt)const{it_error("Not implemented");return 0.0;}
+        
         //! Destructor for future use;
         virtual ~BM() {};
@@ -290 +308 @@
         //!access function 
         void set_evalll(bool evl0){evalll=evl0;}
+        
+        //! Copy function required in vectors, Arrays of BM etc. Have to be DELETED manually!
+        //! Prototype: BM* _copy_(){BM Tmp*=new Tmp(this*);  return Tmp; }
+        virtual BM* _copy_(bool changerv=false){it_error("function _copy_ not implemented for this BM"); return NULL;};
 };