[lmi-commits] [lmi] master 2e4874e: Vaporize experience rating

[Greg Chicares]

branch: master
commit 2e4874e1299fa3ef5005f34ed69b07db8c015369
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Vaporize experience rating
    
    * ledger_text_formats.cpp: Replace some column headers.
    * mc_enum_types.xpp: Replace some descriptive names in a comment block.
    * reg_d_group_narr_summary2.mst: Move footnote text to database.
    * types.rnc: Remove obsolete report columns.
    * types.xsd: Likewise.
---
 ledger_text_formats.cpp       | 8 ++++----
 mc_enum_types.xpp             | 2 +-
 reg_d_group_narr_summary2.mst | 3 +--
 types.rnc                     | 4 ----
 types.xsd                     | 4 ----
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index bcaaac7..b856a04 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -533,12 +533,12 @@ void PrintCellTabDelimited
         ,"ClaimsPaid"
         ,"NetClaims"
         ,"[obsolete]"
-        ,"ProjectedMortalityCharge"
         ,"[obsolete]"
-        ,"NetMortalityCharge0Int"
-        ,"NetClaims0Int"
         ,"[obsolete]"
-        ,"ProjectedMortalityCharge0Int"
+        ,"[obsolete]"
+        ,"[obsolete]"
+        ,"[obsolete]"
+        ,"[obsolete]"
         ,"[obsolete]"
         };
 
diff --git a/mc_enum_types.xpp b/mc_enum_types.xpp
index e468680..1675947 100644
--- a/mc_enum_types.xpp
+++ b/mc_enum_types.xpp
@@ -710,7 +710,7 @@
     ,"Guaranteed Cash Value IRR" \
     ,"Current Death Benefit IRR" \
     ,"Guaranteed Death Benefit IRR" \
-    ,"Experience Rating Current Net Claims" \
+    ,"Current Claims Net of Account Value Released on Death" \
     ,"Total Payment" \
     ,"Current Accrued Loan Interest" \
     ,"Current Net Death Benefit" \
diff --git a/reg_d_group_narr_summary2.mst b/reg_d_group_narr_summary2.mst
index 3816836..9a964b7 100644
--- a/reg_d_group_narr_summary2.mst
+++ b/reg_d_group_narr_summary2.mst
@@ -34,8 +34,7 @@
 </p>
 
 <p>
-<!-- PDF !! Move this to {{ExpRatingFootnote}}. -->
-    The illustration does not assume any mortality experience rating.
+    {{ExpRatingFootnote}}
 </p>
 
 <p>
diff --git a/types.rnc b/types.rnc
index 22a909e..363d80e 100644
--- a/types.rnc
+++ b/types.rnc
@@ -350,11 +350,7 @@ report_column =
     | "IrrCsv_Guaranteed"
     | "IrrDb_Current"
     | "IrrDb_Guaranteed"
-    | "ExperienceReserve_Current"
     | "NetClaims_Current"
-    | "NetCOICharge_Current"
-    | "ProjectedCoiCharge_Current"
-    | "KFactor_Current"
     | "GrossPmt"
     | "LoanIntAccrued_Current"
     | "NetDeathBenefit"
diff --git a/types.xsd b/types.xsd
index cd44b97..23ef8fc 100644
--- a/types.xsd
+++ b/types.xsd
@@ -771,11 +771,7 @@ proved unworkable (e.g., because of 
underwriting).</xs:documentation>
       <xs:enumeration value="IrrCsv_Guaranteed"/>
       <xs:enumeration value="IrrDb_Current"/>
       <xs:enumeration value="IrrDb_Guaranteed"/>
-      <xs:enumeration value="ExperienceReserve_Current"/>
       <xs:enumeration value="NetClaims_Current"/>
-      <xs:enumeration value="NetCOICharge_Current"/>
-      <xs:enumeration value="ProjectedCoiCharge_Current"/>
-      <xs:enumeration value="KFactor_Current"/>
       <xs:enumeration value="GrossPmt"/>
       <xs:enumeration value="LoanIntAccrued_Current"/>
       <xs:enumeration value="NetDeathBenefit"/>