[lmi-commits] [5591] Rename certain database entities

[Greg Chicares]

Revision: 5591
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5591
Author:   chicares
Date:     2012-11-10 13:33:25 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
Rename certain database entities

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/dbnames.xpp
    lmi/trunk/ihs_basicval.cpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2012-11-09 13:11:24 UTC (rev 5590)
+++ lmi/trunk/dbdict.cpp        2012-11-10 13:33:25 UTC (rev 5591)
@@ -364,8 +364,8 @@
     ascribe("MaturityAge"         , &DBDictionary::MaturityAge         );
     ascribe("LapseIgnoresSurrChg" , &DBDictionary::LapseIgnoresSurrChg );
     ascribe("DefaultProcessOrder" , &DBDictionary::DefaultProcessOrder );
-    ascribe("TableYTable"         , &DBDictionary::TableYTable         );
-    ascribe("Gam83Table"          , &DBDictionary::Gam83Table          );
+    ascribe("GroupProxyRateTable" , &DBDictionary::GroupProxyRateTable );
+    ascribe("PartialMortTable"    , &DBDictionary::PartialMortTable    );
     ascribe("WeightClass"         , &DBDictionary::WeightClass         );
     ascribe("WeightGender"        , &DBDictionary::WeightGender        );
     ascribe("WeightSmoking"       , &DBDictionary::WeightSmoking       );
@@ -807,24 +807,15 @@
     Add(database_entity(DB_LedgerType          , mce_ill_reg));
     Add(database_entity(DB_AllowExpRating      , false));
 
-    // These aren't really NY Table Y group rates--in fact, they're
-    // US 65-70 male ALB. Though NY Table Y is occasionally
-    // encountered in the group-carveout market, it's not included
+    // These rates are US 65-70 male ALB. NY Table Y is more often
+    // encountered in the group-carveout market, but it's not included
     // in the SOA's databases; for default initialization, a widely-
     // available table is preferred.
-    //
-    // DATABASE !! Hence, the entity is misnamed; it really means
-    // something like "group proxy rate". However, what's really
-    // wanted is a choice among tables. The same can be said of
-    // 'DB_Gam83Table', which really means "partial-mortality table";
-    // this support request:
-    //   http://savannah.nongnu.org/support/?105593
-    // would offer a choice and make that database entity unnecessary.
-    Add(database_entity(DB_TableYTable         , 358));
+    Add(database_entity(DB_GroupProxyRateTable , 358));
 
     // Use male rates for unisex--1983 GAM seems to have no unisex version.
     double T83Gam[3] = {825, 826, 826,};
-    Add(database_entity(DB_Gam83Table, e_number_of_axes, dims311, T83Gam, "Use 
male rates for unisex--1983 GAM seems to have no unisex version."));
+    Add(database_entity(DB_PartialMortTable, e_number_of_axes, dims311, 
T83Gam, "Use male rates for unisex--1983 GAM seems to have no unisex 
version."));
 
     Add(database_entity(DB_AllowWd             , true));
     Add(database_entity(DB_AllowLoan           , true));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2012-11-09 13:11:24 UTC (rev 5590)
+++ lmi/trunk/dbdict.hpp        2012-11-10 13:33:25 UTC (rev 5591)
@@ -341,8 +341,13 @@
     database_entity MaturityAge         ;
     database_entity LapseIgnoresSurrChg ;
     database_entity DefaultProcessOrder ;
-    database_entity TableYTable         ;
-    database_entity Gam83Table          ;
+    database_entity GroupProxyRateTable ;
+    // SOMEDAY !! This support request:
+    //   http://savannah.nongnu.org/support/?105593
+    // would move the choice of partial mortality table to the GUI and
+    // make this entity superfluous. 'GroupProxyRateTable' could be
+    // treated the same way.
+    database_entity PartialMortTable    ;
     database_entity WeightClass         ;
     database_entity WeightGender        ;
     database_entity WeightSmoking       ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2012-11-09 13:11:24 UTC (rev 5590)
+++ lmi/trunk/dbnames.hpp       2012-11-10 13:33:25 UTC (rev 5591)
@@ -450,8 +450,8 @@
         ,DB_LapseIgnoresSurrChg
         ,DB_DefaultProcessOrder
 
-        ,DB_TableYTable
-        ,DB_Gam83Table
+        ,DB_GroupProxyRateTable
+        ,DB_PartialMortTable
 
     ,DB_Topic_Weights
 

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2012-11-09 13:11:24 UTC (rev 5590)
+++ lmi/trunk/dbnames.xpp       2012-11-10 13:33:25 UTC (rev 5591)
@@ -289,8 +289,8 @@
 {DB_MaturityAge,DB_Topic_Miscellanea,"MaturityAge","Normal maturity age",}, \
 {DB_LapseIgnoresSurrChg,DB_Topic_Miscellanea,"LapseIgnoresSurrChg","Ignore 
tabular surrender charge for lapse processing",}, \
 {DB_DefaultProcessOrder,DB_Topic_Miscellanea,"DefaultProcessOrder","Default 
processing order: 0=life by life, 1=month by month [not yet implemented]",}, \
-{DB_TableYTable,DB_Topic_Miscellanea,"TableYTable","New York table Y (index in 
mortality table database)",}, \
-{DB_Gam83Table,DB_Topic_Miscellanea,"Gam83Table","1983 Group Annuitant 
Mortality table (index in mortality table database)",}, \
+{DB_GroupProxyRateTable,DB_Topic_Miscellanea,"GroupProxyRateTable","Group-term 
proxy rate (index in mortality table database)",}, \
+{DB_PartialMortTable,DB_Topic_Miscellanea,"PartialMortTable","Partial 
mortality table (index in mortality table database)",}, \
 {DB_Topic_Weights,DB_FIRST,"Weights","Weights for profit analysis cells [not 
yet implemented]",}, \
 {DB_WeightClass,DB_Topic_Weights,"WeightClass","Weight by underwriting class 
[not yet implemented]",}, \
 {DB_WeightGender,DB_Topic_Weights,"WeightGender","Weight by gender [not yet 
implemented]",}, \

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-11-09 13:11:24 UTC (rev 5590)
+++ lmi/trunk/ihs_basicval.cpp  2012-11-10 13:33:25 UTC (rev 5591)
@@ -1886,7 +1886,7 @@
 {
     return GetTable
         (ProductData_->datum("TableYFilename")
-        ,DB_TableYTable
+        ,DB_GroupProxyRateTable
         );
 }
 
@@ -1919,7 +1919,7 @@
 {
     return GetTable
         (ProductData_->datum("Gam83Filename")
-        ,DB_Gam83Table
+        ,DB_PartialMortTable
         ,true
         ,CannotBlend
         ,CanBlend