Changeset 780

Timestamp:

01/12/10 23:09:07 (14 years ago)

Author:

smidl

Message:

fix broken mixtures - test_suite was OK with this?

Location:

library/bdm

Files:

• estim/mixtures.cpp (modified) (1 diff)
• stat/emix.cpp (modified) (1 diff)

library/bdm/estim/mixtures.cpp

@@ -144 +144 @@
         for ( int i = 0; i < n; i++ ) {
                 pC ( i ) = Coms ( i )->epredictor ( );
+                pC (i) -> set_rv(_yrv());
         }
         emix* tmp;

library/bdm/stat/emix.cpp

@@ -12 +12 @@
         w = w / sum_w;
 
-        int dim = Coms ( 0 )->dimension();
-        for ( int i = 1; i < Coms.length(); i++ ) {
+        dim = Coms ( 0 )->dimension();
+        RV rv_tmp= Coms ( 0 )->_rv() ;
+        bool isnam=true;
+        for ( int i = 0; i < Coms.length(); i++ ) {
                 bdm_assert ( dim == ( Coms ( i )->dimension() ), "Component sizes do not match!" );
-                bdm_assert ( Coms(i)->isnamed() , "An unnamed component is forbidden here!" );
-        }
-
-        set_rv ( Coms ( 0 )->_rv() ); 
+                isnam &= Coms(i)->isnamed() & Coms(i)->_rv().equal(rv_tmp);
+        }
+        if (isnam)
+                set_rv ( rv_tmp); 
 }