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

library/bdm/stat/exp_family.h

@@ -163 +163 @@
                 vec variance() const {return diag (R.to_mat());}
 //      mlnorm<sq_T>* condition ( const RV &rvn ) const ; <=========== fails to cmpile. Why?
-                shared_ptr<mpdf> condition ( const RV &rvn ) const;
+                shared_ptr<pdf> condition ( const RV &rvn ) const;
 
                 // target not typed to mlnorm<sq_T, enorm<sq_T> > &
@@ -169 +169 @@
                 // haven't finished defining enorm yet), but the type
                 // is required
-                void condition ( const RV &rvn, mpdf &target ) const;
+                void condition ( const RV &rvn, pdf &target ) const;
 
                 shared_ptr<epdf> marginal (const RV &rvn ) const;
@@ -367 +367 @@
 */
 
-class mDirich: public mpdf_internal<eDirich> {
+class mDirich: public pdf_internal<eDirich> {
         protected:
                 //! constant \f$ k \f$ of the random walk
@@ -376 +376 @@
                 vec betac;
         public:
-                mDirich(): mpdf_internal<eDirich>(), _beta(iepdf._beta()){};
+                mDirich(): pdf_internal<eDirich>(), _beta(iepdf._beta()){};
                 void condition (const vec &val) {_beta =  val/k+betac; };
                 /*! Create Dirichlet random walk 
@@ -391 +391 @@
                 */
                 void from_setting (const Setting &set) {
-                        mpdf::from_setting (set); // reads rv and rvc
+                        pdf::from_setting (set); // reads rv and rvc
                         if (_rv()._dsize()>0){
                                 rvc = _rv().copy_t(-1);
@@ -408 +408 @@
                 }
                 void validate() { 
-                        mpdf_internal<eDirich>::validate();
+                        pdf_internal<eDirich>::validate();
                         bdm_assert(_beta.length()==betac.length(),"beta0 and betac are not compatible");
                         if (_rv()._dsize()>0){
@@ -644 +644 @@
 
 //! Uniform density with conditional mean value
-class mguni : public mpdf_internal<euni>{
+class mguni : public pdf_internal<euni>{
         //! function of the mean value
         shared_ptr<fnc> mean;
@@ -656 +656 @@
                 //! load from
                 void from_setting(const Setting &set){
-                        mpdf::from_setting(set); //reads rv and rvc
+                        pdf::from_setting(set); //reads rv and rvc
                         UI::get(delta,set,"delta",UI::compulsory);
                         mean = UI::build<fnc>(set,"mean",UI::compulsory);
@@ -672 +672 @@
 */
 template < class sq_T, template <typename> class TEpdf = enorm >
-class mlnorm : public mpdf_internal< TEpdf<sq_T> >
+class mlnorm : public pdf_internal< TEpdf<sq_T> >
 {
         protected:
@@ -683 +683 @@
                 //! \name Constructors
                 //!@{
-                mlnorm() : mpdf_internal< TEpdf<sq_T> >() {};
-                mlnorm (const mat &A, const vec &mu0, const sq_T &R) : mpdf_internal< TEpdf<sq_T> >() {
+                mlnorm() : pdf_internal< TEpdf<sq_T> >() {};
+                mlnorm (const mat &A, const vec &mu0, const sq_T &R) : pdf_internal< TEpdf<sq_T> >() {
                         set_parameters (A, mu0, R);
                 }
@@ -724 +724 @@
                 */
                 void from_setting (const Setting &set) {
-                        mpdf::from_setting (set);
+                        pdf::from_setting (set);
 
                         UI::get (A, set, "A", UI::compulsory);
@@ -734 +734 @@
                 };
                 void validate() {
-                        mpdf_internal<TEpdf<sq_T> >::validate();
+                        pdf_internal<TEpdf<sq_T> >::validate();
                         bdm_assert (A.rows() == mu_const.length(), "mlnorm: A vs. mu mismatch");
                         bdm_assert (A.rows() == _R().rows(), "mlnorm: A vs. R mismatch");
@@ -747 +747 @@
 SHAREDPTR2 ( mlnorm, chmat );
 
-//! Mpdf with general function for mean value
+//! pdf with general function for mean value
 template<class sq_T>
-class mgnorm : public mpdf_internal< enorm< sq_T > >
+class mgnorm : public pdf_internal< enorm< sq_T > >
 {
         private:
@@ -757 +757 @@
         public:
                 //!default constructor
-                mgnorm() : mpdf_internal<enorm<sq_T> >() { }
+                mgnorm() : pdf_internal<enorm<sq_T> >() { }
                 //!set mean function
                 inline void set_parameters (const shared_ptr<fnc> &g0, const sq_T &R0);
@@ -782 +782 @@
 
                 void from_setting (const Setting &set) {
-                        mpdf::from_setting(set);
+                        pdf::from_setting(set);
                         shared_ptr<fnc> g = UI::build<fnc> (set, "g", UI::compulsory);
 
@@ -863 +863 @@
 The standard deviation of the walk is then: \f$\mu/\sqrt(k)\f$.
 */
-class mgamma : public mpdf_internal<egamma>
+class mgamma : public pdf_internal<egamma>
 {
         protected:
@@ -875 +875 @@
         public:
                 //! Constructor
-                mgamma() : mpdf_internal<egamma>(), k (0),
+                mgamma() : pdf_internal<egamma>(), k (0),
                                 _beta (iepdf._beta()) {
                 }
@@ -895 +895 @@
                 */
                 void from_setting (const Setting &set) {
-                        mpdf::from_setting (set); // reads rv and rvc
+                        pdf::from_setting (set); // reads rv and rvc
                         vec betatmp; // ugly but necessary
                         UI::get (betatmp, set, "beta", UI::compulsory);
@@ -903 +903 @@
                 }
                 void validate() {
-                        mpdf_internal<egamma>::validate();
+                        pdf_internal<egamma>::validate();
                         
                         dim = _beta.length();
@@ -921 +921 @@
 The standard deviation of the walk is then: \f$ \mu/\sqrt(k)\f$.
  */
-class migamma : public mpdf_internal<eigamma>
+class migamma : public pdf_internal<eigamma>
 {
         protected:
@@ -936 +936 @@
                 //! \name Constructors
                 //!@{
-                migamma() : mpdf_internal<eigamma>(),
+                migamma() : pdf_internal<eigamma>(),
                                 k (0),
                                 _alpha (iepdf._alpha()),
@@ -942 +942 @@
                 }
 
-                migamma (const migamma &m) : mpdf_internal<eigamma>(),
+                migamma (const migamma &m) : pdf_internal<eigamma>(),
                                 k (0),
                                 _alpha (iepdf._alpha()),
@@ -1074 +1074 @@
 
  */
-class mlognorm : public mpdf_internal<elognorm>
+class mlognorm : public pdf_internal<elognorm>
 {
         protected:
@@ -1084 +1084 @@
         public:
                 //! Constructor
-                mlognorm() : mpdf_internal<elognorm>(),
+                mlognorm() : pdf_internal<elognorm>(),
                                 sig2 (0),
                                 mu (iepdf._mu()) {
@@ -1221 +1221 @@
 
 //! Random Walk on inverse Wishart
-class rwiWishartCh : public mpdf_internal<eiWishartCh>
+class rwiWishartCh : public pdf_internal<eiWishartCh>
 {
         protected:
@@ -1474 +1474 @@
 
 template<class sq_T>
-shared_ptr<mpdf> enorm<sq_T>::condition ( const RV &rvn ) const
+shared_ptr<pdf> enorm<sq_T>::condition ( const RV &rvn ) const
 {
         mlnorm<sq_T> *tmp = new mlnorm<sq_T> ();
-        shared_ptr<mpdf> narrow(tmp);
+        shared_ptr<pdf> narrow(tmp);
         condition ( rvn, *tmp );
         return narrow;
@@ -1483 +1483 @@
 
 template<class sq_T>
-void enorm<sq_T>::condition ( const RV &rvn, mpdf &target ) const
+void enorm<sq_T>::condition ( const RV &rvn, pdf &target ) const
 {
         typedef mlnorm<sq_T> TMlnorm;