Changeset 464 for library

Show
Ignore:
Timestamp:
08/01/09 00:36:00 (15 years ago)
Author:
smidl
Message:

merger adapted to changes + fixes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • library/bdm/stat/emix.cpp

    r460 r464  
    66        w = w0/sum ( w0 ); 
    77        dim = Coms0(0)->dimension(); 
     8        bool isnamed = Coms0(0)->isnamed(); 
    89        int i; 
    9         RV tmp_rv=Coms0(0)->_rv(); 
     10        RV tmp_rv; 
     11        if (isnamed) tmp_rv=Coms0(0)->_rv(); 
     12         
    1013        for ( i=0;i<w.length();i++ ) { 
    1114                it_assert_debug ( dim== ( Coms0 ( i )->dimension() ),"Component sizes do not match!" );  
    12                 it_assert_debug ( tmp_rv.equal( Coms0 ( i )->_rv() ),"Component RVs do not match!" ); 
     15                it_assert_debug ( !isnamed || tmp_rv.equal( Coms0 ( i )->_rv() ),"Component RVs do not match!" ); 
    1316        } 
    1417        if ( copy ) { 
     
    2225                destroyComs=false; 
    2326        } 
    24         if (tmp_rv._dsize()==dim) epdf::set_rv(tmp_rv); //coms aer already OK, no need for set_rv 
     27        if (isnamed) epdf::set_rv(tmp_rv); //coms aer already OK, no need for set_rv 
    2528} 
    2629