Changeset 507 for library/bdm/stat/merger.h

Timestamp:

08/12/09 15:37:43 (15 years ago)

Author:

vbarta

Message:

removed class compositepdf; keeping mpdfs of mprod and merger_base in shared pointers

Files:

• library/bdm/stat/merger.h (modified) (4 diffs)

library/bdm/stat/merger.h

@@ -42 +42 @@
 */
 
-class merger_base : public compositepdf, public epdf {
+class merger_base : public epdf {
 protected:
+        //! Elements of composition
+        Array<shared_ptr<mpdf> > mpdfs;
+
         //! Data link for each mpdf in mpdfs
         Array<datalink_m2e*> dls;
+
         //! Array of rvs that are not modelled by mpdfs at all, \f$ z_i \f$
         Array<RV> rvzs;
+
         //! Data Links for extension \f$ f(z_i|x_i,y_i) \f$
         Array<datalink_m2e*> zdls;
+
         //! number of support points
         int Npoints;
+
         //! number of sources
         int Nsources;
@@ -77 +84 @@
         //! @{
 
-        //!Empty constructor
-        merger_base () : compositepdf() {
-                DBG = false;
-                dbg_file = NULL;
+        //! Default constructor
+        merger_base () : Npoints(0), Nsources(0), DBG(false), dbg_file(0) {
         }
 
         //!Constructor from sources
-        merger_base ( const Array<mpdf*> &S, bool own = false );
+        merger_base ( const Array<shared_ptr<mpdf> > &S );
 
         //! Function setting the main internal structures
-        void set_sources ( const Array<mpdf*> &Sources, bool own ) {
-                compositepdf::set_elements ( Sources, own );
+        void set_sources ( const Array<shared_ptr<mpdf> > &Sources ) {
+                mpdfs = Sources;
                 Nsources = mpdfs.length();
                 //set sizes
@@ -95 +100 @@
                 zdls.set_size ( Sources.length() );
 
-                rv = getrv ( /* checkoverlap = */ false );
+                rv = get_composite_rv ( mpdfs, /* checkoverlap = */ false );
+
                 RV rvc;
-                setrvc ( rv, rvc );  // Extend rv by rvc!
+                // Extend rv by rvc!
+                for ( int i = 0; i < mpdfs.length(); i++ ) {
+                        RV rvx = mpdfs ( i )->_rvc().subt ( rv );
+                        rvc.add ( rvx ); // add rv to common rvc
+                }
+
                 // join rv and rvc - see descriprion
                 rv.add ( rvc );
@@ -325 +336 @@
         //!\name Constructors
         //!@{
-        merger_mix () {};
-        merger_mix ( const Array<mpdf*> &S, bool own = false ) {
-                set_sources ( S, own );
-        };
+        merger_mix ():Ncoms(0), effss_coef(0), stop_niter(0) { }
+
+        merger_mix ( const Array<shared_ptr<mpdf> > &S ):
+                Ncoms(0), effss_coef(0), stop_niter(0) {
+                set_sources ( S );
+        }
+
         //! Set sources and prepare all internal structures
-        void set_sources ( const Array<mpdf*> &S, bool own ) {
-                merger_base::set_sources ( S, own );
+        void set_sources ( const Array<shared_ptr<mpdf> > &S ) {
+                merger_base::set_sources ( S );
                 Nsources = S.length();
         }
+
         //! Set internal parameters used in approximation
         void set_parameters ( int Ncoms0 = DFLT_Ncoms, double effss_coef0 = DFLT_effss_coef ) {