Re: [lmi] Supplemental report with zero-percent columns

[Greg Chicares]

On 2009-09-28 13:01Z, Greg Chicares wrote:
[...]
> The patch below [0]

Here's the accidentally-omitted patch:

Index: input_harmonization.cpp
===================================================================
RCS file: /sources/lmi/lmi/input_harmonization.cpp,v
retrieving revision 1.105
diff -U 3 -r1.105 input_harmonization.cpp
--- input_harmonization.cpp     24 Jun 2009 20:05:14 -0000      1.105
+++ input_harmonization.cpp     28 Sep 2009 13:01:53 -0000
@@ -919,6 +919,34 @@
     SupplementalReportColumn09.enable(create_supplemental_report);
     SupplementalReportColumn10.enable(create_supplemental_report);
     SupplementalReportColumn11.enable(create_supplemental_report);
+
+    // TODO ?? EGREGIOUS_DEFECT: instead, don't offer these columns at all.
+    std::vector<mcenum_report_column> weird_report_columns;
+    weird_report_columns.push_back(mce_current_0_account_value_general_account 
   );
+    
weird_report_columns.push_back(mce_guaranteed_0_account_value_general_account );
+    
weird_report_columns.push_back(mce_current_0_account_value_separate_account   );
+    
weird_report_columns.push_back(mce_guaranteed_0_account_value_separate_account);
+    weird_report_columns.push_back(mce_current_0_account_value                 
   );
+    weird_report_columns.push_back(mce_guaranteed_0_account_value              
   );
+    weird_report_columns.push_back(mce_current_0_cash_surrender_value          
   );
+    weird_report_columns.push_back(mce_guaranteed_0_cash_surrender_value       
   );
+
+    typedef std::vector<mcenum_report_column>::const_iterator vrci;
+    for(vrci i = weird_report_columns.begin(); i != 
weird_report_columns.end(); ++i)
+        {
+        SupplementalReportColumn00.allow(*i, home_office_only);
+        SupplementalReportColumn01.allow(*i, home_office_only);
+        SupplementalReportColumn02.allow(*i, home_office_only);
+        SupplementalReportColumn03.allow(*i, home_office_only);
+        SupplementalReportColumn04.allow(*i, home_office_only);
+        SupplementalReportColumn05.allow(*i, home_office_only);
+        SupplementalReportColumn06.allow(*i, home_office_only);
+        SupplementalReportColumn07.allow(*i, home_office_only);
+        SupplementalReportColumn08.allow(*i, home_office_only);
+        SupplementalReportColumn09.allow(*i, home_office_only);
+        SupplementalReportColumn10.allow(*i, home_office_only);
+        SupplementalReportColumn11.allow(*i, home_office_only);
+        }
 }

 /// Change values as required for consistency.
Index: ledger_text_formats.cpp
===================================================================
RCS file: /sources/lmi/lmi/ledger_text_formats.cpp,v
retrieving revision 1.64
diff -U 3 -r1.64 ledger_text_formats.cpp
--- ledger_text_formats.cpp     26 Sep 2009 01:37:40 -0000      1.64
+++ ledger_text_formats.cpp     28 Sep 2009 13:01:55 -0000
@@ -125,14 +125,17 @@
         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"
-        m["AVGenAcct_CurrentZero"      ] = ledger_metadata(0, oe_format_normal 
   , "Curr Charges 0% Account Value Gen Acct"); // "Curr Charges 0% Account 
Value General Account"
-        m["AVGenAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value Gen Acct"); // "Guar Charges 0% 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"
+// '*_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 0% Account Value Gen Acct"); // "Curr Charges 0% Account 
Value General Account"
+//      m["AVGenAcct_GuaranteedZero"   ] = ledger_metadata(0, oe_format_normal 
   , "Guar Charges 0% Account Value Gen Acct"); // "Guar Charges 0% 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;
Index: preferences_model.cpp
===================================================================
RCS file: /sources/lmi/lmi/preferences_model.cpp,v
retrieving revision 1.13
diff -U 3 -r1.13 preferences_model.cpp
--- preferences_model.cpp       27 Dec 2008 02:56:52 -0000      1.13
+++ preferences_model.cpp       28 Sep 2009 13:01:55 -0000
@@ -144,6 +144,34 @@
     CalculationSummaryColumn09.enable(do_not_use_builtin_defaults);
     CalculationSummaryColumn10.enable(do_not_use_builtin_defaults);
     CalculationSummaryColumn11.enable(do_not_use_builtin_defaults);
+
+    // TODO ?? EGREGIOUS_DEFECT: instead, don't offer these columns at all.
+    std::vector<mcenum_report_column> weird_report_columns;
+    weird_report_columns.push_back(mce_current_0_account_value_general_account 
   );
+    
weird_report_columns.push_back(mce_guaranteed_0_account_value_general_account );
+    
weird_report_columns.push_back(mce_current_0_account_value_separate_account   );
+    
weird_report_columns.push_back(mce_guaranteed_0_account_value_separate_account);
+    weird_report_columns.push_back(mce_current_0_account_value                 
   );
+    weird_report_columns.push_back(mce_guaranteed_0_account_value              
   );
+    weird_report_columns.push_back(mce_current_0_cash_surrender_value          
   );
+    weird_report_columns.push_back(mce_guaranteed_0_cash_surrender_value       
   );
+
+    typedef std::vector<mcenum_report_column>::const_iterator vrci;
+    for(vrci i = weird_report_columns.begin(); i != 
weird_report_columns.end(); ++i)
+        {
+        CalculationSummaryColumn00.allow(*i, false);
+        CalculationSummaryColumn01.allow(*i, false);
+        CalculationSummaryColumn02.allow(*i, false);
+        CalculationSummaryColumn03.allow(*i, false);
+        CalculationSummaryColumn04.allow(*i, false);
+        CalculationSummaryColumn05.allow(*i, false);
+        CalculationSummaryColumn06.allow(*i, false);
+        CalculationSummaryColumn07.allow(*i, false);
+        CalculationSummaryColumn08.allow(*i, false);
+        CalculationSummaryColumn09.allow(*i, false);
+        CalculationSummaryColumn10.allow(*i, false);
+        CalculationSummaryColumn11.allow(*i, false);
+        }
 }

 void PreferencesModel::DoTransmogrify()