Changeset 507 for library/bdm/stat/emix.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/emix.h (modified) (4 diffs)

library/bdm/stat/emix.h

@@ -270 +270 @@
 Note that
 */
-class mprod: public compositepdf, public mpdf {
+class mprod: public mpdf {
+private:
+        Array<shared_ptr<mpdf> > mpdfs;
+
 protected:
         //! Data link for each mpdfs
@@ -279 +282 @@
 
 public:
-        /*!\brief Constructor from list of mFacs,
+        //! \brief Default constructor
+        mprod() { }
+
+        /*!\brief Constructor from list of mFacs
         */
-        mprod() : iepdf( ) { }
-        mprod ( Array<mpdf*> mFacs ) :
-                        iepdf ( ) {
+        mprod ( const Array<shared_ptr<mpdf> > &mFacs ) {
                 set_elements ( mFacs );
         }
 
-        void set_elements ( Array<mpdf*> mFacs , bool own = false ) {
-
-                compositepdf::set_elements ( mFacs, own );
-                dls.set_size ( mFacs.length() );
-
-                set_ep ( iepdf);
-                RV rv = getrv ( true );
-                set_rv ( rv );
-                iepdf.set_parameters ( rv._dsize() );
-                setrvc (_rv(), rvc );
-                // rv and rvc established = > we can link them with mpdfs
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
-                        dls ( i ) = new datalink_m2m;
-                        dls ( i )->set_connection ( mpdfs ( i )->_rv(), mpdfs ( i )->_rvc(), _rv(), _rvc() );
-                }
-
-        };
+        void set_elements (const Array<shared_ptr<mpdf> > &mFacs );
 
         double evallogcond ( const vec &val, const vec &cond ) {
@@ -359 +347 @@
         }
 
-        ~mprod() {};
         //! Load from structure with elements:
         //!  \code
@@ -368 +355 @@
         //!@}
         void from_setting ( const Setting &set ) {
-                Array<mpdf*> Atmp; //temporary Array
-                UI::get ( Atmp, set, "mpdfs", UI::compulsory );
-                set_elements ( Atmp, true );
+                Array<mpdf*> atmp; //temporary Array
+                UI::get ( atmp, set, "mpdfs", UI::compulsory );
+                
+                Array<shared_ptr<mpdf> > btmp ( atmp.length() );
+                for (int i = 0; i < atmp.length(); ++i) {
+                        btmp ( i ) = shared_ptr<mpdf> ( atmp ( i ) );
+                }
+
+                set_elements ( btmp );
         }