Changeset 1192 for library/bdm/stat

Timestamp:

09/17/10 14:35:13 (14 years ago)

Author:

smidl

Message:

fixes ob ProdBM

Location:

library/bdm/stat

Files:

• emix.h (modified) (7 diffs)
• exp_family.cpp (modified) (1 diff)

library/bdm/stat/emix.h

@@ -293 +293 @@
     virtual const int no_factors() const NOT_IMPLEMENTED(0);
     //! Default constructor
-    eprod_base () :  dls (0) {};
-    //! Set internal
+        eprod_base () :  dls (0) {};
+        eprod_base (const eprod_base &ep0) :  dls (ep0.dls) {};
+        //! Set internal
     vec mean() const;
 
@@ -449 +450 @@
         ProdBMBase & pb;
     public :
-        eprod_bm(ProdBMBase &pb0): pb(pb0) {}
-        const epdf* factor(int i ) const {
+                eprod_bm(ProdBMBase &pb0): pb(pb0) {}
+                const epdf* factor(int i ) const {
             return &(pb.bm(i)->posterior());
         }
@@ -458 +459 @@
     } est;
 public:
-    ProdBMBase():est(*this) {}
-    virtual BM* bm(int i) NOT_IMPLEMENTED(NULL);
+        ProdBMBase():BM(),est(*this) {}
+        ProdBMBase(const ProdBMBase &p0):BM(p0),bm_yt(p0.bm_yt),bm_cond(p0.bm_cond),est(*this) {
+                est.validate();
+        }
+        virtual BM* bm(int i) NOT_IMPLEMENTED(NULL);
     virtual int no_bms() const {
         return 0;
@@ -496 +500 @@
 
         for (int i=0; i<no_bms(); i++) {
+                        bm_yt(i).set_length(bm(i)->dimensiony());
             bm_yt(i).connect(bm(i)->_yrv(), yrv);
-            bm_cond(i).connect(bm(i)->_rvc(), yrv, rvc);
+                        bm_cond(i).set_length(bm(i)->dimensionc());
+                        bm_cond(i).connect(bm(i)->_rvc(), yrv, rvc);
         }
     }
@@ -506 +512 @@
             bm_cond(i).update(dt,cond);
             bm(i)->bayes(bm_yt(i), bm_cond(i));
-        }
-    }
-
+                        ll+=bm(i)->_ll();
+        }
+    }
+    vec samplepred( const vec &cond) {
+                vec samp=zeros(dimy);
+                
+                for(int i=0; i<no_bms(); i++) {
+                        bm_cond(i).update(samp,cond);
+                        vec yi=bm(i)->samplepred(bm_cond(i));
+                        bm_yt(i)._dl().pushup(samp,yi);
+                }
+                return samp;
+        }
+        
 };
 
@@ -515 +532 @@
     Array<shared_ptr<BM> > BMs;
 public:
+        ProdBM():ProdBMBase(),BMs(){};
+        ProdBM(const ProdBM &p0):ProdBMBase(p0),BMs(p0.BMs){est.validate();};
+    ProdBM* _copy() const {return new ProdBM(*this);}
     virtual BM* bm(int i) {
         return BMs(i).get();
@@ -529 +549 @@
         UI::save(BMs,set,"BMs");
     }
-
 };
 UIREGISTER(ProdBM);

library/bdm/stat/exp_family.cpp

@@ -160 +160 @@
 vec egiw::est_theta() const {
     if ( dimx == 1 ) {
+                if (dimc<1) return empty_vec;
+                
         const mat &L = V._L();
         int end = L.rows() - 1;