Changeset 388 for library/bdm/base
- Timestamp:
- 06/19/09 11:43:48 (15 years ago)
- Location:
- library/bdm/base
- Files:
-
- 2 modified
Legend:
- Unmodified
- Added
- Removed
-
library/bdm/base/bdmbase.h
r384 r388 581 581 class compositepdf { 582 582 protected: 583 //!Number of mpdfs in the composite584 int n;585 583 //! Elements of composition 586 584 Array<mpdf*> mpdfs; 587 public: 588 compositepdf(Array<mpdf*> A0) : n(A0.length()), mpdfs(A0) {}; 585 bool owning_mpdfs; 586 public: 587 compositepdf():mpdfs(0){}; 588 compositepdf(Array<mpdf*> A0, bool own=false){set_elements(A0,own);}; 589 void set_elements(Array<mpdf*> A0, bool own=false) {mpdfs=A0;owning_mpdfs=own;}; 589 590 //! find common rv, flag \param checkoverlap modifies whether overlaps are acceptable 590 591 RV getrv(bool checkoverlap = false); 591 592 //! common rvc of all mpdfs is written to rvc 592 593 void setrvc(const RV &rv, RV &rvc); 594 ~compositepdf(){if (owning_mpdfs) for(int i=0;i<mpdfs.length();i++){delete mpdfs(i);}}; 593 595 }; 594 596 -
library/bdm/base/user_info.h
r384 r388 235 235 return instance; 236 236 } 237 //! VS: addition for root elements 238 template<class T> static T* build( const Setting &element ) 239 { 240 T* instance; 241 from_setting<T>( instance, element ); 242 return instance; 243 } 237 244 238 245 template<class T> static T* build( const Setting &element, const string &name )