Changeset 429 for applications/bdmtoolbox/mex/merger.cpp

Timestamp:

07/27/09 13:12:23 (15 years ago)

Author:

smidl

Message:

merger changes + corresponding fixes

Files:

• applications/bdmtoolbox/mex/merger.cpp (modified) (3 diffs)

applications/bdmtoolbox/mex/merger.cpp

@@ -118 +118 @@
         
 // save results
+        Array<vec> source_vals(Sources.length());
+                for (int i=0;i<Sources.length();i++){
+                        datalink_m2e dl;
+                        dl.set_connection(Sources(i)->_rv(), Sources(i)->_rvc(), Merger->_rv());
+                        
+                        vec ll(Merger->_Smp()._samples().length());
+                        for(int j=0; j<Merger->_Smp()._samples().length(); j++){
+                                vec dt=dl.pushdown(Merger->_Smp()._samples()(j));
+                                vec dtc=dl.get_cond(Merger->_Smp()._samples()(j));
+                                ll(j)=Sources(i)->evallogcond(dt,dtc);
+                        }
+
+                        vec sll = exp(ll);
+                        
+                        source_vals(i)=sll/sum(sll);
+                }               
+
+                        vec ll(Merger->_Smp()._samples().length());
+                        for(int j=0; j<Merger->_Smp()._samples().length(); j++){
+                                ll(j)=Merger->evallog(Merger->_Smp()._samples()(j));
+                        }
+
+                        vec sll = exp(ll);
+                        
+                        vec mix_val=sll/sum(sll);
+                
         
 #ifdef MEX
@@ -137 +163 @@
                 vec2mxArray(w,fldw);
                 mxReplaceFieldNM(tmp, "weights", fldw);
+                
+                //mixture values
+                mxArray* fldm=mxCreateDoubleMatrix(1, w.length(), mxREAL);
+                vec2mxArray(mix_val,fldm);
+                mxReplaceFieldNM(tmp, "mix", fldm);
 
                 // sources
@@ -142 +173 @@
                 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);
+                        mxArray* fldw=mxCreateDoubleMatrix(1, source_vals(i).length(), mxREAL);
+                        vec2mxArray(source_vals(i),fldw);
                         mxReplaceFieldNM(tmp, srcstr, fldw);
                 }