[lmi-commits] [5694] Rename two member functions

[Greg Chicares]

Revision: 5694
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5694
Author:   chicares
Date:     2013-04-18 09:24:25 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Rename two member functions

Modified Paths:
--------------
    lmi/trunk/loads.cpp
    lmi/trunk/loads_test.cpp
    lmi/trunk/mec_server.cpp
    lmi/trunk/premium_tax.cpp
    lmi/trunk/premium_tax.hpp
    lmi/trunk/premium_tax_test.cpp

Modified: lmi/trunk/loads.cpp
===================================================================
--- lmi/trunk/loads.cpp 2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/loads.cpp 2013-04-18 09:24:25 UTC (rev 5694)
@@ -56,7 +56,7 @@
         (length
         ,V.yare_input_.AmortizePremiumLoad
         ,V.PremiumTax_->load_rate()
-        ,V.PremiumTax_->least_load_rate()
+        ,V.PremiumTax_->minimum_load_rate()
         ,V.PremiumTax_->levy_rate()
         ,V.Database_->Query(DB_PremTaxAmortIntRate)
         ,V.Database_->Query(DB_PremTaxAmortPeriod)

Modified: lmi/trunk/loads_test.cpp
===================================================================
--- lmi/trunk/loads_test.cpp    2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/loads_test.cpp    2013-04-18 09:24:25 UTC (rev 5694)
@@ -61,9 +61,9 @@
 double product_database::Query(e_database_key) const {return 0.0;}
 
 #include "premium_tax.hpp"
-double premium_tax::levy_rate      () const {return 0.0;}
-double premium_tax::load_rate      () const {return 0.0;}
-double premium_tax::least_load_rate() const {return 0.0;}
+double premium_tax::levy_rate        () const {return 0.0;}
+double premium_tax::load_rate        () const {return 0.0;}
+double premium_tax::minimum_load_rate() const {return 0.0;}
 
 struct LoadsTest
 {

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/mec_server.cpp    2013-04-18 09:24:25 UTC (rev 5694)
@@ -308,7 +308,7 @@
         ,false // Assume load is not amortized.
         ,database
         ,stratified
-        ).least_load_rate();
+        ).minimum_load_rate();
 
     std::vector<double> target_sales_load  ;
     std::vector<double> excess_sales_load  ;

Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp   2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/premium_tax.cpp   2013-04-18 09:24:25 UTC (rev 5694)
@@ -99,7 +99,7 @@
     ,amortize_premium_load_  (amortize_premium_load)
     ,levy_rate_              (0.0)   // Reset below.
     ,load_rate_              (0.0)   // Reset below.
-    ,least_load_rate_        (0.0)   // Reset below.
+    ,minimum_load_rate_      (0.0)   // Reset below.
     ,domiciliary_load_rate_  (0.0)   // Reset below.
     ,is_tiered_in_tax_state_ (false) // Reset below.
     ,is_tiered_in_domicile_  (false) // Reset below.
@@ -114,10 +114,7 @@
 
     is_retaliatory_ = premium_tax_is_retaliatory(tax_state_, domicile_);
 
-    least_load_rate_ = lowest_premium_tax_load
-        (db
-        ,strata
-        );
+    minimum_load_rate_ = ascertain_minimum_load_rate(db, strata);
 
     // TODO ?? It would be better not to constrain so many things
     // not to vary by duration by using Query(enumerator).
@@ -155,7 +152,7 @@
     ,amortize_premium_load_  (false)
     ,levy_rate_              (0.0) // Reset below.
     ,load_rate_              (0.0)
-    ,least_load_rate_        (0.0)
+    ,minimum_load_rate_      (0.0)
     ,domiciliary_load_rate_  (0.0)
     ,is_tiered_in_tax_state_ (false)
     ,is_tiered_in_domicile_  (false)
@@ -425,7 +422,7 @@
 
 /// Lowest premium-tax load, for 7702 and 7702A purposes.
 
-double premium_tax::lowest_premium_tax_load
+double premium_tax::ascertain_minimum_load_rate
     (product_database   const& db
     ,stratified_charges const& strata
     ) const
@@ -473,9 +470,9 @@
     return load_rate_;
 }
 
-double premium_tax::least_load_rate() const
+double premium_tax::minimum_load_rate() const
 {
-    return least_load_rate_;
+    return minimum_load_rate_;
 }
 
 bool premium_tax::is_tiered() const

Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp   2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/premium_tax.hpp   2013-04-18 09:24:25 UTC (rev 5694)
@@ -121,13 +121,13 @@
 
     double levy_rate              () const;
     double load_rate              () const;
-    double least_load_rate        () const;
+    double minimum_load_rate      () const;
     bool   is_tiered              () const;
 
   private:
     void test_consistency(product_database const& db) const;
 
-    double lowest_premium_tax_load
+    double ascertain_minimum_load_rate
         (product_database   const& db
         ,stratified_charges const& strata
         ) const;
@@ -139,7 +139,7 @@
 
     double levy_rate_;
     double load_rate_;
-    double least_load_rate_;
+    double minimum_load_rate_;
     double domiciliary_load_rate_;
     bool   is_tiered_in_tax_state_;
     bool   is_tiered_in_domicile_;

Modified: lmi/trunk/premium_tax_test.cpp
===================================================================
--- lmi/trunk/premium_tax_test.cpp      2013-04-18 08:52:18 UTC (rev 5693)
+++ lmi/trunk/premium_tax_test.cpp      2013-04-18 09:24:25 UTC (rev 5694)
@@ -75,7 +75,7 @@
     premium_tax z(mce_s_CT, mce_s_CT, false, db, strata);
     BOOST_TEST_EQUAL(z.levy_rate                (), 0.0175);
     BOOST_TEST_EQUAL(z.load_rate                (), 0.0175);
-    BOOST_TEST_EQUAL(z.least_load_rate          (), 0.0175);
+    BOOST_TEST_EQUAL(z.minimum_load_rate        (), 0.0175);
     BOOST_TEST_EQUAL(z.is_tiered                (), false );
     BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0175);
     }
@@ -85,7 +85,7 @@
     premium_tax z(mce_s_CT, mce_s_MA, false, db, strata);
     BOOST_TEST_EQUAL(z.levy_rate                (), 0.0200);
     BOOST_TEST_EQUAL(z.load_rate                (), 0.0200);
-    BOOST_TEST_EQUAL(z.least_load_rate          (), 0.0200);
+    BOOST_TEST_EQUAL(z.minimum_load_rate        (), 0.0200);
     BOOST_TEST_EQUAL(z.is_tiered                (), false );
     BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0200);
     }
@@ -95,7 +95,7 @@
     premium_tax z(mce_s_AK, mce_s_CT, false, db, strata);
     BOOST_TEST_EQUAL(z.levy_rate                (), 0.0000);
     BOOST_TEST_EQUAL(z.load_rate                (), 0.0000);
-    BOOST_TEST_EQUAL(z.least_load_rate          (), 0.0010);
+    BOOST_TEST_EQUAL(z.minimum_load_rate        (), 0.0010);
     BOOST_TEST_EQUAL(z.is_tiered                (), true  );
     BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0270);
     }
@@ -112,12 +112,12 @@
     premium_tax z(mce_s_AK, mce_s_CT, false, db, strata);
     BOOST_TEST_EQUAL(z.levy_rate                (), 0.0000);
     BOOST_TEST_EQUAL(z.load_rate                (), 0.0000);
-    BOOST_TEST_EQUAL(z.least_load_rate          (), 0.0000);
+    BOOST_TEST_EQUAL(z.minimum_load_rate        (), 0.0000);
     BOOST_TEST_EQUAL(z.is_tiered                (), true  );
     // TODO ?? This is a pitfall--at least it should be diagnosed.
     // The tiered load is 2.7% on the first dollar, but the '0.027'
     // answer is surprising and inconsistent with the behavior of
-    // least_load_rate() above.
+    // minimum_load_rate() above.
 //    BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0000);
 
     DBDictionary::instance().datum("PremTaxLoad") = original;
@@ -129,7 +129,7 @@
     // TODO ?? Don't the suppressed tests indicate a defect?
 //    BOOST_TEST_EQUAL(z.levy_rate                (), 0.0000);
 //    BOOST_TEST_EQUAL(z.load_rate                (), 0.0000);
-    BOOST_TEST_EQUAL(z.least_load_rate          (), 0.0000);
+    BOOST_TEST_EQUAL(z.minimum_load_rate        (), 0.0000);
     BOOST_TEST_EQUAL(z.is_tiered                (), false );
 //    BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0000);
     }