Changeset 311 for bdm/estim/merger.cpp

Timestamp:

04/09/09 14:33:10 (15 years ago)

Author:

smidl

Message:

merger

Files:

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

bdm/estim/merger.cpp

@@ -57 +57 @@
 
                 //initialize importance weights
-                if ( !fix_smp ) 
-                        for ( int i=0;i<Ns;i++ ){
-                        lw_mix ( i ) =g0->evallog ( Smp ( i ) );
-                }
+                if ( !fix_smp )
+                        for ( int i=0;i<Ns;i++ )
+                        {
+                                lw_mix ( i ) =g0->evallog ( Smp ( i ) );
+                        }
 
                 // Initial component in the mixture model
@@ -78 +79 @@
                 vec Mix_pdf ( Ns );
                 while ( !converged )
-        {
-                //Re-estimate Mix
-                //Re-Initialize Mixture model
-                Mix.flatten ( &Mix_init );
+                {
+                        //Re-estimate Mix
+                        //Re-Initialize Mixture model
+                        Mix.flatten ( &Mix_init );
                         Mix.bayesB ( Smp_ex, w*Ns );
                         delete Mpred;
@@ -99 +100 @@
                                         //Importance of the mixture
                                         //lw_mix ( i ) =Mix.logpred (Smp_ex.get_col(i) );
-                                        lw_mix ( i ) = Mpred->evallog(Smp(i));
-                                }
-                                if ( 1 )
+                                        lw_mix ( i ) = Mpred->evallog ( Smp ( i ) );
+                                }
+                                if ( 0 )
                                 {
                                         cout<<"Resampling =" << 1./sum_sqr ( w ) << endl;