[lmi-commits] [lmi] master ef38c9d 141/156: Revert the title map related changes

[Greg Chicares]

branch: master
commit ef38c9db6f5c6b3db19cbdb51e8738c3b4e217ed
Author: Vadim Zeitlin <address@hidden>
Commit: Vadim Zeitlin <address@hidden>

    Revert the title map related changes
    
    This reverts commits f6b09f929ab18fae4ca927f4986256f27dda9964 and
    f8121e1799af3ed02d379fbec30c98e1c2302af6, restoring the original title
    map keys and values.
---
 ledger_evaluator.cpp | 189 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 126 insertions(+), 63 deletions(-)

diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 83ea4ef..403881b 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -144,8 +144,6 @@ std::string ledger_evaluator::operator()
 
 ledger_evaluator Ledger::make_evaluator() const
 {
-    // This map defines titles for all columns that can appear in a
-    // supplemental report.
     title_map_t title_map;
 
 // Can't seem to get a literal &nbsp; into the output.
@@ -166,68 +164,129 @@ ledger_evaluator Ledger::make_evaluator() const
     // they are defined only on a current basis--experience-rating
     // columns, e.g.
 
-    title_map["AVGenAcct_CurrentZero"           ] = "Curr Charges\nAccount 
Value\nGen Acct";
-    title_map["AVGenAcct_GuaranteedZero"        ] = "Guar Charges\nAccount 
Value\nGen Acct";
-    title_map["AVRelOnDeath_Current"            ] = "Account Value\nReleased 
on Death";
-    title_map["AVSepAcct_CurrentZero"           ] = "Curr Charges\n0% Account 
Value\nSep Acct";
-    title_map["AVSepAcct_GuaranteedZero"        ] = "Guar Charges\n0% Account 
Value\nSep Acct";
-    title_map["AcctVal_Current"                 ] = "Curr Account\nValue";
-    title_map["AcctVal_CurrentZero"             ] = "Curr Charges\n0% Account 
Value";
-    title_map["AcctVal_Guaranteed"              ] = "Guar Account\nValue";
-    title_map["AcctVal_GuaranteedZero"          ] = "Guar Charges\n0% Account 
Value";
-    title_map["AnnGAIntRate_Current"            ] = "Curr Ann\nGen Acct\nInt 
Rate";
-    title_map["AnnSAIntRate_Current"            ] = "Curr Ann\nSep Acct\nInt 
Rate";
-    title_map["AttainedAge"                     ] = "End of\nYear Age";
-    title_map["BaseDeathBft_Current"            ] = "Curr Base\nDeath Benefit";
-    title_map["BaseDeathBft_Guaranteed"         ] = "Guar Base\nDeath Benefit";
-    title_map["COICharge_Current"               ] = "Curr COI\nCharge";
-    title_map["COICharge_Guaranteed"            ] = "Guar COI\nCharge";
-    title_map["CSVNet_Current"                  ] = "Curr Net\nCash\nSurr 
Value";
-    title_map["CSVNet_CurrentZero"              ] = "Curr Charges\n0% Net 
Cash\nSurr Value";
-    title_map["CSVNet_Guaranteed"               ] = "Guar Net\nCash\nSurr 
Value";
-    title_map["CSVNet_GuaranteedZero"           ] = "Guar Charges\n0% Net 
Cash\nSurr Value";
-    title_map["ClaimsPaid_Current"              ] = "Curr\nClaims\nPaid";
-    title_map["CorridorFactor"                  ] = "Corridor Factor";
-    title_map["DeathProceedsPaid_Current"       ] = "Curr Death\nProceeds 
Paid";
-    title_map["EOYDeathBft_Current"             ] = "Curr EOY\nDeath Benefit";
-    title_map["EOYDeathBft_Guaranteed"          ] = "Guar EOY\nDeath Benefit";
-    title_map["EeGrossPmt"                      ] = "EE Gross\nPayment";
-    title_map["EeModalMinimumPremium"           ] = "EE 
Modal\nMinimum\nPremium";
-    title_map["ErGrossPmt"                      ] = "ER Gross\nPayment";
-    title_map["ErModalMinimumPremium"           ] = "ER 
Modal\nMinimum\nPremium";
-    title_map["ExperienceReserve_Current"       ] = 
"Experience\nRating\nReserve";
-    title_map["GrossIntCredited_Current"        ] = "Curr Gross\nInt Credited";
-    title_map["GrossPmt"                        ] = "Premium Outlay";
-    title_map["InforceLives"                    ] = "BOY\nLives\nInforce";
-    title_map["IrrCsv_Current"                  ] = "Curr IRR\non CSV";
-    title_map["IrrCsv_Guaranteed"               ] = "Guar IRR\non CSV";
-    title_map["IrrDb_Current"                   ] = "Curr IRR\non DB";
-    title_map["IrrDb_Guaranteed"                ] = "Guar IRR\non DB";
-    title_map["KFactor_Current"                 ] = "Experience\nRating K 
Factor";
-    title_map["LoanIntAccrued_Current"          ] = "Curr Loan\nInt\nAccrued";
+    title_map["AVGenAcct_CurrentZero"           ] = "Curr Charges Account 
Value Gen Acct";
+    title_map["AVGenAcct_GuaranteedZero"        ] = "Guar Charges Account 
Value Gen Acct";
+    title_map["AVRelOnDeath_Current"            ] = "Account Value 
____Released on Death";
+    title_map["AVSepAcct_CurrentZero"           ] = "Curr Charges 0% Account 
Value Sep Acct";
+    title_map["AVSepAcct_GuaranteedZero"        ] = "Guar Charges 0% Account 
Value Sep Acct";
+    title_map["AcctVal_Current"                 ] = " _____________ Curr 
Account Value";
+    title_map["AcctVal_CurrentZero"             ] = "Curr Charges 0% Account 
Value";
+    title_map["AcctVal_Guaranteed"              ] = " _____________ Guar 
Account Value";
+    title_map["AcctVal_GuaranteedZero"          ] = "Guar Charges 0% Account 
Value";
+    title_map["AddonCompOnAssets"               ] = "Additional Comp on 
Assets";
+    title_map["AddonCompOnPremium"              ] = "Additional Comp on 
Premium";
+    title_map["AddonMonthlyFee"                 ] = "Additional Monthly Fee";
+    title_map["AnnGAIntRate_Current"            ] = " _____________ Curr Ann 
Gen Acct Int Rate";
+    title_map["AnnGAIntRate_Guaranteed"         ] = " _____________ Guar Ann 
Gen Acct Int Rate";
+    title_map["AnnHoneymoonValueRate_Current"   ] = "Curr Ann Honeymoon Value 
Rate";
+    title_map["AnnHoneymoonValueRate_Guaranteed"] = "Guar Ann Honeymoon Value 
Rate";
+    title_map["AnnPostHoneymoonRate_Current"    ] = "Curr Post Honeymoon Rate";
+    title_map["AnnPostHoneymoonRate_Guaranteed" ] = "Guar Post Honeymoon Rate";
+    title_map["AnnSAIntRate_Current"            ] = " _____________ Curr Ann 
Sep Acct Int Rate";
+    title_map["AnnSAIntRate_Guaranteed"         ] = " _____________ Guar Ann 
Sep Acct Int Rate";
+    title_map["AttainedAge"                     ] = " _____________ 
_____________ End of __Year Age";
+    title_map["AvgDeathBft_Current"             ] = "Curr Avg Death Benefit";
+    title_map["AvgDeathBft_Guaranteed"          ] = "Guar Avg Death Benefit";
+    title_map["BaseDeathBft_Current"            ] = " _____________ Curr Base 
Death Benefit";
+    title_map["BaseDeathBft_Guaranteed"         ] = " _____________ Guar Base 
Death Benefit";
+    title_map["COICharge_Current"               ] = " _____________ 
_____________ Curr COI Charge";
+    title_map["COICharge_Guaranteed"            ] = " _____________ 
_____________ Guar COI Charge";
+    title_map["CSVNet_Current"                  ] = " _____________ Curr Net 
Cash Surr Value";
+    title_map["CSVNet_CurrentZero"              ] = "Curr Charges 0% Net Cash 
Surr Value";
+    title_map["CSVNet_Guaranteed"               ] = " _____________ Guar Net 
Cash Surr Value";
+    title_map["CSVNet_GuaranteedZero"           ] = "Guar Charges 0% Net Cash 
Surr Value";
+    title_map["CV7702_Current"                  ] = "Curr 7702 Cash Value";
+    title_map["CV7702_Guaranteed"               ] = "Guar 7702 Cash Value";
+    title_map["ClaimsPaid_Current"              ] = " _____________ _______ 
Curr ___Claims ___Paid";
+    title_map["ClaimsPaid_Guaranteed"           ] = " _____________ _______ 
Guar ___Claims ___Paid";
+    title_map["CorpTaxBracket"                  ] = " _____________ Corp Tax 
Bracket";
+    title_map["CorridorFactor"                  ] = " _____________ 
_____________ Corridor Factor";
+    title_map["CurrMandE"                       ] = "Mortality and Expense 
Charge";
+    title_map["DBOpt"                           ] = "Death Benefit Option";
+    title_map["DacTaxLoad_Current"              ] = " _____________ Curr DAC 
Tax Load";
+    title_map["DacTaxLoad_Guaranteed"           ] = " _____________ Guar DAC 
Tax Load";
+    title_map["DacTaxRsv_Current"               ] = "Curr DAC Tax Reserve";
+    title_map["DacTaxRsv_Guaranteed"            ] = "Guar DAC Tax Reserve";
+    title_map["DeathProceedsPaid_Current"       ] = " _____________ Curr Death 
Proceeds Paid";
+    title_map["DeathProceedsPaid_Guaranteed"    ] = " _____________ Guar Death 
Proceeds Paid";
+    title_map["EOYDeathBft_Current"             ] = " _____________ Curr EOY 
Death Benefit";
+    title_map["EOYDeathBft_Guaranteed"          ] = " _____________ Guar EOY 
Death Benefit";
+    title_map["EeGrossPmt"                      ] = " _____________ ______ EE 
Gross Payment";
+    title_map["EeModalMinimumPremium"           ] = "EE Modal Minimum Premium";
+    title_map["EeMode"                          ] = "EE Payment Mode";
+// TODO ?? This can't be a mode. I don't know how it differs from 'EeGrossPmt' 
above.
+    title_map["EePmt"                           ] = "EE Payment Mode";
+    title_map["ErGrossPmt"                      ] = " _____________ ______ ER 
Gross Payment";
+    title_map["ErModalMinimumPremium"           ] = "ER Modal Minimum Premium";
+    title_map["ErMode"                          ] = "ER Payment Mode";
+// TODO ?? This can't be a mode. I don't know how it differs from 'ErGrossPmt' 
above.
+    title_map["ErPmt"                           ] = "ER Payment Mode";
+    title_map["ExpenseCharges_Current"          ] = "Curr Expense Charge";
+    title_map["ExpenseCharges_Guaranteed"       ] = "Guar Expense Charge";
+    title_map["ExperienceReserve_Current"       ] = " _____________ Experience 
Rating Reserve";
+    title_map["GptForceout"                     ] = "Forceout";
+    title_map["GrossIntCredited_Current"        ] = "Curr Gross Int Credited";
+    title_map["GrossIntCredited_Guaranteed"     ] = "Guar Gross Int Credited";
+    title_map["GrossPmt"                        ] = " _____________ 
_____________ Premium Outlay";
+    title_map["HoneymoonValueSpread"            ] = "Honeymoon Value Spread";
+    title_map["IndvTaxBracket"                  ] = " _____________ EE Tax 
Bracket";
+    title_map["InforceLives"                    ] = " _____________ ______BOY 
_______Lives _______Inforce";
+    title_map["IrrCsv_Current"                  ] = " _____________ 
_____________ Curr IRR on CSV";
+    title_map["IrrCsv_Guaranteed"               ] = " _____________ 
_____________ Guar IRR on CSV";
+    title_map["IrrDb_Current"                   ] = " _____________ 
_____________ Curr IRR on DB";
+    title_map["IrrDb_Guaranteed"                ] = " _____________ 
_____________ Guar IRR on DB";
+    title_map["KFactor_Current"                 ] = " _____________ Experience 
_______Rating K Factor";
+    title_map["LoanIntAccrued_Current"          ] = " _____________ ____Curr 
Loan Int __Accrued";
+    title_map["LoanIntAccrued_Guaranteed"       ] = " _____________ ____Guar 
Loan Int __Accrued";
+    title_map["MlyGAIntRate_Current"            ] = "Curr Monthly Gen Acct Int 
Rate";
+    title_map["MlyGAIntRate_Guaranteed"         ] = "Guar Monthly Gen Acct Int 
Rate";
+    title_map["MlyHoneymoonValueRate_Current"   ] = "Curr Monthly Honeymoon 
Value Rate";
+    title_map["MlyHoneymoonValueRate_Guaranteed"] = "Guar Monthly Honeymoon 
Value Rate";
+    title_map["MlyPostHoneymoonRate_Current"    ] = "Curr Monthly Post 
Honeymoon Rate";
+    title_map["MlyPostHoneymoonRate_Guaranteed" ] = "Guar Monthly Post 
Honeymoon Rate";
+    title_map["MlySAIntRate_Current"            ] = "Curr Monthly Sep Acct Int 
Rate";
+    title_map["MlySAIntRate_Guaranteed"         ] = "Guar Monthly Sep Acct Int 
Rate";
     title_map["ModalMinimumPremium"             ] = "Modal Minimum Premium";
-    title_map["NetCOICharge_Current"            ] = "Experience\nRating\nNet 
COI Charge";
-    title_map["NetClaims_Current"               ] = "Curr Net\nClaims";
-    title_map["NetDeathBenefit"                 ] = "Net\nDeath Benefit";
-    title_map["NetIntCredited_Current"          ] = "Curr Net\nInt Credited";
-    title_map["NetWD"                           ] = "Withdrawal";
-    title_map["NewCashLoan"                     ] = "Annual Loan";
-    title_map["Outlay"                          ] = "Net Outlay";
-    title_map["PolicyFee_Current"               ] = "Curr\nPolicy Fee";
-    title_map["PolicyYear"                      ] = "Policy\nYear";
-    title_map["ProjectedCoiCharge_Current"      ] = 
"Experience\nRating\nProjected\nCOI Charge";
-    title_map["RiderCharges_Current"            ] = "Curr Rider\nCharges";
-    title_map["SepAcctCharges_Current"          ] = "Curr Sep\nAcct Charges";
-    title_map["SpecAmt"                         ] = "Specified Amount";
-    title_map["SpecAmtLoad_Current"             ] = "Curr Spec\nAmt Load";
-    title_map["SupplDeathBft_Current"           ] = "Curr Suppl\nDeath 
Benefit";
-    title_map["SupplDeathBft_Guaranteed"        ] = "Guar Suppl\nDeath 
Benefit";
-    title_map["SupplSpecAmt"                    ] = "Suppl Specified Amount";
-    title_map["TermPurchased_Current"           ] = "Curr Term\nAmt Purchased";
-    title_map["TermPurchased_Guaranteed"        ] = "Guar Term\nAmt Purchased";
-    title_map["TermSpecAmt"                     ] = "Term Specified Amount";
-    title_map["TotalLoanBalance_Current"        ] = "Curr Total\nLoan Balance";
-    title_map["TotalLoanBalance_Guaranteed"     ] = "Guar Total\nLoan Balance";
+    title_map["AnnualFlatExtra"                 ] = " _____________ Annual 
Flat Extra";
+//    title_map["NaarForceout"                    ] = "Forced Withdrawal due 
to NAAR Limit";
+    title_map["NetCOICharge_Current"            ] = "Experience _______Rating 
_______Net COI Charge";
+    title_map["NetClaims_Current"               ] = " _____________ 
_____________ Curr Net Claims";
+    title_map["NetClaims_Guaranteed"            ] = " _____________ 
_____________ Guar Net Claims";
+    title_map["NetIntCredited_Current"          ] = " _____________ Curr Net 
Int Credited";
+    title_map["NetIntCredited_Guaranteed"       ] = " _____________ Guar Net 
Int Credited";
+    title_map["NetPmt_Current"                  ] = " _____________ Curr Net 
Payment";
+    title_map["NetPmt_Guaranteed"               ] = " _____________ Guar Net 
Payment";
+    title_map["NetWD"                           ] = " _____________ 
_____________ _____________ Withdrawal";
+    title_map["NewCashLoan"                     ] = " _____________ 
_____________ Annual Loan";
+    title_map["Outlay"                          ] = " _____________ 
_____________ ____Net Outlay";
+    title_map["PartMortTableMult"               ] = "Partial Mortality 
Muliplier";
+    title_map["PolicyFee_Current"               ] = "Curr ____Policy Fee";
+    title_map["PolicyFee_Guaranteed"            ] = "Guar ____Policy Fee";
+    title_map["PolicyYear"                      ] = " _____________ 
_____________ Policy __Year";
+    title_map["PrefLoanBalance_Current"         ] = "Curr Preferred Loan Bal";
+    title_map["PrefLoanBalance_Guaranteed"      ] = "Guar Preferred Loan Bal";
+    title_map["PremTaxLoad_Current"             ] = "Curr Premium Tax Load";
+    title_map["PremTaxLoad_Guaranteed"          ] = "Guar Premium Tax Load";
+// Excluded because it's unimplemented:
+//    title_map["ProducerCompensation"            ] = " _____________ Producer 
Compensation";
+    title_map["ProjectedCoiCharge_Current"      ] = "Experience Rating 
Projected COI Charge";
+    title_map["RefundableSalesLoad"             ] = " _____________ Refundable 
Sales Load";
+    title_map["RiderCharges_Current"            ] = " _____________ 
_____________ Curr Rider Charges";
+    title_map["Salary"                          ] = " _____________ 
_____________ Salary";
+    title_map["SepAcctCharges_Current"          ] = "Curr Sep Acct Charges";
+    title_map["SepAcctCharges_Guaranteed"       ] = "Guar Sep Acct Charges";
+    title_map["SpecAmt"                         ] = " _____________ 
_____________ Specified Amount";
+    title_map["SpecAmtLoad_Current"             ] = " _____________ Curr Spec 
Amt Load";
+    title_map["SpecAmtLoad_Guaranteed"          ] = " _____________ Guar Spec 
Amt Load";
+    title_map["SurrChg_Current"                 ] = " _____________ Curr Surr 
Charge";
+    title_map["SurrChg_Guaranteed"              ] = " _____________ Guar Surr 
Charge";
+    title_map["TermPurchased_Current"           ] = " _____________ Curr Term 
Amt Purchased";
+    title_map["TermPurchased_Guaranteed"        ] = " _____________ Guar Term 
Amt Purchased";
+    title_map["TermSpecAmt"                     ] = " _____________ Term 
Specified Amount";
+    title_map["TgtPrem"                         ] = " _____________ Target 
Premium";
+    title_map["TotalIMF"                        ] = "Total Investment Mgt Fee";
+    title_map["TotalLoanBalance_Current"        ] = " _____________ Curr Total 
Loan Balance";
+    title_map["TotalLoanBalance_Guaranteed"     ] = " _____________ Guar Total 
Loan Balance";
 
     // TODO ?? Titles ought to be read from an external file that
     // permits flexible customization. Compliance might require that
@@ -600,17 +659,21 @@ ledger_evaluator Ledger::make_evaluator() const
         ,std::minus<double>()
         );
     vectors   ["NetDeathBenefit"] = &NetDeathBenefit;
+    title_map ["NetDeathBenefit"] = " _____________ __Net __Death Benefit";
     format_map["NetDeathBenefit"] = f1;
 
     std::vector<double> SupplDeathBft_Current   (Curr_.TermPurchased);
     std::vector<double> SupplDeathBft_Guaranteed(Guar_.TermPurchased);
     vectors   ["SupplDeathBft_Current"   ] = &SupplDeathBft_Current;
     vectors   ["SupplDeathBft_Guaranteed"] = &SupplDeathBft_Guaranteed;
+    title_map ["SupplDeathBft_Current"   ] = " _____________ Curr Suppl Death 
Benefit";
+    title_map ["SupplDeathBft_Guaranteed"] = " _____________ Guar Suppl Death 
Benefit";
     format_map["SupplDeathBft_Current"   ] = f1;
     format_map["SupplDeathBft_Guaranteed"] = f1;
 
     std::vector<double> SupplSpecAmt(Invar.TermSpecAmt);
     vectors   ["SupplSpecAmt"            ] = &SupplSpecAmt;
+    title_map ["SupplSpecAmt"            ] = " _____________ Suppl Specified 
Amount";
     format_map["SupplSpecAmt"            ] = f1;
 
     // [End of derived columns.]