Changeset 679 for library/bdm/stat/exp_family.h

Timestamp:

10/23/09 00:05:25 (15 years ago)

Author:

smidl

Message:

Major changes in BM -- OK is only test suite and tests/tutorial -- the rest is broken!!!

Files:

• library/bdm/stat/exp_family.h (modified) (4 diffs)

library/bdm/stat/exp_family.h

@@ -96 +96 @@
 
                 //! Weighted update of sufficient statistics (Bayes rule)
-                virtual void bayes (const vec &data, const double w) {};
+                virtual void bayes_weighted (const vec &data, const vec &cond=empty_vec, const double w=1.0) {};
                 //original Bayes
-                void bayes (const vec &dt);
+                void bayes (const vec &yt, const vec &cond=empty_vec);
 
                 //!Flatten the posterior according to the given BMEF (of the same type!)
@@ -436 +436 @@
                 //! Sets sufficient statistics to match that of givefrom mB0
                 void set_statistics (const BM* mB0) {const multiBM* mB = dynamic_cast<const multiBM*> (mB0); beta = mB->beta;}
-                void bayes (const vec &dt) {
+                void bayes (const vec &yt, const vec &cond=empty_vec) {
                         if (frg < 1.0) {beta *= frg;last_lognc = est.lognc();}
-                        beta += dt;
+                        beta += yt;
                         if (evalll) {ll = est.lognc() - last_lognc;}
                 }
-                double logpred (const vec &dt) const {
+                double logpred (const vec &yt) const {
                         eDirich pred (est);
                         vec &beta = pred._beta();
@@ -452 +452 @@
                                 else{lll = pred.lognc();}
 
-                        beta += dt;
+                        beta += yt;
                         return pred.lognc() - lll;
                 }
@@ -832 +832 @@
                 }
                 void condition (const vec &cond) {
-                        iepdf._mu() = A * cond + mu_const;
+                        if (cond.length()>0) {
+                                iepdf._mu() = A * cond + mu_const;
+                        } else {
+                                iepdf._mu() =  mu_const;
+                        }
                         double zeta;
                         //ugly hack!