Changeset 773

Timestamp:

01/12/10 20:26:03 (15 years ago)

Author:

smidl

Message:

robustification of merger

Location:

library/bdm/stat

Files:

• exp_family.h (modified) (2 diffs)
• merger.cpp (modified) (3 diffs)
• merger.h (modified) (1 diff)

library/bdm/stat/exp_family.h

@@ -144 +144 @@
         */
         void from_setting ( const Setting &root );
+        void to_setting ( Setting &root ) const ;
+        
         void validate() {
                 bdm_assert ( mu.length() == R.rows(), "mu and R parameters do not match" );
@@ -1535 +1537 @@
 
 template<class sq_T>
+void enorm<sq_T>::to_setting ( Setting &set ) const {
+        epdf::to_setting ( set ); //reads rv    
+        UI::save ( mu, set, "mu");
+        UI::save ( R.to_mat(), set, "R");
+}
+
+template<class sq_T>
 void enorm<sq_T>::dupdate ( mat &v, double nu ) {
         //

library/bdm/stat/merger.cpp

@@ -169 +169 @@
 
 vec merger_base::variance() const {
-        const vec &w = eSmp._w();
-        const Array<vec> &S = eSmp._samples();
-
-        vec tmp = zeros ( dim );
-        for ( int i = 0; i < Nsources; i++ ) {
-                tmp += w ( i ) * pow ( S ( i ), 2 );
-        }
-        return tmp - pow ( mean(), 2 );
+        return eSmp.variance();
 }
 
 void merger_mix::merge ( ) {
+        if(Npoints<1){
+                set_support(enorm<fsqmat>(zeros(dim), eye(dim)), 100);
+        }
+                
+        bdm_assert(Npoints>0,"No points in support");
+        bdm_assert(Nsources>0,"No Sources");
+        
         Array<vec> &Smp = eSmp._samples(); //aux
         vec &w = eSmp._w(); //aux
@@ -250 +250 @@
                         sprintf ( dbg_str, "Mpred_var%d", niter );
                         *dbg_file << Name ( dbg_str ) << Mpred->variance();
-
+                        sprintf ( dbg_str, "Mpred_cov%d", niter );
+                        *dbg_file << Name ( dbg_str ) << covariance();
+                        
 
                         sprintf ( dbg_str, "pdf%d", niter );
@@ -350 +352 @@
 // DEFAULTS FOR MERGER_MIX
 const int merger_mix::DFLT_Ncoms = 10;
-const double merger_mix::DFLT_effss_coef = 0.5;
-
-}
+const double merger_mix::DFLT_effss_coef = 0.9;
+
+}

library/bdm/stat/merger.h

@@ -271 +271 @@
                 merger_base::from_setting ( set );
                 Ncoms=DFLT_Ncoms;
-                set.lookupValue ( "ncoms", Ncoms );
+                UI::get( Ncoms, set, "ncoms", UI::optional );
                 effss_coef=DFLT_effss_coef;
-                set.lookupValue ( "effss_coef", effss_coef );
+                UI::get (effss_coef , set,  "effss_coef", UI::optional);
                 stop_niter=10;
-                set.lookupValue ( "stop_niter", stop_niter );
+                UI::get ( stop_niter, set,"stop_niter", UI::optional );
+                
+                validate();
+        }
+        void validate() {
+                bdm_assert(Ncoms>0,"Ncoms too small");
         }