Changeset 407

Timestamp:

07/02/09 22:16:11 (16 years ago)

Author:

smidl

Message:

clean up of bdmdir mex - merger is now in one .cpp file

Files:

• applications/bdmtoolbox/mex/CMakeLists.txt (modified) (1 diff)
• applications/bdmtoolbox/mex/bm_kolo.sh (deleted)
• applications/bdmtoolbox/mex/bm_note.sh (deleted)
• applications/bdmtoolbox/mex/buildmex.bat (deleted)
• applications/bdmtoolbox/mex/buildmex.sh (deleted)
• applications/bdmtoolbox/mex/merger.cpp (modified) (4 diffs)
• applications/bdmtoolbox/mex/merger_mx.cpp (deleted)
• applications/bdmtoolbox/mex/mexopts-opt.bat (deleted)
• library/system/SetBdmEnv.cmake (modified) (1 diff)

applications/bdmtoolbox/mex/CMakeLists.txt

@@ -1 +1 @@
 IF(MEX_COMPILER)
 
-MEX(merger_mx)
+MEX(merger)
 EXEC(merger)
 MEX(config2mxstruct)

applications/bdmtoolbox/mex/merger.cpp

@@ -1 +1 @@
 #include <stat/merger.h>
+
+#ifdef MEX
+#include <itpp/itmex.h>
+#include <mex/mex_logger.h>
+#include <mex/mex_parser.h>
+#include <mex/config2mxstruct.h>
+#endif
 
 using namespace bdm;
 
-int main()
+#ifdef MEX
+void mexFunction(int n_output, mxArray *output[], int n_input, const mxArray *input[])
 {
-  UIFile Cfg("merger_mx.cfg");
-        
+    // Check the number of inputs and output arguments
+        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 Cfg;
+        Cfg.addList(input[0],"Sources");
+        Cfg.addGroup(input[1],"Support");
+        Cfg.addGroup(input[2],"Merger");
+
+        //DBG
+        Cfg.writeFile("merger.cfg");
+#else
+        int main()
+        {
+                UIFile Cfg("merger.cfg");
+#endif  
         // Sources
         Array<mpdf*> Sources;
@@ -24 +58 @@
                                 if (etmp){
                                         Sources(i) = new mepdf(etmp, true);
-                                }
-                                
+                                }                               
                         }
                         catch (UIException e) 
@@ -33 +66 @@
                         catch (std::exception e) {
                                 it_error("Error in UI at "+_Sources[i].getPath());
-                        }               
+                        }
                 }
                 catch (std::exception e) {
                         it_error("Error in UI at "+_Sources[i].getPath());
-                }               
+                }
         }
 
@@ -66 +99 @@
         Merger->merge();
         
+// save results
+        
+#ifdef MEX
+        mxArray* tmp ;
+        // Save results
+        if (n_output>0){
+                tmp = mxCreateStructMatrix(1,1,0,NULL);
+                //support
+                Array<vec> &samples=Merger->_Smp()._samples();
+                if (samples.size()>0){
+                        mxArray* fld=mxCreateDoubleMatrix(samples(0).length(), samples.size(), mxREAL);
+                Arrayvec2mxArray(samples,fld);
+                mxReplaceFieldNM(tmp, "support", fld);
+                }
+
+                //weights
+                vec &w = Merger->_Smp()._w();
+                mxArray* fldw=mxCreateDoubleMatrix(1, w.length(), mxREAL);
+                vec2mxArray(w,fldw);
+                mxReplaceFieldNM(tmp, "weights", fldw);
+
+                // sources
+                char srcstr[20];
+                for (int i=0;i<Sources.length();i++){
+                        sprintf(srcstr,"source%d",i+1);
+                        vec sll=exp(Sources(i)->evallogcond_m(Merger->_Smp()._samples(),vec(0)));
+
+                        mxArray* fldw=mxCreateDoubleMatrix(1, sll.length(), mxREAL);
+                        vec2mxArray(sll/sum(sll),fldw);
+                        mxReplaceFieldNM(tmp, srcstr, fldw);
+                }               
+
+                output[0] = tmp;
+        }
+#endif
 }

library/system/SetBdmEnv.cmake

@@ -100 +100 @@
         INCLUDE_DIRECTORIES(${MATLAB_INCLUDE_DIR} "${BDM_SOURCE_DIR}/bdm")
         LINK_DIRECTORIES("${BDM_SOURCE_DIR}/bdm")
-        ADD_LIBRARY(${FN} MODULE ${FN}.cpp)
-        set_target_properties(${FN} PROPERTIES
+        ADD_LIBRARY("${FN}.${MATLAB_MEX_SUFFIX}" MODULE ${FN}.cpp)
+        set_target_properties("${FN}.${MATLAB_MEX_SUFFIX}" PROPERTIES
                 PREFIX ""
-                SUFFIX  ${MATLAB_MEX_SUFFIX}
+                SUFFIX "" 
+                COMPILE_FLAGS "-DMEX"
         )
-        TARGET_LINK_LIBRARIES(${FN} ${MATLAB_LIBRARIES} bdm itpp)
+        TARGET_LINK_LIBRARIES("${FN}.${MATLAB_MEX_SUFFIX}" ${MATLAB_LIBRARIES} bdm itpp)
 ENDMACRO(MEX)