Changeset 270 for bdm/estim/merger.h
- Timestamp:
- 02/16/09 10:02:08 (15 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
bdm/estim/merger.h
r262 r270 49 49 //!Default constructor 50 50 merger ( const Array<mpdf*> &S ) : 51 compositepdf ( S ), epdf ( getrv ( false )),52 Mix ( Array<BMEF*> ( 0 ),vec ( 0 ) ), dls ( n ), rvzs ( n ), zdls ( n ), eSmp( rv,0) {51 compositepdf ( S ), epdf ( ), 52 Mix ( Array<BMEF*> ( 0 ),vec ( 0 ) ), dls ( n ), rvzs ( n ), zdls ( n ), eSmp() { 53 53 RV ztmp; 54 54 // Extend rv by rvc! … … 96 96 const Vec<double> &w = eSmp._w(); 97 97 const Array<vec> &S = eSmp._samples(); 98 vec tmp=zeros ( rv.count());98 vec tmp=zeros ( dim); 99 99 for ( int i=0; i<Ns; i++ ) { 100 100 tmp+=w ( i ) *S ( i ); … … 110 110 cout << sum(w) << "," << w*w <<endl; 111 111 112 mat Tmp=zeros( rv.count(), rv.count());112 mat Tmp=zeros(dim, dim); 113 113 for ( int i=0; i<Ns; i++ ) { 114 114 Tmp+=w ( i ) *outer_product(S ( i ), S(i)); … … 120 120 const Array<vec> &S = eSmp._samples(); 121 121 122 vec tmp=zeros( rv.count());122 vec tmp=zeros(dim); 123 123 for ( int i=0; i<Ns; i++ ) { 124 124 tmp+=w ( i ) *pow(S ( i ),2);