Changeset 464

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)
• library/bdm/stat/emix.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];

library/bdm/stat/emix.cpp

@@ -6 +6 @@
         w = w0/sum ( w0 );
         dim = Coms0(0)->dimension();
+        bool isnamed = Coms0(0)->isnamed();
         int i;
-        RV tmp_rv=Coms0(0)->_rv();
+        RV tmp_rv;
+        if (isnamed) tmp_rv=Coms0(0)->_rv();
+        
         for ( i=0;i<w.length();i++ ) {
                 it_assert_debug ( dim== ( Coms0 ( i )->dimension() ),"Component sizes do not match!" ); 
-                it_assert_debug ( tmp_rv.equal( Coms0 ( i )->_rv() ),"Component RVs do not match!" );
+                it_assert_debug ( !isnamed || tmp_rv.equal( Coms0 ( i )->_rv() ),"Component RVs do not match!" );
         }
         if ( copy ) {
@@ -22 +25 @@
                 destroyComs=false;
         }
-        if (tmp_rv._dsize()==dim) epdf::set_rv(tmp_rv); //coms aer already OK, no need for set_rv
+        if (isnamed) epdf::set_rv(tmp_rv); //coms aer already OK, no need for set_rv
 }