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

Timestamp:

05/27/10 23:07:57 (14 years ago)

Author:

smidl

Message:

Mixtures example

Files:

• library/bdm/estim/mixtures.cpp (modified) (3 diffs)

library/bdm/estim/mixtures.cpp

@@ -18 +18 @@
 //      Coms(0)->set_evalll(false);
         Coms ( 0 )->bayes_batch ( Data );
-        // Flatten it to its original shape
-        shared_ptr<BMEF> SharpCom((BMEF*)Coms(0)->_copy());
+
         Coms ( 0 )->flatten ( Com0 ); 
 
@@ -34 +33 @@
                 } else { // pick at random
                         int ind = (int) floor ( ndat * UniRNG.sample() );
-                        Coms ( i )->bayes_weighted ( Data.get_col ( ind ), empty_vec, ndat/Coms.length() );
+                        Coms ( i )->bayes_weighted ( Data.get_col ( ind ), empty_vec, ndat );
+                        Coms (i)->flatten(Com0,ndat/Coms.length());
                 }
                 //sharpen to the sharp component
                 //Coms ( i )->flatten ( SharpCom.get(), 1.0/Coms.length() );
         }
+        MixEF_options old_opt =options;
+        MixEF_options ini_opt=options;
+        ini_opt.method = EM;
+        ini_opt.max_niter= 1;
+        bayes_batch(Data, empty_vec);
+        
+        for ( i = 0; i < Coms.length(); i++ ) {
+                Coms (i)->flatten(Com0);
+        }
+        
+        options = old_opt;
 }
 
@@ -83 +94 @@
 
                         maxll = max ( ll, maxi );
-                        switch ( method ) {
+                        switch ( options.method ) {
                         case QB:
                                 w = exp ( ll - maxll );