[lmi-commits] [lmi] master 03424fd 2/6: Expunge obsolete surrender-charge components

[Greg Chicares]

branch: master
commit 03424fd9647f2e8c82ab9d6830b422dff8590c09
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Expunge obsolete surrender-charge components
---
 account_value.hpp |  2 --
 ihs_acctval.cpp   | 11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/account_value.hpp b/account_value.hpp
index 91f96bb..6605368 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -495,8 +495,6 @@ class LMI_SO AccountValue
     double       YearsRegLnIntDueRate;
     double       YearsPrfLnIntDueRate;
 
-    double       YearsSurrChgPremMult;
-    double       YearsSurrChgAVMult;
     double       YearsCoiRate0;
     double       YearsCoiRate1;
     double       YearsCoiRate2;
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index a7f16cb..0e98744 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1202,9 +1202,7 @@ double AccountValue::SurrChg()
     LMI_ASSERT(0.0 <= InvariantValues().SpecAmt[0]);
 
     return
-            YearsSurrChgAVMult      * std::max(0.0, TotalAccountValue())
-        +   YearsSurrChgPremMult    * std::max(0.0, CumPmts)
-        +   SurrChg_[Year]
+            SurrChg_[Year]
         -   YearsCashValueEnhMult   * std::max(0.0, TotalAccountValue())
         -   yare_input_.CashValueEnhancementRate[Year] * std::max(0.0, 
TotalAccountValue())
         ;
@@ -1598,13 +1596,6 @@ void AccountValue::SetAnnualInvariants()
     YearsSpouseRiderRate    = MortalityRates_->SpouseRiderRates    
(GenBasis_)[Year];
     YearsChildRiderRate     = MortalityRates_->ChildRiderRates     ()         
[Year];
 
-    YearsSurrChgPremMult    = SurrChgRates_->RatePerDollarOfPremium()         
[Year];
-
-    YearsSurrChgAVMult =
-          SurrChgRates_->RatePerDollarOfAcctval()      [Year]
-        * SurrChgRates_->AcctvalRateDurationalFactor() [Year]
-        ;
-
     YearsTotLoadTgt         = Loads_->target_total_load     (GenBasis_)[Year];
     YearsTotLoadExc         = Loads_->excess_total_load     (GenBasis_)[Year];
     // TAXATION !! This '_lowest_premium_tax' approach needs to be