[lmi-commits] [lmi] master d4562c7 09/25: Remove dead code [294]

[Greg Chicares]

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

    Remove dead code [294]
---
 interest_rates.cpp | 19 -------------------
 interest_rates.hpp | 19 -------------------
 2 files changed, 38 deletions(-)

diff --git a/interest_rates.cpp b/interest_rates.cpp
index aea0421..c5867e6 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -283,7 +283,6 @@ instead of passing BasicValues, pass these requirements 
only:
     v.round_interest_rate()
     v.round_interest_rate_7702()
     v.IsSubjectToIllustrationReg()
-    v.SpreadFor7702()
 #endif // 0
 
 InterestRates::InterestRates(BasicValues const& v)
@@ -301,7 +300,6 @@ InterestRates::InterestRates(BasicValues const& v)
     ,LoanRateType_       {v.yare_input_.LoanRateType}
     ,NeedPrefLoanRates_  {v.database().query<bool>(DB_AllowPrefLoan)}
     ,NeedHoneymoonRates_ {v.yare_input_.HoneymoonEndorsement}
-    ,SpreadFor7702_      {v.SpreadFor7702()}
 {
     Initialize(v);
 }
@@ -390,8 +388,6 @@ void InterestRates::Initialize(BasicValues const& v)
             );
         }
 
-    v.database().query_into(DB_AnnInterestRate7702, Statutory7702i_);
-
     // Convert interest rates and test.
 
     InitializeGeneralAccountRates();
@@ -802,19 +798,4 @@ void InterestRates::DynamicMlySepAcctRate
 
 void InterestRates::Initialize7702Rates()
 {
-// TODO ?? TAXATION !! Calculate both:
-//    std::vector<double> MlyGlpRate_;
-//    std::vector<double> MlyGspRate_;
-
-    std::vector<double> const& annual_guar_rate = 
GenAcctGrossRate_[mce_gen_guar];
-
-    // ET !! This ought to be implicit, at least in some 'safe' mode:
-    //   LMI_ASSERT_EQUAL(MlyGlpRate_.size(), SpreadFor7702_.size());
-    // _without_ assigning from Zero_ first; but it's not.
-    // See test_pete_assignment() in 'expression_template_0_test.cpp'.
-    MlyGlpRate_ = Zero_;
-    assign(MlyGlpRate_, apply_binary(greater_of<double>(), Statutory7702i_, 
annual_guar_rate));
-    LMI_ASSERT(MlyGlpRate_.size() == SpreadFor7702_.size());
-    MlyGlpRate_ -= SpreadFor7702_;
-    assign(MlyGlpRate_, apply_unary(i_upper_12_over_12_from_i<double>(), 
MlyGlpRate_));
 }
diff --git a/interest_rates.hpp b/interest_rates.hpp
index fdbe8fd..34fe220 100644
--- a/interest_rates.hpp
+++ b/interest_rates.hpp
@@ -142,9 +142,6 @@ class InterestRates
     InterestRates(BasicValues const&);
     ~InterestRates() = default;
 
-    std::vector<double> const& MlyGlpRate() const;
-    std::vector<double> const& MlyGspRate() const;
-
     std::vector<double> const& GenAcctGrossRate
         (mcenum_gen_basis
         ) const;
@@ -291,12 +288,6 @@ class InterestRates
         ;
     std::vector<double> HoneymoonValueSpread_;
     std::vector<double> PostHoneymoonSpread_;
-
-    // GLP and GSP interest rates. DCV uses the GLP rate.
-    std::vector<double> Statutory7702i_;
-    std::vector<double> SpreadFor7702_;
-    std::vector<double> MlyGlpRate_;
-    std::vector<double> MlyGspRate_;
 };
 
 inline std::vector<double> const& InterestRates::GenAcctGrossRate
@@ -398,14 +389,4 @@ inline std::vector<double> const& 
InterestRates::PostHoneymoonGenAcctRate
     return PostHoneymoonGenAcctRate_[rate_period][gen_basis];
 }
 
-inline std::vector<double> const& InterestRates::MlyGlpRate() const
-{
-    return MlyGlpRate_;
-}
-
-inline std::vector<double> const& InterestRates::MlyGspRate() const
-{
-    return MlyGspRate_;
-}
-
 #endif // interest_rates_hpp