Changeset 461 for library/bdm/stat

Timestamp:

07/31/09 13:06:49 (15 years ago)

Author:

vbarta

Message:

mpdf (& its dependencies) reformat: now using shared_ptr, moved virtual method bodies to .cpp

Location:

library/bdm/stat

Files:

• emix.h (modified) (9 diffs)
• exp_family.cpp (modified) (1 diff)
• exp_family.h (modified) (18 diffs)
• merger.cpp (modified) (2 diffs)

library/bdm/stat/emix.h

@@ -16 +16 @@
 #define LOG2  0.69314718055995  
 
+#include "../shared_ptr.h"
 #include "exp_family.h"
 
@@ -51 +52 @@
                 rvc = nom0->_rv().subt ( rv );
                 dimc = rvc._dsize();
-                ep = new epdf;
-                ep->set_parameters(rv._dsize());
-                ep->set_rv(rv);
+                set_ep(shared_ptr<epdf>(new epdf));
+                e()->set_parameters(rv._dsize());
+                e()->set_rv(rv);
                 
                 //prepare data structures
@@ -66 +67 @@
         double evallogcond ( const vec &val, const vec &cond ) {
                 double tmp;
-                vec nom_val ( ep->dimension() + dimc );
+                vec nom_val ( e()->dimension() + dimc );
                 dl.pushup_cond ( nom_val,val,cond );
                 tmp = exp ( nom->evallog ( nom_val ) - den->evallog ( cond ) );
@@ -228 +229 @@
         //! Data link for each mpdfs
         Array<datalink_m2m*> dls;
+
         //! dummy ep
-        epdf dummy;
+        shared_ptr<epdf> dummy;
+
 public:
         /*!\brief Constructor from list of mFacs,
         */
-        mprod (){};
-        mprod (Array<mpdf*> mFacs ){set_elements( mFacs );};
+        mprod():dummy(new epdf()) { }
+        mprod (Array<mpdf*> mFacs):
+            dummy(new epdf()) {
+            set_elements(mFacs);
+        }
+
         void set_elements(Array<mpdf*> mFacs , bool own=false) {
                 
@@ -241 +248 @@
                 epdfs.set_size(mFacs.length());
                                 
-                ep=&dummy;
+                set_ep(dummy);
                 RV rv=getrv ( true );
                 set_rv ( rv );
-                dummy.set_parameters ( rv._dsize() );
-                setrvc ( ep->_rv(),rvc );
+                dummy->set_parameters(rv._dsize());
+                setrvc(e()->_rv(), rvc);
                 // rv and rvc established = > we can link them with mpdfs
                 for ( int i = 0;i < mpdfs.length(); i++ ) {
@@ -253 +260 @@
 
                 for ( int i=0; i<mpdfs.length(); i++ ) {
-                        epdfs ( i ) =& ( mpdfs ( i )->_epdf() );
+                        epdfs(i) = mpdfs(i)->e();
                 }
         };
@@ -291 +298 @@
         //TODO smarter...
         vec samplecond ( const vec &cond ) {
-                //! Ugly hack to help to discover if mpfs are not in proper order. Correct solution = check that explicitely.
-                vec smp= std::numeric_limits<double>::infinity() * ones ( ep->dimension() );
+            //! Ugly hack to help to discover if mpfs are not in proper order. Correct solution = check that explicitely.
+            vec smp= std::numeric_limits<double>::infinity() * ones ( e()->dimension() );
                 vec smpi;
                 // Hard assumption here!!! We are going backwards, to assure that samples that are needed from smp are already generated!
@@ -417 +424 @@
         //! Component (epdfs)
         Array<mpdf*> Coms;
+
         //!Internal epdf
-        emix Epdf;
+        shared_ptr<emix> iepdf;
+
 public:
         //!Default constructor
-        mmix ( ) : mpdf ( ), Epdf () {ep = &Epdf;};
+        mmix():iepdf(new emix()) {
+            set_ep(iepdf);
+        }
+
         //! Set weights \c w and components \c R
         void set_parameters ( const vec &w, const Array<mpdf*> &Coms ) {
@@ -427 +439 @@
 
                 for ( int i = 0;i < Coms.length();i++ ) {
-                        Eps ( i ) = & ( Coms ( i )->_epdf() );
-                }
-                Epdf.set_parameters ( w, Eps );
-        };
+                        Eps(i) = Coms(i)->e();
+                }
+
+                iepdf->set_parameters(w, Eps);
+        }
 
         void condition ( const vec &cond ) {

library/bdm/stat/exp_family.cpp

@@ -211 +211 @@
 }
 
-//MGamma
-void mgamma::set_parameters ( double k0, const vec &beta0 ) {
-        k=k0;
-        ep = &epdf;
-        epdf.set_parameters ( k*ones ( beta0.length()),beta0 );
-        dimc = ep->dimension();
-};
+void mgamma::set_parameters(double k0, const vec &beta0) {
+        k = k0;
+        iepdf->set_parameters(k * ones(beta0.length()), beta0);
+        dimc = e()->dimension();
+}
 
 ivec eEmp::resample (RESAMPLING_METHOD method) {

library/bdm/stat/exp_family.h

@@ -15 +15 @@
 
 
+#include "../shared_ptr.h"
 #include "../base/bdmbase.h"
 #include "../math/chmat.h"
@@ -530 +531 @@
                 protected:
                         //! Internal epdf that arise by conditioning on \c rvc
-                        enorm<sq_T> epdf;
+                        shared_ptr<enorm<sq_T> > iepdf;
                         mat A;
                         vec mu_const;
@@ -537 +538 @@
                         //! \name Constructors
                         //!@{
-                        mlnorm ( ) :mEF (),epdf ( ),A ( ),_mu ( epdf._mu() ) {ep =&epdf; };
-                        mlnorm ( const  mat &A, const vec &mu0, const sq_T &R ) :epdf ( ),_mu ( epdf._mu() )
-                        {
-                                ep =&epdf; set_parameters ( A,mu0,R );
-                        };
+                        mlnorm():iepdf(new enorm<sq_T>()), _mu(iepdf->_mu()) { set_ep(iepdf); };
+                        mlnorm (const mat &A, const vec &mu0, const sq_T &R ) :iepdf(new enorm<sq_T>()), _mu(iepdf->_mu())
+                        {
+                                set_ep(iepdf); set_parameters ( A,mu0,R );
+                        }
+
                         //! Set \c A and \c R
                         void set_parameters ( const  mat &A, const vec &mu0, const sq_T &R );
@@ -553 +555 @@
                         mat& _A() {return A;}
                         //!access function
-                        mat _R() {return epdf._R().to_mat();}
+                        mat _R() { return iepdf->_R().to_mat(); }
 
                         template<class sq_M>
@@ -577 +579 @@
                 protected:
                         //! Internal epdf that arise by conditioning on \c rvc
-                        enorm<sq_T> epdf;
+                        shared_ptr<enorm<sq_T> > iepdf;
                         vec &mu;
                         fnc* g;
                 public:
                         //!default constructor
-                        mgnorm() :mu ( epdf._mu() ) {ep=&epdf;}
+                        mgnorm():iepdf(new enorm<sq_T>()), mu(iepdf->_mu()) { set_ep(iepdf); }
                         //!set mean function
-                        void set_parameters ( fnc* g0, const sq_T &R0 ) {g=g0; epdf.set_parameters ( zeros ( g->dimension() ), R0 );}
+                        void set_parameters ( fnc* g0, const sq_T &R0 ) {g=g0; iepdf->set_parameters ( zeros ( g->dimension() ), R0 );}
                         void condition ( const vec &cond ) {mu=g->eval ( cond );};
 
@@ -662 +664 @@
                 public:
                         mlstudent ( ) :mlnorm<ldmat> (),
-                                        Lambda (),      _R ( epdf._R() ) {}
+                                        Lambda (),      _R ( iepdf->_R() ) {}
                         void set_parameters ( const mat &A0, const vec &mu0, const ldmat &R0, const ldmat& Lambda0 )
                         {
@@ -668 +670 @@
                                 it_assert_debug ( R0.rows() ==A0.rows(),"" );
 
-                                epdf.set_parameters ( mu0,Lambda ); //
+                                iepdf->set_parameters ( mu0,Lambda ); //
                                 A = A0;
                                 mu_const = mu0;
@@ -705 +707 @@
                 protected:
                         //! Internal epdf that arise by conditioning on \c rvc
-                        egamma epdf;
+                        shared_ptr<egamma> iepdf;
+
                         //! Constant \f$k\f$
                         double k;
-                        //! cache of epdf.beta
+
+                        //! cache of iepdf.beta
                         vec &_beta;
 
                 public:
                         //! Constructor
-                        mgamma ( ) : mEF ( ), epdf (), _beta ( epdf._beta() ) {ep=&epdf;};
+                        mgamma():iepdf(new egamma()), k(0),
+                            _beta(iepdf->_beta()) {
+                            set_ep(iepdf);
+                        }
+
                         //! Set value of \c k
-                        void set_parameters ( double k, const vec &beta0 );
+                        void set_parameters(double k, const vec &beta0);
+
                         void condition ( const vec &val ) {_beta=k/val;};
                         //! Load from structure with elements:
@@ -749 +758 @@
                 protected:
                         //! Internal epdf that arise by conditioning on \c rvc
-                        eigamma epdf;
+                        shared_ptr<eigamma> iepdf;
+
                         //! Constant \f$k\f$
                         double k;
-                        //! cache of epdf.alpha
+
+                        //! cache of iepdf.alpha
                         vec &_alpha;
-                        //! cache of epdf.beta
+
+                        //! cache of iepdf.beta
                         vec &_beta;
 
@@ -760 +772 @@
                         //! \name Constructors
                         //!@{
-                        migamma ( ) : mEF (), epdf ( ), _alpha ( epdf._alpha() ), _beta ( epdf._beta() ) {ep=&epdf;};
-                        migamma ( const migamma &m ) : mEF (), epdf ( m.epdf ), _alpha ( epdf._alpha() ), _beta ( epdf._beta() ) {ep=&epdf;};
+                        migamma():iepdf(new eigamma()),
+                            k(0),
+                            _alpha(iepdf->_alpha()),
+                            _beta(iepdf->_beta()) {
+                            set_ep(iepdf);
+                        }
+
+                        migamma(const migamma &m):iepdf(m.iepdf),
+                            k(0),
+                            _alpha(iepdf->_alpha()),
+                            _beta(iepdf->_beta()) {
+                            set_ep(iepdf);
+                        }
                         //!@}
 
@@ -768 +791 @@
                         {
                                 k=k0;
-                                epdf.set_parameters ( ( 1.0/ ( k*k ) +2.0 ) *ones ( len ) /*alpha*/, ones ( len ) /*beta*/ );
+                                iepdf->set_parameters ( ( 1.0/ ( k*k ) +2.0 ) *ones ( len ) /*alpha*/, ones ( len ) /*beta*/ );
                                 dimc = dimension();
                         };
@@ -907 +930 @@
         {
                 protected:
-                        elognorm eno;
+                        shared_ptr<elognorm> eno;
+
                         //! parameter 1/2*sigma^2
                         double sig2;
+
                         //! access
                         vec &mu;
                 public:
                         //! Constructor
-                        mlognorm ( ) : eno (), mu ( eno._mu() ) {ep=&eno;};
+                        mlognorm():eno(new elognorm()),
+                            sig2(0),
+                            mu(eno->_mu()) {
+                            set_ep(eno);
+                        }
+
                         //! Set value of \c k
                         void set_parameters ( int size, double k )
                         {
                                 sig2 = 0.5*log ( k*k+1 );
-                                eno.set_parameters ( zeros ( size ),2*sig2*eye ( size ) );
+                                eno->set_parameters ( zeros ( size ),2*sig2*eye ( size ) );
 
                                 dimc = size;
@@ -1053 +1083 @@
         {
                 protected:
-                        eiWishartCh eiW;
+                        shared_ptr<eiWishartCh> eiW;
                         //!square root of \f$ \nu-p-1 \f$ - needed for computation of \f$ \Psi \f$ from conditions
                         double sqd;
@@ -1060 +1090 @@
                         double l;
                         int p;
-                public:
+
+                public:
+                        rwiWishartCh():eiW(new eiWishartCh()),
+                            sqd(0), l(0), p(0) {
+                            set_ep(eiW);
+                        }
+
                         void set_parameters ( int p0, double k, vec ref0, double l0  )
                         {
@@ -1069 +1105 @@
                                 refl=pow(ref0,1-l);
                                 
-                                eiW.set_parameters ( eye ( p ),delta );
-                                ep=&eiW;
-                                dimc=eiW.dimension();
+                                eiW->set_parameters ( eye ( p ),delta );
+                                dimc=eiW->dimension();
                         }
                         void condition ( const vec &c ) {
@@ -1081 +1116 @@
                                 }
 
-                                eiW._setY ( sqd*z );
+                                eiW->_setY ( sqd*z );
                         }
         };
@@ -1239 +1274 @@
                 it_assert_debug ( A0.rows() ==R0.rows(),"" );
 
-                epdf.set_parameters ( zeros ( A0.rows() ),R0 );
+                iepdf->set_parameters(zeros(A0.rows()), R0);
                 A = A0;
                 mu_const = mu0;
-                dimc=A0.cols();
+                dimc = A0.cols();
         }
 
@@ -1332 +1367 @@
                 os << "A:"<< ml.A<<endl;
                 os << "mu:"<< ml.mu_const<<endl;
-                os << "R:" << ml.epdf._R().to_mat() <<endl;
+                os << "R:" << ml.iepdf->_R().to_mat() <<endl;
                 return os;
         };

library/bdm/stat/merger.cpp

@@ -156 +156 @@
                                 {
                                         // no need for conditioning or marginalization
-                                        lw_src = mpdfs ( i )->_epdf().evallog_m ( Smp  );
+                                        lw_src = mpdfs ( i )->e()->evallog_m ( Smp  );
                                 }
                                 else
@@ -202 +202 @@
                                         {
                                                 mpdfs ( i )->condition ( dls ( i )->get_cond ( Smp ( k ) ) );
-                                                lw_src ( k ) += mpdfs ( i )->_epdf().evallog ( dls ( i )->pushdown ( Smp ( k ) ) );
+                                                lw_src ( k ) += mpdfs ( i )->e()->evallog ( dls ( i )->pushdown ( Smp ( k ) ) );
                                         }