Changeset 388 for applications

Timestamp:

06/19/09 11:43:48 (16 years ago)

Author:

smidl

Message:

mergers

Files:

• applications/bdmtoolbox/mex/merger_mx.cpp (modified) (2 diffs)

applications/bdmtoolbox/mex/merger_mx.cpp

@@ -10 +10 @@
 {
     // Check the number of inputs and output arguments
-        if(n_input!=1) mexErrMsgTxt("Configuration structure expected in the form:\n"  
-                "S.sources = { };                          % cell of pdfs (epdfs or mpdfs) to be merged,\n"
-                "S.merger= struct('class','merger_*');     % object to be used for merging,\n\n"
+        if(n_input!=3) mexErrMsgTxt("Usage:\n"  
+                "result=merger(sources, support, merger)\n"
+                "  sources= { struct('class','epdf'),... };  % cell of pdfs (epdfs or mpdfs) to be merged,\n"
+                "  support= struct(\n"
+                "           grid    = {[dim1_start,dim1_end], [dim2_start, dim2_end]...}  %support boundary \n"   
+                "           nbins   = [bins_in_dim1, bins_in_dim2,...]                    %fixed \n"   
+                "         === OR ==\n"
+                "           pdf     = struct('class','epdf'); % pdf to draw samples from\n"
+                "           nsamples= 100;                    % number of samples\n"
+                "           );\n"
+                "        If all elements are present,  (grid,nbins) is used;\n"
+                "  merger = struct('class','merger_*');       % object to be used for merging,\n\n"
                 "see documentation of classes epdf, mpdf, merger_base and their offsprings in BDM.");
 
         // LOAD CONFIG
-        UImxArray F (input[0]);
+        UImxArray Src;
+        Src.addList(input[0],"Sources");
+        
+        UImxArray Sup (input[1]);
+        UImxArray Mer (input[2]);
+        // Sources
+        Array<mpdf*> Sources;
+        //abuse Mer to store sources
 
-        Array<mpdf*> Sources;
-
-        Setting& _Sources=F.lookup("sources");
+        Setting& _Sources=Src.lookup("Sources");
         int Slen=_Sources.getLength();
         Sources.set_size(Slen);
@@ -35 +49 @@
 
         }
+
+        merger_base* Merger=UI::build<merger_base>(Mer.getRoot());
+
+        // Support
+        Setting & _Supp=Sup.getRoot();
         
-        merger_base* Merger=UI::build<merger_base>(F.getRoot(),"merger");
-
+        Array<vec> bounds (0);
+        UI::get (bounds, _Supp, "grid");
+        ivec nbins(0);
+        UI::get (nbins, _Supp, "nbins");
+        
+        epdf *g0=UI::build<epdf> (_Supp, "pdf");
+        int npoints=100;
+        _Supp.lookupValue("nsamples",npoints);
+        
 // COMPUTE RESULTS
-
+        Merger->set_sources(Sources,true); // takes care of deletion of sources
+        if (bounds.length() > 0 && nbins.length()>0) {
+                Merger->set_support (bounds,nbins);
+        } else {
+                if (g0) {
+                        Merger->set_support (*g0,npoints);
+                        delete g0;
+                }
+        }
         Merger->merge();
         
+        // Save results
         if (n_output>0){
                 mxArray* tmp = mxCreateStructMatrix(1,1,0,NULL);