Changeset 197 for bdm/estim/merger.cpp

Timestamp:

11/04/08 14:54:33 (16 years ago)

Author:

smidl

Message:

opravy v bdm

Files:

• bdm/estim/merger.cpp (modified) (5 diffs)

bdm/estim/merger.cpp

@@ -47 +47 @@
         mat V0=1e-8*eye ( rv.count() +1 );
         ARX A0 ( RV ( "{th_r  }", vec_1 ( rv.count() * ( rv.count() +1 ) ) ),\
-                 V0, rv.count() *rv.count() +3.0 ); //initial guess of Mix: zero mean, large variance
+                 V0, rv.count() *rv.count() +5.0 ); //initial guess of Mix: zero mean, large variance
+
+        Mix.init ( &A0, Smp_ex, Nc );
+        //Preserve initial mixture for repetitive estimation via flattening
+        MixEF Mix_init(Mix);
 
         // ============= MAIN LOOP ==================
@@ -59 +63 @@
                 //Re-estimate Mix
                 //Re-Initialize Mixture model
-                Mix.init ( &A0, Smp_ex, Nc );
+                Mix.flatten(&Mix_init);
                 Mix.bayesB ( Smp_ex, w*Ns );
                 Mpred = Mix.predictor ( rv ); // Allocation => must be deleted at the end!!
 
-                if ( 1 ) {
-                        // Generate new samples
-                        eSmp.set_samples ( Mpred );
-                        for ( int i=0;i<Ns;i++ ) {      set_col_part ( Smp_ex,i,Smp ( i ) );}
-                }
-                else {
-                        for ( int ii=0;ii<10;ii++ ) {
-                                for ( int jj=0; jj<10; jj++ ) {
-                                        Smp ( ii+jj*10 ) =vec_2 ( -1.0+6*ii/10.0, -1.0+6*jj/10.0 );
-                                }
-                        }
-                        for ( int i=0;i<Ns;i++ ) {      set_col_part ( Smp_ex,i,Smp ( i ) );}
-                }
+                sprintf ( str,"Mpred_mean%d",niter );
+                dbg << Name ( str ) << Mpred->mean();
+
+                // Generate new samples
+                eSmp.set_samples ( Mpred );
+                for ( int i=0;i<Ns;i++ ) {      set_col_part ( Smp_ex,i,Smp ( i ) );}
 
                 sprintf ( str,"Mpdf%d",niter );
@@ -109 +106 @@
                                 if ( rv.count() > ( mpdfs ( i )->_rv().count() + mpdfs ( i )->_rvc().count() ) ) {
                                         ///////////////
-                                        cout << Mpred->mean() <<endl;
                                         // There are variales unknown to mpdfs(i) : rvzs
                                         mpdf* tmp_cond = Mpred->condition ( rvzs ( i ) );
@@ -127 +123 @@
                                         lw_src ( k ) += mpdfs ( i )->_epdf().evalpdflog ( dls ( i )->get_val ( Smp ( k ) ) );
                                 }
-                                
+
                         }
                         lW.set_row ( i, lw_src ); // do not divide by mix
@@ -161 +157 @@
                 // ==== stopping rule ===
                 niter++;
-                converged = ( niter>4 );
+                converged = ( niter>9 );
         }