[lmi-commits] [5598] Rename certain members for clarity and consistency

[Greg Chicares]

Revision: 5598
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5598
Author:   chicares
Date:     2012-11-16 12:39:32 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Rename certain members for clarity and consistency

Modified Paths:
--------------
    lmi/trunk/basic_values.hpp
    lmi/trunk/ihs_avstrtgy.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ihs_mortal.cpp
    lmi/trunk/mortality_rates.hpp
    lmi/trunk/mortality_rates_fetch.cpp

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/basic_values.hpp  2012-11-16 12:39:32 UTC (rev 5598)
@@ -161,11 +161,11 @@
     std::vector<double> GetGuaranteedSpouseRiderRates() const;
     std::vector<double> GetCurrentTermRates()           const;
     std::vector<double> GetGuaranteedTermRates()        const;
-    std::vector<double> GetTableYRates()                const;
+    std::vector<double> GetGroupProxyRates()            const;
     std::vector<double> GetTAMRA7PayRates()             const;
     std::vector<double> GetTgtPremRates()               const;
     std::vector<double> GetIRC7702Rates()               const;
-    std::vector<double> Get83GamRates()                 const;
+    std::vector<double> GetPartialMortalityRates()      const;
     std::vector<double> GetSubstdTblMultTable()         const;
     std::vector<double> GetCurrSpecAmtLoadTable()       const;
     std::vector<double> GetGuarSpecAmtLoadTable()       const;

Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp  2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/ihs_avstrtgy.cpp  2012-11-16 12:39:32 UTC (rev 5598)
@@ -225,13 +225,13 @@
         case mce_pmt_table:
             {
 // TODO ?? This assumes that the group term proxy rates given by
-// TableYRates() are monthly. They should instead be annual, so that
+// GroupProxyRates() are monthly. They should instead be annual, so that
 // any other qx table can be substituted--for example, an experience
 // table from the SOA database, as DBDictionary::WriteSampleDBFile()
 // specifies.
             return
                   ActualSpecAmt
-                * MortalityRates_->TableYRates()[Year]
+                * MortalityRates_->GroupProxyRates()[Year]
                 * (12.0 / a_CurrentMode)
                 * a_TblMult
                 ;

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/ihs_basicval.cpp  2012-11-16 12:39:32 UTC (rev 5598)
@@ -1877,7 +1877,7 @@
         );
 }
 
-std::vector<double> BasicValues::GetTableYRates() const
+std::vector<double> BasicValues::GetGroupProxyRates() const
 {
     return GetTable
         (ProductData_->datum("TableYFilename")
@@ -1910,7 +1910,7 @@
         );
 }
 
-std::vector<double> BasicValues::Get83GamRates() const
+std::vector<double> BasicValues::GetPartialMortalityRates() const
 {
     return GetTable
         (ProductData_->datum("Gam83Filename")

Modified: lmi/trunk/ihs_mortal.cpp
===================================================================
--- lmi/trunk/ihs_mortal.cpp    2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/ihs_mortal.cpp    2012-11-16 12:39:32 UTC (rev 5598)
@@ -58,7 +58,7 @@
     MonthlyMidpointCoiRatesBand2_ .reserve(Length_);
     MidpointSpouseRiderRates_     .reserve(Length_);
     MonthlyMidpointTermCoiRates_  .reserve(Length_);
-    TableYRates_                  .reserve(Length_);
+    GroupProxyRates_              .reserve(Length_);
     PartialMortalityQ_            .reserve(Length_);
     CvatCorridorFactors_          .reserve(Length_);
     SevenPayRates_                .reserve(Length_);

Modified: lmi/trunk/mortality_rates.hpp
===================================================================
--- lmi/trunk/mortality_rates.hpp       2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/mortality_rates.hpp       2012-11-16 12:39:32 UTC (rev 5598)
@@ -76,7 +76,7 @@
     std::vector<double> const& TargetPremiumRates  () const;
 
     std::vector<double> const& Irc7702Q            () const;
-    std::vector<double> const& TableYRates         () const;
+    std::vector<double> const& GroupProxyRates     () const;
     std::vector<double> const& PartialMortalityQ   () const;
     std::vector<double> const& CvatCorridorFactors () const;
     std::vector<double> const& SevenPayRates       () const;
@@ -157,7 +157,7 @@
     std::vector<double> TargetPremiumRates_;
 
     std::vector<double> Irc7702Q_;
-    std::vector<double> TableYRates_;
+    std::vector<double> GroupProxyRates_;
     std::vector<double> PartialMortalityQ_;
     std::vector<double> CvatCorridorFactors_;
     std::vector<double> SevenPayRates_;
@@ -189,9 +189,9 @@
     return Irc7702Q_;
 }
 
-inline std::vector<double> const& MortalityRates::TableYRates() const
+inline std::vector<double> const& MortalityRates::GroupProxyRates() const
 {
-    return TableYRates_;
+    return GroupProxyRates_;
 }
 
 inline std::vector<double> const& MortalityRates::PartialMortalityQ() const

Modified: lmi/trunk/mortality_rates_fetch.cpp
===================================================================
--- lmi/trunk/mortality_rates_fetch.cpp 2012-11-14 13:31:21 UTC (rev 5597)
+++ lmi/trunk/mortality_rates_fetch.cpp 2012-11-16 12:39:32 UTC (rev 5598)
@@ -103,8 +103,8 @@
     TargetPremiumRates_            = basic_values.GetTgtPremRates();
 
     Irc7702Q_                      = basic_values.GetIRC7702Rates();
-    TableYRates_                   = basic_values.GetTableYRates();
-    PartialMortalityQ_             = basic_values.Get83GamRates();
+    GroupProxyRates_               = basic_values.GetGroupProxyRates();
+    PartialMortalityQ_             = basic_values.GetPartialMortalityRates();
     CvatCorridorFactors_           = basic_values.GetCvatCorridorFactors();
     SevenPayRates_                 = basic_values.GetTAMRA7PayRates();