Changeset 399

Timestamp:

06/29/09 15:18:56 (15 years ago)

Author:

smidl

Message:

compilation + DFLT in merger

Location:

library/bdm

Files:

• base/user_info.h (modified) (2 diffs)
• stat/merger.cpp (modified) (1 diff)
• stat/merger.h (modified) (4 diffs)

library/bdm/base/user_info.h

@@ -2 +2 @@
   \file
   \brief UI (user info) class for loading/saving objects from/to configuration files.  
-  It is designed over with an use of 'libconfig � C/C++ Configuration File Library'
+  It is designed with use of libconfig C/C++ Configuration File Library
   \author Vaclav Smidl.
 
@@ -73 +73 @@
                 return message.c_str();
         }
+        ~UIException() throw() {};
 };
 

library/bdm/stat/merger.cpp

@@ -223 +223 @@
         }
 
+        // DEFAULTS FOR MERGER_BASE 
+        const MERGER_METHOD merger_base::DFLT_METHOD=LOGNORMAL;
+        const double merger_base::DFLT_beta=1.2;
+        // DEFAULTS FOR MERGER_MIX
+        const int merger_mix::DFLT_Ncoms=10;
+        const double merger_mix::DFLT_effss_coef=0.5;
+
 }

library/bdm/stat/merger.h

@@ -59 +59 @@
                 //! switch of the methoh used for merging
                 MERGER_METHOD METHOD;
+                //! Default for METHOD
+                static const MERGER_METHOD DFLT_METHOD;
+                
                 //!Prior on the log-normal merging model
                 double beta;
-
+                //! default for beta
+                static const double DFLT_beta;
+                
                 //! Projection to empirical density (could also be piece-wise linear)
                 eEmp eSmp;
@@ -162 +167 @@
                 }
                 //! Set internal parameters used in approximation
-                void set_method (MERGER_METHOD MTH, double beta0 = 0.0) {
+                void set_method (MERGER_METHOD MTH=DFLT_METHOD, double beta0 = DFLT_beta) {
                         METHOD = MTH;
                         beta = beta0;
@@ -307 +312 @@
                 //! stop after niter iterations
                 int stop_niter;
+                
+                //! default value for Ncoms
+                static const int DFLT_Ncoms;
+                //! default value for efss_coef;
+                static const double DFLT_effss_coef;
 
         public:
@@ -319 +329 @@
                 }
                 //! Set internal parameters used in approximation
-                void set_parameters (int Ncoms0 = 10, double effss_coef0 = 0.5) {
+                void set_parameters (int Ncoms0 = DFLT_Ncoms, double effss_coef0 = DFLT_effss_coef) {
                         Ncoms = Ncoms0;
                         effss_coef = effss_coef0;