[lmi-commits] [lmi] master 89c7ced 3/5: Fix another off-by-one error

[Greg Chicares]

branch: master
commit 89c7ced4eaebc616183ad58ca594ea57b72b39f9
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Fix another off-by-one error
    
    In addition to removing a spurious "+ 1", renamed the variable: it is
    indeed an "interest" rate, but more precisely a "crediting" rate; it is
    the rate in effect on the date the illustration is run, and is indeed
    "current" in that sense, but "present" is less ambiguous, particularly
    as "current" elsewhere in an illustration more often contrasts with
    "guaranteed" (and the label for this quantity in the MST file is thus
    unfortunate); but it is in no wise an "ultimate_interest_rate" as the
    xslt original nonsensically called it, although the translation to MST
    was faithful.
---
 ill_reg_header.mst          | 2 +-
 ledger_pdf_generator_wx.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ill_reg_header.mst b/ill_reg_header.mst
index e78d2f2..4afcb16 100644
--- a/ill_reg_header.mst
+++ b/ill_reg_header.mst
@@ -93,7 +93,7 @@
                 {{InitAnnGenAcctInt_Current}}
             {{/InforceYearEq0}}
             {{^InforceYearEq0}}
-                {{UltimateInterestRate}}
+                {{PresentCreditingRate}}
             {{/InforceYearEq0}}
             <br>
 
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 7620235..b66ec19 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -2072,8 +2072,8 @@ class pdf_illustration_regular : public pdf_illustration
 
         int const inforce_year = bourn_cast<int>(invar.InforceYear);
         add_variable
-            ("UltimateInterestRate"
-            ,evaluate("AnnGAIntRate_Current", inforce_year + 1)
+            ("PresentCreditingRate"
+            ,evaluate("AnnGAIntRate_Current", inforce_year)
             );
 
         add_variable