Changeset 957 for library/bdm/stat/exp_family.cpp

Timestamp:

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

Author:

mido

Message:

a small patches of previous commit as arranged yesterday

Files:

• library/bdm/stat/exp_family.cpp (modified) (2 diffs)

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");
 }