[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 4912e96 03/15: Simplify [317]
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 4912e96 03/15: Simplify [317] |
Date: |
Sun, 14 Feb 2021 18:24:52 -0500 (EST) |
branch: master
commit 4912e96fa069f15e3914756ee6e86ad387246b4c
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Simplify [317]
Separate-account charges may be tiered by assets, affecting the net
rate; but the gross rate is unaffected.
---
ihs_avmly.cpp | 5 -----
interest_rates.cpp | 7 -------
interest_rates.hpp | 1 -
3 files changed, 13 deletions(-)
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 2bf4403..b9220a2 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -2104,15 +2104,10 @@ void AccountValue::ApplyDynamicMandE(currency assets)
;
}
- // TODO ?? Unused for the moment. At least the first must be
- // implemented in order for reports to show components separately.
- double gross_rate = 0.0;
-
InterestRates_->DynamicMlySepAcctRate
(GenBasis_
,SepBasis_
,Year
- ,gross_rate
,m_and_e_rate
,imf_rate
,asset_comp_rate
diff --git a/interest_rates.cpp b/interest_rates.cpp
index 2314646..d5ac30a 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -853,7 +853,6 @@ void InterestRates::DynamicMlySepAcctRate
(mcenum_gen_basis gen_basis
,mcenum_sep_basis sep_basis
,int year
- ,double& MonthlySepAcctGrossRate
,double& AnnualSepAcctMandERate
,double& AnnualSepAcctIMFRate
,double& AnnualSepAcctMiscChargeRate
@@ -882,12 +881,6 @@ void InterestRates::DynamicMlySepAcctRate
<< LMI_FLUSH
;
}
-// TODO ?? Is what follows appropriate for both current and guaranteed
-// bases?
-
-// TODO ?? What if it's not 'full'--what if we want 'half' or 'zero'?
- MonthlySepAcctGrossRate =
SepAcctGrossRate_[mce_monthly_rate][mce_sep_full][year];
-
convert_interest_rates
(SepAcctGrossRate_[mce_annual_rate][sep_basis][year]
,SepAcctNetRate_[mce_annual_rate ][gen_basis][sep_basis][year]
diff --git a/interest_rates.hpp b/interest_rates.hpp
index 3e2d37e..3767ef8 100644
--- a/interest_rates.hpp
+++ b/interest_rates.hpp
@@ -167,7 +167,6 @@ class InterestRates
(mcenum_gen_basis gen_basis
,mcenum_sep_basis sep_basis
,int year
- ,double& MonthlySepAcctGrossRate
,double& AnnualSepAcctMandERate
,double& AnnualSepAcctIMFRate
,double& AnnualSepAcctMiscChargeRate
- [lmi-commits] [lmi] master 48caef4 07/15: Resolve a marked defect [313], (continued)
- [lmi-commits] [lmi] master 48caef4 07/15: Resolve a marked defect [313], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master 9b46a92 08/15: Assume genacct and loan rates are always needed [312], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master a7bf1d0 04/15: Remove a duplicative defect marker [316], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master d58eb9b 12/15: Remove assertions that provably cannot fire, Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master bc8e2d9 13/15: Remove a defunct defect marker [307], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master dbac503 14/15: Demote a marked defect [306], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master 791ccce 02/15: Expunge disused stable-value fund charge from database, Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master 9f4e2a2 09/15: Expunge an unused member function [311], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master 387eeaa 10/15: Prepare to resolve some marked defects, Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master cb5e424 11/15: Resolve several marked defects [308], Greg Chicares, 2021/02/14
- [lmi-commits] [lmi] master 4912e96 03/15: Simplify [317],
Greg Chicares <=
- [lmi-commits] [lmi] master 3143a30 15/15: Simplify using expression templates [305], Greg Chicares, 2021/02/14