[lmi-commits] [5648] Remove unused 'PremLoad7702' database entity

[Greg Chicares]

Revision: 5648
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5648
Author:   chicares
Date:     2013-01-07 21:49:34 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Remove unused 'PremLoad7702' database entity

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-01-06 08:44:15 UTC (rev 5647)
+++ lmi/trunk/ChangeLog 2013-01-07 21:49:34 UTC (rev 5648)
@@ -31768,3 +31768,14 @@
   input_harmonization.cpp
 Enforce spouse and child rider amount limits.
 
+20130107T2149Z <address@hidden> [544]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+Remove unused 'PremLoad7702' database entity. Combining premium-based
+loads actually used for calculating current account value makes it
+harder to overlook subtleties. Any 7702-specific load component should
+be handled explicitly--as premium tax is, for now at least.
+

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2013-01-06 08:44:15 UTC (rev 5647)
+++ lmi/trunk/dbdict.cpp        2013-01-07 21:49:34 UTC (rev 5648)
@@ -149,7 +149,6 @@
     ascribe("CorridorTable"       , &DBDictionary::CorridorTable       );
     ascribe("SevenPayTable"       , &DBDictionary::SevenPayTable       );
     ascribe("Irc7702QTable"       , &DBDictionary::Irc7702QTable       );
-    ascribe("PremLoad7702"        , &DBDictionary::PremLoad7702        );
     ascribe("Equiv7702Dbo3"       , &DBDictionary::Equiv7702Dbo3       );
     ascribe("GuarCoiTable"        , &DBDictionary::GuarCoiTable        );
     ascribe("GuarCoiIsAnnual"     , &DBDictionary::GuarCoiIsAnnual     );
@@ -725,7 +724,6 @@
     double T7702q[9] = {35, 41, 107,}; // Female, male, unisex.
     Add(database_entity(DB_Irc7702QTable, e_number_of_axes, dims311, T7702q));
 
-    Add(database_entity(DB_PremLoad7702        , 0.02));
     Add(database_entity(DB_AllowDbo1           , true));
     Add(database_entity(DB_AllowDbo2           , true));
     Add(database_entity(DB_AllowDbo3           , true));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2013-01-06 08:44:15 UTC (rev 5647)
+++ lmi/trunk/dbdict.hpp        2013-01-07 21:49:34 UTC (rev 5648)
@@ -124,7 +124,6 @@
     database_entity CorridorTable       ;
     database_entity SevenPayTable       ;
     database_entity Irc7702QTable       ;
-    database_entity PremLoad7702        ;
     database_entity Equiv7702Dbo3       ;
     database_entity GuarCoiTable        ;
     database_entity GuarCoiIsAnnual     ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2013-01-06 08:44:15 UTC (rev 5647)
+++ lmi/trunk/dbnames.hpp       2013-01-07 21:49:34 UTC (rev 5648)
@@ -143,7 +143,6 @@
         ,DB_SevenPayTable
         ,DB_Irc7702QTable
 
-        ,DB_PremLoad7702
         ,DB_Equiv7702Dbo3
 
     ,DB_Topic_MortalityCharges

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2013-01-06 08:44:15 UTC (rev 5647)
+++ lmi/trunk/dbnames.xpp       2013-01-07 21:49:34 UTC (rev 5648)
@@ -56,7 +56,6 @@
 {DB_CorridorTable,DB_Topic_7702And7702A,"CorridorTable","Cash value 
accumulation test 'corridor' factor (index in mortality table database)",}, \
 {DB_SevenPayTable,DB_Topic_7702And7702A,"SevenPayTable","7702A table of annual 
seven-pay premium rates per $1 (index in mortality table database)",}, \
 {DB_Irc7702QTable,DB_Topic_7702And7702A,"Irc7702QTable","7702 and 7702A annual 
mortality rate (index in mortality table database)",}, \
-{DB_PremLoad7702,DB_Topic_7702And7702A,"PremLoad7702","Premium load for 7702 
and 7702A (may be lower than current premium load for simplicity)",}, \
 {DB_Equiv7702Dbo3,DB_Topic_7702And7702A,"Equiv7702Dbo3","For 7702, treat 
return of premium death benefit option same as: 0=level 1=increasing",}, \
 {DB_Topic_MortalityCharges,DB_FIRST,"Mortality charges","Mortality rates, 
limits, conversions, and reentry",}, \
 {DB_GuarCoiTable,DB_Topic_MortalityCharges,"GuarCoiTable","Guaranteed 
mortality charge table (index in mortality table database)",}, \