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

library/bdm/stat/emix.h

@@ -35 +35 @@
 At present the only supported operation is evallogcond().
  */
-class mratio: public mpdf {
+class mratio: public pdf {
 protected:
-        //! Nominator in the form of mpdf
+        //! Nominator in the form of pdf
         const epdf* nom;
 
@@ -50 +50 @@
         //!Default constructor. By default, the given epdf is not copied!
         //! It is assumed that this function will be used only temporarily.
-        mratio ( const epdf* nom0, const RV &rv, bool copy = false ) : mpdf ( ), dl ( ) {
+        mratio ( const epdf* nom0, const RV &rv, bool copy = false ) : pdf ( ), dl ( ) {
                 // adjust rv and rvc
 
@@ -178 +178 @@
         //! Update already existing marginal density  \c target
         void marginal ( const RV &rv, emix &target ) const;
-        shared_ptr<mpdf> condition ( const RV &rv ) const;
+        shared_ptr<pdf> condition ( const RV &rv ) const;
 
 //Access methods
@@ -283 +283 @@
 Note that
 */
-class mprod: public mpdf {
+class mprod: public pdf {
 private:
-        Array<shared_ptr<mpdf> > mpdfs;
-
-        //! Data link for each mpdfs
+        Array<shared_ptr<pdf> > pdfs;
+
+        //! Data link for each pdfs
         Array<shared_ptr<datalink_m2m> > dls;
 
@@ -300 +300 @@
         /*!\brief Constructor from list of mFacs
         */
-        mprod ( const Array<shared_ptr<mpdf> > &mFacs ) {
+        mprod ( const Array<shared_ptr<pdf> > &mFacs ) {
                 set_elements ( mFacs );
         }
-        //! Set internal \c mpdfs from given values
-        void set_elements (const Array<shared_ptr<mpdf> > &mFacs );
+        //! Set internal \c pdfs from given values
+        void set_elements (const Array<shared_ptr<pdf> > &mFacs );
 
         double evallogcond ( const vec &val, const vec &cond ) {
                 int i;
                 double res = 0.0;
-                for ( i = mpdfs.length() - 1; i >= 0; i-- ) {
-                        /*                      if ( mpdfs(i)->_rvc().count() >0) {
-                                                        mpdfs ( i )->condition ( dls ( i )->get_cond ( val,cond ) );
+                for ( i = pdfs.length() - 1; i >= 0; i-- ) {
+                        /*                      if ( pdfs(i)->_rvc().count() >0) {
+                                                        pdfs ( i )->condition ( dls ( i )->get_cond ( val,cond ) );
                                                 }
                                                 // add logarithms
                                                 res += epdfs ( i )->evallog ( dls ( i )->pushdown ( val ) );*/
-                        res += mpdfs ( i )->evallogcond (
+                        res += pdfs ( i )->evallogcond (
                                    dls ( i )->pushdown ( val ),
                                    dls ( i )->get_cond ( val, cond )
@@ -344 +344 @@
                 vec smpi;
                 // Hard assumption here!!! We are going backwards, to assure that samples that are needed from smp are already generated!
-                for ( int i = ( mpdfs.length() - 1 ); i >= 0; i-- ) {
-                        // generate contribution of this mpdf
-                        smpi = mpdfs(i)->samplecond(dls ( i )->get_cond ( smp , cond ));                        
+                for ( int i = ( pdfs.length() - 1 ); i >= 0; i-- ) {
+                        // generate contribution of this pdf
+                        smpi = pdfs(i)->samplecond(dls ( i )->get_cond ( smp , cond ));                 
                         // copy contribution of this pdf into smp
                         dls ( i )->pushup ( smp, smpi );
@@ -356 +356 @@
         //!  \code
         //! { class='mprod';
-        //!   mpdfs = (..., ...);     // list of mpdfs in the order of chain rule
+        //!   pdfs = (..., ...);     // list of pdfs in the order of chain rule
         //! }
         //! \endcode
         //!@}
         void from_setting ( const Setting &set ) {
-                Array<shared_ptr<mpdf> > atmp; //temporary Array
-                UI::get ( atmp, set, "mpdfs", UI::compulsory );
+                Array<shared_ptr<pdf> > atmp; //temporary Array
+                UI::get ( atmp, set, "pdfs", UI::compulsory );
                 set_elements ( atmp );
         }
@@ -460 +460 @@
 
 
-/*! \brief Mixture of mpdfs with constant weights, all mpdfs are of equal RV and RVC
+/*! \brief Mixture of pdfs with constant weights, all pdfs are of equal RV and RVC
 
 */
-class mmix : public mpdf {
+class mmix : public pdf {
 protected:
-        //! Component (mpdfs)
-        Array<shared_ptr<mpdf> > Coms;
+        //! Component (pdfs)
+        Array<shared_ptr<pdf> > Coms;
         //!weights of the components
         vec w;
@@ -474 +474 @@
 
         //! Set weights \c w and components \c R
-        void set_parameters ( const vec &w0, const Array<shared_ptr<mpdf> > &Coms0 ) {
+        void set_parameters ( const vec &w0, const Array<shared_ptr<pdf> > &Coms0 ) {
                 //!\todo check if all components are OK
                 Coms = Coms0;