[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 0e8b77e 4/8: Regularize formatting
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 0e8b77e 4/8: Regularize formatting |
|
Date: |
Tue, 24 Apr 2018 07:02:36 -0400 (EDT) |
branch: master
commit 0e8b77e7b4086030802264001bfd249cc1558b34
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Regularize formatting
Aligned blocks of 'struct illustration_table_column' initializers
uniformly, so that they can be extracted easily.
$ <ledger_pdf_generator_wx.cpp grep '999' |sort |wc -l
77
$ <ledger_pdf_generator_wx.cpp grep '999' |sort -u |wc -l
66 [before this change]
36 [after this change]
It is easier to deal with 36 unique lines, than with 66 of which 30
differ only in whitespace.
---
ledger_pdf_generator_wx.cpp | 198 ++++++++++++++++++++++----------------------
1 file changed, 99 insertions(+), 99 deletions(-)
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 9b7a18f..2b985ff 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1344,19 +1344,19 @@ class numeric_summary_table_cell
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999"
}
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
- ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999,999"
}
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "999,999,999"
}
- ,{ "" , " " , "-"
}
- ,{ "AcctVal_Midpoint" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Midpoint" , "Cash Surr\nValue" , "999,999,999"
}
- ,{ "EOYDeathBft_Midpoint" , "Death\nBenefit" , "999,999,999"
}
- ,{ "" , " " , "-"
}
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999,999"
}
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "AcctVal_Guaranteed" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "AcctVal_Midpoint" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Midpoint" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Midpoint" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "AcctVal_Current" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -1845,16 +1845,16 @@ class ill_reg_tabular_detail_page : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999"
}
- ,{ "AttainedAge" , "End of\nYear Age" , "999"
}
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
- ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999,999"
}
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "999,999,999"
}
- ,{ "" , " " , "----"
}
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999,999"
}
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "AcctVal_Guaranteed" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"----" }
+ ,{ "AcctVal_Current" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -1891,10 +1891,10 @@ class ill_reg_tabular_detail2_page : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "AnnGAIntRate_Current", "Illustrated\nCrediting Rate",
"99.99%" }
- ,{ "SpecAmt" , "Selected\nFace Amount" ,
"999,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "AnnGAIntRate_Current" , "Illustrated\nCrediting Rate" ,
"99.99%" }
+ ,{ "SpecAmt" , "Selected\nFace Amount" ,
"999,999,999" }
};
return columns;
@@ -2183,20 +2183,20 @@ class page_with_basic_tabular_report : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
- ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -2378,21 +2378,21 @@ class nasd_supplemental : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "ErGrossPmt" , "ER Gross\nPayment" ,
"999,999,999" }
- ,{ "EeGrossPmt" , "EE Gross\nPayment" ,
"999,999,999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
- ,{ "PolicyFee_Current" , "Admin\nCharge" ,
"999,999,999" }
- ,{ "PremTaxLoad_Current" , "Premium\nTax Load" ,
"999,999,999" }
- ,{ "DacTaxLoad_Current" , "DAC\nTax Load" ,
"999,999,999" }
- ,{ "ErModalMinimumPremium", "ER Modal\nMinimum\nPremium" ,
"999,999,999" }
- ,{ "EeModalMinimumPremium", "EE Modal\nMinimum\nPremium" ,
"999,999,999" }
- ,{ "NetPmt_Current" , "Net\nPremium" ,
"999,999,999" }
- ,{ "COICharge_Current" , "Cost of\nInsurance\nCharges",
"999,999,999" }
- ,{ "AcctVal_Current" , "Current\nAccount\nValue" ,
"999,999,999" }
- ,{ "CSVNet_Current" , "Current\nCash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_Current" , "Current\nDeath\nBenefit" ,
"999,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "ErGrossPmt" , "ER Gross\nPayment" ,
"999,999,999" }
+ ,{ "EeGrossPmt" , "EE Gross\nPayment" ,
"999,999,999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "PolicyFee_Current" , "Admin\nCharge" ,
"999,999,999" }
+ ,{ "PremTaxLoad_Current" , "Premium\nTax Load" ,
"999,999,999" }
+ ,{ "DacTaxLoad_Current" , "DAC\nTax Load" ,
"999,999,999" }
+ ,{ "ErModalMinimumPremium" , "ER Modal\nMinimum\nPremium" ,
"999,999,999" }
+ ,{ "EeModalMinimumPremium" , "EE Modal\nMinimum\nPremium" ,
"999,999,999" }
+ ,{ "NetPmt_Current" , "Net\nPremium" ,
"999,999,999" }
+ ,{ "COICharge_Current" , "Cost of\nInsurance\nCharges" ,
"999,999,999" }
+ ,{ "AcctVal_Current" , "Current\nAccount\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Current" , "Current\nCash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Current\nDeath\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -2463,14 +2463,14 @@ class nasd_assumption_detail : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "AnnSAIntRate_Current", "Sep Acct Net\nInt Rate" ,
"99.99%" }
- ,{ "AnnGAIntRate_Current", "Gen Acct\nCurrent Rate" ,
"99.99%" }
- ,{ "CurrMandE" , "M&E" ,
"99.99%" }
- ,{ "EeMode" , "Indiv\nPmt Mode" ,
"Semiannual" }
- ,{ "ErMode" , "Corp\nPmt Mode" ,
"Semiannual" }
- ,{ "InitAnnLoanDueRate" , "Assumed\nLoan Interest" ,
"99.99%" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "AnnSAIntRate_Current" , "Sep Acct Net\nInt Rate" ,
"99.99%" }
+ ,{ "AnnGAIntRate_Current" , "Gen Acct\nCurrent Rate" ,
"99.99%" }
+ ,{ "CurrMandE" , "M&E" ,
"99.99%" }
+ ,{ "EeMode" , "Indiv\nPmt Mode" ,
"Semiannual" }
+ ,{ "ErMode" , "Corp\nPmt Mode" ,
"Semiannual" }
+ ,{ "InitAnnLoanDueRate" , "Assumed\nLoan Interest" ,
"99.99%" }
};
return columns;
@@ -2730,18 +2730,18 @@ class reg_d_individual_guar_irr : public
reg_d_individual_irr_base
{
// PDF !! Here and elsewhere, IRR columns must be widened.
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
- ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "IrrCsv_GuaranteedZero" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_GuaranteedZero" , "IRR on\nDeath Bft" ,
"99.99%" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "IrrCsv_Guaranteed" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_Guaranteed" , "IRR on\nDeath Bft" ,
"99.99%" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_GuaranteedZero" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_GuaranteedZero" , "IRR on\nDeath Bft" ,
"99.99%" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_Guaranteed" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_Guaranteed" , "IRR on\nDeath Bft" ,
"99.99%" }
};
return columns;
@@ -2764,18 +2764,18 @@ class reg_d_individual_curr_irr : public
reg_d_individual_irr_base
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
- ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "IrrCsv_CurrentZero" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_CurrentZero" , "IRR on\nDeath Bft" ,
"99.99%" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
- ,{ "IrrCsv_Current" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_Current" , "IRR on\nDeath Bft" ,
"99.99%" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_CurrentZero" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_CurrentZero" , "IRR on\nDeath Bft" ,
"99.99%" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_Current" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_Current" , "IRR on\nDeath Bft" ,
"99.99%" }
};
return columns;
@@ -2808,17 +2808,17 @@ class reg_d_individual_curr : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999"
}
- ,{ "AttainedAge" , "End of\nYear Age" , "999"
}
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
- ,{ "PremiumLoads" , "Premium\nLoads" , "999,999,999"
}
- ,{ "AdminCharges" , "Admin\nCharges" , "999,999,999"
}
- ,{ "COICharge_Current" , "Mortality\nCharges", "999,999,999"
}
- ,{ "SepAcctCharges_Current" , "Asset\nCharges" , "999,999,999"
}
- ,{ "GrossIntCredited_Current", "Investment\nIncome", "999,999,999"
}
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999,999"
}
- ,{ "CSVNet_Current" , "Cash\nSurr Value" , "999,999,999"
}
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "PremiumLoads" , "Premium\nLoads" ,
"999,999,999" }
+ ,{ "AdminCharges" , "Admin\nCharges" ,
"999,999,999" }
+ ,{ "COICharge_Current" , "Mortality\nCharges" ,
"999,999,999" }
+ ,{ "SepAcctCharges_Current" , "Asset\nCharges" ,
"999,999,999" }
+ ,{ "GrossIntCredited_Current" , "Investment\nIncome" ,
"999,999,999" }
+ ,{ "AcctVal_Current" , "Account\nValue" ,
"999,999,999" }
+ ,{ "CSVNet_Current" , "Cash\nSurr Value" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
};
return columns;
- [lmi-commits] [lmi] master updated (7146202 -> 29e1c5a), Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master d3552b4 6/8: Demonstrate formatting improvements for a few columns, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master 3af5d1f 7/8: Move suggested invocation from subordinate to main script, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master f31ade8 5/8: Add a map of formatting masks to complement column titles, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master 0e8b77e 4/8: Regularize formatting,
Greg Chicares <=
- [lmi-commits] [lmi] master 2f7c850 1/8: Transplant implementation of a nested class, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master 2ecfa2a 3/8: Add another filter for build clutter, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master 29e1c5a 8/8: Improve and expand PDF insufficient-width warning, Greg Chicares, 2018/04/24
- [lmi-commits] [lmi] master 30f630e 2/8: Adjust debian-msw hybrid FOP command, Greg Chicares, 2018/04/24