Show
Ignore:
Timestamp:
06/10/10 21:54:57 (14 years ago)
Author:
smidl
Message:

Changes in merger + change in loading ARX

Location:
applications/bdmtoolbox/tutorial/merging
Files:
3 modified

Legend:

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

    r706 r1079  
    66 
    77% merger  
    8 Merger.class='merger_base'; 
     8Merger.class='MergerDiscrete'; 
    99Merger.beta=1; 
    1010 
     
    4848 
    4949% 2D support 
    50 type=1; 
     50type=0; 
    5151if type==0 
    5252    support2.class='rectangular_support'; 
  • applications/bdmtoolbox/tutorial/merging/merge_mix.m

    r706 r1079  
    11% Random Variables 
    2 a=struct('class','RV','names',{{'a'}}); 
    3 b=struct('class','RV','names',{{'b'}}); 
    4 ab=struct('class','RV','names',{{'a','b'}}); 
     2a=RV('a'); 
     3b=RV('b'); 
     4ab=RV({'a','b'}); 
    55 
    66% Sources 
     
    1717 
    1818% merger  
    19 merger.class='merger_mix'; 
    20 merger.method='lognormal'; 
    21 merger.beta=2; 
    22 merger.ncoms=20; 
    23 merger.stop_niter=5; 
    24 merger.effss_coef=1; 
     19M.class='merger_mix'; 
     20M.method='lognormal'; 
     21M.beta=2; 
     22M.ncoms=20; 
     23M.stop_niter=5; 
     24M.effss_coef=1; 
    2525%merger.dbg_file='merger_mix_dbg'; 
    2626 
    2727% support 
    28 support.grid={[-5,5]}; 
    29 support.nbins=[100]; 
     28support.class='rectangular_support'; 
     29support.ranges={[-5,5]}; 
     30support.gridsizes=[100]; 
    3031 
    3132% 1D 
    32 [vy]=merger_mx({f1,f2},support,merger) 
     33[vy]=merger({f1,f2},support,M) 
    3334figure(1) 
    3435hold off 
     
    4849    'rv', ab); 
    4950f4 = struct('class','egiw',... 
    50     'V',4*[5 2; 2 1],... 
     51    'fV',4*[5 2; 2 1],... 
    5152    'nu',  4,... 
    5253    'dimx',  1,... 
    5354    'rv', ab); 
    5455% 2D support 
    55 support2.grid={[-5,5],[0.001,5]}; 
    56 support2.nbins=[20,20]; 
     56support2.class='rectangular_support'; 
     57support2.ranges={[-5,5],[0.001,5]}; 
     58support2.gridsizes=[20,20]; 
    5759 
    5860% 2D 
    59 vy2=merger_mx({f3,f4},support2,merger) 
    60 X=zeros(support2.nbins(1)); 
    61 Y=zeros(support2.nbins(1)); 
    62 Z=zeros(support2.nbins(1)); 
     61vy2=merger({f3,f4},support2,M) 
     62X=zeros(support2.gridsizes(1)); 
     63Y=zeros(support2.gridsizes(1)); 
     64Z=zeros(support2.gridsizes(1)); 
    6365 
    6466figure(2); 
  • applications/bdmtoolbox/tutorial/merging/pdfs.m

    r803 r1079  
    3333    'rv', ab); 
    3434GiW = struct('class','egiw',... 
    35     'V',4*[2^2+1 2; 2 1],... 
     35    'fV',4*[2^2+1 2; 2 1],... 
    3636    'nu',  8,... 
    3737    'dimx',  1,...