[lmi-commits] [6193] Add new database entities

[Greg Chicares]

Revision: 6193
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6193
Author:   chicares
Date:     2015-05-27 16:43:20 +0000 (Wed, 27 May 2015)
Log Message:
-----------
Add new database entities

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

Modified: lmi/trunk/account_value.hpp
===================================================================
--- lmi/trunk/account_value.hpp 2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/account_value.hpp 2015-05-27 16:43:20 UTC (rev 6193)
@@ -530,6 +530,7 @@
     double  case_k_factor;
     double  ActualCoiRate;
 
+    bool    TermCanLapse;
     bool    TermRiderActive;
     double  ActualSpecAmt;
     double  TermSpecAmt;

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/basic_values.hpp  2015-05-27 16:43:20 UTC (rev 6193)
@@ -292,6 +292,7 @@
     bool                         WDCanDecrSADBO3;
     int                          MaxIncrAge;
     bool                         WaivePmTxInt1035;
+    bool                         TermIsNotRider;
     int                          TermForcedConvAge;
     int                          TermForcedConvDur;
     bool                         TermIsDbFor7702;

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/dbdict.cpp        2015-05-27 16:43:20 UTC (rev 6193)
@@ -296,6 +296,8 @@
     ascribe("TermTable"           , &DBDictionary::TermTable           );
     ascribe("TermMinIssAge"       , &DBDictionary::TermMinIssAge       );
     ascribe("TermMaxIssAge"       , &DBDictionary::TermMaxIssAge       );
+    ascribe("TermIsNotRider"      , &DBDictionary::TermIsNotRider      );
+    ascribe("TermCanLapse"        , &DBDictionary::TermCanLapse        );
     ascribe("TermForcedConvAge"   , &DBDictionary::TermForcedConvAge   );
     ascribe("TermForcedConvDur"   , &DBDictionary::TermForcedConvDur   );
     ascribe("MaxTermProportion"   , &DBDictionary::MaxTermProportion   );

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/dbdict.hpp        2015-05-27 16:43:20 UTC (rev 6193)
@@ -272,6 +272,8 @@
     database_entity TermTable           ;
     database_entity TermMinIssAge       ;
     database_entity TermMaxIssAge       ;
+    database_entity TermIsNotRider      ;
+    database_entity TermCanLapse        ;
     database_entity TermForcedConvAge   ;
     database_entity TermForcedConvDur   ;
     database_entity MaxTermProportion   ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/dbnames.hpp       2015-05-27 16:43:20 UTC (rev 6193)
@@ -360,6 +360,8 @@
         ,DB_TermTable
         ,DB_TermMinIssAge
         ,DB_TermMaxIssAge
+        ,DB_TermIsNotRider
+        ,DB_TermCanLapse
         ,DB_TermForcedConvAge
         ,DB_TermForcedConvDur
         ,DB_MaxTermProportion

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/dbnames.xpp       2015-05-27 16:43:20 UTC (rev 6193)
@@ -206,11 +206,13 @@
 {DB_DboChgCanDecrSpecAmt,DB_Topic_DeathBenefits,"DboChgCanDecrSpecAmt","Option 
changes can decrease specified amount to preserve net amount at risk",}, \
 {DB_AllowExtEndt,DB_Topic_DeathBenefits,"AllowExtEndt","Allow coverage beyond 
normal maturity ('extended endowment') [not yet implemented]",}, \
 {DB_Topic_Riders,DB_FIRST,"Riders","Riders and other additional benefits",}, \
-{DB_AllowTerm,DB_Topic_Riders,"AllowTerm","Allow term rider: 0=no, 1=yes",}, \
-{DB_GuarTermTable,DB_Topic_Riders,"GuarTermTable","Term rider guaranteed 
mortality charge table (index in mortality table database)",}, \
-{DB_TermTable,DB_Topic_Riders,"TermTable","Term rider current mortality charge 
table (index in mortality table database)",}, \
-{DB_TermMinIssAge,DB_Topic_Riders,"TermMinIssAge","Term rider minimum issue 
age",}, \
-{DB_TermMaxIssAge,DB_Topic_Riders,"TermMaxIssAge","Term rider maximum issue 
age",}, \
+{DB_AllowTerm,DB_Topic_Riders,"AllowTerm","Allow term: 0=no, 1=yes",}, \
+{DB_GuarTermTable,DB_Topic_Riders,"GuarTermTable","Term guaranteed mortality 
charge table (index in mortality table database)",}, \
+{DB_TermTable,DB_Topic_Riders,"TermTable","Term current mortality charge table 
(index in mortality table database)",}, \
+{DB_TermMinIssAge,DB_Topic_Riders,"TermMinIssAge","Term minimum issue age",}, \
+{DB_TermMaxIssAge,DB_Topic_Riders,"TermMaxIssAge","Term maximum issue age",}, \
+{DB_TermIsNotRider,DB_Topic_Riders,"TermIsNotRider","Term benefit is not 
formally a rider",}, \
+{DB_TermCanLapse,DB_Topic_Riders,"TermCanLapse","Term rider can lapse 
independently",}, \
 {DB_TermForcedConvAge,DB_Topic_Riders,"TermForcedConvAge","Minimum age at 
which term rider converts to base policy with no positive election required",}, 
\
 {DB_TermForcedConvDur,DB_Topic_Riders,"TermForcedConvDur","Minimum number of 
years after which term rider converts to base policy with no positive election 
required",}, \
 {DB_MaxTermProportion,DB_Topic_Riders,"MaxTermProportion","Term rider as 
maximum proportion of total coverage [not yet implemented]",}, \

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/ihs_acctval.cpp   2015-05-27 16:43:20 UTC (rev 6193)
@@ -669,6 +669,7 @@
         NoLapseActive           = false;
         }
 
+    TermCanLapse                = Database_->Query(DB_TermCanLapse);
     TermRiderActive             = true;
     TermDB                      = 0.0;
 

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2015-05-27 13:50:20 UTC (rev 6192)
+++ lmi/trunk/ihs_basicval.cpp  2015-05-27 16:43:20 UTC (rev 6193)
@@ -660,6 +660,7 @@
     WDCanDecrSADBO3     = Database_->Query(DB_WdCanDecrSpecAmtDbo3 );
     MaxIncrAge          = static_cast<int>(Database_->Query(DB_MaxIncrAge));
     WaivePmTxInt1035    = Database_->Query(DB_WaivePremTaxInt1035  );
+    TermIsNotRider      = Database_->Query(DB_TermIsNotRider       );
     TermForcedConvAge   = 
static_cast<int>(Database_->Query(DB_TermForcedConvAge));
     TermForcedConvDur   = 
static_cast<int>(Database_->Query(DB_TermForcedConvDur));
     ExpPerKLimit        = Database_->Query(DB_ExpSpecAmtLimit      );