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

Timestamp:

06/10/10 21:54:57 (14 years ago)

Author:

smidl

Message:

Changes in merger + change in loading ARX

Files:

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

library/bdm/stat/merger.h

@@ -32 +32 @@
                 //! weights of the sources -- no restrictions
                 vec w;
-                //! get ith source
+                //! source pdfs -- conditioning allowed
                 Array<shared_ptr<epdf> > sources;
                 //! merge 
-                void merge() NOT_IMPLEMENTED_VOID;
+                virtual void merge() NOT_IMPLEMENTED_VOID;
                 //! 
                 //! check if all epdfs are on the same support
-                void validate() {
+                void validate_sources() {
                         int n=sources.length();
                         
@@ -75 +75 @@
                         vec mea=zeros(dim);
                         // go through all sources
+                        epdf * si;
                         for (int i=0; i<n; i++){
-                                sq_T Ci = sources(i)->covariance();
+                                si = dynamic_cast<epdf*>(sources(i).get());  // transform pdf into epdf
+
+                                if (!si) {bdm_error("Can't merger this type of pdf: " + sources(i)->to_string());}
+                                
+                                sq_T Ci = si->covariance();
                                 sq_T wCi = Ci; wCi*=w(i);
-                                vec mi = sources(i)->mean();
+                                vec mi = si->mean();
                                 switch (method) {
                                         case ARITHMETIC:{
@@ -133 +138 @@
 However, these operations can not be performed in general. Hence, this class merges only sources on common support, \f$ y_i={}, z_i={}, \forall i \f$.
 For merging of more general cases, use offsprings merger_mix and merger_grid.
+
+\TODO use sources for extensions
 */
-class merger_base : public epdf {
+class MergerDiscrete : public MergerBase {
 protected:
-    //! Elements of composition
-    Array<shared_ptr<pdf> > pdfs;
-
+        //! partial sources
+        Array<shared_ptr< pdf > > part_sources;
+        
     //! Data link for each pdf in pdfs
     Array<datalink_m2e*> dls;
@@ -177 +184 @@
 
     //! Default constructor
-    merger_base () : Npoints ( 0 ), Nsources ( 0 ), DBG ( false ), dbg_file ( 0 ) {
+    MergerDiscrete () : Npoints ( 0 ), Nsources ( 0 ), DBG ( false ), dbg_file ( 0 ) {
     }
 
     //!Constructor from sources
-    merger_base ( const Array<shared_ptr<pdf> > &S );
+    MergerDiscrete ( const Array<shared_ptr<pdf> > &S );
 
     //! Function setting the main internal structures
-    void set_sources ( const Array<shared_ptr<pdf> > &Sources );
+    void set_sources ( const Array<shared_ptr<pdf> > &PartSources );
 
     //! Set support points from rectangular grid
@@ -205 +212 @@
 
     //! Set internal parameters used in approximation
-    void set_method ( MERGER_METHOD MTH = DFLT_METHOD, double beta0 = DFLT_beta ) {
+    void set_method ( MERGER_METHOD MTH = GEOMETRIC, double beta0 = 1.2 ) {
         METHOD = MTH;
         beta = beta0;
@@ -216 +223 @@
 
     //! Destructor
-    virtual ~merger_base() {
+    virtual ~MergerDiscrete() {
         for ( int i = 0; i < Nsources; i++ ) {
             delete dls ( i );
@@ -229 +236 @@
 
     //!Merge given sources in given points
-    virtual void merge ();
+    void merge ();
 
     //! Merge log-likelihood values in points using method specified by parameter METHOD
     vec merge_points ( mat &lW );
 
-
-    //! sample from merged density
-//! weight w is a
-    vec mean() const;
-
-    mat covariance() const;
-
-    vec variance() const;
-
-    //! Compute log-probability of argument \c val
-    virtual double evallog ( const vec &val ) const NOT_IMPLEMENTED(0);
-
-    //! Returns a sample, \f$ x \f$ from density \f$ f_x()\f$
-    virtual vec sample() const NOT_IMPLEMENTED(0);
-
-    //!@}
+  //!@}
 
     //! \name Access to attributes
@@ -258 +250 @@
         return eSmp;
     }
+
+        eEmp & merger() {return eSmp;}
 
     /*! Create object from the following structure
@@ -279 +273 @@
     //!@}
 };
-UIREGISTER ( merger_base );
-SHAREDPTR ( merger_base );
+UIREGISTER ( MergerDiscrete );
+SHAREDPTR ( MergerDiscrete );
 
 //! \brief Merger using importance sampling with mixture proposal density
-class merger_mix : public merger_base {
+class merger_mix : public MergerDiscrete {
 protected:
     //!Internal mixture of EF models
@@ -311 +305 @@
     //! Set sources and prepare all internal structures
     void set_sources ( const Array<shared_ptr<pdf> > &S ) {
-        merger_base::set_sources ( S );
+        MergerDiscrete::set_sources ( S );
         //Nsources = S.length();
     }
@@ -349 +343 @@
     emix* proposal() {
         emix* tmp = Mix.epredictor();
-        tmp->set_rv ( rv );
+        tmp->set_rv ( merger()._rv() );
         return tmp;
     }
@@ -376 +370 @@
     void validate();
 
+//      const emix &merger(){return *Mpred;}
     //! @}
 };