Changeset 464 for applications/bdmtoolbox

Timestamp:

08/01/09 00:36:00 (15 years ago)

Author:

smidl

Message:

merger adapted to changes + fixes

Files:

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

applications/bdmtoolbox/mex/merger.cpp

@@ -128 +128 @@
         }
 
-        vec ll (Merger->_Smp()._samples().length());
-        for (int j = 0; j < Merger->_Smp()._samples().length(); j++) {
-                ll (j) = Merger->evallog (Merger->_Smp()._samples() (j));
+        merger_mix* MerMix=dynamic_cast<merger_mix*>(Merger);
+        vec mix_val;
+                        
+        if (MerMix){
+                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);
+        
+                mix_val = sll / sum (sll);
         }
-
-        vec sll = exp (ll);
-
-        vec mix_val = sll / sum (sll);
-
 
 #ifdef MEX
@@ -158 +162 @@
 
                 //mixture values
-                mxArray* fldm = mxCreateDoubleMatrix (1, w.length(), mxREAL);
-                vec2mxArray (mix_val, fldm);
-                mxReplaceFieldNM (tmp, "mix", fldm);
-
+                if (mix_val.length()>0){
+                        mxArray* fldm = mxCreateDoubleMatrix (1, w.length(), mxREAL);
+                        vec2mxArray (mix_val, fldm);
+                        mxReplaceFieldNM (tmp, "mix", fldm);
+                }
                 // sources
                 char srcstr[20];