[lmi-commits] [lmi] master 566c52b 3/6: Continue DBO renaming: effect of withdrawals on specamt

[Greg Chicares]

branch: master
commit 566c52b1aa5dd79c0fd96e461a63d551573b7b26
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Continue DBO renaming: effect of withdrawals on specamt
    
    Replaced subtly-different name-pairs like
      WdCanDecrSpecAmtDbo1
      WDCanDecrSADBO1
    with single names like
      WdDecrSpecAmtDboLvl
    
    Added no MDB congener: for MDB, specamt is zero and cannot decrease.
---
 basic_values.hpp |  6 +++---
 dbdict.cpp       | 12 ++++++------
 dbdict.hpp       |  6 +++---
 dbnames.hpp      |  6 +++---
 dbnames.xpp      |  6 +++---
 ihs_avmly.cpp    |  6 +++---
 ihs_basicval.cpp |  6 +++---
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/basic_values.hpp b/basic_values.hpp
index 4e4c048..6d3855c 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -303,9 +303,9 @@ class LMI_SO BasicValues
     bool                         NoLapseUnratedOnly;
     bool                         OptChgCanIncrSA;
     bool                         OptChgCanDecrSA;
-    bool                         WDCanDecrSADBO1;
-    bool                         WDCanDecrSADBO2;
-    bool                         WDCanDecrSADBO3;
+    bool                         WdDecrSpecAmtDboLvl;
+    bool                         WdDecrSpecAmtDboInc;
+    bool                         WdDecrSpecAmtDboRop;
     int                          MaxIncrAge;
     bool                         WaivePmTxInt1035;
     bool                         TermIsNotRider;
diff --git a/dbdict.cpp b/dbdict.cpp
index a29fc8a..76e7ddf 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -324,9 +324,9 @@ void DBDictionary::ascribe_members()
     ascribe("MaxWdGenAcctValMult" , &DBDictionary::MaxWdGenAcctValMult );
     ascribe("MaxWdSepAcctValMult" , &DBDictionary::MaxWdSepAcctValMult );
     ascribe("MaxWdDed"            , &DBDictionary::MaxWdDed            );
-    ascribe("WdCanDecrSpecAmtDbo1", &DBDictionary::WdCanDecrSpecAmtDbo1);
-    ascribe("WdCanDecrSpecAmtDbo2", &DBDictionary::WdCanDecrSpecAmtDbo2);
-    ascribe("WdCanDecrSpecAmtDbo3", &DBDictionary::WdCanDecrSpecAmtDbo3);
+    ascribe("WdDecrSpecAmtDboLvl" , &DBDictionary::WdDecrSpecAmtDboLvl );
+    ascribe("WdDecrSpecAmtDboInc" , &DBDictionary::WdDecrSpecAmtDboInc );
+    ascribe("WdDecrSpecAmtDboRop" , &DBDictionary::WdDecrSpecAmtDboRop );
     ascribe("FirstWdMonth"        , &DBDictionary::FirstWdMonth        );
     ascribe("AllowLoan"           , &DBDictionary::AllowLoan           );
     ascribe("AllowPrefLoan"       , &DBDictionary::AllowPrefLoan       );
@@ -611,9 +611,9 @@ void DBDictionary::write_database_files()
     z.Add(database_entity(DB_MinWd               , 100.0));
     z.Add(database_entity(DB_WdFee               , 25.0));
     z.Add(database_entity(DB_WdFeeRate           , 0.02));
-    z.Add(database_entity(DB_WdCanDecrSpecAmtDbo1, true));
-    z.Add(database_entity(DB_WdCanDecrSpecAmtDbo2, true));
-    z.Add(database_entity(DB_WdCanDecrSpecAmtDbo3, true));
+    z.Add(database_entity(DB_WdDecrSpecAmtDboLvl , true));
+    z.Add(database_entity(DB_WdDecrSpecAmtDboInc , true));
+    z.Add(database_entity(DB_WdDecrSpecAmtDboRop , true));
     z.Add(database_entity(DB_FirstLoanMonth      , 0.0));
     z.Add(database_entity(DB_AllowPrefLoan       , false));
     z.Add(database_entity(DB_AllowFixedLoan      , true));
diff --git a/dbdict.hpp b/dbdict.hpp
index ce23e35..156ec3d 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -308,9 +308,9 @@ class LMI_SO DBDictionary final
     database_entity MaxWdGenAcctValMult ;
     database_entity MaxWdSepAcctValMult ;
     database_entity MaxWdDed            ;
-    database_entity WdCanDecrSpecAmtDbo1;
-    database_entity WdCanDecrSpecAmtDbo2;
-    database_entity WdCanDecrSpecAmtDbo3;
+    database_entity WdDecrSpecAmtDboLvl ;
+    database_entity WdDecrSpecAmtDboInc ;
+    database_entity WdDecrSpecAmtDboRop ;
     database_entity FirstWdMonth        ;
     database_entity AllowLoan           ;
     database_entity AllowPrefLoan       ;
diff --git a/dbnames.hpp b/dbnames.hpp
index c7b4d04..7e77b7b 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -405,9 +405,9 @@ enum e_database_key
         ,DB_MaxWdSepAcctValMult
         ,DB_MaxWdDed
 
-        ,DB_WdCanDecrSpecAmtDbo1
-        ,DB_WdCanDecrSpecAmtDbo2
-        ,DB_WdCanDecrSpecAmtDbo3
+        ,DB_WdDecrSpecAmtDboLvl
+        ,DB_WdDecrSpecAmtDboInc
+        ,DB_WdDecrSpecAmtDboRop
 
         ,DB_FirstWdMonth
 
diff --git a/dbnames.xpp b/dbnames.xpp
index a0273b5..2406252 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -262,9 +262,9 @@
 {DB_MaxWdGenAcctValMult,DB_Topic_Withdrawals,"MaxWdGenAcctValMult","Maximum 
withdrawal as proportion of general-account value, e.g. 1=100%",}, \
 {DB_MaxWdSepAcctValMult,DB_Topic_Withdrawals,"MaxWdSepAcctValMult","Maximum 
withdrawal as proportion of separate-account value, e.g. 1=100%",}, \
 {DB_MaxWdDed,DB_Topic_Withdrawals,"MaxWdDed","Monthiversary deductions 
reflected in maximum withdrawal: 0=12 times most recent, 1=to next anniversary, 
2=to next modal premium due date, 3=18 times most recent",}, \
-{DB_WdCanDecrSpecAmtDbo1,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo1","Withdrawals
 decrease specified amount for level death benefit option",}, \
-{DB_WdCanDecrSpecAmtDbo2,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo2","Withdrawals
 decrease specified amount for increasing death benefit option",}, \
-{DB_WdCanDecrSpecAmtDbo3,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo3","Withdrawals
 decrease specified amount for return of premium death benefit option",}, \
+{DB_WdDecrSpecAmtDboLvl,DB_Topic_Withdrawals,"WdDecrSpecAmtDboLvl","Withdrawals
 decrease specified amount for level death benefit option",}, \
+{DB_WdDecrSpecAmtDboInc,DB_Topic_Withdrawals,"WdDecrSpecAmtDboInc","Withdrawals
 decrease specified amount for increasing death benefit option",}, \
+{DB_WdDecrSpecAmtDboRop,DB_Topic_Withdrawals,"WdDecrSpecAmtDboRop","Withdrawals
 decrease specified amount for return of premium death benefit option",}, \
 {DB_FirstWdMonth,DB_Topic_Withdrawals,"FirstWdMonth","Number of months 
withdrawals not allowed [not supported yet]",}, \
 {DB_Topic_Loans,DB_FIRST,"Loans","Loan rates, spreads, options, and 
restrictions",}, \
 {DB_AllowLoan,DB_Topic_Loans,"AllowLoan","Allow loans: 0=no, 1=yes",}, \
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 599a427..4259dd6 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -2509,7 +2509,7 @@ void AccountValue::TxTakeWD()
             // I'm confused by
             //   specamt (after withdrawal) = min[specamt(before 
withdrawal);'face'(m)-W]
             // Do you really want 'face' here rather than specamt? --Yes
-            if(WDCanDecrSADBO1)
+            if(WdDecrSpecAmtDboLvl)
                 {
                 ChangeSpecAmtBy(-GrossWD);
                 // Min AV after WD not directly implemented.
@@ -2529,7 +2529,7 @@ void AccountValue::TxTakeWD()
             break;
         case mce_option2:
             {
-            if(WDCanDecrSADBO2)
+            if(WdDecrSpecAmtDboInc)
                 {
                 ChangeSpecAmtBy(-GrossWD);
                 }
@@ -2541,7 +2541,7 @@ void AccountValue::TxTakeWD()
             break;
         case mce_rop:
             {
-            if(WDCanDecrSADBO3)
+            if(WdDecrSpecAmtDboRop)
                 {
                 ChangeSpecAmtBy(-GrossWD);
                 }
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 29fbd0d..18cff1a 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -614,9 +614,9 @@ void BasicValues::SetPermanentInvariants()
     database().query_into(DB_NoLapseUnratedOnly   , NoLapseUnratedOnly);
     database().query_into(DB_DboChgCanIncrSpecAmt , OptChgCanIncrSA);
     database().query_into(DB_DboChgCanDecrSpecAmt , OptChgCanDecrSA);
-    database().query_into(DB_WdCanDecrSpecAmtDbo1 , WDCanDecrSADBO1);
-    database().query_into(DB_WdCanDecrSpecAmtDbo2 , WDCanDecrSADBO2);
-    database().query_into(DB_WdCanDecrSpecAmtDbo3 , WDCanDecrSADBO3);
+    database().query_into(DB_WdDecrSpecAmtDboLvl  , WdDecrSpecAmtDboLvl);
+    database().query_into(DB_WdDecrSpecAmtDboInc  , WdDecrSpecAmtDboInc);
+    database().query_into(DB_WdDecrSpecAmtDboRop  , WdDecrSpecAmtDboRop);
     database().query_into(DB_MaxIncrAge           , MaxIncrAge);
     database().query_into(DB_WaivePremTaxInt1035  , WaivePmTxInt1035);
     database().query_into(DB_TermIsNotRider       , TermIsNotRider);