[lmi-commits] [5688] Refactor, making a misbegotten free function a member

[Greg Chicares]

Revision: 5688
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5688
Author:   chicares
Date:     2013-04-16 17:26:18 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Refactor, making a misbegotten free function a member

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

Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp    2013-04-16 15:23:16 UTC (rev 5687)
+++ lmi/trunk/mec_server.cpp    2013-04-16 17:26:18 UTC (rev 5688)
@@ -47,7 +47,7 @@
 #include "miscellany.hpp"               // ios_out_trunc_binary()
 #include "oecumenic_enumerations.hpp"
 #include "path_utility.hpp"             // fs::path inserter
-#include "premium_tax.hpp"              // lowest_premium_tax_load()
+#include "premium_tax.hpp"
 #include "product_data.hpp"
 #include "round_to.hpp"
 #include "stratified_algorithms.hpp"    // TieredGrossToNet()
@@ -302,13 +302,13 @@
             ;
         }
 
-    double const premium_tax_load = lowest_premium_tax_load
+    double const premium_tax_load = premium_tax
         (PremiumTaxState
         ,mc_state_from_string(product_filenames.datum("InsCoDomicile"))
         ,false // Assume load is not amortized.
         ,database
         ,stratified
-        );
+        ).least_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-16 15:23:16 UTC (rev 5687)
+++ lmi/trunk/premium_tax.cpp   2013-04-16 17:26:18 UTC (rev 5688)
@@ -433,13 +433,13 @@
 /// policyowner, is a 7702A material change or a GPT adjustment event.
 /// Therefore, this function will be expunged.
 
-double lowest_premium_tax_load
+double premium_tax::lowest_premium_tax_load
     (mcenum_state              tax_state
     ,mcenum_state              domicile
     ,bool                      amortize_premium_load
     ,product_database   const& db
     ,stratified_charges const& strata
-    )
+    ) const
 {
     double z = 0.0;
     if(amortize_premium_load)

Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp   2013-04-16 15:23:16 UTC (rev 5687)
+++ lmi/trunk/premium_tax.hpp   2013-04-16 17:26:18 UTC (rev 5688)
@@ -124,6 +124,14 @@
   private:
     void test_consistency(product_database const& db) const;
 
+    double lowest_premium_tax_load
+        (mcenum_state              tax_state
+        ,mcenum_state              domicile
+        ,bool                      amortize_premium_load
+        ,product_database   const& db
+        ,stratified_charges const& strata
+        ) const;
+
     // Ctor value-arguments.
     mcenum_state tax_state_;
     mcenum_state domicile_;
@@ -147,13 +155,5 @@
 
 std::vector<double> const& premium_tax_rates_for_annuities();
 
-double lowest_premium_tax_load
-    (mcenum_state              tax_state
-    ,mcenum_state              domicile
-    ,bool                      amortize_premium_load
-    ,product_database   const& db
-    ,stratified_charges const& strata
-    );
-
 #endif // premium_tax_hpp