[lmi-commits] [5702] Fix defect noted 20130416T1214Z

[Greg Chicares]

Revision: 5702
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5702
Author:   chicares
Date:     2013-04-19 11:00:26 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Fix defect noted 20130416T1214Z

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

Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp   2013-04-19 10:46:34 UTC (rev 5701)
+++ lmi/trunk/premium_tax.cpp   2013-04-19 11:00:26 UTC (rev 5702)
@@ -122,14 +122,16 @@
 
     load_rate_is_levy_rate_ = db.are_equivalent(DB_PremTaxLoad, 
DB_PremTaxRate);
 
-    database_index index0 = db.index().state(tax_state_);
-    levy_rate_ = db.Query(DB_PremTaxRate, index0);
-    load_rate_ = db.Query(DB_PremTaxLoad, index0);
+    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);
+        }
 
-    database_index index1 = db.index().state(domicile_);
-    domiciliary_load_rate_ = 0.0; // Pointless: duplicates ctor-initializer.
     if(!amortize_premium_load_)
         {
+        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_)

Modified: lmi/trunk/premium_tax_test.cpp
===================================================================
--- lmi/trunk/premium_tax_test.cpp      2013-04-19 10:46:34 UTC (rev 5701)
+++ lmi/trunk/premium_tax_test.cpp      2013-04-19 11:00:26 UTC (rev 5702)
@@ -126,13 +126,12 @@
     // Amortized.
     {
     premium_tax z(mce_s_CT, mce_s_MA, true , db, strata);
-    // 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.levy_rate                (), 0.0000);
+    BOOST_TEST_EQUAL(z.load_rate                (), 0.0000);
     BOOST_TEST_EQUAL(z.maximum_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);
+    BOOST_TEST_EQUAL(z.calculate_load(1.0, strata), 0.0000);
     }
 }