Changeset 737 for library/bdm/stat/emix.cpp
- Timestamp:
- 11/25/09 12:14:38 (15 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
library/bdm/stat/emix.cpp
r693 r737 38 38 shared_ptr<epdf> emix::marginal ( const RV &rv ) const { 39 39 emix *tmp = new emix(); 40 shared_ptr<epdf> narrow (tmp);40 shared_ptr<epdf> narrow ( tmp ); 41 41 marginal ( rv, *tmp ); 42 42 return narrow; … … 57 57 bdm_assert ( isnamed(), "rvs are not assigned" ); 58 58 mratio *tmp = new mratio ( this, rv ); 59 return shared_ptr<pdf> (tmp);59 return shared_ptr<pdf> ( tmp ); 60 60 } 61 61 … … 118 118 shared_ptr<epdf> egiwmix::marginal ( const RV &rv ) const { 119 119 emix *tmp = new emix(); 120 shared_ptr<epdf> narrow (tmp);120 shared_ptr<epdf> narrow ( tmp ); 121 121 marginal ( rv, *tmp ); 122 122 return narrow; … … 203 203 }; 204 204 205 void mprod::set_elements ( const Array<shared_ptr<pdf> > &mFacs ) {205 void mprod::set_elements ( const Array<shared_ptr<pdf> > &mFacs ) { 206 206 pdfs = mFacs; 207 207 dls.set_size ( mFacs.length() ); … … 214 214 rvc.add ( rvx ); // add rv to common rvc 215 215 } 216 dimc =rvc._dsize();216 dimc = rvc._dsize(); 217 217 218 218 // rv and rvc established = > we can link them with pdfs … … 223 223 } 224 224 225 vec mmix::samplecond (const vec &cond) {225 vec mmix::samplecond ( const vec &cond ) { 226 226 //Sample which component 227 227 vec cumDist = cumsum ( w ); … … 235 235 } 236 236 237 return Coms ( i )->samplecond (cond);237 return Coms ( i )->samplecond ( cond ); 238 238 } 239 239