[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 788def5 3/6: Rename an MST variable
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 788def5 3/6: Rename an MST variable |
Date: |
Sun, 30 Sep 2018 17:07:13 -0400 (EDT) |
branch: master
commit 788def590b1d7e91d3077d20c0226b9a9b118736
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename an MST variable
Names formed as
root + any of several suffixes
alphabetize contiguously, emphasizing their semantic affinity; prefixed
names don't. A "Has" prefix has historically been used for variables
declared elsewhere, but it seems preferable today to treat that as a
nonproductive facet of the naming scheme.
---
ill_reg_column_headings.mst | 8 ++++----
ill_reg_narr_summary2.mst | 4 ++--
ledger_evaluator.cpp | 12 +++++++-----
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ill_reg_column_headings.mst b/ill_reg_column_headings.mst
index 3d0155b..2619974 100644
--- a/ill_reg_column_headings.mst
+++ b/ill_reg_column_headings.mst
@@ -71,9 +71,9 @@ Presumably the description of death benefit options should be
moved into
Option in which the death benefit is equal to the selected
face amount of the contract on the date of death of the insured,
or if greater the {{AvName}} Value
-{{#HasSalesLoadRefund}}
+{{#SalesLoadRefundAvailable}}
plus the refund of sales loads (if applicable)
-{{/HasSalesLoadRefund}}
+{{/SalesLoadRefundAvailable}}
on the insured's date of death multiplied by the minimum face
amount percentage for the insured's attained age at death
(minimum face amount). Please refer to the contract
@@ -88,9 +88,9 @@ face amount of the contract
plus the {{AvName}} Value
on the date of death of the insured, or if greater,
the {{AvName}} Value
-{{#HasSalesLoadRefund}}
+{{#SalesLoadRefundAvailable}}
plus the refund of sales loads (if applicable)
-{{/HasSalesLoadRefund}}
+{{/SalesLoadRefundAvailable}}
on the insured's date of death multiplied
by the death benefit factor for the insured's attained age
at death (minimum face amount). Please refer to the contract
diff --git a/ill_reg_narr_summary2.mst b/ill_reg_narr_summary2.mst
index 5fdd3c3..ca0d1d7 100644
--- a/ill_reg_narr_summary2.mst
+++ b/ill_reg_narr_summary2.mst
@@ -28,7 +28,7 @@
<font size="-1">
-{{#HasSalesLoadRefund}}
+{{#SalesLoadRefundAvailable}}
<p>
Sales Load Refund: We will refund a portion of the sales load
to you, as part of your {{CsvName}}
@@ -40,7 +40,7 @@
{{SalesLoadRefundRate1}}
of the first contract year sales load collected.
</p>
-{{/HasSalesLoadRefund}}
+{{/SalesLoadRefundAvailable}}
{{#NoLapse}}
<p>
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index a34aae9..450bb3f 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -520,7 +520,6 @@ ledger_evaluator Ledger::make_evaluator() const
format_map["HasADD" ] = f1;
format_map["HasChildRider" ] = f1;
format_map["HasHoneymoon" ] = f1;
- format_map["HasSalesLoadRefund" ] = f1;
format_map["HasSpouseRider" ] = f1;
format_map["HasSupplSpecAmt" ] = f1;
format_map["HasTerm" ] = f1;
@@ -544,6 +543,7 @@ ledger_evaluator Ledger::make_evaluator() const
format_map["NoLapseMinAge" ] = f1;
format_map["NoLapseMinDur" ] = f1;
format_map["RetAge" ] = f1;
+ format_map["SalesLoadRefundAvailable" ] = f1;
format_map["SmokerBlended" ] = f1;
format_map["SmokerDistinct" ] = f1;
format_map["SplitFundAllocation" ] = f1;
@@ -849,7 +849,9 @@ ledger_evaluator Ledger::make_evaluator() const
strings["PrepMonth"] = &PrepMonth;
strings["PrepDay" ] = &PrepDay;
- double HasSalesLoadRefund =
+ // PDF !! Sales-load refunds are mentioned on 'mce_ill_reg' PDFs
+ // only. Other formats defectively ignore them.
+ double SalesLoadRefundAvailable =
!each_equal(ledger_invariant_->RefundableSalesLoad, 0.0);
double SalesLoadRefundRate0 = ledger_invariant_->RefundableSalesLoad[0];
double SalesLoadRefundRate1 = ledger_invariant_->RefundableSalesLoad[1];
@@ -864,9 +866,9 @@ ledger_evaluator Ledger::make_evaluator() const
)
);
- scalars["HasSalesLoadRefund" ] = &HasSalesLoadRefund ;
- scalars["SalesLoadRefundRate0"] = &SalesLoadRefundRate0;
- scalars["SalesLoadRefundRate1"] = &SalesLoadRefundRate1;
+ scalars["SalesLoadRefundAvailable"] = &SalesLoadRefundAvailable;
+ scalars["SalesLoadRefundRate0" ] = &SalesLoadRefundRate0;
+ scalars["SalesLoadRefundRate1" ] = &SalesLoadRefundRate1;
double SepAcctAllocation = 1.0 - ledger_invariant_->GenAcctAllocation;
scalars ["SepAcctAllocation"] = &SepAcctAllocation;
- [lmi-commits] [lmi] master updated (5e45c3d -> f1af0f9), Greg Chicares, 2018/09/30
- [lmi-commits] [lmi] master f9ddc04 5/6: Do not depict a scalar as a vector, Greg Chicares, 2018/09/30
- [lmi-commits] [lmi] master f1af0f9 6/6: Remove some obsolete comments, Greg Chicares, 2018/09/30
- [lmi-commits] [lmi] master 788def5 3/6: Rename an MST variable,
Greg Chicares <=
- [lmi-commits] [lmi] master 7bfe072 2/6: Replace an assertion with a more elaborate alarum, Greg Chicares, 2018/09/30
- [lmi-commits] [lmi] master d077bc5 1/6: Note a future improvement to a column heading, Greg Chicares, 2018/09/30
- [lmi-commits] [lmi] master ac17f79 4/6: Add and remove defect markers [380], Greg Chicares, 2018/09/30