Changeset 1187

Timestamp:

09/16/10 13:21:51 (14 years ago)

Author:

smidl

Message:

logging of weights + old computing of weights

Location:

library/bdm/estim

Files:

• particles.cpp (modified) (1 diff)
• particles.h (modified) (3 diffs)

library/bdm/estim/particles.cpp

@@ -43 +43 @@
     bayes_weights();
 
+        if (log_level[logweights]) {
+                log_level.store( logweights, w);
+        }
+        
     if ( do_resampling() ) {
         resample ( );

library/bdm/estim/particles.h

@@ -408 +408 @@
     void log_write ( ) const {
         BM::log_write();
-        if (log_level[logweights]) {
-            log_level.store( logweights, w);
-        }
+                // weigths are before resamplign -- bayes
         if (log_level[logmeans]) {
             for (int i=0; i<particles.length(); i++) {
@@ -731 +729 @@
 
                         vec z_y =h->eval(h_args)-dt;
-                        ARX *abm = dynamic_cast<ARX*>(bmy.get());
-                        double ll2;
+//                      ARX *abm = dynamic_cast<ARX*>(bmy.get());
+/*                      double ll2;
                         if (abm){ //ARX
                                 shared_ptr<epdf> pr_y(abm->epredictor_student(empty_vec));
@@ -739 +737 @@
                                 shared_ptr<epdf> pr_y(bmy->epredictor(empty_vec));
                                 ll2=pr_y->evallog(z_y);
-                        }
+                        }*/
                         
                         bmy->bayes(z_y);
                         // test _lls
-                        ll= ll2;//bmy->_ll();
+                        ll= bmy->_ll();
                 }
                 void from_setting(const Setting &set) {