[lmi-commits] [lmi] master cf5779e 2/6: Continue renaming DBOs: no-lapse availability

[Greg Chicares]

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

    Continue renaming DBOs: no-lapse availability
    
    Replaced both these subtly-different names
      NoLapseDbo1Only
      NoLapseOpt1Only
    with this one:
      NoLapseDboLvlOnly
    
    Would the availability of a no-lapse guarantee with the level DBO
    suggest its availability with the MDB DBO? No: the MDB DBO by design
    is virtually immune to lapse, and the benefit that it would guarantee
    is zero.
---
 basic_values.hpp | 2 +-
 dbdict.cpp       | 4 ++--
 dbdict.hpp       | 2 +-
 dbnames.hpp      | 2 +-
 dbnames.xpp      | 2 +-
 ihs_acctval.cpp  | 2 +-
 ihs_avmly.cpp    | 2 +-
 ihs_basicval.cpp | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/basic_values.hpp b/basic_values.hpp
index d6bc8d6..4e4c048 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -299,7 +299,7 @@ class LMI_SO BasicValues
     double                       MinIssBaseSpecAmt;
     double                       MinRenlSpecAmt;
     double                       MinRenlBaseSpecAmt;
-    bool                         NoLapseOpt1Only;
+    bool                         NoLapseDboLvlOnly;
     bool                         NoLapseUnratedOnly;
     bool                         OptChgCanIncrSA;
     bool                         OptChgCanDecrSA;
diff --git a/dbdict.cpp b/dbdict.cpp
index f38639e..a29fc8a 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -357,7 +357,7 @@ void DBDictionary::ascribe_members()
     ascribe("NoLapseMinDur"       , &DBDictionary::NoLapseMinDur       );
     ascribe("NoLapseMinAge"       , &DBDictionary::NoLapseMinAge       );
     ascribe("NoLapseUnratedOnly"  , &DBDictionary::NoLapseUnratedOnly  );
-    ascribe("NoLapseDbo1Only"     , &DBDictionary::NoLapseDbo1Only     );
+    ascribe("NoLapseDboLvlOnly"   , &DBDictionary::NoLapseDboLvlOnly   );
     ascribe("NoLapseAlwaysActive" , &DBDictionary::NoLapseAlwaysActive );
     ascribe("AllowHoneymoon"      , &DBDictionary::AllowHoneymoon      );
     ascribe("DeductionMethod"     , &DBDictionary::DeductionMethod     );
@@ -780,7 +780,7 @@ void DBDictionary::write_database_files()
     z.Add(database_entity(DB_NoLapseMinDur       , 0.0));
     z.Add(database_entity(DB_NoLapseMinAge       , 0.0));
     z.Add(database_entity(DB_NoLapseUnratedOnly  , false));
-    z.Add(database_entity(DB_NoLapseDbo1Only     , false));
+    z.Add(database_entity(DB_NoLapseDboLvlOnly   , false));
     z.Add(database_entity(DB_LoadRfdProportion   , 0.0));
 
     // uw_class, smoker
diff --git a/dbdict.hpp b/dbdict.hpp
index 0d16120..ce23e35 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -341,7 +341,7 @@ class LMI_SO DBDictionary final
     database_entity NoLapseMinDur       ;
     database_entity NoLapseMinAge       ;
     database_entity NoLapseUnratedOnly  ;
-    database_entity NoLapseDbo1Only     ;
+    database_entity NoLapseDboLvlOnly   ;
     database_entity NoLapseAlwaysActive ;
     database_entity AllowHoneymoon      ;
     database_entity DeductionMethod     ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 6a29149..c7b4d04 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -452,7 +452,7 @@ enum e_database_key
         ,DB_NoLapseMinDur
         ,DB_NoLapseMinAge
         ,DB_NoLapseUnratedOnly
-        ,DB_NoLapseDbo1Only
+        ,DB_NoLapseDboLvlOnly
         ,DB_NoLapseAlwaysActive
 
         ,DB_AllowHoneymoon
diff --git a/dbnames.xpp b/dbnames.xpp
index 46597ac..a0273b5 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -298,7 +298,7 @@
 {DB_NoLapseMinDur,DB_Topic_SecondaryGuarantees,"NoLapseMinDur","Minimum number 
of years no-lapse guarantee remains in effect if premium requirement 
satisfied",}, \
 {DB_NoLapseMinAge,DB_Topic_SecondaryGuarantees,"NoLapseMinAge","Minimum age to 
which no-lapse guarantee remains in effect if premium requirement satisfied",}, 
\
 
{DB_NoLapseUnratedOnly,DB_Topic_SecondaryGuarantees,"NoLapseUnratedOnly","No-lapse
 guarantee available only to unrated lives: 0=no, 1=yes",}, \
-{DB_NoLapseDbo1Only,DB_Topic_SecondaryGuarantees,"NoLapseDbo1Only","No-lapse 
guarantee available only with level death benefit option: 0=no, 1=yes",}, \
+{DB_NoLapseDboLvlOnly,DB_Topic_SecondaryGuarantees,"NoLapseDboLvlOnly","No-lapse
 guarantee available only with level death benefit option: 0=no, 1=yes",}, \
 
{DB_NoLapseAlwaysActive,DB_Topic_SecondaryGuarantees,"NoLapseAlwaysActive","No-lapse
 guarantee requirements are always met by contract or issue rules: 0=no, 
1=yes",}, \
 {DB_AllowHoneymoon,DB_Topic_SecondaryGuarantees,"AllowHoneymoon","Honeymoon 
allowed: 0=no, 1=yes",}, \
 {DB_Topic_Allocations,DB_FIRST,"Allocations","Allocations between general and 
separate account",}, \
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 529a224..425c3e2 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -632,7 +632,7 @@ void AccountValue::SetInitialValues()
     loan_ullage_       .assign(BasicValues::GetLength(), 0.0);
     withdrawal_ullage_ .assign(BasicValues::GetLength(), 0.0);
     NoLapseActive               = true;
-    if(NoLapseOpt1Only && mce_option1 != DeathBfts_->dbopt()[0])
+    if(NoLapseDboLvlOnly && mce_option1 != DeathBfts_->dbopt()[0])
         {
         NoLapseActive           = false;
         }
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 3dad212..599a427 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -849,7 +849,7 @@ void AccountValue::TxOptionChange()
         return;
         }
 
-    if(NoLapseActive &&  mce_option1 != YearsDBOpt &&  NoLapseOpt1Only)
+    if(NoLapseActive && mce_option1 != YearsDBOpt && NoLapseDboLvlOnly)
         {
         NoLapseActive = false;
         }
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index f292030..29fbd0d 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -610,7 +610,7 @@ void BasicValues::SetPermanentInvariants()
     database().query_into(DB_MinIssBaseSpecAmt    , MinIssBaseSpecAmt);
     database().query_into(DB_MinRenlSpecAmt       , MinRenlSpecAmt);
     database().query_into(DB_MinRenlBaseSpecAmt   , MinRenlBaseSpecAmt);
-    database().query_into(DB_NoLapseDbo1Only      , NoLapseOpt1Only);
+    database().query_into(DB_NoLapseDboLvlOnly    , NoLapseDboLvlOnly);
     database().query_into(DB_NoLapseUnratedOnly   , NoLapseUnratedOnly);
     database().query_into(DB_DboChgCanIncrSpecAmt , OptChgCanIncrSA);
     database().query_into(DB_DboChgCanDecrSpecAmt , OptChgCanDecrSA);