Changeset 411

Timestamp:

07/02/09 22:16:20 (15 years ago)

Author:

smidl

Message:

merger finalization

Location:

applications/bdmtoolbox

Files:

• mex/config2mxstruct.cpp (modified) (1 diff)
• mex/merger.cpp (modified) (1 diff)
• tutorial/merging/merge_frag.m (modified) (2 diffs)

applications/bdmtoolbox/mex/config2mxstruct.cpp

@@ -1 +1 @@
 #include <mex/config2mxstruct.h>
+#include <base/user_info.h>
 
 void mexFunction ( int n_output, mxArray *output[], int n_input, const mxArray *input[] ) {
-        string filename = mxArray2string(input[0]);
-        UImxConfig C (filename.c_str());
-        output[0] = mxDuplicateArray(C.mxconfig);
+        if (n_input>0){
+                string filename = mxArray2string(input[0]);
+                try{
+                        UImxConfig C (filename.c_str());
+                        if (n_output>0)
+                                output[0] = mxDuplicateArray(C.mxconfig);
+                }catch(SettingException xcptn){
+                        cout<<"Error in:" + string(xcptn.getPath()) <<endl;
+                }
+                catch(exception e){
+                        cout <<e.what() <<endl;
+                }
+        }
 }

applications/bdmtoolbox/mex/merger.cpp

@@ -8 +8 @@
 #endif
 
+/*! \file 
+\brief Merging static pdfs
+Merger is a program/mex-function for static merging of given pdfs on given support.
+
+In command line, it expected config file with the following structure:
+\code
+Sources = (... any epdf or mpdf  ...);
+Support = {grid=([low1d,high1d],[low2d,high2d],...);
+                   nbins=[bins1d,bins2d,... ]}; 
+// OR
+Support = {pdf={class='epdf',...};
+                   nsamples=2}; 
+Merger = {class="merger_base",...}
+\endcode
+
+In mex-file, the above structures (Sources,Support,Merger) are input arguments. Type >>merger for help.
+*/
+
 using namespace bdm;
 
-#ifdef MEX
+#ifdef MEX 
 void mexFunction(int n_output, mxArray *output[], int n_input, const mxArray *input[])
 {

applications/bdmtoolbox/tutorial/merging/merge_frag.m

@@ -11 +11 @@
 
 % merger 
-merger.class='merger_mix';
-merger.method='lognormal';
-merger.beta=2;
-merger.ncoms=20;
-merger.stop_niter=5;
-merger.effss_coef=1;
-%merger.dbg_file='merger_mix_dbg';
+Merger.class='merger_mix';
+Merger.method='lognormal';
+Merger.beta=2;
+Merger.ncoms=20;
+Merger.stop_niter=5;
+Merger.effss_coef=1;
+%Merger.dbg_file='merger_mix_dbg';
 
 
@@ -35 +35 @@
 
 % 2D
-vy2=merger_mx({f3,f1}, support2, merger)
+vy2=merger({f3,f1}, support2, Merger)
 X=zeros(support2.nbins(1));
 Y=zeros(support2.nbins(1));