[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 7d7b4b4 4/6: Expunge experience rating from d
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 7d7b4b4 4/6: Expunge experience rating from database [321] |
Date: |
Sun, 31 Jan 2021 17:27:28 -0500 (EST) |
branch: master
commit 7d7b4b4250093adeceff15ebb1804b0e61703924
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Expunge experience rating from database [321]
---
db_sort.sed | 7 -------
dbdict.cpp | 15 ---------------
dbdict.hpp | 6 ------
dbnames.hpp | 9 ---------
dbnames.xpp | 7 -------
input_harmonization.cpp | 32 --------------------------------
ledger_invariant_init.cpp | 1 -
7 files changed, 77 deletions(-)
diff --git a/db_sort.sed b/db_sort.sed
index 709b830..3657252 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -330,13 +330,6 @@
/DB_AssetComp\>/ s/^/P05/
/DB_AllowExtraAssetComp\>/ s/^/P06/
/DB_AllowExtraPremComp\>/ s/^/P07/
-# DB_Topic_ExperienceRating
-/DB_AllowExpRating\>/ s/^/Q01/
-/DB_ExpRatStdDevMult\>/ s/^/Q02/
-/DB_ExpRatIbnrMult\>/ s/^/Q03/
-/DB_ExpRatCoiRetention\>/ s/^/Q04/
-/DB_ExpRatRiskCoiMult\>/ s/^/Q05/
-/DB_ExpRatAmortPeriod\>/ s/^/Q06/
# DB_Topic_Miscellanea
/DB_LedgerType\>/ s/^/R01/
/DB_Nonillustrated\>/ s/^/R02/
diff --git a/dbdict.cpp b/dbdict.cpp
index 6ce5cd4..83d06cf 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -401,12 +401,6 @@ void DBDictionary::ascribe_members()
ascribe("AssetComp" , &DBDictionary::AssetComp
);
ascribe("AllowExtraAssetComp" , &DBDictionary::AllowExtraAssetComp
);
ascribe("AllowExtraPremComp" , &DBDictionary::AllowExtraPremComp
);
- ascribe("AllowExpRating" , &DBDictionary::AllowExpRating
);
- ascribe("ExpRatStdDevMult" , &DBDictionary::ExpRatStdDevMult
);
- ascribe("ExpRatIbnrMult" , &DBDictionary::ExpRatIbnrMult
);
- ascribe("ExpRatCoiRetention" , &DBDictionary::ExpRatCoiRetention
);
- ascribe("ExpRatRiskCoiMult" , &DBDictionary::ExpRatRiskCoiMult
);
- ascribe("ExpRatAmortPeriod" , &DBDictionary::ExpRatAmortPeriod
);
ascribe("LedgerType" , &DBDictionary::LedgerType
);
ascribe("Nonillustrated" , &DBDictionary::Nonillustrated
);
ascribe("NoLongerIssued" , &DBDictionary::NoLongerIssued
);
@@ -1077,14 +1071,6 @@ sample::sample()
Add({DB_AllowHoneymoon , true});
Add({DB_AllowExtraAssetComp , true});
Add({DB_AllowExtraPremComp , true});
- Add({DB_AllowExpRating , false});
- Add({DB_AllowExpRating , true});
- Add({DB_ExpRatStdDevMult , 0.0});
- Add({DB_ExpRatIbnrMult , 0.0});
- Add({DB_ExpRatIbnrMult , 6.0});
- Add({DB_ExpRatCoiRetention , 0.0});
- Add({DB_ExpRatRiskCoiMult , 0});
- Add({DB_ExpRatAmortPeriod , 4.0});
Add({DB_LedgerType , mce_ill_reg});
Add({DB_AgeLastOrNearest , oe_age_last_birthday});
Add({DB_MaturityAge , 100});
@@ -1598,7 +1584,6 @@ void DBDictionary::InitAntediluvian()
Add({DB_NoLapseMinDur , 0.0});
Add({DB_NoLapseMinAge , 0.0});
Add({DB_NoLapseAlwaysActive , 0.0});
- Add({DB_ExpRatAmortPeriod , 4.0});
Add({DB_LedgerType , mce_ill_reg});
Add({DB_AgeLastOrNearest , oe_age_nearest_birthday_ties_older});
Add({DB_MaturityAge , 100});
diff --git a/dbdict.hpp b/dbdict.hpp
index 699fbdf..4ce2f92 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -382,12 +382,6 @@ class LMI_SO DBDictionary
database_entity AssetComp ;
database_entity AllowExtraAssetComp ;
database_entity AllowExtraPremComp ;
- database_entity AllowExpRating ;
- database_entity ExpRatStdDevMult ;
- database_entity ExpRatIbnrMult ;
- database_entity ExpRatCoiRetention ;
- database_entity ExpRatRiskCoiMult ;
- database_entity ExpRatAmortPeriod ;
database_entity LedgerType ;
database_entity Nonillustrated ;
database_entity NoLongerIssued ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 4921ce1..3f0ed32 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -499,15 +499,6 @@ enum e_database_key
,DB_AllowExtraAssetComp
,DB_AllowExtraPremComp
- ,DB_Topic_ExperienceRating
-
- ,DB_AllowExpRating
- ,DB_ExpRatStdDevMult
- ,DB_ExpRatIbnrMult
- ,DB_ExpRatCoiRetention
- ,DB_ExpRatRiskCoiMult
- ,DB_ExpRatAmortPeriod
-
,DB_Topic_Miscellanea
,DB_LedgerType
diff --git a/dbnames.xpp b/dbnames.xpp
index 4017a87..fec6d39 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -336,13 +336,6 @@
{DB_AssetComp,DB_Topic_Compensation,"AssetComp","Producer-only compensation on
separate-account assets--not tiered by assets [not yet implemented]",}, \
{DB_AllowExtraAssetComp,DB_Topic_Compensation,"AllowExtraAssetComp","Allow
input extra asset-based compensation: 0=no, 1=yes",}, \
{DB_AllowExtraPremComp,DB_Topic_Compensation,"AllowExtraPremComp","Allow input
extra premium-based compensation: 0=no, 1=yes",}, \
-{DB_Topic_ExperienceRating,DB_FIRST,"Experience rating","Experience-rating
parameters",}, \
-{DB_AllowExpRating,DB_Topic_ExperienceRating,"AllowExpRating","Allow
experience rating: 0=no, 1=yes",}, \
-{DB_ExpRatStdDevMult,DB_Topic_ExperienceRating,"ExpRatStdDevMult","Experience
rating reserve as multiple of standard deviation of expected claims net of
account value released on death",}, \
-{DB_ExpRatIbnrMult,DB_Topic_ExperienceRating,"ExpRatIbnrMult","Experience
rating IBNR as number of months of net cost of insurance charges",}, \
-{DB_ExpRatCoiRetention,DB_Topic_ExperienceRating,"ExpRatCoiRetention","Experience
rating retention as proportion of net cost of insurance charges",}, \
-{DB_ExpRatRiskCoiMult,DB_Topic_ExperienceRating,"ExpRatRiskCoiMult","Maximum
risk charge as a multiple of annual cost of insurance charges",}, \
-{DB_ExpRatAmortPeriod,DB_Topic_ExperienceRating,"ExpRatAmortPeriod","Experience
rating amortization period",}, \
{DB_Topic_Miscellanea,DB_FIRST,"Miscellanea","Parameters that don't fit tidily
into other categories",}, \
{DB_LedgerType,DB_Topic_Miscellanea,"LedgerType","Ledger type: 0=illustration
reg, 1=FINRA, 3=group private placement, 6=individual private placement",}, \
{DB_Nonillustrated,DB_Topic_Miscellanea,"Nonillustrated","Forbid all
illustrations: 0=no, 1=yes",}, \
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index 55de25d..5a0faf3 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -206,38 +206,6 @@ void Input::DoHarmonize()
SurviveToYear .enable(part_mort_used && mce_survive_to_year ==
SurviveToType);
SurviveToAge .enable(part_mort_used && mce_survive_to_age ==
SurviveToType);
- bool enable_experience_rating =
- database_->query<bool>(DB_AllowExpRating)
- && part_mort_used
- && mce_month_by_month == RunOrder
- ;
- UseExperienceRating.enable(enable_experience_rating);
-
- // TODO ?? These shouldn't need to depend on 'enable_experience_rating';
- // instead, 'UseExperienceRating' should be transmogrified if it's not
- // enabled.
- OverrideExperienceReserveRate.enable
- ( enable_experience_rating
- && mce_yes == UseExperienceRating
- );
- ExperienceReserveRate.enable
- ( enable_experience_rating
- && mce_yes == UseExperienceRating
- && mce_yes == OverrideExperienceReserveRate
- );
- ExperienceRatingInitialKFactor.enable
- ( enable_experience_rating
- && mce_yes == UseExperienceRating
- );
- InforceNetExperienceReserve.enable
- ( enable_experience_rating
- && mce_yes == UseExperienceRating
- );
- InforceYtdNetCoiCharge.enable
- ( enable_experience_rating
- && mce_yes == UseExperienceRating
- );
-
EffectiveDate.enable(mce_no == EffectiveDateToday);
IssueAge .enable(mce_no == UseDOB);
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 922c488..f6bcc0f 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -198,7 +198,6 @@ void LedgerInvariant::Init(BasicValues const* b)
NoLongerIssued = b->database().query<bool>(DB_NoLongerIssued);
AllowGroupQuote = b->database().query<bool>(DB_AllowGroupQuote);
b->database().query_into(DB_TxCallsGuarUwSubstd, TxCallsGuarUwSubstd);
- AllowExperienceRating = b->database().query<bool>(DB_AllowExpRating);
UseExperienceRating = b->yare_input_.UseExperienceRating;
UsePartialMort = b->yare_input_.UsePartialMortality;
- [lmi-commits] [lmi] master updated (ef8f7b4 -> 64c9105), Greg Chicares, 2021/01/31
- [lmi-commits] [lmi] master 72b54df 3/6: Expunge experience-rating calculations [322], Greg Chicares, 2021/01/31
- [lmi-commits] [lmi] master 2384269 1/6: Allow currency/currency --> double, Greg Chicares, 2021/01/31
- [lmi-commits] [lmi] master 64c9105 6/6: Expunge experience rating from ledger, Greg Chicares, 2021/01/31
- [lmi-commits] [lmi] master 0e4c210 2/6: Mark experience-rating code for expunction, Greg Chicares, 2021/01/31
- [lmi-commits] [lmi] master 7d7b4b4 4/6: Expunge experience rating from database [321],
Greg Chicares <=
- [lmi-commits] [lmi] master 526fdb4 5/6: Neither use nor allow experience rating, Greg Chicares, 2021/01/31