Changeset 1013 for applications/bdmtoolbox

Timestamp:

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

Author:

smidl

Message:

Flatten has an extra argument

Location:

applications/bdmtoolbox

Files:

• mex/mixef_init.cpp (modified) (1 diff)
• tutorial/userguide/mixef_basic.m (modified) (4 diffs)

applications/bdmtoolbox/mex/mixef_init.cpp

@@ -54 +54 @@
         MixEF mix;
         mix.init(&(*com1),Data,no_com);
-        mix.bayes_batch(Data,zeros(0,Data.cols()),ones(Data.cols()));
+//      mix.bayes_batch(Data,zeros(0,Data.cols()));
         shared_ptr<epdf> p=mix.epredictor(vec(0));
         UIFile prf;

applications/bdmtoolbox/tutorial/userguide/mixef_basic.m

@@ -5 +5 @@
 com.rgr = RV({},[],[]);
 
-Data = randn(2,20);
+Data = [randn(2,50) randn(2,50)+10*ones(2,50)];
 
 [Mix0,P0]=mixef_init(Data,com);
-
 % show predictor
 
 Pred = bm_epredictor(Mix0);
+figure(1);
+hold off
+plot(Data(1,:), Data(2,:),'.');
+hold on
 epdf_2dplot(Pred);
 
@@ -29 +32 @@
     % normalize weights
     w = exp(log_w_nn-max(log_w_nn));
-    w = w/sum(w);
+    w = w/sum(w)
     
     for c=1:n
         yt = Data(:,t);
-        [MixQB.Coms{c}]=bm_bayes(MixQB.Coms{c}, yt);
+        [MixQB.Coms{c}]=bm_bayesweighted(MixQB.Coms{c}, yt, [], w(c));
     end
+    MixQB.weights = bm_bayes(MixQB.weights, w);
 end
 toc
@@ -40 +44 @@
 tic
 % should be the same as:
-% MixQBc = bm_bayes_batch(MixQB,Data);
+MixQBc = bm_bayes_batch(MixQB,Data);
 toc
 
 %% display results
 
+PredQB = bm_epredictor(MixQB);
 figure(2);
-PredQB = bm_epredictor(MixQB);
-epdf_2dplot(Pred);
+hold off
+plot(Data(1,:), Data(2,:),'.');
+hold on
+epdf_2dplot(PredQB);
 
 %% relations between components
@@ -56 +63 @@
     end
 end
+figure(3)
 imagesc(Batta_dist);