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

Timestamp:

11/02/09 17:27:29 (15 years ago)

Author:

mido

Message:

mpdf renamed to pdf in the whole library

Files:

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

library/bdm/stat/merger.h

@@ -46 +46 @@
 protected:
         //! Elements of composition
-        Array<shared_ptr<mpdf> > mpdfs;
-
-        //! Data link for each mpdf in mpdfs
+        Array<shared_ptr<pdf> > pdfs;
+
+        //! Data link for each pdf in pdfs
         Array<datalink_m2e*> dls;
 
-        //! Array of rvs that are not modelled by mpdfs at all, \f$ z_i \f$
+        //! Array of rvs that are not modelled by pdfs at all, \f$ z_i \f$
         Array<RV> rvzs;
 
@@ -90 +90 @@
 
         //!Constructor from sources
-        merger_base ( const Array<shared_ptr<mpdf> > &S );
+        merger_base ( const Array<shared_ptr<pdf> > &S );
 
         //! Function setting the main internal structures
-        void set_sources ( const Array<shared_ptr<mpdf> > &Sources ) {
-                mpdfs = Sources;
-                Nsources = mpdfs.length();
+        void set_sources ( const Array<shared_ptr<pdf> > &Sources ) {
+                pdfs = Sources;
+                Nsources = pdfs.length();
                 //set sizes
                 dls.set_size ( Sources.length() );
@@ -101 +101 @@
                 zdls.set_size ( Sources.length() );
 
-                rv = get_composite_rv ( mpdfs, /* checkoverlap = */ false );
+                rv = get_composite_rv ( pdfs, /* checkoverlap = */ false );
 
                 RV rvc;
                 // Extend rv by rvc!
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
-                        RV rvx = mpdfs ( i )->_rvc().subt ( rv );
+                for ( int i = 0; i < pdfs.length(); i++ ) {
+                        RV rvx = pdfs ( i )->_rvc().subt ( rv );
                         rvc.add ( rvx ); // add rv to common rvc
                 }
@@ -117 +117 @@
                 // create links between sources and common rv
                 RV xytmp;
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
-                        //Establich connection between mpdfs and merger
+                for ( int i = 0; i < pdfs.length(); i++ ) {
+                        //Establich connection between pdfs and merger
                         dls ( i ) = new datalink_m2e;
-                        dls ( i )->set_connection ( mpdfs ( i )->_rv(), mpdfs ( i )->_rvc(), rv );
-
-                        // find out what is missing in each mpdf
-                        xytmp = mpdfs ( i )->_rv();
-                        xytmp.add ( mpdfs ( i )->_rvc() );
+                        dls ( i )->set_connection ( pdfs ( i )->_rv(), pdfs ( i )->_rvc(), rv );
+
+                        // find out what is missing in each pdf
+                        xytmp = pdfs ( i )->_rv();
+                        xytmp.add ( pdfs ( i )->_rvc() );
                         // z_i = common_rv-xy
                         rvzs ( i ) = rv.subt ( xytmp );
@@ -185 +185 @@
                 //check if sources overlap:
                 bool OK = true;
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
+                for ( int i = 0; i < pdfs.length(); i++ ) {
                         OK &= ( rvzs ( i )._dsize() == 0 ); // z_i is empty
-                        OK &= ( mpdfs ( i )->_rvc()._dsize() == 0 ); // y_i is empty
+                        OK &= ( pdfs ( i )->_rvc()._dsize() == 0 ); // y_i is empty
                 }
 
                 if ( OK ) {
-                        mat lW = zeros ( mpdfs.length(), eSmp._w().length() );
+                        mat lW = zeros ( pdfs.length(), eSmp._w().length() );
 
                         vec emptyvec ( 0 );
-                        for ( int i = 0; i < mpdfs.length(); i++ ) {
+                        for ( int i = 0; i < pdfs.length(); i++ ) {
                                 for ( int j = 0; j < eSmp._w().length(); j++ ) {
-                                        lW ( i, j ) = mpdfs ( i )->evallogcond ( eSmp._samples() ( j ), emptyvec );
+                                        lW ( i, j ) = pdfs ( i )->evallogcond ( eSmp._samples() ( j ), emptyvec );
                                 }
                         }
@@ -313 +313 @@
         merger_mix ():Ncoms(0), effss_coef(0), stop_niter(0) { }
 
-        merger_mix ( const Array<shared_ptr<mpdf> > &S ):
+        merger_mix ( const Array<shared_ptr<pdf> > &S ):
                 Ncoms(0), effss_coef(0), stop_niter(0) {
                 set_sources ( S );
@@ -319 +319 @@
 
         //! Set sources and prepare all internal structures
-        void set_sources ( const Array<shared_ptr<mpdf> > &S ) {
+        void set_sources ( const Array<shared_ptr<pdf> > &S ) {
                 merger_base::set_sources ( S );
                 Nsources = S.length();