Changeset 190 for matlab

Timestamp:

10/22/08 10:46:38 (16 years ago)

Author:

smidl

Message:

adaptation of merger for changes and creation of datalink class

Files:

• matlab/merger_iter_debug.m (modified) (2 diffs)

matlab/merger_iter_debug.m

@@ -3 +3 @@
 ndat = 1000; % check if true!
 
+XL = [-1 4];
+YL= XL;
+
 figure(1);
-for it=0:6
+for it=0:20
     figure(it+1)
     subplot(2,2,1);
-    hold off
     si = num2str(it);
-    eval(['plot3(Smp' si '(1,:),Smp' si '(2,:),exp(Mpdf' si '),''r.'')']);
-    if i==0, title('Proposal & mix'); end
-    set(gca,'XLim',[-10,10]);
+    eval(['contour_2(Smp' si '(1,:),Smp' si '(2,:),exp(Mpdf' si '))']);
+    title('Proposal density ');
+    set(gca,'XLim',XL);
+    set(gca,'YLim',YL);
         
     subplot(2,2,2);
-    hold off
     eval(['contour_2(Smp' si '(1,:),Smp' si '(2,:),exp(lW' si '(1,:)))']);
-%    hold on
-%    eval(['plot3(Smp' si '(1,:),Smp' si '(2,:),w' si ',''r.'')']);
-    if i==0, title('Weighed Smp'); end
+    title('First source'); 
+    set(gca,'XLim',XL);
+    set(gca,'YLim',YL);
     
     subplot(2,2,3);
-    hold off
     eval(['contour_2(Smp' si '(1,:),Smp' si '(2,:),exp(lW' si '(2,:)))']);
-%    eval(['plot3(Smp' si '(1,:),Smp' si '(2,:),w' si ',''.'')']);
-%    hold on
-%    eval(['plot3(Smp' si '(1,:),Smp' si '(2,:),w_is_' si ',''r.'')']);
-    if i==0, title('Weighed Smp'); end
+    title('Second source');
+    set(gca,'XLim',XL);
+    set(gca,'YLim',YL);
     
     
     subplot(2,2,4);
     eval(['contour_2(Smp' si '(1,:),Smp' si '(2,:),w' si ')']);
-    if i==0, title('Resampled hist'); end
+    title('Merged density'); 
+    set(gca,'XLim',XL);
+    set(gca,'YLim',YL);
     
-  %  keyboard
 end
 
@@ -43 +44 @@
 figure(it+2);
 M1 = reshape(exp(Res1),Npoints,Npoints);
-contour(XG,YG,M1);
+contour(XG,YG,M1,7);
 
 figure(it+3);
-M2 = reshape(exp(Res2),Npoints,Npoints);
-contour(XG,YG,M2);
-
-figure(it+4);
-L1 = reshape(exp(lf1),Npoints,Npoints);
-contour(XG,YG,L1);
+hold off
+mm = max(max(Res2));
+for i=1:size(Res2,1)
+    M2 = reshape(Res2(i,:),Npoints,Npoints);
+    contour(XG,YG,M2,[0:mm/7:mm]);
+    hold on
+end