[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 1d40d82 2/4: Expunge unused 'YearsSurrChgSAMu
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 1d40d82 2/4: Expunge unused 'YearsSurrChgSAMult' [358] |
Date: |
Tue, 30 Oct 2018 11:05:58 -0400 (EDT) |
branch: master
commit 1d40d8295d57ca5897551238908ad1305de5c63c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Expunge unused 'YearsSurrChgSAMult' [358]
---
account_value.hpp | 1 -
ihs_acctval.cpp | 14 +-------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/account_value.hpp b/account_value.hpp
index bbd408b..c8243cc 100644
--- a/account_value.hpp
+++ b/account_value.hpp
@@ -498,7 +498,6 @@ class LMI_SO AccountValue
double YearsPrfLnIntDueRate;
double YearsSurrChgPremMult;
double YearsSurrChgAVMult;
- double YearsSurrChgSAMult;
double YearsCoiRate0;
double YearsCoiRate1;
double YearsCoiRate2;
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index d7c1f09..72f764b 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1284,8 +1284,6 @@ double AccountValue::SurrChg()
YearsSurrChgAVMult * std::max(0.0, TotalAccountValue())
+ YearsSurrChgPremMult * std::max(0.0, CumPmts)
+ SurrChg_[Year]
-// TODO ?? expunge this and its antecedents:
-// + YearsSurrChgSAMult * InvariantValues().SpecAmt[0]
- yare_input_.CashValueEnhancementRate[Year] * std::max(0.0,
TotalAccountValue())
;
}
@@ -1680,21 +1678,11 @@ void AccountValue::SetAnnualInvariants()
YearsSurrChgPremMult = SurrChgRates_->RatePerDollarOfPremium()
[Year];
-/* TODO ?? expunge
- YearsSurrChgAVMult = SurrChgRates_->RatePerDollarOfAcctval()
[Year];
- YearsSurrChgSAMult = SurrChgRates_->RatePerDollarOfSpecamt()
[Year];
-*/
-
YearsSurrChgAVMult =
SurrChgRates_->RatePerDollarOfAcctval() [Year]
* SurrChgRates_->AcctvalRateDurationalFactor() [Year]
;
-/*
- YearsSurrChgSAMult =
- SurrChgRates_->RatePerDollarOfSpecamt() [Year]
- * SurrChgRates_->SpecamtRateDurationalFactor() [Year]
- ;
-*/
+
YearsTotLoadTgt = Loads_->target_total_load (GenBasis_)[Year];
YearsTotLoadExc = Loads_->excess_total_load (GenBasis_)[Year];
// TAXATION !! This '_lowest_premium_tax' approach needs to be