[lmi-commits] [lmi] master b0e83f8 4/8: Make premium-tax amortization period an integral number of years

[Greg Chicares]

branch: master
commit b0e83f86f0811ed7a40be22606c45883d46b9ffb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Make premium-tax amortization period an integral number of years
---
 dbnames.xpp    | 2 +-
 loads.cpp      | 2 +-
 loads_impl.hpp | 4 ++--
 loads_test.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dbnames.xpp b/dbnames.xpp
index 9a33c4f..c450dbd 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -181,7 +181,7 @@
 {DB_PremTaxTierGroup,DB_Topic_DacAndPremiumTax,"PremTaxTierGroup","Apply 
tiered premium tax to all contracts in a group aggregated together: 0=no, 1=yes 
[not supported yet]",}, \
 {DB_PremTaxTierPeriod,DB_Topic_DacAndPremiumTax,"PremTaxTierPeriod","Apply 
tiered premium tax to premiums aggregated by: 0=policy year, 1=calendar year 
[not supported yet]",}, \
 {DB_PremTaxTierNonDecr,DB_Topic_DacAndPremiumTax,"PremTaxTierNonDecr","Tiered 
premium tax effective rate constrained not to decrease from one year to the 
next: 0=no, 1=yes [not supported yet]",}, \
-{DB_PremTaxAmortPeriod,DB_Topic_DacAndPremiumTax,"PremTaxAmortPeriod","Premium 
tax amortization period in years",}, \
+{DB_PremTaxAmortPeriod,DB_Topic_DacAndPremiumTax,"PremTaxAmortPeriod","Premium 
tax amortization period in integral years",}, \
 
{DB_PremTaxAmortIntRate,DB_Topic_DacAndPremiumTax,"PremTaxAmortIntRate","Premium
 tax amortization annual effective interest rate",}, \
 {DB_PremTaxRate,DB_Topic_DacAndPremiumTax,"PremTaxRate","Scalar premium tax 
rate paid by insurance company--distinct from premium load due to premium 
tax",}, \
 {DB_PremTaxState,DB_Topic_DacAndPremiumTax,"PremTaxState","[Obsolete--retained 
only for backward compatibility] State that formerly determined premium tax 
rate: 0=insured state, 1=corporation state",}, \
diff --git a/loads.cpp b/loads.cpp
index 06a4a2e..a06ad8a 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -50,7 +50,7 @@ Loads::Loads(BasicValues& V)
         ,V.PremiumTax_->minimum_load_rate()
         ,V.PremiumTax_->levy_rate()
         ,V.database().query<double>(DB_PremTaxAmortIntRate)
-        ,V.database().query<double>(DB_PremTaxAmortPeriod)
+        ,V.database().query<int   >(DB_PremTaxAmortPeriod)
         ,V.database().query<oenum_asset_charge_type>(DB_AssetChargeType)
         ,V.IsSubjectToIllustrationReg()
         ,V.round_interest_rate()
diff --git a/loads_impl.hpp b/loads_impl.hpp
index 4023c36..2c14e1b 100644
--- a/loads_impl.hpp
+++ b/loads_impl.hpp
@@ -89,7 +89,7 @@ struct load_details
         ,double                     minimum_premium_tax_load_rate
         ,double                     premium_tax_rate
         ,double                     premium_tax_amortization_rate
-        ,double                     premium_tax_amortization_period
+        ,int                        premium_tax_amortization_period
         ,oenum_asset_charge_type    asset_charge_type
         ,bool                       NeedMidpointRates
         ,round_to<double>    const& round_interest_rate
@@ -124,7 +124,7 @@ struct load_details
     double                     minimum_premium_tax_load_rate_;
     double                     premium_tax_rate_;
     double                     premium_tax_amortization_rate_;
-    double                     premium_tax_amortization_period_;
+    int                        premium_tax_amortization_period_;
     oenum_asset_charge_type    asset_charge_type_;
     bool                       NeedMidpointRates_;
     round_to<double>    const& round_interest_rate_;
diff --git a/loads_test.cpp b/loads_test.cpp
index 25283e4..c63ce44 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -207,7 +207,7 @@ int test_main(int, char*[])
         ,0.02                   // minimum_premium_tax_load_rate_
         ,999.999                // premium_tax_rate_                [unused]
         ,999.999                // premium_tax_amortization_rate_   [unused]
-        ,999.999                // premium_tax_amortization_period_ [unused]
+        ,999                    // premium_tax_amortization_period_ [unused]
         ,oe_asset_charge_load   // asset_charge_type_
         ,true                   // NeedMidpointRates_
         ,round_interest_rate    // round_interest_rate_