Changeset 395 for applications/bdmtoolbox

Timestamp:

06/22/09 13:17:49 (16 years ago)

Author:

smidl

Message:

merging works for merger_mx

Files:

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

applications/bdmtoolbox/mex/merger_mx.cpp

@@ -83 +83 @@
         Merger->set_sources(Sources,true); // takes care of deletion of sources
         Merger->merge();
-        
+
+        mxArray* tmp ;
         // Save results
         if (n_output>0){
-                mxArray* tmp = mxCreateStructMatrix(1,1,0,NULL);
+                tmp = mxCreateStructMatrix(1,1,0,NULL);
                 //support
                 Array<vec> &samples=Merger->_Smp()._samples();
@@ -100 +101 @@
                 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;
         }