[lmi-commits] [5652] Add numerous database entities for 7702 and 7702A

[Greg Chicares]

Revision: 5652
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5652
Author:   chicares
Date:     2013-01-09 14:02:32 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Add numerous database entities for 7702 and 7702A

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-09 13:09:21 UTC (rev 5651)
+++ lmi/trunk/ChangeLog 2013-01-09 14:02:32 UTC (rev 5652)
@@ -31779,3 +31779,29 @@
 harder to overlook subtleties. Any 7702-specific load component should
 be handled explicitly--as premium tax is, for now at least.
 
+20130109T1256Z <address@hidden> [544]
+
+  dbnames.hpp
+Improve documentation.
+
+20130109T1304Z <address@hidden> [544]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+Improve names of certain database entities.
+
+20130109T1309Z <address@hidden> [544]
+
+  dbdict.cpp
+Clarify by using a more generic table number for unused tables.
+
+20130109T1402Z <address@hidden> [544]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+Add numerous database entities for 7702 and 7702A.
+

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2013-01-09 13:09:21 UTC (rev 5651)
+++ lmi/trunk/dbdict.cpp        2013-01-09 14:02:32 UTC (rev 5652)
@@ -146,9 +146,19 @@
     ascribe("AllowCvat"           , &DBDictionary::AllowCvat           );
     ascribe("AllowGpt"            , &DBDictionary::AllowGpt            );
     ascribe("AllowNo7702"         , &DBDictionary::AllowNo7702         );
+    ascribe("CorridorWhence"      , &DBDictionary::CorridorWhence      );
+    ascribe("Irc7702NspWhence"    , &DBDictionary::Irc7702NspWhence    );
+    ascribe("SevenPayWhence"      , &DBDictionary::SevenPayWhence      );
     ascribe("CorridorTable"       , &DBDictionary::CorridorTable       );
+    ascribe("Irc7702NspTable"     , &DBDictionary::Irc7702NspTable     );
     ascribe("SevenPayTable"       , &DBDictionary::SevenPayTable       );
     ascribe("Irc7702QTable"       , &DBDictionary::Irc7702QTable       );
+    ascribe("RatingsAffect7702"   , &DBDictionary::RatingsAffect7702   );
+    ascribe("CvatMatChangeDefn"   , &DBDictionary::CvatMatChangeDefn   );
+    ascribe("CorrHidesIncreases"  , &DBDictionary::CorrHidesIncreases  );
+    ascribe("Irc7702BftIsSpecAmt" , &DBDictionary::Irc7702BftIsSpecAmt );
+    ascribe("Initial7702BftIsDb"  , &DBDictionary::Initial7702BftIsDb  );
+    ascribe("Irc7702Endowment"    , &DBDictionary::Irc7702Endowment    );
     ascribe("Equiv7702Dbo3"       , &DBDictionary::Equiv7702Dbo3       );
     ascribe("GuarCoiTable"        , &DBDictionary::GuarCoiTable        );
     ascribe("GuarCoiIsAnnual"     , &DBDictionary::GuarCoiIsAnnual     );
@@ -707,10 +717,15 @@
     Add(database_entity(DB_AllowCvat           , true));
     Add(database_entity(DB_AllowGpt            , true));
 
-    // This is just a sample product, so we make do with plausible
+    Add(database_entity(DB_CorridorWhence      , 1));
+    Add(database_entity(DB_Irc7702NspWhence    , 2));
+    Add(database_entity(DB_SevenPayWhence      , 1));
+    // This is just a sample product, so make do with plausible
     // all-male seven-pay premiums, and use GPT corridor factors for
-    // CVAT.
+    // CVAT. 'Irc7702NspWhence' specifies that NSP is calculated as
+    // the reciprocal of corridor, so no NSP table is needed.
     Add(database_entity(DB_CorridorTable       , 7));
+    Add(database_entity(DB_Irc7702NspTable     , 0));
     Add(database_entity(DB_SevenPayTable       , 10));
 
     // Following IRS Notice 88-128, use only the male and female
@@ -890,6 +905,12 @@
     Add(database_entity(DB_EnforceNaarLimit    , true));
     Add(database_entity(DB_DynamicSepAcctLoad  , false));
     Add(database_entity(DB_SpecAmtLoadLimit    , 10000000.0));
+    Add(database_entity(DB_RatingsAffect7702   , false));
+    Add(database_entity(DB_CvatMatChangeDefn   , 
mce_earlier_of_increase_or_unnecessary_premium));
+    Add(database_entity(DB_CorrHidesIncreases  , false));
+    Add(database_entity(DB_Irc7702BftIsSpecAmt , 0));
+    Add(database_entity(DB_Initial7702BftIsDb  , false));
+    Add(database_entity(DB_Irc7702Endowment    , 0));
     Add(database_entity(DB_Equiv7702Dbo3       , 0));
     Add(database_entity(DB_ExpRatRiskCoiMult   , 0));
     Add(database_entity(DB_SurrChgSpecAmtMult  , 0.0));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2013-01-09 13:09:21 UTC (rev 5651)
+++ lmi/trunk/dbdict.hpp        2013-01-09 14:02:32 UTC (rev 5652)
@@ -121,9 +121,19 @@
     database_entity AllowCvat           ;
     database_entity AllowGpt            ;
     database_entity AllowNo7702         ;
+    database_entity CorridorWhence      ;
+    database_entity Irc7702NspWhence    ;
+    database_entity SevenPayWhence      ;
     database_entity CorridorTable       ;
+    database_entity Irc7702NspTable     ;
     database_entity SevenPayTable       ;
     database_entity Irc7702QTable       ;
+    database_entity RatingsAffect7702   ;
+    database_entity CvatMatChangeDefn   ;
+    database_entity CorrHidesIncreases  ;
+    database_entity Irc7702BftIsSpecAmt ;
+    database_entity Initial7702BftIsDb  ;
+    database_entity Irc7702Endowment    ;
     database_entity Equiv7702Dbo3       ;
     database_entity GuarCoiTable        ;
     database_entity GuarCoiIsAnnual     ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2013-01-09 13:09:21 UTC (rev 5651)
+++ lmi/trunk/dbnames.hpp       2013-01-09 14:02:32 UTC (rev 5652)
@@ -157,10 +157,20 @@
         ,DB_AllowGpt
         ,DB_AllowNo7702
 
+        ,DB_CorridorWhence
+        ,DB_Irc7702NspWhence
+        ,DB_SevenPayWhence
         ,DB_CorridorTable
+        ,DB_Irc7702NspTable
         ,DB_SevenPayTable
         ,DB_Irc7702QTable
 
+        ,DB_RatingsAffect7702
+        ,DB_CvatMatChangeDefn
+        ,DB_CorrHidesIncreases
+        ,DB_Irc7702BftIsSpecAmt
+        ,DB_Initial7702BftIsDb
+        ,DB_Irc7702Endowment
         ,DB_Equiv7702Dbo3
 
     ,DB_Topic_MortalityCharges

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2013-01-09 13:09:21 UTC (rev 5651)
+++ lmi/trunk/dbnames.xpp       2013-01-09 14:02:32 UTC (rev 5652)
@@ -53,9 +53,19 @@
 {DB_AllowCvat,DB_Topic_7702And7702A,"AllowCvat","Allow cash value accumulation 
test: 0=no, 1=yes",}, \
 {DB_AllowGpt,DB_Topic_7702And7702A,"AllowGpt","Allow guideline premium test: 
0=no, 1=yes",}, \
 {DB_AllowNo7702,DB_Topic_7702And7702A,"AllowNo7702","Allow 7702 to be ignored 
(foreign): 0=no, 1=yes",}, \
-{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_CorridorWhence,DB_Topic_7702And7702A,"CorridorWhence","Source of CVAT 
'corridor' factors: 0=first principles, 1=table",}, \
+{DB_Irc7702NspWhence,DB_Topic_7702And7702A,"Irc7702NspWhence","Source of 7702 
and 7702A net single premium rates: 0=first principles, 1=table, 2=reciprocal 
of CVAT corridor",}, \
+{DB_SevenPayWhence,DB_Topic_7702And7702A,"SevenPayWhence","Source of 7702A 
seven-pay premium rates: 0=first principles, 1=table",}, \
+{DB_CorridorTable,DB_Topic_7702And7702A,"CorridorTable","CVAT 'corridor' 
factors (index in mortality table database)",}, \
+{DB_Irc7702NspTable,DB_Topic_7702And7702A,"Irc7702NspTable","7702 and 7702A 
net single premium rates per $1 (index in mortality table database)",}, \
+{DB_SevenPayTable,DB_Topic_7702And7702A,"SevenPayTable","7702A 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_RatingsAffect7702,DB_Topic_7702And7702A,"RatingsAffect7702","Flat extras 
and table ratings affect 7702 and 7702A calculations: 0=no, 1=yes",}, \
+{DB_CvatMatChangeDefn,DB_Topic_7702And7702A,"CvatMatChangeDefn","Definition of 
7702A material change for CVAT: 0=unnec prem, 1=increase, 2=increase after 
unnec prem, 3=any unnec prem or increase",}, \
+{DB_CorrHidesIncreases,DB_Topic_7702And7702A,"CorrHidesIncreases","For 7702 
and 7702A, ignore specified-amount increases that don't affect DB due to 
corridor: 0=no, 1=yes",}, \
+{DB_Irc7702BftIsSpecAmt,DB_Topic_7702And7702A,"Irc7702BftIsSpecAmt","7702(f)(3)
 'death benefit' is specamt rather than DB: 0=no, 1=yes",}, \
+{DB_Initial7702BftIsDb,DB_Topic_7702And7702A,"Initial7702BftIsDb","For DBO 2, 
riskily reflect 1035 and initial payment in initial 7702(f)(3) 'death benefit': 
0=no, 1=yes",}, \
+{DB_Irc7702Endowment,DB_Topic_7702And7702A,"Irc7702Endowment","7702(e)(1)(D) 
endowment amount for 7702 and 7702A calculations: 0=specamt, 1=initial specamt 
(LDB), 2=none",}, \
 {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)",}, \