[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 1202dd1 1/3: Set correct width for every IRR
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 1202dd1 1/3: Set correct width for every IRR column |
|
Date: |
Fri, 27 Apr 2018 12:39:41 -0400 (EDT) |
branch: master
commit 1202dd1e6204b31bba54f999e00482d17c7c4116
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Set correct width for every IRR column
The maximum hardcoded in irr_helper::operator() is this real number:
1000.0 // Assumed upper bound.
---
ledger_evaluator.cpp | 8 ++++----
ledger_pdf_generator_wx.cpp | 17 ++++++++---------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 2afff2d..1ec59ef 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -367,10 +367,10 @@ ledger_evaluator Ledger::make_evaluator() const
mask_map ["HoneymoonValueSpread" ] = "999,999,999";
mask_map ["IndvTaxBracket" ] = "999,999,999";
mask_map ["InforceLives" ] = "999,999,999";
- mask_map ["IrrCsv_Current" ] = "999,999,999";
- mask_map ["IrrCsv_Guaranteed" ] = "999,999,999";
- mask_map ["IrrDb_Current" ] = "999,999,999";
- mask_map ["IrrDb_Guaranteed" ] = "999,999,999";
+ mask_map ["IrrCsv_Current" ] = "100000.00%";
+ mask_map ["IrrCsv_Guaranteed" ] = "100000.00%";
+ mask_map ["IrrDb_Current" ] = "100000.00%";
+ mask_map ["IrrDb_Guaranteed" ] = "100000.00%";
mask_map ["KFactor_Current" ] = "999,999,999";
mask_map ["LoanIntAccrued_Current" ] = "999,999,999";
mask_map ["LoanIntAccrued_Guaranteed" ] = "999,999,999";
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 378b315..504f23f 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -2738,20 +2738,19 @@ class reg_d_individual_guar_irr : public
reg_d_individual_irr_base
illustration_table_columns const& get_table_columns() const override
{
- // 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%" }
+ ,{ "IrrCsv_GuaranteedZero" , "IRR on\nSurr Value" ,
"100000.00%" }
+ ,{ "IrrDb_GuaranteedZero" , "IRR on\nDeath Bft" ,
"100000.00%" }
,{ "" , " " ,
"-" }
,{ "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%" }
+ ,{ "IrrCsv_Guaranteed" , "IRR on\nSurr Value" ,
"100000.00%" }
+ ,{ "IrrDb_Guaranteed" , "IRR on\nDeath Bft" ,
"100000.00%" }
};
return columns;
@@ -2779,13 +2778,13 @@ class reg_d_individual_curr_irr : public
reg_d_individual_irr_base
,{ "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%" }
+ ,{ "IrrCsv_CurrentZero" , "IRR on\nSurr Value" ,
"100000.00%" }
+ ,{ "IrrDb_CurrentZero" , "IRR on\nDeath Bft" ,
"100000.00%" }
,{ "" , " " ,
"-" }
,{ "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%" }
+ ,{ "IrrCsv_Current" , "IRR on\nSurr Value" ,
"100000.00%" }
+ ,{ "IrrDb_Current" , "IRR on\nDeath Bft" ,
"100000.00%" }
};
return columns;