[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master b1e039d 4/6: Continue DBO renaming: effective
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master b1e039d 4/6: Continue DBO renaming: effective 7702 DBO |
Date: |
Thu, 8 Nov 2018 17:45:06 -0500 (EST) |
branch: master
commit b1e039dbaca315215933d759c60ddc11f1608bec
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Continue DBO renaming: effective 7702 DBO
Replaced both these subtly-different names:
Equiv7702Dbo3
Equiv7702DBO3
with this one:
Effective7702DboRop
For 7702, ROP is treated effectively as one of the DBOs recognized by
the statute, yet it is not _equivalent_ to either.
Added no congener for MDB, which is effectively the level DBO for 7702.
---
basic_values.hpp | 2 +-
dbdict.cpp | 4 ++--
dbdict.hpp | 2 +-
dbnames.hpp | 2 +-
dbnames.xpp | 2 +-
ihs_acctval.cpp | 2 +-
ihs_avmly.cpp | 4 ++--
ihs_basicval.cpp | 12 ++++++------
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/basic_values.hpp b/basic_values.hpp
index 6d3855c..f9b1cc9 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -291,7 +291,7 @@ class LMI_SO BasicValues
double MaxSurvivalDur;
mcenum_defn_life_ins DefnLifeIns_;
mcenum_defn_material_change DefnMaterialChange_;
- mcenum_dbopt_7702 Equiv7702DBO3;
+ mcenum_dbopt_7702 Effective7702DboRop;
double MaxNAAR;
int EndtAge;
double MinSpecAmt; // Antediluvian.
diff --git a/dbdict.cpp b/dbdict.cpp
index 76e7ddf..df0d975 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -151,7 +151,7 @@ void DBDictionary::ascribe_members()
ascribe("Irc7702BftIsSpecAmt" , &DBDictionary::Irc7702BftIsSpecAmt );
ascribe("Initial7702BftIsDb" , &DBDictionary::Initial7702BftIsDb );
ascribe("Irc7702Endowment" , &DBDictionary::Irc7702Endowment );
- ascribe("Equiv7702Dbo3" , &DBDictionary::Equiv7702Dbo3 );
+ ascribe("Effective7702DboRop" , &DBDictionary::Effective7702DboRop );
ascribe("TermIsQABOrDb7702" , &DBDictionary::TermIsQABOrDb7702 );
ascribe("TermIsQABOrDb7702A" , &DBDictionary::TermIsQABOrDb7702A );
ascribe("GioIsQAB" , &DBDictionary::GioIsQAB );
@@ -924,7 +924,7 @@ void DBDictionary::write_database_files()
z.Add(database_entity(DB_Irc7702BftIsSpecAmt , 0));
z.Add(database_entity(DB_Initial7702BftIsDb , false));
z.Add(database_entity(DB_Irc7702Endowment , 0));
- z.Add(database_entity(DB_Equiv7702Dbo3 , 0));
+ z.Add(database_entity(DB_Effective7702DboRop , 0));
z.Add(database_entity(DB_TermIsQABOrDb7702 , 1));
z.Add(database_entity(DB_TermIsQABOrDb7702A , 1));
z.Add(database_entity(DB_GioIsQAB , false));
diff --git a/dbdict.hpp b/dbdict.hpp
index 156ec3d..ae87d1f 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -135,7 +135,7 @@ class LMI_SO DBDictionary final
database_entity Irc7702BftIsSpecAmt ;
database_entity Initial7702BftIsDb ;
database_entity Irc7702Endowment ;
- database_entity Equiv7702Dbo3 ;
+ database_entity Effective7702DboRop ;
database_entity TermIsQABOrDb7702 ;
database_entity TermIsQABOrDb7702A ;
database_entity GioIsQAB ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 7e77b7b..c69a6c6 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -171,7 +171,7 @@ enum e_database_key
,DB_Irc7702BftIsSpecAmt
,DB_Initial7702BftIsDb
,DB_Irc7702Endowment
- ,DB_Equiv7702Dbo3
+ ,DB_Effective7702DboRop
,DB_TermIsQABOrDb7702
,DB_TermIsQABOrDb7702A
diff --git a/dbnames.xpp b/dbnames.xpp
index 2406252..6e0c1db 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -80,7 +80,7 @@
{DB_Irc7702BftIsSpecAmt,DB_Topic_7702And7702A,"Irc7702BftIsSpecAmt","7702(f)(3)
'death benefit' is specamt rather than DB: 0=no, 1=yes",}, \
{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=none",}, \
-{DB_Equiv7702Dbo3,DB_Topic_7702And7702A,"Equiv7702Dbo3","For 7702, treat
return of premium death benefit option same as: 0=level 1=increasing",}, \
+{DB_Effective7702DboRop,DB_Topic_7702And7702A,"Effective7702DboRop","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_GioIsQAB,DB_Topic_7702And7702A,"GioIsQAB","Treat guaranteed insurability
option as a QAB for 7702 and 7702A: 0=no, 1=yes [not yet implemented]",}, \
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 425c3e2..7f9a5aa 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -448,7 +448,7 @@ void AccountValue::InitializeLife(mcenum_run_basis a_Basis)
Irc7702_->Initialize7702
(sa
,sa
- ,effective_dbopt_7702(InvariantValues().DBOpt[0].value(),
Equiv7702DBO3)
+ ,effective_dbopt_7702(InvariantValues().DBOpt[0].value(),
Effective7702DboRop)
,annual_target_premium
);
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 4259dd6..412ace5 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -1060,8 +1060,8 @@ void AccountValue::TxTestGPT()
// If there is an adjustable event, then DB (not specamt) is used
// in calculating the adjustment.
//
- mcenum_dbopt_7702 const new_dbopt(effective_dbopt_7702(YearsDBOpt,
Equiv7702DBO3));
- mcenum_dbopt_7702 const old_dbopt(effective_dbopt_7702(OldDBOpt ,
Equiv7702DBO3));
+ mcenum_dbopt_7702 const new_dbopt(effective_dbopt_7702(YearsDBOpt,
Effective7702DboRop));
+ mcenum_dbopt_7702 const old_dbopt(effective_dbopt_7702(OldDBOpt ,
Effective7702DboRop));
// TAXATION !! This may require revision if DB is treated as the 7702
benefit.
// TAXATION !! This assumes the term rider can be treated as death benefit;
// use 'TermIsDbFor7702'.
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 18cff1a..474dffc 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -64,7 +64,7 @@ BasicValues::BasicValues(Input const& input)
,database_ (yare_input_)
,DefnLifeIns_ {mce_cvat}
,DefnMaterialChange_ {mce_unnecessary_premium}
- ,Equiv7702DBO3 {mce_option1_for_7702}
+ ,Effective7702DboRop {mce_option1_for_7702}
,MaxWDDed_ {mce_twelve_times_last}
,MaxLoanDed_ {mce_twelve_times_last}
,StateOfJurisdiction_{mce_s_CT}
@@ -103,7 +103,7 @@ BasicValues::BasicValues
)
,DefnLifeIns_ {mce_cvat}
,DefnMaterialChange_ {mce_unnecessary_premium}
- ,Equiv7702DBO3 {a_DBOptFor7702}
+ ,Effective7702DboRop {a_DBOptFor7702}
,MaxWDDed_ {mce_twelve_times_last}
,MaxLoanDed_ {mce_twelve_times_last}
,StateOfJurisdiction_{a_StateOfJurisdiction}
@@ -545,7 +545,7 @@ void BasicValues::Init7702()
,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
,yare_input_.SpecifiedAmount[0] + yare_input_.TermRiderAmount
- ,effective_dbopt_7702(yare_input_.DeathBenefitOption[0],
Equiv7702DBO3)
+ ,effective_dbopt_7702(yare_input_.DeathBenefitOption[0],
Effective7702DboRop)
,Loads_->annual_policy_fee (mce_gen_curr)
,Loads_->monthly_policy_fee (mce_gen_curr)
,Loads_->specified_amount_load(mce_gen_curr)
@@ -760,7 +760,7 @@ void BasicValues::SetPermanentInvariants()
auto const z =
database().query<mcenum_defn_material_change>(DB_CvatMatChangeDefn);
DefnMaterialChange_ = (mce_gpt == DefnLifeIns_) ? mce_adjustment_event
: z;
}
- database().query_into(DB_Equiv7702Dbo3, Equiv7702DBO3);
+ database().query_into(DB_Effective7702DboRop, Effective7702DboRop);
TermIsDbFor7702 = 1.0 == database().Query(DB_TermIsQABOrDb7702 );
TermIsDbFor7702A = 1.0 == database().Query(DB_TermIsQABOrDb7702A);
MaxNAAR = yare_input_.MaximumNaar;
@@ -985,7 +985,7 @@ double BasicValues::GetModalPremGLP
,a_bft_amt
,a_specamt
,Irc7702_->GetLeastBftAmtEver()
- ,effective_dbopt_7702(DeathBfts_->dbopt()[0], Equiv7702DBO3)
+ ,effective_dbopt_7702(DeathBfts_->dbopt()[0], Effective7702DboRop)
);
// TODO ?? TAXATION !! PROBLEMS HERE
@@ -1428,7 +1428,7 @@ double BasicValues::GetModalSpecAmtMinNonMec(double
annualized_pmt) const
//============================================================================
double BasicValues::GetModalSpecAmtGLP(double annualized_pmt) const
{
- mcenum_dbopt_7702 const z = effective_dbopt_7702(DeathBfts_->dbopt()[0],
Equiv7702DBO3);
+ mcenum_dbopt_7702 const z = effective_dbopt_7702(DeathBfts_->dbopt()[0],
Effective7702DboRop);
return gpt_specamt::CalculateGLPSpecAmt(*this, 0, annualized_pmt, z);
}
- [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 <=
- [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, 2018/11/08