[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 526fdb4 5/6: Neither use nor allow experience
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 526fdb4 5/6: Neither use nor allow experience rating |
Date: |
Sun, 31 Jan 2021 17:27:28 -0500 (EST) |
branch: master
commit 526fdb48ff4dd30ebfee2883b92648bbd01e563e
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Neither use nor allow experience rating
---
ihs_basicval.cpp | 7 +++----
ledger_evaluator.cpp | 2 --
ledger_invariant.cpp | 4 ----
ledger_invariant.hpp | 2 --
ledger_invariant_init.cpp | 1 -
reg_d_group_narr_summary2.mst | 9 ++-------
6 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index d039a28..0af78ac 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -625,10 +625,9 @@ void BasicValues::SetPermanentInvariants()
database().query_into(DB_UnusualCoiBanding , UseUnusualCOIBanding);
// 'Unusual' COI banding accommodates a particular idiosyncratic
- // product which has no term rider and doesn't permit experience
- // rating, so we assert those preconditions and write simple code
- // for 'unusual' COI banding that ignores those features.
- LMI_ASSERT(!(UseUnusualCOIBanding && yare_input_.UseExperienceRating));
+ // product which has no term rider, so assert the absence of term
+ // as a precondition and write simple code for 'unusual' COI
+ // banding that ignores term.
LMI_ASSERT(!(UseUnusualCOIBanding &&
database().query<bool>(DB_AllowTerm)));
// Flat extras can be used even with guaranteed issue, e.g., for
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 7446d2c..4d3ee91 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -484,7 +484,6 @@ format_map_t static_formats()
// > Format as a number with thousand separators and no decimal places
(#,###,###)
// >
,{"Age" , f1}
- ,{"AllowExperienceRating" , f1}
,{"AllowGroupQuote" , f1}
,{"AvgFund" , f1}
,{"ChildRiderAmount" , f1}
@@ -536,7 +535,6 @@ format_map_t static_formats()
,{"SurviveToExpectancy" , f1}
,{"SurviveToYear" , f1}
,{"TxCallsGuarUwSubstd" , f1}
- ,{"UseExperienceRating" , f1}
,{"UsePartialMort" , f1}
,{"WriteTsvFile" , f1}
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 2c6ae46..1ba0878 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -149,8 +149,6 @@ void LedgerInvariant::Alloc(int len)
OtherScalars ["NoLongerIssued" ] = &NoLongerIssued
;
OtherScalars ["AllowGroupQuote" ] = &AllowGroupQuote
;
OtherScalars ["TxCallsGuarUwSubstd" ] = &TxCallsGuarUwSubstd
;
- OtherScalars ["AllowExperienceRating" ] = &AllowExperienceRating
;
- OtherScalars ["UseExperienceRating" ] = &UseExperienceRating
;
OtherScalars ["UsePartialMort" ] = &UsePartialMort
;
OtherScalars ["SurviveToExpectancy" ] = &SurviveToExpectancy
;
@@ -672,8 +670,6 @@ LedgerInvariant& LedgerInvariant::PlusEq(LedgerInvariant
const& a_Addend)
NoLongerIssued = NoLongerIssued ||
a_Addend.NoLongerIssued;
AllowGroupQuote = AllowGroupQuote &&
a_Addend.AllowGroupQuote;
TxCallsGuarUwSubstd = TxCallsGuarUwSubstd ||
a_Addend.TxCallsGuarUwSubstd;
- AllowExperienceRating = AllowExperienceRating ||
a_Addend.AllowExperienceRating;
- UseExperienceRating = UseExperienceRating ||
a_Addend.UseExperienceRating;
UsePartialMort = a_Addend.UsePartialMort;
SurviveToExpectancy = a_Addend.SurviveToExpectancy;
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index a7b3767..69f7ef4 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -141,8 +141,6 @@ class LMI_SO LedgerInvariant final
double NoLongerIssued;
double AllowGroupQuote;
double TxCallsGuarUwSubstd;
- double AllowExperienceRating;
- double UseExperienceRating;
double UsePartialMort;
double SurviveToExpectancy;
double SurviveToYear;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index f6bcc0f..418dbfd 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);
- UseExperienceRating = b->yare_input_.UseExperienceRating;
UsePartialMort = b->yare_input_.UsePartialMortality;
SurviveToExpectancy = false;
diff --git a/reg_d_group_narr_summary2.mst b/reg_d_group_narr_summary2.mst
index f6601a3..3816836 100644
--- a/reg_d_group_narr_summary2.mst
+++ b/reg_d_group_narr_summary2.mst
@@ -34,13 +34,8 @@
</p>
<p>
-{{#UseExperienceRating}}
- {{ExpRatingFootnote}}
-{{/UseExperienceRating}}
-{{^UseExperienceRating}}
- The illustration does not assume any mortality
- experience rating.
-{{/UseExperienceRating}}
+<!-- PDF !! Move this to {{ExpRatingFootnote}}. -->
+ The illustration does not assume any mortality experience rating.
</p>
<p>
- [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, 2021/01/31
- [lmi-commits] [lmi] master 526fdb4 5/6: Neither use nor allow experience rating,
Greg Chicares <=