Changeset 787 for library/bdm/stat

Show
Ignore:
Timestamp:
01/14/10 21:37:57 (14 years ago)
Author:
smidl
Message:

arena experiment + numerical fixes

Files:
1 modified

Legend:

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

    r773 r787  
    163163        mat Tmp = zeros ( dim, dim ); 
    164164        for ( int i = 0; i < Npoints; i++ ) { 
    165                 Tmp += w ( i ) * outer_product ( S ( i ), S ( i ) ); 
    166         } 
    167         return Tmp - outer_product ( mea, mea ); 
     165                vec tmp=S ( i )-mea; //inefficient but numerically stable 
     166                Tmp += w ( i ) * outer_product (tmp , tmp ); 
     167        } 
     168        return Tmp; 
    168169} 
    169170 
     
    174175void merger_mix::merge ( ) { 
    175176        if(Npoints<1){ 
    176                 set_support(enorm<fsqmat>(zeros(dim), eye(dim)), 100); 
     177                set_support(enorm<fsqmat>(zeros(dim), eye(dim)), 1000); 
    177178        } 
    178179