[lmi-commits] [lmi] master a085fc5 2/2: Annihilate vestiges of weird "0%" columns from GUI [352]

[Greg Chicares]

branch: master
commit a085fc513c282b816a7c6341a7c3cbc5c2c7030e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Annihilate vestiges of weird "0%" columns from GUI [352]
    
    The 20190129T2158 expunction was insufficiently radical.
---
 ledger_text_formats.cpp         | 11 -----------
 types.rnc                       |  8 --------
 types.xsd                       |  8 --------
 wx_test_calculation_summary.cpp |  7 -------
 4 files changed, 34 deletions(-)

diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index a9a0e6c..0b1bcd0 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -123,17 +123,6 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["NetIntCredited_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Net Int Credited"                 ); // "Current Interest Credited 
Net of Separate Account Charges"
         m["SepAcctCharges_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Sep Acct Charges"                 ); // "Current Separate Account 
Asset Charges"
         m["PolicyFee_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr Policy Fee"                       ); // "Current Policy Fee"
-// '*_CurrentZero' and '*_GuaranteedZero' columns deliberately suppressed--see:
-//   http://lists.nongnu.org/archive/html/lmi/2009-09/msg00012.html
-// TODO ?? EGREGIOUS_DEFECT: instead, don't offer these columns at all.
-//      m["AVGenAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges Account Value Gen Acct"   ); // "Curr Charges Account Value 
General Account"
-//      m["AVGenAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges Account Value Gen Acct"   ); // "Guar Charges Account Value 
General Account"
-//      m["AVSepAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value Sep Acct"); // "Curr Charges 0% Account 
Value Separate Account"
-//      m["AVSepAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value Sep Acct"); // "Guar Charges 0% Account 
Value Separate Account"
-//      m["AcctVal_CurrentZero"        ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value"         ); // "Curr Charges 0% Account 
Value"
-//      m["AcctVal_GuaranteedZero"     ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value"         ); // "Guar Charges 0% Account 
Value"
-//      m["CSVNet_CurrentZero"         ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Net Cash Surr Value"   ); // "Curr Charges 0% Net Cash 
Surrender Value"
-//      m["CSVNet_GuaranteedZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Net Cash Surr Value"   ); // "Guar Charges 0% Net Cash 
Surrender Value"
         }
 
     return m;
diff --git a/types.rnc b/types.rnc
index 7299c13..f7697c4 100644
--- a/types.rnc
+++ b/types.rnc
@@ -366,14 +366,6 @@ report_column =
     | "NetIntCredited_Current"
     | "SepAcctCharges_Current"
     | "PolicyFee_Current"
-    | "AVGenAcct_CurrentZero"
-    | "AVGenAcct_GuaranteedZero"
-    | "AVSepAcct_CurrentZero"
-    | "AVSepAcct_GuaranteedZero"
-    | "AcctVal_CurrentZero"
-    | "AcctVal_GuaranteedZero"
-    | "CSVNet_CurrentZero"
-    | "CSVNet_GuaranteedZero"
 
 ## Built-in supplemental illustration.
 suppl_illus_type =
diff --git a/types.xsd b/types.xsd
index b2d50af..3c5b761 100644
--- a/types.xsd
+++ b/types.xsd
@@ -787,14 +787,6 @@ proved unworkable (e.g., because of 
underwriting).</xs:documentation>
       <xs:enumeration value="NetIntCredited_Current"/>
       <xs:enumeration value="SepAcctCharges_Current"/>
       <xs:enumeration value="PolicyFee_Current"/>
-      <xs:enumeration value="AVGenAcct_CurrentZero"/>
-      <xs:enumeration value="AVGenAcct_GuaranteedZero"/>
-      <xs:enumeration value="AVSepAcct_CurrentZero"/>
-      <xs:enumeration value="AVSepAcct_GuaranteedZero"/>
-      <xs:enumeration value="AcctVal_CurrentZero"/>
-      <xs:enumeration value="AcctVal_GuaranteedZero"/>
-      <xs:enumeration value="CSVNet_CurrentZero"/>
-      <xs:enumeration value="CSVNet_GuaranteedZero"/>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="suppl_illus_type">
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index bf4249a..6a9c439 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -242,13 +242,6 @@ void check_calculation_summary_columns
 // To test backward compatibility, modify 'configurable_settings'
 // directly, adding a field that was formerly removed, and setting
 // the version number to a version that offered that field.
-//
-// Columns whose names end with "Zero" are available iff inforce
-// general and separate account value are both nonzero. This could be
-// tested here; however, it would be a vastly better use of limited
-// time to generate the special report that uses them automatically
-// rather than manually, and then to expunge those columns from
-// 'mc_enum_types.?pp'.
 
 /// Test calculation summary.
 ///