Changeset 1079 for applications/bdmtoolbox

Timestamp:

06/10/10 21:54:57 (14 years ago)

Author:

smidl

Message:

Changes in merger + change in loading ARX

Location:

applications/bdmtoolbox

Files:

• mex/merger.cpp (modified) (3 diffs)
• tutorial/merging/merge_grid.m (modified) (2 diffs)
• tutorial/merging/merge_mix.m (modified) (3 diffs)
• tutorial/merging/pdfs.m (modified) (1 diff)

applications/bdmtoolbox/mex/merger.cpp

@@ -59 +59 @@
         Array<shared_ptr<pdf> >  Sources;
         UI::get(Sources, Cfg, "Sources", UI::compulsory);
-        shared_ptr<merger_base> Merger = UI::build<merger_base> ( Cfg, "Merger" );
+        shared_ptr<MergerDiscrete> Merger = UI::build<MergerDiscrete> ( Cfg, "Merger" );
 
         // Support
@@ -82 +82 @@
         for ( int i = 0;i < Sources.length();i++ ) {
                 datalink_m2e dl;
-                dl.set_connection ( Sources ( i )->_rv(), Sources ( i )->_rvc(), Merger->_rv() );
+                dl.set_connection ( Sources ( i )->_rv(), Sources ( i )->_rvc(), Merger->merger()._rv() );
 
                 vec ll ( Merger->_Smp()._samples().length() );
@@ -102 +102 @@
                 vec ll ( Merger->_Smp()._samples().length() );
                 for ( int j = 0; j < Merger->_Smp()._samples().length(); j++ ) {
-                        ll ( j ) = Merger->evallog ( Merger->_Smp()._samples() ( j ) );
+                        ll ( j ) = MerMix->merger()._w ()(j);
                 }
 

applications/bdmtoolbox/tutorial/merging/merge_grid.m

@@ -6 +6 @@
 
 % merger 
-Merger.class='merger_base';
+Merger.class='MergerDiscrete';
 Merger.beta=1;
 
@@ -48 +48 @@
 
 % 2D support
-type=1;
+type=0;
 if type==0
     support2.class='rectangular_support';

applications/bdmtoolbox/tutorial/merging/merge_mix.m

@@ -1 +1 @@
 % Random Variables
-a=struct('class','RV','names',{{'a'}});
-b=struct('class','RV','names',{{'b'}});
-ab=struct('class','RV','names',{{'a','b'}});
+a=RV('a');
+b=RV('b');
+ab=RV({'a','b'});
 
 % Sources
@@ -17 +17 @@
 
 % merger 
-merger.class='merger_mix';
-merger.method='lognormal';
-merger.beta=2;
-merger.ncoms=20;
-merger.stop_niter=5;
-merger.effss_coef=1;
+M.class='merger_mix';
+M.method='lognormal';
+M.beta=2;
+M.ncoms=20;
+M.stop_niter=5;
+M.effss_coef=1;
 %merger.dbg_file='merger_mix_dbg';
 
 % support
-support.grid={[-5,5]};
-support.nbins=[100];
+support.class='rectangular_support';
+support.ranges={[-5,5]};
+support.gridsizes=[100];
 
 % 1D
-[vy]=merger_mx({f1,f2},support,merger)
+[vy]=merger({f1,f2},support,M)
 figure(1)
 hold off
@@ -48 +49 @@
     'rv', ab);
 f4 = struct('class','egiw',...
-    'V',4*[5 2; 2 1],...
+    'fV',4*[5 2; 2 1],...
     'nu',  4,...
     'dimx',  1,...
     'rv', ab);
 % 2D support
-support2.grid={[-5,5],[0.001,5]};
-support2.nbins=[20,20];
+support2.class='rectangular_support';
+support2.ranges={[-5,5],[0.001,5]};
+support2.gridsizes=[20,20];
 
 % 2D
-vy2=merger_mx({f3,f4},support2,merger)
-X=zeros(support2.nbins(1));
-Y=zeros(support2.nbins(1));
-Z=zeros(support2.nbins(1));
+vy2=merger({f3,f4},support2,M)
+X=zeros(support2.gridsizes(1));
+Y=zeros(support2.gridsizes(1));
+Z=zeros(support2.gridsizes(1));
 
 figure(2);

applications/bdmtoolbox/tutorial/merging/pdfs.m

@@ -33 +33 @@
     'rv', ab);
 GiW = struct('class','egiw',...
-    'V',4*[2^2+1 2; 2 1],...
+    'fV',4*[2^2+1 2; 2 1],...
     'nu',  8,...
     'dimx',  1,...