[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 61f6a237 21/27: Reorder format-style map
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 61f6a237 21/27: Reorder format-style map |
Date: |
Mon, 25 Apr 2022 12:56:17 -0400 (EDT) |
branch: master
commit 61f6a2372f980f1c8bdcf6adf2220263dea17547
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Reorder format-style map
---
ledger_evaluator.cpp | 68 ++++++++++++++++++++++++++++++----------------------
1 file changed, 40 insertions(+), 28 deletions(-)
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 94e8ae3d..f15de062 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -474,15 +474,19 @@ format_map_t static_formats()
// > Format as a number with thousand separators and two decimal places
(#,###,###.00)
// >
,{"CurrentCoiMultiplier" , f2}
- ,{"EeListBillPremium" , f6}
- ,{"ErListBillPremium" , f6}
,{"GuarPrem" , f2}
,{"InforceTaxBasis" , f2}
,{"InforceTotalAV" , f2}
+ ,{"InitSevenPayPrem" , f2}
+// >
+// F6: two decimals, commas, cents to dollars
+// > Format as a number with thousand separators and two decimal places
(#,###,###.00)
+// >
+ ,{"EeListBillPremium" , f6}
+ ,{"ErListBillPremium" , f6}
,{"InitGLP" , f6}
,{"InitGSP" , f6}
,{"InitPrem" , f6}
- ,{"InitSevenPayPrem" , f2}
,{"InitTgtPrem" , f6}
,{"ListBillPremium" , f6}
// >
@@ -494,10 +498,8 @@ format_map_t static_formats()
,{"AvgFund" , f1}
,{"ChildRiderAmount" , f1}
,{"CustomFund" , f1}
- ,{"Dumpin" , f5}
,{"EndtAge" , f1}
,{"ErNotionallyPaysTerm" , f1}
- ,{"External1035Amount" , f5}
,{"GenderBlended" , f1}
,{"GreatestLapseDuration" , f1}
,{"GroupIndivSelection" , f1}
@@ -512,10 +514,6 @@ format_map_t static_formats()
,{"InforceIsMec" , f1}
,{"InforceMonth" , f1}
,{"InforceYear" , f1}
- ,{"InitBaseSpecAmt" , f5}
- ,{"InitTermSpecAmt" , f5}
- ,{"InitTotalSA" , f5}
- ,{"Internal1035Amount" , f5}
,{"IsInforce" , f1}
,{"IsMec" , f1}
,{"IsSinglePremium" , f1}
@@ -543,6 +541,16 @@ format_map_t static_formats()
,{"TxCallsGuarUwSubstd" , f1}
,{"UsePartialMort" , f1}
,{"WriteTsvFile" , f1}
+// >
+// F5: zero decimals, commas, cents to dollars
+// > Format as a number with thousand separators and no decimal places
(#,###,###)
+// >
+ ,{"Dumpin" , f5}
+ ,{"External1035Amount" , f5}
+ ,{"InitBaseSpecAmt" , f5}
+ ,{"InitTermSpecAmt" , f5}
+ ,{"InitTotalSA" , f5}
+ ,{"Internal1035Amount" , f5}
// > Vector Formatting
// >
@@ -612,42 +620,50 @@ format_map_t static_formats()
// F1: zero decimals, commas
// > Format as a number with thousand separators and no decimal places
(#,###,##0)
// >
- ,{"AVGenAcct" , f5}
,{"AVRelOnDeath" , f1}
- ,{"AVSepAcct" , f5}
- ,{"AcctVal" , f5}
,{"AccumulatedPremium" , f1}
,{"AddonCompOnAssets" , f1}
,{"AddonCompOnPremium" , f1}
,{"AvgDeathBft" , f1}
,{"BOYAssets" , f1}
- ,{"BaseDeathBft" , f5}
- ,{"COICharge" , f5}
- ,{"CSVNet" , f5}
- ,{"CV7702" , f5}
,{"ClaimsPaid" , f1}
,{"Composite" , f1}
,{"DacTaxLoad" , f1}
,{"DacTaxRsv" , f1}
- ,{"Dcv" , f5}
,{"DeathProceedsPaid" , f1}
+// ,{"EeMode" , f1} // Not numeric.
+// ,{"ErMode" , f1} // Not numeric.
+ ,{"ExpenseCharges" , f1}
+ ,{"FundNumbers" , f1}
+ ,{"Loads" , f1}
+ ,{"NaarForceout" , f1}
+ ,{"NetClaims" , f1}
+ ,{"PremTaxLoad" , f1}
+ ,{"RefundableSalesLoad" , f1}
+ ,{"Salary" , f1}
+ ,{"SpouseRiderAmount" , f1}
+// >
+// F5: zero decimals, commas, cents to dollars
+// > Format as a number with thousand separators and no decimal places
(#,###,##0)
+// >
+ ,{"AVGenAcct" , f5}
+ ,{"AVSepAcct" , f5}
+ ,{"AcctVal" , f5}
+ ,{"BaseDeathBft" , f5}
+ ,{"COICharge" , f5}
+ ,{"CSVNet" , f5}
+ ,{"CV7702" , f5}
+ ,{"Dcv" , f5}
,{"EOYDeathBft" , f5}
,{"EeGrossPmt" , f5}
,{"EeModalMinimumPremium" , f5}
-// ,{"EeMode" , f1} // Not numeric.
,{"ErGrossPmt" , f5}
,{"ErModalMinimumPremium" , f5}
-// ,{"ErMode" , f1} // Not numeric.
- ,{"ExpenseCharges" , f1}
- ,{"FundNumbers" , f1}
,{"GptForceout" , f5}
,{"GrossIntCredited" , f5}
,{"GrossPmt" , f5}
- ,{"Loads" , f1}
,{"LoanIntAccrued" , f5}
,{"ModalMinimumPremium" , f5}
- ,{"NaarForceout" , f1}
- ,{"NetClaims" , f1}
,{"NetIntCredited" , f5}
,{"NetPmt" , f5}
,{"NetWD" , f5}
@@ -655,14 +671,10 @@ format_map_t static_formats()
,{"Outlay" , f5}
,{"PolicyFee" , f5}
,{"PrefLoanBalance" , f5} // Not used yet.
- ,{"PremTaxLoad" , f1}
- ,{"RefundableSalesLoad" , f1}
,{"RiderCharges" , f5}
- ,{"Salary" , f1}
,{"SepAcctCharges" , f5}
,{"SpecAmt" , f5}
,{"SpecAmtLoad" , f5}
- ,{"SpouseRiderAmount" , f1}
,{"SurrChg" , f5}
,{"TermPurchased" , f5}
,{"TermSpecAmt" , f5}
- [lmi-commits] [lmi] master af0666c3 24/27: Distinguish two ledger formats, (continued)
- [lmi-commits] [lmi] master af0666c3 24/27: Distinguish two ledger formats, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 7b30e2d8 03/27: Filter unexpectedly small system-test discrepancies, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master d7ab80c6 04/27: Clean up beforehand, not afterward, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 12192723 06/27: Add two new ledger emission options, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 119df7a9 13/27: Add a 'divisor' argument to LedgerBase::value_str(), Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 2b108ed7 18/27: Avoid unnecessary rounding, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master b7c61b4d 20/27: Regularize format names, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 8de190ce 17/27: Regularize whitespace, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 0b6a3b69 02/27: Avoid writing " \n", Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 95b4e917 19/27: Remove an unnecessary comment, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 61f6a237 21/27: Reorder format-style map,
Greg Chicares <=
- [lmi-commits] [lmi] master 299cc249 22/27: Improve documentation, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 6f50ad93 23/27: Transpose a ledger format, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 00289fa7 25/27: Rearrange ledger formats, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 16898eb9 26/27: Use a more reasonable format for an unused field, Greg Chicares, 2022/04/25
- [lmi-commits] [lmi] master 09e00258 27/27: Mark or expunge unused fields, Greg Chicares, 2022/04/25