[lmi-commits] [lmi] master 84ea017 11/25: Localize 7702 spread in class BasicValues

[Greg Chicares]

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

    Localize 7702 spread in class BasicValues
    
    Localized SpreadFor7702_, moving its initialization to the place where
    it's used. Removed its SpreadFor7702() accessor.
---
 basic_values.hpp |  2 --
 basicvalues.cpp  |  9 ---------
 ihs_basicval.cpp | 20 ++++++++------------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/basic_values.hpp b/basic_values.hpp
index 04b178d..880111b 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -141,7 +141,6 @@ class LMI_SO BasicValues
     currency GetAnnualTgtPrem(int a_year, currency a_specamt) const;
 
     std::vector<double> const& GetCorridorFactor() const;
-    std::vector<double> const& SpreadFor7702() const;
     std::vector<double> const& GetMly7702iGlp() const;
     std::vector<double> const& GetMly7702qc() const;
     std::vector<double> const& GetMlyDcvqc() const;
@@ -448,7 +447,6 @@ class LMI_SO BasicValues
 
     void                Init7702();
     void                Init7702A();
-    std::vector<double> SpreadFor7702_;
     std::vector<double> Mly7702iGlp;
     std::vector<double> Mly7702iGsp;
     std::vector<double> Mly7702ig;
diff --git a/basicvalues.cpp b/basicvalues.cpp
index 931fac9..6a4726b 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -119,9 +119,6 @@ void BasicValues::Init()
     no_can_issue_         = no_longer_issued && is_new_business;
     IsSubjectToIllustrationReg_ = is_subject_to_ill_reg(ledger_type());
 
-    // IHS !! Just a dummy initialization here--implemented in lmi.
-    SpreadFor7702_.assign(Length, 0.0);
-
     // Multilife contracts will need a vector of mortality-rate objects.
     MortalityRates_ = std::make_unique<MortalityRates>(*this);
     InterestRates_  = std::make_unique<InterestRates >(*this);
@@ -316,12 +313,6 @@ currency BasicValues::GetModalTgtSpecAmt
 }
 
 //============================================================================
-std::vector<double> const& BasicValues::SpreadFor7702() const
-{
-    return SpreadFor7702_;
-}
-
-//============================================================================
 std::vector<double> const& BasicValues::GetCorridorFactor() const
 {
     return MortalityRates_->CvatCorridorFactors();
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 64fe867..9bbed20 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -261,13 +261,6 @@ void BasicValues::Init()
             ;
         }
 
-#if 1 // 7702 !! moved to class i7702
-    SpreadFor7702_.assign
-        (Length
-        ,StratifiedCharges_->minimum_tiered_spread_for_7702()
-        );
-#endif // 1 // 7702 !! moved to class i7702
-
     // Multilife contracts will need a vector of mortality-rate objects.
 
     // Mortality and interest rates require database and rounding.
@@ -436,6 +429,14 @@ void BasicValues::Init7702()
 
     // 7702 !! local with '_' suffix: should become a member
     i7702 i7702_(database(), *StratifiedCharges_);
+
+#if 1 // 7702 !! moved to class i7702
+    std::vector<double> const SpreadFor7702_
+        (Length
+        ,StratifiedCharges_->minimum_tiered_spread_for_7702()
+        );
+#endif // 1 // 7702 !! moved to class i7702
+
 #if 1 // 7702 !! moved to class i7702
     // Monthly guar net int for 7702 is
     //   greater of {iglp(), igsp()} and annual guar int rate
@@ -1952,11 +1953,6 @@ std::vector<double> const& 
BasicValues::GetCorridorFactor() const
 
 // potential inlines
 
-std::vector<double> const& BasicValues::SpreadFor7702() const
-{
-    return SpreadFor7702_;
-}
-
 std::vector<double> const& BasicValues::GetMly7702iGlp() const
 {
     return Mly7702iGlp;