[lmi-commits] [lmi] master 74927c6 13/14: Eradicate 'EePmt' and 'ErPmt'

[Greg Chicares]

branch: master
commit 74927c699cc76405a0ab1cadc8bb29aeca02cf46
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Eradicate 'EePmt' and 'ErPmt'
---
 ihs_acctval.cpp           | 2 +-
 ihs_avstrtgy.cpp          | 4 ----
 ledger_invariant.hpp      | 4 ----
 ledger_invariant_init.cpp | 7 -------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 92c2eaa..a05b691 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -362,7 +362,7 @@ void AccountValue::InitializeLife(mcenum_run_basis a_Basis)
     if(!SolvingForGuarPremium)
         {
         // TODO ?? There used to be some code in FinalizeYear() below that
-        // sets InvariantValues().EePmt to an annualized value, but
+        // set the former InvariantValues().EePmt to an annualized value, but
         // PerformSpecAmtStrategy() expects a modal value. The
         // annualized value is wiped out a few lines below anyway.
         // This is a crock to suppress an observed symptom.
diff --git a/ihs_avstrtgy.cpp b/ihs_avstrtgy.cpp
index 751c2a9..a92d084 100644
--- a/ihs_avstrtgy.cpp
+++ b/ihs_avstrtgy.cpp
@@ -63,8 +63,6 @@ double AccountValue::CalculateSpecAmtFromStrategy
     ,mcenum_sa_strategy strategy
     ) const
 {
-    LMI_ASSERT(Outlay_->ee_modal_premiums() == InvariantValues().EePmt);
-    LMI_ASSERT(Outlay_->er_modal_premiums() == InvariantValues().ErPmt);
     double annualized_pmt =
             Outlay_->ee_premium_modes ()[reference_year]
           * Outlay_->ee_modal_premiums()[reference_year]
@@ -320,7 +318,6 @@ double AccountValue::DoPerformPmtStrategy
 
 double AccountValue::PerformEePmtStrategy() const
 {
-    LMI_ASSERT(Outlay_->ee_modal_premiums() == InvariantValues().EePmt);
     return DoPerformPmtStrategy
         (mce_solve_ee_prem
         ,Outlay_->ee_premium_modes()[Year]
@@ -335,7 +332,6 @@ double AccountValue::PerformEePmtStrategy() const
 
 double AccountValue::PerformErPmtStrategy() const
 {
-    LMI_ASSERT(Outlay_->er_modal_premiums() == InvariantValues().ErPmt);
     return DoPerformPmtStrategy
         (mce_solve_er_prem
         ,Outlay_->er_premium_modes()[Year]
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index c1aa98f..e8f576d 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -451,10 +451,6 @@ class LMI_SO LedgerInvariant final
     std::vector<int>         FundAllocs; // Obsolete--spreadsheet only.
     std::vector<double>      FundAllocations;
 
-    // These two are used only for a payment-strategy kludge:
-    std::vector<double> EePmt;
-    std::vector<double> ErPmt;
-
     // IRRs that we need to think about some more before deciding
     // where to put them.
 
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 289283b..d5d2421 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -671,13 +671,6 @@ void LedgerInvariant::Init(BasicValues const* b)
         FundAllocations.push_back(0.01 * v[j]);
         }
 
-// EePmt and ErPmt are *input* values, used only as a kludge, e.g. in
-// premium-strategy calculations. Use E[er]GrossPmt for illustrations:
-// they're *output* values that result from transaction processing.
-
-    EePmt                      = b->Outlay_->ee_modal_premiums();
-    ErPmt                      = b->Outlay_->er_modal_premiums();
-
     // Special-case strings.
 
     EffDate                    = calendar_date(b->yare_input_.EffectiveDate    
 ).str();