[lmi-commits] [5889] Rearrange and refactor, indicating whether term is a QAB

[Greg Chicares]

Revision: 5889
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5889
Author:   chicares
Date:     2014-05-04 15:59:12 +0000 (Sun, 04 May 2014)
Log Message:
-----------
Rearrange and refactor, indicating whether term is a QAB

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/ChangeLog 2014-05-04 15:59:12 UTC (rev 5889)
@@ -33761,3 +33761,15 @@
   version.hpp
 Designate release candidate 5888.
 
+20140504T1559Z <address@hidden> [542]
+
+  dbdict.cpp
+  dbdict.hpp
+  dbnames.hpp
+  dbnames.xpp
+  ihs_basicval.cpp
+Rearrange and refactor, indicating whether term is a QAB. Combine this
+with the death-benefit flag, because those two ways of treating a term
+rider are mutually exclusive. Rearrange to show that QAB treatment for
+this and other riders is more a 7702 than a rider parameter.
+

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/dbdict.cpp        2014-05-04 15:59:12 UTC (rev 5889)
@@ -162,6 +162,8 @@
     ascribe("Initial7702BftIsDb"  , &DBDictionary::Initial7702BftIsDb  );
     ascribe("Irc7702Endowment"    , &DBDictionary::Irc7702Endowment    );
     ascribe("Equiv7702Dbo3"       , &DBDictionary::Equiv7702Dbo3       );
+    ascribe("TermIsQABOrDb7702"   , &DBDictionary::TermIsQABOrDb7702   );
+    ascribe("TermIsQABOrDb7702A"  , &DBDictionary::TermIsQABOrDb7702A  );
     ascribe("GuarCoiTable"        , &DBDictionary::GuarCoiTable        );
     ascribe("GuarCoiIsAnnual"     , &DBDictionary::GuarCoiIsAnnual     );
     ascribe("GuarCoiMultiplier"   , &DBDictionary::GuarCoiMultiplier   );
@@ -295,8 +297,6 @@
     ascribe("MaxTermProportion"   , &DBDictionary::MaxTermProportion   );
     ascribe("TermCoiRate"         , &DBDictionary::TermCoiRate         );
     ascribe("TermPremRate"        , &DBDictionary::TermPremRate        );
-    ascribe("TermIsDbFor7702"     , &DBDictionary::TermIsDbFor7702     );
-    ascribe("TermIsDbFor7702A"    , &DBDictionary::TermIsDbFor7702A    );
     ascribe("AllowWp"             , &DBDictionary::AllowWp             );
     ascribe("WpTable"             , &DBDictionary::WpTable             );
     ascribe("WpMinIssAge"         , &DBDictionary::WpMinIssAge         );
@@ -803,8 +803,6 @@
     Add(database_entity(DB_MaxTermProportion   , 0.0));
     Add(database_entity(DB_TermCoiRate         , 0.0));
     Add(database_entity(DB_TermPremRate        , 0.0));
-    Add(database_entity(DB_TermIsDbFor7702     , true));
-    Add(database_entity(DB_TermIsDbFor7702A    , true));
     Add(database_entity(DB_WpTable             , 8));
     Add(database_entity(DB_AllowWp             , true));
     Add(database_entity(DB_WpMinIssAge         , 18));
@@ -926,6 +924,8 @@
     Add(database_entity(DB_Initial7702BftIsDb  , false));
     Add(database_entity(DB_Irc7702Endowment    , 0));
     Add(database_entity(DB_Equiv7702Dbo3       , 0));
+    Add(database_entity(DB_TermIsQABOrDb7702   , 1));
+    Add(database_entity(DB_TermIsQABOrDb7702A  , 1));
     Add(database_entity(DB_ExpRatRiskCoiMult   , 0));
     Add(database_entity(DB_SurrChgSpecAmtMult  , 0.0));
     Add(database_entity(DB_AllowSpouseRider    , false));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/dbdict.hpp        2014-05-04 15:59:12 UTC (rev 5889)
@@ -138,6 +138,8 @@
     database_entity Initial7702BftIsDb  ;
     database_entity Irc7702Endowment    ;
     database_entity Equiv7702Dbo3       ;
+    database_entity TermIsQABOrDb7702   ;
+    database_entity TermIsQABOrDb7702A  ;
     database_entity GuarCoiTable        ;
     database_entity GuarCoiIsAnnual     ;
     database_entity GuarCoiMultiplier   ;
@@ -271,8 +273,6 @@
     database_entity MaxTermProportion   ;
     database_entity TermCoiRate         ;
     database_entity TermPremRate        ;
-    database_entity TermIsDbFor7702     ;
-    database_entity TermIsDbFor7702A    ;
     database_entity AllowWp             ;
     database_entity WpTable             ;
     database_entity WpMinIssAge         ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/dbnames.hpp       2014-05-04 15:59:12 UTC (rev 5889)
@@ -175,6 +175,9 @@
         ,DB_Irc7702Endowment
         ,DB_Equiv7702Dbo3
 
+        ,DB_TermIsQABOrDb7702
+        ,DB_TermIsQABOrDb7702A
+
     ,DB_Topic_MortalityCharges
 
         ,DB_GuarCoiTable
@@ -358,8 +361,6 @@
         ,DB_MaxTermProportion
         ,DB_TermCoiRate
         ,DB_TermPremRate
-        ,DB_TermIsDbFor7702
-        ,DB_TermIsDbFor7702A
 
         ,DB_AllowWp
         ,DB_WpTable

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/dbnames.xpp       2014-05-04 15:59:12 UTC (rev 5889)
@@ -69,6 +69,8 @@
 {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_TermIsQABOrDb7702,DB_Topic_7702And7702A,"TermIsQABOrDb7702","Treat term 
rider as QAB or death benefit for 7702: 0=neither, 1=DB, 2=QAB",}, \
+{DB_TermIsQABOrDb7702A,DB_Topic_7702And7702A,"TermIsQABOrDb7702A","Treat term 
rider as QAB or death benefit for 7702A: 0=neither, 1=DB, 2=QAB",}, \
 {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)",}, \
 {DB_GuarCoiIsAnnual,DB_Topic_MortalityCharges,"GuarCoiIsAnnual","Guaranteed 
cost of insurance table rates are: 0=monthly, 1=annual",}, \
@@ -210,8 +212,6 @@
 {DB_MaxTermProportion,DB_Topic_Riders,"MaxTermProportion","Term rider as 
maximum proportion of total coverage [not yet implemented]",}, \
 {DB_TermCoiRate,DB_Topic_Riders,"TermCoiRate","[not yet implemented--use 
external table instead]",}, \
 {DB_TermPremRate,DB_Topic_Riders,"TermPremRate","[not yet implemented--use 
external table instead]",}, \
-{DB_TermIsDbFor7702,DB_Topic_Riders,"TermIsDbFor7702","Term rider qualifies as 
death benefit for 7702: 0=no, 1=yes",}, \
-{DB_TermIsDbFor7702A,DB_Topic_Riders,"TermIsDbFor7702A","Term rider qualifies 
as death benefit for 7702A: 0=no, 1=yes",}, \
 {DB_AllowWp,DB_Topic_Riders,"AllowWp","Allow waiver benefit: 0=no, 1=yes",}, \
 {DB_WpTable,DB_Topic_Riders,"WpTable","Waiver benefit charge (index in 
mortality table database)",}, \
 {DB_WpMinIssAge,DB_Topic_Riders,"WpMinIssAge","Waiver benefit minimum issue 
age",}, \

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2014-04-24 14:20:16 UTC (rev 5888)
+++ lmi/trunk/ihs_basicval.cpp  2014-05-04 15:59:12 UTC (rev 5889)
@@ -719,8 +719,6 @@
     AllowTerm           = Database_->Query(DB_AllowTerm            );
     TermForcedConvAge   = 
static_cast<int>(Database_->Query(DB_TermForcedConvAge));
     TermForcedConvDur   = 
static_cast<int>(Database_->Query(DB_TermForcedConvDur));
-    TermIsDbFor7702     = Database_->Query(DB_TermIsDbFor7702      );
-    TermIsDbFor7702A    = Database_->Query(DB_TermIsDbFor7702A     );
     ExpPerKLimit        = Database_->Query(DB_ExpSpecAmtLimit      );
     MinPremType         = 
static_cast<oenum_modal_prem_type>(static_cast<int>(Database_->Query(DB_MinPremType)));
     TgtPremType         = 
static_cast<oenum_modal_prem_type>(static_cast<int>(Database_->Query(DB_TgtPremType)));
@@ -861,6 +859,8 @@
         DefnMaterialChange_ = (mce_gpt == DefnLifeIns_) ? mce_adjustment_event 
: z;
         }
     Equiv7702DBO3       = 
static_cast<mcenum_dbopt_7702>(static_cast<int>(Database_->Query(DB_Equiv7702Dbo3)));
+    TermIsDbFor7702     = 1.0 == Database_->Query(DB_TermIsQABOrDb7702 );
+    TermIsDbFor7702A    = 1.0 == Database_->Query(DB_TermIsQABOrDb7702A);
     MaxNAAR             = yare_input_.MaximumNaar;
 
     Database_->Query(MinPremIntSpread_, DB_MinPremIntSpread);