Changeset 957

Timestamp:

05/19/10 05:31:37 (15 years ago)

Author:

mido

Message:

a small patches of previous commit as arranged yesterday

Location:

library/bdm/stat

Files:

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

library/bdm/stat/exp_family.cpp

@@ -613 +613 @@
         migamma::from_setting(set);
         vec ref;
+        double k,l;
+
         UI::get ( ref, set, "ref" , UI::compulsory );
-        set_parameters ( set["k"], ref, set["l"] );
-        validate();
-}
+        UI::get( k, set, "k", UI::compulsory );
+        UI::get( l, set, "l", UI::compulsory );
+        set_parameters ( k, ref, l );
+}
+
 void  migamma_ref::to_setting  (Setting  &set) const {
         migamma::to_setting(set);
@@ -623 +627 @@
         UI::save(k,set,"k");
 }
+
 void mlognorm::from_setting ( const Setting &set ) {
         pdf_internal<elognorm>::from_setting(set);
         vec mu0;
+        double k;
         UI::get ( mu0, set, "mu0", UI::compulsory );
-        set_parameters ( mu0.length(), set["k"] );
+        UI::get( k, set, "k", UI::compulsory );
+        set_parameters ( mu0.length(), k );
         condition ( mu0 );
 }
-
 
 void mlognorm::to_setting  (Setting  &set) const {
         pdf_internal<elognorm>::to_setting(set);
         UI::save ( exp(mu + sig2), set, "mu0");
+
+        // inversion of sig2 = 0.5 * log ( k * k + 1 );
+        double k = sqrt( exp( 2 * sig2 ) - 1  );
+        UI::save(k,set,"k");
 }
 

library/bdm/stat/exp_family.h

@@ -1253 +1253 @@
          */
         void from_setting ( const Setting &set );
+
         void to_setting  (Setting  &set) const; 
-        // TODO dodelat void to_setting( Setting &set ) const;
 };
 
@@ -1330 +1330 @@
         */
         void from_setting ( const Setting &set );
+        
         void to_setting  (Setting  &set) const; 
-
-        // TODO dodelat void to_setting( Setting &set ) const;
-
 };
 

library/bdm/stat/merger.cpp

@@ -350 +350 @@
 
 void merger_mix::from_setting ( const Setting& set ) {
-                merger_base::from_setting ( set );
-                Ncoms=DFLT_Ncoms;
-                UI::get( Ncoms, set, "ncoms", UI::optional );
-                effss_coef=DFLT_effss_coef;
-                UI::get (effss_coef , set,  "effss_coef", UI::optional);
-                stop_niter=10;
-                UI::get ( stop_niter, set,"stop_niter", UI::optional );
+        merger_base::from_setting ( set );
+        Ncoms=DFLT_Ncoms;
+        UI::get( Ncoms, set, "ncoms", UI::optional );
+        effss_coef=DFLT_effss_coef;
+        UI::get (effss_coef , set,  "effss_coef", UI::optional);
+        stop_niter=10;
+        UI::get ( stop_niter, set,"stop_niter", UI::optional );         
+}
+
+void    merger_mix::to_setting  (Setting  &set) const  {
+        merger_base::to_setting(set);
+        UI::save( Ncoms, set, "ncoms");
+        UI::save (effss_coef , set,  "effss_coef");
+        UI::save ( stop_niter, set,"stop_niter");
+}
+
+void merger_mix::validate() {
+        merger_base::validate();
+        bdm_assert(Ncoms>0,"Ncoms too small");
+}
+
+void merger_base::from_setting ( const Setting& set ) {
+        // get support
+        // find which method to use
+        epdf::from_setting (set);
+        string meth_str;
+        UI::get( meth_str, set, "method", UI::compulsory );
+        if ( meth_str == "arithmetic" ) 
+                set_method ( ARITHMETIC );
+        else if ( meth_str == "geometric" )             
+                set_method ( GEOMETRIC );
+        else if ( meth_str ==  "lognormal" ) {  
+                set_method ( LOGNORMAL );
+                UI::get(beta, set, "beta", UI::compulsory ); 
+        }
         
-        }
-
-void    merger_mix::to_setting  (Setting  &set) const  {
-                merger_base::to_setting(set);
-                UI::save( Ncoms, set, "ncoms");
-                UI::save (effss_coef , set,  "effss_coef");
-                UI::save ( stop_niter, set,"stop_niter");
-
-        }
-
-void merger_mix::validate() {
-                merger_base::validate();
-                bdm_assert(Ncoms>0,"Ncoms too small");
-        }
-
-void merger_base::from_setting ( const Setting& set ) {
-                // get support
-                // find which method to use
-                epdf::from_setting (set);
-                string meth_str;
-                UI::get<string> ( meth_str, set, "method", UI::compulsory );
-                if ( !strcmp ( meth_str.c_str(), "arithmetic" ) )
-                        set_method ( ARITHMETIC );
-                else {
-                        if ( !strcmp ( meth_str.c_str(), "geometric" ) )
-                                set_method ( GEOMETRIC );
-                        else if ( !strcmp ( meth_str.c_str(), "lognormal" ) ) {
-                                set_method ( LOGNORMAL );
-                                set.lookupValue ( "beta", beta );
-                        }
-                }
-                string dbg_file;
-                if ( UI::get ( dbg_file, set, "dbg_file" ) )
-                        set_debug_file ( dbg_file );
-                //validate() - not used
-        }
-        
-        void merger_base::to_setting  (Setting  &set) const {
-                epdf::to_setting(set);
+
+        string dbg_filename;
+        if ( UI::get ( dbg_filename, set, "dbg_file" ) )
+                set_debug_file( dbg_filename );
+
+}
+
+void merger_base::to_setting  (Setting  &set) const {
+        epdf::to_setting(set);
                 
-                UI::save( METHOD, set, "method");
+        UI::save( METHOD, set, "method");
+
+        if( METHOD == LOGNORMAL )
+                UI::save (beta, set, "beta" );
+
+        if( DBG ) 
                 UI::save ( dbg_file->get_fname(), set, "dbg_file" );
-                UI::save (beta, set, "beta" );
-        }
-
-        void merger_base::validate() {
+}
+
+void merger_base::validate() {
 //              bdm_assert ( eSmp._w().length() > 0, "Empty support, use set_support()." );
 //              bdm_assert ( dim == eSmp._samples() ( 0 ).length(), "Support points and rv are not compatible!" );
-                epdf::validate();
-                bdm_assert ( isnamed(), "mergers must be named" );
-        }
+        epdf::validate();
+        bdm_assert ( isnamed(), "mergers must be named" );
+}
+
 // DEFAULTS FOR MERGER_BASE
 const MERGER_METHOD merger_base::DFLT_METHOD = LOGNORMAL;

library/bdm/stat/merger.h

@@ -104 +104 @@
                 eSmp.validate();
         }
+
+
         //! set debug file
         void set_debug_file ( const string fname ) {
                 if ( DBG ) delete dbg_file;
                 dbg_file = new it_file ( fname );
-                if ( dbg_file ) DBG = true;
-        }
+                DBG = ( dbg_file != 0 );
+        }
+
         //! Set internal parameters used in approximation
         void set_method ( MERGER_METHOD MTH = DFLT_METHOD, double beta0 = DFLT_beta ) {