[lmi-commits] [5703] Refactor

[Greg Chicares]

Revision: 5703
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5703
Author:   chicares
Date:     2013-04-19 11:07:13 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Refactor

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

Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp   2013-04-19 11:00:26 UTC (rev 5702)
+++ lmi/trunk/premium_tax.cpp   2013-04-19 11:07:13 UTC (rev 5703)
@@ -122,23 +122,21 @@
 
     load_rate_is_levy_rate_ = db.are_equivalent(DB_PremTaxLoad, 
DB_PremTaxRate);
 
+    double domiciliary_levy_rate = 0.0;
     if(!amortize_premium_load_)
         {
         database_index index0 = db.index().state(tax_state_);
-        levy_rate_ = db.Query(DB_PremTaxRate, index0);
-        load_rate_ = db.Query(DB_PremTaxLoad, index0);
+        levy_rate_             = db.Query(DB_PremTaxRate, index0);
+        load_rate_             = db.Query(DB_PremTaxLoad, index0);
+        database_index index1 = db.index().state(domicile_);
+        domiciliary_levy_rate  = db.Query(DB_PremTaxRate, index1);
+        domiciliary_load_rate_ = db.Query(DB_PremTaxLoad, index1);
         }
 
-    if(!amortize_premium_load_)
+    if(is_retaliatory_)
         {
-        database_index index1 = db.index().state(domicile_);
-        double domiciliary_levy_rate = db.Query(DB_PremTaxRate, index1);
-        domiciliary_load_rate_       = db.Query(DB_PremTaxLoad, index1);
-        if(is_retaliatory_)
-            {
-            levy_rate_ = std::max(levy_rate_, domiciliary_levy_rate );
-            load_rate_ = std::max(load_rate_, domiciliary_load_rate_);
-            }
+        levy_rate_ = std::max(levy_rate_, domiciliary_levy_rate );
+        load_rate_ = std::max(load_rate_, domiciliary_load_rate_);
         }
 
     maximum_load_rate_ = ascertain_maximum_load_rate(strata);