[lmi-commits] [5196] Refactor

[Greg Chicares]

Revision: 5196
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5196
Author:   chicares
Date:     2011-06-01 11:42:45 +0000 (Wed, 01 Jun 2011)
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   2011-06-01 11:32:16 UTC (rev 5195)
+++ lmi/trunk/premium_tax.cpp   2011-06-01 11:42:45 UTC (rev 5196)
@@ -70,26 +70,9 @@
 }
 } // Unnamed namespace.
 
-premium_tax::premium_tax
-    (mcenum_state              premium_tax_state
-    ,mcenum_state              state_of_domicile
-    ,bool                      amortize_premium_load
-    ,product_database   const& db
-    ,stratified_charges const& strata
-    )
-    :premium_tax_state_     (premium_tax_state)
-    ,state_of_domicile_     (state_of_domicile)
-    ,amortize_premium_load_ (amortize_premium_load)
-{
-    set_parameters(db, strata);
-}
-
-premium_tax::~premium_tax()
-{}
-
-/// Set all parameters that depend on premium-tax state.
+/// Production ctor.
 ///
-/// These database entities should be looked up by tax state:
+/// These database entities should be looked up by premium-tax state:
 ///  - DB_PremTaxLoad
 ///  - DB_PremTaxRate
 /// These probably (for inchoate amortization) shouldn't:
@@ -104,10 +87,16 @@
 ///  - DB_PremTaxTierPeriod
 ///  - DB_PremTaxTierNonDecr
 
-void premium_tax::set_parameters
-    (product_database   const& db
+premium_tax::premium_tax
+    (mcenum_state              premium_tax_state
+    ,mcenum_state              state_of_domicile
+    ,bool                      amortize_premium_load
+    ,product_database   const& db
     ,stratified_charges const& strata
     )
+    :premium_tax_state_     (premium_tax_state)
+    ,state_of_domicile_     (state_of_domicile)
+    ,amortize_premium_load_ (amortize_premium_load)
 {
     load_is_tiered_in_premium_tax_state_ = 
strata.premium_tax_is_tiered(premium_tax_state_);
     load_is_tiered_in_state_of_domicile_ = 
strata.premium_tax_is_tiered(state_of_domicile_);
@@ -150,6 +139,9 @@
     test_consistency();
 }
 
+premium_tax::~premium_tax()
+{}
+
 /// Test consistency of premium-tax loads.
 ///
 /// In particular, if the tiered premium-tax load isn't zero, then the

Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp   2011-06-01 11:32:16 UTC (rev 5195)
+++ lmi/trunk/premium_tax.hpp   2011-06-01 11:42:45 UTC (rev 5196)
@@ -56,10 +56,6 @@
     bool   premium_tax_is_retaliatory         () const;
 
   private:
-    void set_parameters
-        (product_database   const&
-        ,stratified_charges const&
-        );
     void test_consistency() const;
 
     // Ctor value-arguments.