Changeset 783 for library

Timestamp:

01/13/10 11:08:30 (14 years ago)

Author:

mido

Message:

mmix::validate corrected according the previous correction of emix::validate, but it does not pass through unit tests, where is the problem?

Files:

• library/bdm/stat/emix.cpp (modified) (2 diffs)

library/bdm/stat/emix.cpp

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