Changeset 679 for library/bdm/estim/mixtures.cpp

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/estim/mixtures.cpp (modified) (4 diffs)

library/bdm/estim/mixtures.cpp

@@ -30 +30 @@
                 //pick one datum
                 int ind = floor ( ndat * UniRNG.sample() );
-                Coms ( i )->bayes ( Data.get_col ( ind ), 1.0 );
+                Coms ( i )->bayes ( Data.get_col ( ind ), empty_vec );
                 //flatten back to oringinal
                 Coms ( i )->flatten ( Com0 );
@@ -41 +41 @@
 }
 
-void MixEF::bayesB ( const mat &data , const vec &wData ) {
+void MixEF::bayesB ( const mat &data , const mat &cond, const vec &wData ) {
         int ndat = data.cols();
         int t, i, niter;
@@ -106 +106 @@
                         //#pragma omp parallel for
                         for ( i = 0; i < n; i++ ) {
-                                Coms ( i )-> bayes ( data.get_col ( t ), W ( i, t ) * wData ( t ) );
+                                Coms ( i )-> bayes_weighted ( data.get_col ( t ), empty_vec, W ( i, t ) * wData ( t ) );
                         }
                         weights.bayes ( W.get_col ( t ) * wData ( t ) );
@@ -122 +122 @@
 }
 
-void MixEF::bayes ( const vec &data ) {
+void MixEF::bayes ( const vec &data, const vec &cond=empty_vec ) {
 
 };
 
-void MixEF::bayes ( const mat &data ) {
-        this->bayesB ( data, ones ( data.cols() ) );
+void MixEF::bayes ( const mat &data, const vec &cond=empty_vec ) {
+        this->bayesB ( data, cond, ones ( data.cols() ) );
 };
 
 
-double MixEF::logpred ( const vec &dt ) const {
+double MixEF::logpred ( const vec &yt ) const {
 
         vec w = weights.posterior().mean();
         double exLL = 0.0;
         for ( int i = 0; i < n; i++ ) {
-                exLL += w ( i ) * exp ( Coms ( i )->logpred ( dt ) );
+                exLL += w ( i ) * exp ( Coms ( i )->logpred ( yt ) );
         }
         return log ( exLL );