[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master a75971e 1/6: Begin renaming DBOs; add another
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master a75971e 1/6: Begin renaming DBOs; add another DBO: 'AllowDboX' only |
Date: |
Thu, 8 Nov 2018 17:45:06 -0500 (EST) |
branch: master
commit a75971e686d6f3cdf442848618ecdceb6a2abf9c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Begin renaming DBOs; add another DBO: 'AllowDboX' only
Options 1 and 2 (i.e., A and B) are almost universally unambiguous, but
option 3 can mean various things. Renamed existing DBOs for clarity, and
added a new one:
Dbo1 --> DboLvl [level specamt]
Dbo2 --> DboInc [increasing--i.e., constant NAAR]
Dbo3 --> DboRop [return of premium]
[new] DboMdb [minimum death benefit: same as DboLvl with specamt=0]
Restricted this commit's renaming to 'AllowDboX'. Other names will be
changed similarly in the next few commits.
---
dbdict.cpp | 16 +++++++++-------
dbdict.hpp | 7 ++++---
dbnames.hpp | 7 ++++---
dbnames.xpp | 7 ++++---
input_harmonization.cpp | 2 +-
input_realization.cpp | 2 +-
6 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/dbdict.cpp b/dbdict.cpp
index 99d16d8..f38639e 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -270,9 +270,10 @@ void DBDictionary::ascribe_members()
ascribe("MinRenlBaseSpecAmt" , &DBDictionary::MinRenlBaseSpecAmt );
ascribe("MaxIssSpecAmt" , &DBDictionary::MaxIssSpecAmt );
ascribe("MaxRenlSpecAmt" , &DBDictionary::MaxRenlSpecAmt );
- ascribe("AllowDbo1" , &DBDictionary::AllowDbo1 );
- ascribe("AllowDbo2" , &DBDictionary::AllowDbo2 );
- ascribe("AllowDbo3" , &DBDictionary::AllowDbo3 );
+ ascribe("AllowDboLvl" , &DBDictionary::AllowDboLvl );
+ ascribe("AllowDboInc" , &DBDictionary::AllowDboInc );
+ ascribe("AllowDboRop" , &DBDictionary::AllowDboRop );
+ ascribe("AllowDboMdb" , &DBDictionary::AllowDboMdb );
ascribe("AllowChangeToDbo2" , &DBDictionary::AllowChangeToDbo2 );
ascribe("DboChgCanIncrSpecAmt", &DBDictionary::DboChgCanIncrSpecAmt);
ascribe("DboChgCanDecrSpecAmt", &DBDictionary::DboChgCanDecrSpecAmt);
@@ -732,9 +733,10 @@ void DBDictionary::write_database_files()
double T7702q[9] = {35, 41, 107,}; // Female, male, unisex.
z.Add(database_entity(DB_Irc7702QTable, e_number_of_axes, dims311,
T7702q));
- z.Add(database_entity(DB_AllowDbo1 , true));
- z.Add(database_entity(DB_AllowDbo2 , true));
- z.Add(database_entity(DB_AllowDbo3 , true));
+ z.Add(database_entity(DB_AllowDboLvl , true));
+ z.Add(database_entity(DB_AllowDboInc , true));
+ z.Add(database_entity(DB_AllowDboRop , true));
+ z.Add(database_entity(DB_AllowDboMdb , true));
z.Add(database_entity(DB_DboChgCanIncrSpecAmt, true));
z.Add(database_entity(DB_DboChgCanDecrSpecAmt, true));
z.Add(database_entity(DB_SnflQTable , 0.0));
@@ -1055,7 +1057,7 @@ void DBDictionary::InitAntediluvian()
Add(database_entity(DB_AllowWd , true));
Add(database_entity(DB_AllowFlatExtras , true));
Add(database_entity(DB_AllowChangeToDbo2 , true));
- Add(database_entity(DB_AllowDbo3 , true));
+ Add(database_entity(DB_AllowDboRop , true));
Add(database_entity(DB_LedgerType , mce_ill_reg));
diff --git a/dbdict.hpp b/dbdict.hpp
index 583bad9..0d16120 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -254,9 +254,10 @@ class LMI_SO DBDictionary final
database_entity MinRenlBaseSpecAmt ;
database_entity MaxIssSpecAmt ;
database_entity MaxRenlSpecAmt ;
- database_entity AllowDbo1 ;
- database_entity AllowDbo2 ;
- database_entity AllowDbo3 ;
+ database_entity AllowDboLvl ;
+ database_entity AllowDboInc ;
+ database_entity AllowDboRop ;
+ database_entity AllowDboMdb ;
database_entity AllowChangeToDbo2 ;
database_entity DboChgCanIncrSpecAmt;
database_entity DboChgCanDecrSpecAmt;
diff --git a/dbnames.hpp b/dbnames.hpp
index a48c14e..6a29149 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -338,9 +338,10 @@ enum e_database_key
,DB_MaxIssSpecAmt
,DB_MaxRenlSpecAmt
- ,DB_AllowDbo1
- ,DB_AllowDbo2
- ,DB_AllowDbo3
+ ,DB_AllowDboLvl
+ ,DB_AllowDboInc
+ ,DB_AllowDboRop
+ ,DB_AllowDboMdb
,DB_AllowChangeToDbo2
,DB_DboChgCanIncrSpecAmt
,DB_DboChgCanDecrSpecAmt
diff --git a/dbnames.xpp b/dbnames.xpp
index 8a10346..46597ac 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -206,9 +206,10 @@
{DB_MinRenlBaseSpecAmt,DB_Topic_DeathBenefits,"MinRenlBaseSpecAmt","Minimum
specified amount after issue for base policy only, ignoring any term rider",}, \
{DB_MaxIssSpecAmt,DB_Topic_DeathBenefits,"MaxIssSpecAmt","Maximum specified
amount allowed at issue [not yet implemented]",}, \
{DB_MaxRenlSpecAmt,DB_Topic_DeathBenefits,"MaxRenlSpecAmt","Maximum specified
amount after issue [not yet implemented]",}, \
-{DB_AllowDbo1,DB_Topic_DeathBenefits,"AllowDbo1","Allow level death benefit
option: 0=no, 1=yes",}, \
-{DB_AllowDbo2,DB_Topic_DeathBenefits,"AllowDbo2","Allow increasing death
benefit option: 0=no, 1=yes",}, \
-{DB_AllowDbo3,DB_Topic_DeathBenefits,"AllowDbo3","Allow return of premium
death benefit option: 0=no, 1=yes",}, \
+{DB_AllowDboLvl,DB_Topic_DeathBenefits,"AllowDboLvl","Allow level
death-benefit option: 0=no, 1=yes",}, \
+{DB_AllowDboInc,DB_Topic_DeathBenefits,"AllowDboInc","Allow increasing
death-benefit option: 0=no, 1=yes",}, \
+{DB_AllowDboRop,DB_Topic_DeathBenefits,"AllowDboRop","Allow return-of-premium
death-benefit option: 0=no, 1=yes",}, \
+{DB_AllowDboMdb,DB_Topic_DeathBenefits,"AllowDboMdb","Allow
minimum-death-benefit death-benefit option: 0=no, 1=yes",}, \
{DB_AllowChangeToDbo2,DB_Topic_DeathBenefits,"AllowChangeToDbo2","Allow change
to increasing death benefit option: 0=no, 1=yes [obsolescent]",}, \
{DB_DboChgCanIncrSpecAmt,DB_Topic_DeathBenefits,"DboChgCanIncrSpecAmt","Option
changes can increase specified amount to preserve net amount at risk
[obsolescent]",}, \
{DB_DboChgCanDecrSpecAmt,DB_Topic_DeathBenefits,"DboChgCanDecrSpecAmt","Option
changes can decrease specified amount to preserve net amount at risk
[obsolescent]",}, \
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index 7f80f56..bc2008e 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -327,7 +327,7 @@ void Input::DoHarmonize()
InforceCumulativeNoLapsePremium .enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
InforceCumulativeNoLapsePayments.enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
- InforceCumulativeRopPayments.enable(database_->query<bool>(DB_AllowDbo3));
+
InforceCumulativeRopPayments.enable(database_->query<bool>(DB_AllowDboRop));
// It would be possible to enable 'InforceCumulativeSalesLoad' iff
// 'DB_LoadRfdProportion' is nonzero in the inforce year. However,
diff --git a/input_realization.cpp b/input_realization.cpp
index 74bdcae..106f5f4 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -573,7 +573,7 @@ std::string Input::RealizeDeathBenefitOption()
}
if
- ( !database_->query<bool>(DB_AllowDbo3)
+ ( !database_->query<bool>(DB_AllowDboRop)
&& contains(DeathBenefitOptionRealized_, mce_dbopt("ROP"))
)
{
- [lmi-commits] [lmi] master updated (a604e1e -> 53201ac), Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master 53201ac 6/6: Add new database entities to govern death benefit option changes, Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master fd66131 5/6: Finish DBO renaming: risky treatment of initial premium, Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master cf5779e 2/6: Continue renaming DBOs: no-lapse availability, Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master b1e039d 4/6: Continue DBO renaming: effective 7702 DBO, Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master 566c52b 3/6: Continue DBO renaming: effect of withdrawals on specamt, Greg Chicares, 2018/11/08
- [lmi-commits] [lmi] master a75971e 1/6: Begin renaming DBOs; add another DBO: 'AllowDboX' only,
Greg Chicares <=