[lmi-commits] [5689] Refactor

[Greg Chicares]

Revision: 5689
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5689
Author:   chicares
Date:     2013-04-17 10:15:16 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
Refactor

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

Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp   2013-04-16 17:26:18 UTC (rev 5688)
+++ lmi/trunk/premium_tax.cpp   2013-04-17 10:15:16 UTC (rev 5689)
@@ -115,10 +115,7 @@
     is_retaliatory_ = premium_tax_is_retaliatory(tax_state_, domicile_);
 
     least_load_rate_ = lowest_premium_tax_load
-        (tax_state_
-        ,domicile_
-        ,amortize_premium_load_
-        ,db
+        (db
         ,strata
         );
 
@@ -434,25 +431,22 @@
 /// Therefore, this function will be expunged.
 
 double premium_tax::lowest_premium_tax_load
-    (mcenum_state              tax_state
-    ,mcenum_state              domicile
-    ,bool                      amortize_premium_load
-    ,product_database   const& db
+    (product_database   const& db
     ,stratified_charges const& strata
     ) const
 {
     double z = 0.0;
-    if(amortize_premium_load)
+    if(amortize_premium_load_)
         {
         return z;
         }
 
-    database_index index = db.index().state(tax_state);
+    database_index index = db.index().state(tax_state_);
     z = db.Query(DB_PremTaxLoad, index);
 
-    if(premium_tax_is_retaliatory(tax_state, domicile))
+    if(premium_tax_is_retaliatory(tax_state_, domicile_))
         {
-        index = db.index().state(domicile);
+        index = db.index().state(domicile_);
         z = std::max(z, db.Query(DB_PremTaxLoad, index));
         }
 
@@ -461,9 +455,9 @@
         return z;
         }
 
-    if(strata.premium_tax_is_tiered(tax_state))
+    if(strata.premium_tax_is_tiered(tax_state_))
         {
-        z = strata.minimum_tiered_premium_tax_rate(tax_state);
+        z = strata.minimum_tiered_premium_tax_rate(tax_state_);
         }
 
     return z;

Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp   2013-04-16 17:26:18 UTC (rev 5688)
+++ lmi/trunk/premium_tax.hpp   2013-04-17 10:15:16 UTC (rev 5689)
@@ -125,10 +125,7 @@
     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
+        (product_database   const& db
         ,stratified_charges const& strata
         ) const;