[lmi-commits] [5705] Rename certain members

[Greg Chicares]

Revision: 5705
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5705
Author:   chicares
Date:     2013-04-19 13:15:27 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Rename certain members

Modified Paths:
--------------
    lmi/trunk/ihs_acctval.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/loads.cpp
    lmi/trunk/loads.hpp
    lmi/trunk/loads_test.cpp

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2013-04-19 12:25:21 UTC (rev 5704)
+++ lmi/trunk/ihs_acctval.cpp   2013-04-19 13:15:27 UTC (rev 5705)
@@ -1512,8 +1512,8 @@
     // TAXATION !! This '_lowest_premium_tax' approach needs to be
     // reworked: there should be an option (at least) to use the
     // current tax rates.
-    YearsTotLoadTgtLowestPremtax = 
Loads_->target_premium_load_7702_lowest_premium_tax()[Year];
-    YearsTotLoadExcLowestPremtax = 
Loads_->excess_premium_load_7702_lowest_premium_tax()[Year];
+    YearsTotLoadTgtLowestPremtax = 
Loads_->target_premium_load_minimum_premium_tax()[Year];
+    YearsTotLoadExcLowestPremtax = 
Loads_->excess_premium_load_minimum_premium_tax()[Year];
     YearsPremLoadTgt        = Loads_->target_premium_load   (GenBasis_)[Year];
     YearsPremLoadExc        = Loads_->excess_premium_load   (GenBasis_)[Year];
     YearsSalesLoadTgt       = Loads_->target_sales_load     (GenBasis_)[Year];

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2013-04-19 12:25:21 UTC (rev 5704)
+++ lmi/trunk/ihs_basicval.cpp  2013-04-19 13:15:27 UTC (rev 5705)
@@ -653,8 +653,8 @@
 /// change in the premium-tax rate, even if passed through to the
 /// policyowner, is a 7702A material change or a GPT adjustment event.
 /// These loads should instead reflect the lowest premium-tax rate.
-            ,Loads_->target_premium_load_7702_excluding_premium_tax()
-            ,Loads_->excess_premium_load_7702_excluding_premium_tax()
+            ,Loads_->target_premium_load_excluding_premium_tax()
+            ,Loads_->excess_premium_load_excluding_premium_tax()
             ,InitialTargetPremium
             ,round_min_premium()
             ,round_max_premium()

Modified: lmi/trunk/loads.cpp
===================================================================
--- lmi/trunk/loads.cpp 2013-04-19 12:25:21 UTC (rev 5704)
+++ lmi/trunk/loads.cpp 2013-04-19 13:15:27 UTC (rev 5705)
@@ -113,10 +113,10 @@
     premium_tax_load_                              .resize(length);
     dac_tax_load_                                  .resize(length);
 
-    target_premium_load_7702_excluding_premium_tax_.resize(length);
-    excess_premium_load_7702_excluding_premium_tax_.resize(length);
-    target_premium_load_7702_lowest_premium_tax_   .resize(length);
-    excess_premium_load_7702_lowest_premium_tax_   .resize(length);
+    target_premium_load_excluding_premium_tax_.resize(length);
+    excess_premium_load_excluding_premium_tax_.resize(length);
+    target_premium_load_minimum_premium_tax_  .resize(length);
+    excess_premium_load_minimum_premium_tax_  .resize(length);
 }
 
 /// Set various data members from product database.
@@ -250,9 +250,9 @@
         target_total_load_[j] += target_premium_load_[j] + dac_tax_load_;
         if(mce_gen_curr == j)
             {
-            target_premium_load_7702_excluding_premium_tax_ = 
target_total_load_[j];
-            target_premium_load_7702_lowest_premium_tax_    = 
target_total_load_[j];
-            target_premium_load_7702_lowest_premium_tax_   += 
details.LowestPremiumTaxLoadRate_;
+            target_premium_load_excluding_premium_tax_ = target_total_load_[j];
+            target_premium_load_minimum_premium_tax_   = target_total_load_[j];
+            target_premium_load_minimum_premium_tax_  += 
details.LowestPremiumTaxLoadRate_;
             }
         target_total_load_[j] += premium_tax_load_;
 
@@ -261,9 +261,9 @@
         excess_total_load_[j] += excess_premium_load_[j] + dac_tax_load_;
         if(mce_gen_curr == j)
             {
-            excess_premium_load_7702_excluding_premium_tax_ = 
excess_total_load_[j];
-            excess_premium_load_7702_lowest_premium_tax_    = 
excess_total_load_[j];
-            excess_premium_load_7702_lowest_premium_tax_   += 
details.LowestPremiumTaxLoadRate_;
+            excess_premium_load_excluding_premium_tax_ = excess_total_load_[j];
+            excess_premium_load_minimum_premium_tax_   = excess_total_load_[j];
+            excess_premium_load_minimum_premium_tax_  += 
details.LowestPremiumTaxLoadRate_;
             }
         excess_total_load_[j] += premium_tax_load_;
         }

Modified: lmi/trunk/loads.hpp
===================================================================
--- lmi/trunk/loads.hpp 2013-04-19 12:25:21 UTC (rev 5704)
+++ lmi/trunk/loads.hpp 2013-04-19 13:15:27 UTC (rev 5705)
@@ -66,10 +66,10 @@
     std::vector<double> const& amortized_premium_tax_load () const;
     std::vector<double> const& dac_tax_load               () const;
 
-    std::vector<double> const& 
target_premium_load_7702_excluding_premium_tax() const;
-    std::vector<double> const& 
excess_premium_load_7702_excluding_premium_tax() const;
-    std::vector<double> const& target_premium_load_7702_lowest_premium_tax() 
const;
-    std::vector<double> const& excess_premium_load_7702_lowest_premium_tax() 
const;
+    std::vector<double> const& target_premium_load_excluding_premium_tax() 
const;
+    std::vector<double> const& excess_premium_load_excluding_premium_tax() 
const;
+    std::vector<double> const& target_premium_load_minimum_premium_tax() const;
+    std::vector<double> const& excess_premium_load_minimum_premium_tax() const;
 
   private:
     Loads(); // Ctor for unit testing.
@@ -97,10 +97,10 @@
     std::vector<double> amortized_premium_tax_load_;
     std::vector<double> dac_tax_load_;
 
-    std::vector<double> target_premium_load_7702_excluding_premium_tax_;
-    std::vector<double> excess_premium_load_7702_excluding_premium_tax_;
-    std::vector<double> target_premium_load_7702_lowest_premium_tax_;
-    std::vector<double> excess_premium_load_7702_lowest_premium_tax_;
+    std::vector<double> target_premium_load_excluding_premium_tax_;
+    std::vector<double> excess_premium_load_excluding_premium_tax_;
+    std::vector<double> target_premium_load_minimum_premium_tax_;
+    std::vector<double> excess_premium_load_minimum_premium_tax_;
 };
 
 inline std::vector<double> const&
@@ -188,27 +188,27 @@
 }
 
 inline std::vector<double> const&
-Loads::target_premium_load_7702_excluding_premium_tax() const
+Loads::target_premium_load_excluding_premium_tax() const
 {
-    return target_premium_load_7702_excluding_premium_tax_;
+    return target_premium_load_excluding_premium_tax_;
 }
 
 inline std::vector<double> const&
-Loads::excess_premium_load_7702_excluding_premium_tax() const
+Loads::excess_premium_load_excluding_premium_tax() const
 {
-    return excess_premium_load_7702_excluding_premium_tax_;
+    return excess_premium_load_excluding_premium_tax_;
 }
 
 inline std::vector<double> const&
-Loads::target_premium_load_7702_lowest_premium_tax() const
+Loads::target_premium_load_minimum_premium_tax() const
 {
-    return target_premium_load_7702_lowest_premium_tax_;
+    return target_premium_load_minimum_premium_tax_;
 }
 
 inline std::vector<double> const&
-Loads::excess_premium_load_7702_lowest_premium_tax() const
+Loads::excess_premium_load_minimum_premium_tax() const
 {
-    return excess_premium_load_7702_lowest_premium_tax_;
+    return excess_premium_load_minimum_premium_tax_;
 }
 
 #endif // loads_hpp

Modified: lmi/trunk/loads_test.cpp
===================================================================
--- lmi/trunk/loads_test.cpp    2013-04-19 12:25:21 UTC (rev 5704)
+++ lmi/trunk/loads_test.cpp    2013-04-19 13:15:27 UTC (rev 5705)
@@ -116,14 +116,14 @@
 {
     std::size_t const z = details_.length_;
 
-    INVOKE_BOOST_TEST_EQUAL(z, loads_.refundable_sales_load_proportion         
     ().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, loads_.premium_tax_load                         
     ().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, loads_.amortized_premium_tax_load               
     ().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, loads_.dac_tax_load                             
     ().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.target_premium_load_7702_excluding_premium_tax().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.excess_premium_load_7702_excluding_premium_tax().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.target_premium_load_7702_lowest_premium_tax   ().size(), file, line);
-    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.excess_premium_load_7702_lowest_premium_tax   ().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.refundable_sales_load_proportion         
().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.premium_tax_load                         
().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.amortized_premium_tax_load               
().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.dac_tax_load                             
().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.target_premium_load_excluding_premium_tax().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, 
loads_.excess_premium_load_excluding_premium_tax().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.target_premium_load_minimum_premium_tax  
().size(), file, line);
+    INVOKE_BOOST_TEST_EQUAL(z, loads_.excess_premium_load_minimum_premium_tax  
().size(), file, line);
 
     INVOKE_BOOST_TEST_EQUAL(z, loads_.monthly_policy_fee    
(mce_gen_curr).size(), file, line);
     INVOKE_BOOST_TEST_EQUAL(z, loads_.annual_policy_fee     
(mce_gen_curr).size(), file, line);
@@ -186,10 +186,10 @@
 
     INVOKE_BOOST_TEST(materially_equal(0.163000, loads_.target_total_load     
(mce_gen_curr)[0]), file, line);
     INVOKE_BOOST_TEST(materially_equal(0.103000, loads_.excess_total_load     
(mce_gen_curr)[0]), file, line);
-    INVOKE_BOOST_TEST(materially_equal(0.142000, 
loads_.target_premium_load_7702_excluding_premium_tax()[0]), file, line);
-    INVOKE_BOOST_TEST(materially_equal(0.082000, 
loads_.excess_premium_load_7702_excluding_premium_tax()[0]), file, line);
-    INVOKE_BOOST_TEST(materially_equal(0.162000, 
loads_.target_premium_load_7702_lowest_premium_tax   ()[0]), file, line);
-    INVOKE_BOOST_TEST(materially_equal(0.102000, 
loads_.excess_premium_load_7702_lowest_premium_tax   ()[0]), file, line);
+    INVOKE_BOOST_TEST(materially_equal(0.142000, 
loads_.target_premium_load_excluding_premium_tax()[0]), file, line);
+    INVOKE_BOOST_TEST(materially_equal(0.082000, 
loads_.excess_premium_load_excluding_premium_tax()[0]), file, line);
+    INVOKE_BOOST_TEST(materially_equal(0.162000, 
loads_.target_premium_load_minimum_premium_tax  ()[0]), file, line);
+    INVOKE_BOOST_TEST(materially_equal(0.102000, 
loads_.excess_premium_load_minimum_premium_tax  ()[0]), file, line);
 }
 
 int test_main(int, char*[])