Show
Ignore:
Timestamp:
07/27/09 13:12:23 (15 years ago)
Author:
smidl
Message:

merger changes + corresponding fixes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • applications/bdmtoolbox/tutorial/merging/merge_frag.m

    r411 r429  
    66% Sources 
    77f1.class= 'enorm<ldmat>'; 
    8 f1.mu   = 3; 
     8f1.mu   = 5; 
    99f1.R    = 1; 
    1010f1.rv   = b; 
     
    1313Merger.class='merger_mix'; 
    1414Merger.method='lognormal'; 
    15 Merger.beta=2; 
     15Merger.beta=1.2; 
    1616Merger.ncoms=20; 
    17 Merger.stop_niter=5; 
     17Merger.stop_niter=50; 
    1818Merger.effss_coef=1; 
    1919%Merger.dbg_file='merger_mix_dbg'; 
     
    2323f3 = struct('class','enorm<ldmat>',... 
    2424    'mu',[1,2],... 
    25     'R',  [2 0; 0 1.5],... 
     25    'R',  [1 -0.5; -0.5 1],... 
    2626    'rv', ab); 
    27 f4 = struct('class','egiw',... 
    28     'V',4*[5 2; 2 1],... 
    29     'nu',  4,... 
    30     'dimx',  1,... 
    31     'rv', ab); 
     27f4 = struct('class','mlnorm<ldmat>',... 
     28    'rv',a,... 
     29    'rvc', b,... 
     30    'A',  1,... 
     31    'const', 0,... 
     32    'R',1); 
    3233% 2D support 
    33 support2.grid={[-5,5],[0.001,5]}; 
    34 support2.nbins=[20,20]; 
     34support2.grid={[-5,5],[0.001,9]}; 
     35support2.nbins=[30,30]; 
    3536 
    3637% 2D 
    37 vy2=merger({f3,f1}, support2, Merger) 
    38 X=zeros(support2.nbins(1)); 
    39 Y=zeros(support2.nbins(1)); 
    40 Z=zeros(support2.nbins(1)); 
     38%vy2=merger({f3,f1}, support2, Merger) 
     39vy2=merger({f3,f4}, support2, Merger) 
    4140 
    4241figure(2); 
    43 subplot(1,3,1); 
     42subplot(2,2,1); 
     43contour_2(vy2.support(1,:),vy2.support(2,:),vy2.source1) 
     44% set(gca,'XLim',[-5,5]) 
     45% set(gca,'YLim',[-1,7]) 
     46title('Source 1') 
     47subplot(2,2,2); 
     48contour_2(vy2.support(1,:),vy2.support(2,:),vy2.source2') 
     49% set(gca,'XLim',[-5,5]) 
     50% set(gca,'YLim',[-1,7]) 
     51title('Source 2') 
     52 
     53subplot(2,2,3); 
     54hold off 
     55contour_2(vy2.support(1,:),vy2.support(2,:),vy2.mix) 
     56% set(gca,'XLim',[-5,5]) 
     57% set(gca,'YLim',[-1,7]) 
     58title('Mixture Approximation') 
     59 
     60subplot(2,2,4); 
    4461hold off 
    4562plot(vy2.support(1,:),vy2.support(2,:),'.','MarkerSize',4) 
    4663hold on 
    4764contour_2(vy2.support(1,:),vy2.support(2,:),vy2.weights) 
    48 subplot(1,3,2); 
    49 contour_2(vy2.support(1,:),vy2.support(2,:),vy2.source1) 
    50 subplot(1,3,3); 
    51 contour_2(vy2.support(1,:),vy2.support(2,:),vy2.source2) 
     65% set(gca,'XLim',[-5,5]) 
     66% set(gca,'YLim',[-1,7]) 
     67title('Weighted Empirical') 
     68