Changeset 487 for library/bdm/stat/emix.h

Timestamp:

08/08/09 13:42:18 (15 years ago)

Author:

smidl

Message:

1st step of mpdf redesign - BROKEN compile

Files:

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

library/bdm/stat/emix.h

@@ -45 +45 @@
         //!datalink between conditional and nom
         datalink_m2e dl;
+        //! dummy epdf that stores only rv and dim
+        epdf iepdf;
 public:
         //!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 ) : mpdf ( ), dl ( ),iepdf() {
                 // adjust rv and rvc
                 rvc = nom0->_rv().subt ( rv );
                 dimc = rvc._dsize();
-                set_ep ( shared_ptr<epdf> ( new epdf ) );
-                e()->set_parameters ( rv._dsize() );
-                e()->set_rv ( rv );
+                set_ep ( iepdf );
+                iepdf.set_parameters ( rv._dsize() );
+                iepdf.set_rv ( rv );
 
                 //prepare data structures
@@ -72 +74 @@
         double evallogcond ( const vec &val, const vec &cond ) {
                 double tmp;
-                vec nom_val ( e()->dimension() + dimc );
+                vec nom_val ( dimension() + dimc );
                 dl.pushup_cond ( nom_val, val, cond );
                 tmp = exp ( nom->evallog ( nom_val ) - den->evallog ( cond ) );
-                it_assert_debug ( std::isfinite ( tmp ), "Infinite value" );
                 return tmp;
         }
@@ -278 +279 @@
 class mprod: public compositepdf, public mpdf {
 protected:
-        //! pointers to epdfs - shortcut to mpdfs().posterior()
-        Array<epdf*> epdfs;
         //! Data link for each mpdfs
         Array<datalink_m2m*> dls;
 
-        //! dummy ep
-        shared_ptr<epdf> dummy;
+        //! dummy epdf used only as storage for RV and dim
+        epdf iepdf;
 
 public:
         /*!\brief Constructor from list of mFacs,
         */
-        mprod() : dummy ( new epdf() ) { }
+        mprod() : iepdf( ) { }
         mprod ( Array<mpdf*> mFacs ) :
-                        dummy ( new epdf() ) {
+                        iepdf ( ) {
                 set_elements ( mFacs );
         }
@@ -299 +298 @@
                 compositepdf::set_elements ( mFacs, own );
                 dls.set_size ( mFacs.length() );
-                epdfs.set_size ( mFacs.length() );
-
-                set_ep ( dummy );
+
+                set_ep ( iepdf);
                 RV rv = getrv ( true );
                 set_rv ( rv );
-                dummy->set_parameters ( rv._dsize() );
-                setrvc ( e()->_rv(), rvc );
+                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++ ) {
@@ -312 +310 @@
                 }
 
-                for ( int i = 0; i < mpdfs.length(); i++ ) {
-                        epdfs ( i ) = mpdfs ( i )->e();
-                }
         };
 
@@ -352 +347 @@
         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 ( e()->dimension() );
+                vec smp = std::numeric_limits<double>::infinity() * ones ( dimension() );
                 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-- ) {
-                        if ( mpdfs ( i )->dimensionc() ) {
-                                mpdfs ( i )->condition ( dls ( i )->get_cond ( smp , cond ) ); // smp is val here!!
-                        }
-                        smpi = epdfs ( i )->sample();
+                        // generate contribution of this mpdf
+                        smpi = mpdfs(i)->samplecond(dls ( i )->get_cond ( smp , cond ));                        
                         // copy contribution of this pdf into smp
                         dls ( i )->pushup ( smp, smpi );
-                        // add ith likelihood contribution
                 }
                 return smp;
@@ -483 +475 @@
 
 */
-class mmix : public mpdf {
-protected:
-        //! Component (epdfs)
-        Array<mpdf*> Coms;
-
-        //!Internal epdf
-        shared_ptr<emix> iepdf;
-
-public:
-        //!Default constructor
-        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 ) {
-                Array<epdf*> Eps ( Coms.length() );
-
-                for ( int i = 0; i < Coms.length(); i++ ) {
-                        Eps ( i ) = Coms ( i )->e();
-                }
-
-                iepdf->set_parameters ( w, Eps );
-        }
-
-        void condition ( const vec &cond ) {
-                for ( int i = 0; i < Coms.length(); i++ ) {
-                        Coms ( i )->condition ( cond );
-                }
-        };
-};
+// class mmix : public mpdf {
+// protected:
+//      //! Component (epdfs)
+//      Array<mpdf*> Coms;
+// 
+//      //!Internal epdf
+//      emix iepdf;
+// 
+// public:
+//      //!Default constructor
+//      mmix() : iepdf ( ) {
+//              set_ep ( iepdf );
+//      }
+// 
+//      //! Set weights \c w and components \c R
+//      void set_parameters ( const vec &w, const Array<mpdf*> &Coms ) {
+//              Array<epdf*> Eps ( Coms.length() );
+// 
+//              for ( int i = 0; i < Coms.length(); i++ ) {
+//                      Eps ( i ) = Coms ( i )->e();
+//              }
+// 
+//              iepdf->set_parameters ( w, Eps );
+//      }
+// 
+//      void condition ( const vec &cond ) {
+//              for ( int i = 0; i < Coms.length(); i++ ) {
+//                      Coms ( i )->condition ( cond );
+//              }
+//      };
+// };
 
 }