[lmi-commits] [5173] Rive premium-based loads in monthly trace file to make testing easier

[Greg Chicares]

Revision: 5173
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5173
Author:   chicares
Date:     2011-05-19 10:47:24 +0000 (Thu, 19 May 2011)
Log Message:
-----------
Rive premium-based loads in monthly trace file to make testing easier

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/account_value.hpp
    lmi/trunk/ihs_avdebug.cpp
    lmi/trunk/ihs_avmly.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-05-18 20:17:53 UTC (rev 5172)
+++ lmi/trunk/ChangeLog 2011-05-19 10:47:24 UTC (rev 5173)
@@ -27786,3 +27786,17 @@
   ihs_basicval.cpp
 Eradicate a SD premium-tax calculation superseded 2008-02-19.
 
+20110518T2017Z <address@hidden> [650]
+
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_xml_io.cpp
+Fix ancient defect noted 20100723T1029Z: remove dangerous scalars.
+
+20110519T1047Z <address@hidden> [650]
+
+  account_value.hpp
+  ihs_avdebug.cpp
+  ihs_avmly.cpp
+Rive premium-based loads in monthly trace file to make testing easier.
+

Modified: lmi/trunk/account_value.hpp
===================================================================
--- lmi/trunk/account_value.hpp 2011-05-18 20:17:53 UTC (rev 5172)
+++ lmi/trunk/account_value.hpp 2011-05-19 10:47:24 UTC (rev 5173)
@@ -516,6 +516,10 @@
 
     double  MonthsPolicyFees;
     double  SpecAmtLoad;
+    double  premium_load_;
+    double  sales_load_;
+    double  premium_tax_load_;
+    double  dac_tax_load_;
 
     // Stratified loads are determined by assets and cumulative
     // payments immediately after the monthly deduction. Both are

Modified: lmi/trunk/ihs_avdebug.cpp
===================================================================
--- lmi/trunk/ihs_avdebug.cpp   2011-05-18 20:17:53 UTC (rev 5172)
+++ lmi/trunk/ihs_avdebug.cpp   2011-05-19 10:47:24 UTC (rev 5173)
@@ -79,7 +79,10 @@
         ,eErPrem
         ,eTotalPrem
         ,eTargetPrem
-        ,ePremLoad
+        ,ePremiumLoad
+        ,eSalesLoad
+        ,ePremiumTaxLoad
+        ,eDacTaxLoad
         ,eNetPrem
         ,ePolicyFees
         ,eSpecAmtLoad
@@ -171,7 +174,10 @@
         v[eErPrem]              = "Er prem";
         v[eTotalPrem]           = "Total prem";
         v[eTargetPrem]          = "Target prem";
-        v[ePremLoad]            = "Prem load";
+        v[ePremiumLoad]         = "Prem load";
+        v[eSalesLoad]           = "Sales load";
+        v[ePremiumTaxLoad]      = "Prem tax load";
+        v[eDacTaxLoad]          = "DAC tax load";
         v[eNetPrem]             = "Net prem";
         v[ePolicyFees]          = "Policy fees";
         v[eSpecAmtLoad]         = "Spec amt load";
@@ -350,7 +356,10 @@
     SetMonthlyDetail(eErPrem             ,ErGrossPmts[Month]               );
     SetMonthlyDetail(eTotalPrem          ,GrossPmts[Month]                 );
     SetMonthlyDetail(eTargetPrem         ,AnnualTargetPrem                 );
-    SetMonthlyDetail(ePremLoad           ,GrossPmts[Month] - NetPmts[Month]);
+    SetMonthlyDetail(ePremiumLoad        ,premium_load_                    );
+    SetMonthlyDetail(eSalesLoad          ,sales_load_                      );
+    SetMonthlyDetail(ePremiumTaxLoad     ,premium_tax_load_                );
+    SetMonthlyDetail(eDacTaxLoad         ,dac_tax_load_                    );
     SetMonthlyDetail(eNetPrem            ,NetPmts[Month]                   );
     SetMonthlyDetail(ePolicyFees         ,MonthsPolicyFees                 );
     SetMonthlyDetail(eSpecAmtLoad        ,SpecAmtLoad                      );

Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp     2011-05-18 20:17:53 UTC (rev 5172)
+++ lmi/trunk/ihs_avmly.cpp     2011-05-19 10:47:24 UTC (rev 5173)
@@ -869,7 +869,11 @@
     we need to figure out why.
 */
 
-    GptForceout = 0.0;
+    GptForceout       = 0.0;
+    premium_load_     = 0.0;
+    sales_load_       = 0.0;
+    premium_tax_load_ = 0.0;
+    dac_tax_load_     = 0.0;
     OldSA = ActualSpecAmt + TermSpecAmt;
     OldDB = DBReflectingCorr + TermDB;
 
@@ -1441,17 +1445,17 @@
         }
     double target_portion = a_pmt - excess_portion;
 
-    double prem_load =
+    premium_load_ =
             target_portion * YearsPremLoadTgt
         +   excess_portion * YearsPremLoadExc
         ;
 
-    double sales_load =
+    sales_load_ =
             target_portion * YearsSalesLoadTgt
         +   excess_portion * YearsSalesLoadExc
         ;
-    CumulativeSalesLoad += sales_load;
-    HOPEFULLY(0.0 <= sales_load);
+    LMI_ASSERT(0.0 <= sales_load_);
+    CumulativeSalesLoad += sales_load_;
 
     // TODO ?? This variable and the variables it depends on probably
     // are no longer needed and should be expunged.
@@ -1461,20 +1465,20 @@
         - a_portion_exempt_from_premium_tax * YearsPremTaxLoadRate
         ;
 
-    double prem_tax_load = GetPremTaxLoad
+    premium_tax_load_ = GetPremTaxLoad
         ( a_pmt
         - a_portion_exempt_from_premium_tax
         );
-    YearsTotalPremTaxLoad += prem_tax_load;
+    YearsTotalPremTaxLoad += premium_tax_load_;
 
-    double dac_tax_load = YearsDacTaxLoadRate * a_pmt;
-    YearsTotalDacTaxLoad += dac_tax_load;
+    dac_tax_load_ = YearsDacTaxLoadRate * a_pmt;
+    YearsTotalDacTaxLoad += dac_tax_load_;
 
     double sum_of_separate_loads =
-          prem_load
-        + sales_load
-        + prem_tax_load
-        + dac_tax_load
+          premium_load_
+        + sales_load_
+        + premium_tax_load_
+        + dac_tax_load_
         ;
     HOPEFULLY(0.0 <= sum_of_separate_loads);
     LMI_ASSERT