Changeset 1167

Timestamp:

08/27/10 17:05:47 (14 years ago)

Author:

smidl

Message:

export stuff from particles

Files:

• library/bdm/estim/particles.h (modified) (5 diffs)

library/bdm/estim/particles.h

@@ -136 +136 @@
     }
 
-    void to_setting(Setting &set) {
+    void to_setting(Setting &set)const {
         MarginalizedParticleBase::to_setting(set);
         UI::save(par,set,"parameter_pdf");
+                UI::save(bm,set,"bm");
     }
     void validate() {
@@ -382 +383 @@
         dimy = bm0->dimensiony();
     }
+    
+    void to_setting(Setting &set) const{
+                BM::to_setting(set);
+                UI::save(particles, set,"particles");
+                UI::save(w,set,"w");
+        }
 
     void log_register ( bdm::logger& L, const string& prefix ) {
@@ -541 +548 @@
     };
     void bayes(const vec &dt, const vec &cond) {
-        shared_ptr<epdf> pred_v=bm->epredictor();
-
-        vec vt=pred_v->sample();
+        //shared_ptr<epdf> pred_v=bm->epredictor();
+
+        //vec vt=pred_v->sample();
+                vec vt = bm->samplepred();
 
         //new sample
@@ -561 +569 @@
         cond2fy.filldown(cond,fy_args);
 
-        ll=bm->_ll() + fy->evallogcond(dt,fy_args);
+        ll= fy->evallogcond(dt,fy_args);
     }
     void from_setting(const Setting &set) {
@@ -575 +583 @@
 
     }
+    void to_setting (Setting &set) const {
+                MarginalizedParticleBase::to_setting(set); //reads bm, yrv,rvc, bm_rv, etc...
+                UI::save(g,set,"g");
+                UI::save(fy,set,"fy");
+                UI::save(bm,set,"bm");
+        }
     void validate() {
         MarginalizedParticleBase::validate();