[lmi-commits] [4911] Improve encapsulation; rename private members

[Greg Chicares]

Revision: 4911
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4911
Author:   chicares
Date:     2010-05-06 13:24:12 +0000 (Thu, 06 May 2010)
Log Message:
-----------
Improve encapsulation; rename private members

Modified Paths:
--------------
    lmi/trunk/database.cpp
    lmi/trunk/database.hpp
    lmi/trunk/ihs_database.cpp

Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp      2010-05-06 02:52:45 UTC (rev 4910)
+++ lmi/trunk/database.cpp      2010-05-06 13:24:12 UTC (rev 4911)
@@ -38,7 +38,7 @@
 
 //============================================================================
 product_database::product_database
-    (std::string const& a_ProductName
+    (std::string const& // a_ProductName
     ,mcenum_gender      a_Gender
     ,mcenum_class       a_Class
     ,mcenum_smoking     a_Smoker
@@ -46,8 +46,7 @@
     ,mcenum_uw_basis    a_UWBasis
     ,mcenum_state       a_State
     )
-    :Filename (a_ProductName)
-    ,length_  (0)
+    :length_  (0)
     ,Gender   (a_Gender)
     ,Class    (a_Class)
     ,Smoker   (a_Smoker)
@@ -55,14 +54,13 @@
     ,UWBasis  (a_UWBasis)
     ,State    (a_State)
 {
-//    DBDictionary::instance().Init(Filename);
+//    DBDictionary::instance().Init(a_ProductName);
     DBDictionary::instance().InitAntediluvian();
-    Init();
+    initialize();
 }
 
 //============================================================================
 product_database::product_database(yare_input const& input)
-    :Filename("Irrelevant in antediluvian branch for now")
 {
     Gender      = input.Gender;
     Class       = input.UnderwritingClass;
@@ -71,9 +69,9 @@
     UWBasis     = input.GroupUnderwritingType;
     State       = input.State;
 
-//    DBDictionary::instance().Init(Filename);
+//    DBDictionary::instance().Init("Irrelevant in antediluvian branch.");
     DBDictionary::instance().InitAntediluvian();
-    Init();
+    initialize();
 }
 
 //============================================================================
@@ -94,7 +92,7 @@
 }
 
 //============================================================================
-void product_database::Init()
+void product_database::initialize()
 {
     index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
     length_ = static_cast<int>(*GetEntry(DB_EndtAge)[index_]) - IssueAge;
@@ -103,7 +101,7 @@
 //===========================================================================
 double product_database::Query(int k) const
 {
-    ConstrainScalar(k); // TODO ?? Is the extra overhead acceptable?
+    constrain_scalar(k); // TODO ?? Is the extra overhead acceptable?
     return *GetEntry(k)[index_];
 }
 
@@ -156,12 +154,11 @@
     return (*i).second;
 }
 
-//===========================================================================
 /// Constrain the value extracted from the database to be scalar--i.e.,
 /// invariant by duration. The database item may nonetheless vary
 /// across any axis except duration.
 
-void product_database::ConstrainScalar(int k) const
+void product_database::constrain_scalar(int k) const
 {
     std::vector<double> z;
     Query(z, k);

Modified: lmi/trunk/database.hpp
===================================================================
--- lmi/trunk/database.hpp      2010-05-06 02:52:45 UTC (rev 4910)
+++ lmi/trunk/database.hpp      2010-05-06 13:24:12 UTC (rev 4911)
@@ -74,19 +74,17 @@
 
     void Query(std::vector<double>& dst, int k) const;
 
-    void ConstrainScalar(int k) const;
-
     database_entity const& GetEntry(int k) const;
 
   private:
     product_database();
 
-    void Init();
-    void Init(std::string const& NewFilename);
+    void initialize();
+    void initialize(std::string const& NewFilename);
 
-    database_index  index_;
-    std::string     Filename;
+    void constrain_scalar(int k) const;
 
+    database_index  index_;
     int             length_;
 
     mcenum_gender   Gender;     // gender

Modified: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp  2010-05-06 02:52:45 UTC (rev 4910)
+++ lmi/trunk/ihs_database.cpp  2010-05-06 13:24:12 UTC (rev 4911)
@@ -54,21 +54,20 @@
     ,mcenum_uw_basis    a_UWBasis
     ,mcenum_state       a_State
     )
-    :Filename 
(AddDataDir(product_data(a_ProductName).datum("DatabaseFilename")))
-    ,Gender   (a_Gender)
+    :Gender   (a_Gender)
     ,Class    (a_Class)
     ,Smoker   (a_Smoker)
     ,IssueAge (a_IssueAge)
     ,UWBasis  (a_UWBasis)
     ,State    (a_State)
 {
-    DBDictionary::instance().Init(Filename);
-    Init();
+    std::string 
filename(product_data(a_ProductName).datum("DatabaseFilename"));
+    DBDictionary::instance().Init(AddDataDir(filename));
+    initialize();
 }
 
 //============================================================================
 product_database::product_database(yare_input const& input)
-    
:Filename(AddDataDir(product_data(input.ProductName).datum("DatabaseFilename")))
 {
 // GET RID OF Gender, Class, Smoker, etc.
     Gender      = input.Gender;
@@ -78,8 +77,9 @@
     UWBasis     = input.GroupUnderwritingType;
     State       = mce_s_CT; // Dummy initialization.
 
-    DBDictionary::instance().Init(Filename);
-    Init();
+    std::string 
filename(product_data(input.ProductName).datum("DatabaseFilename"));
+    DBDictionary::instance().Init(AddDataDir(filename));
+    initialize();
 
     // State of jurisdiction is governed by database item DB_PremTaxState.
     // (TODO ?? misnamed--rename it when we rebuild)
@@ -143,7 +143,7 @@
 }
 
 //============================================================================
-void product_database::Init()
+void product_database::initialize()
 {
     index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
 
@@ -158,13 +158,13 @@
         {
         fatal_error() << "Endowment age precedes issue age." << LMI_FLUSH;
         }
-    ConstrainScalar(DB_EndtAge);
+    constrain_scalar(DB_EndtAge);
 }
 
 //===========================================================================
 double product_database::Query(int k) const
 {
-    ConstrainScalar(k); // TODO ?? Is the extra overhead acceptable?
+    constrain_scalar(k); // TODO ?? Is the extra overhead acceptable?
     return *GetEntry(k)[index_];
 }
 
@@ -239,12 +239,11 @@
         }
 }
 
-//===========================================================================
 /// Constrain the value extracted from the database to be scalar--i.e.,
 /// invariant by duration. The database item may nonetheless vary
 /// across any axis except duration.
 
-void product_database::ConstrainScalar(int k) const
+void product_database::constrain_scalar(int k) const
 {
     std::vector<double> z;
     Query(z, k);