[lmi-commits] [lmi] master 4912e96 03/15: Simplify [317]

[Greg Chicares]

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