[lmi-commits] [5424] Rename data member 'RiderDeductions' to 'RiderCharges'

[Greg Chicares]

Revision: 5424
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5424
Author:   chicares
Date:     2012-03-10 10:29:19 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
Rename data member 'RiderDeductions' to 'RiderCharges'

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

Modified: lmi/trunk/account_value.hpp
===================================================================
--- lmi/trunk/account_value.hpp 2012-03-10 09:53:12 UTC (rev 5423)
+++ lmi/trunk/account_value.hpp 2012-03-10 10:29:19 UTC (rev 5424)
@@ -409,7 +409,7 @@
     double  SepAcctPaymentAllocation;
     double  NAAR;
     double  CoiCharge;
-    double  RiderDeductions;
+    double  RiderCharges;
     double  NetCoiCharge;
     double  SpecAmtLoadBase;
     double  DacTaxRsv;

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2012-03-10 09:53:12 UTC (rev 5423)
+++ lmi/trunk/ihs_acctval.cpp   2012-03-10 10:29:19 UTC (rev 5424)
@@ -722,7 +722,7 @@
         }
 
     CoiCharge                   = 0.0;
-    RiderDeductions             = 0.0;
+    RiderCharges                = 0.0;
     NetCoiCharge                = 0.0;
     MlyDed                      = 0.0;
     CumulativeSalesLoad         = 0.0; // INFORCE !! Add to inforce input.

Modified: lmi/trunk/ihs_avdebug.cpp
===================================================================
--- lmi/trunk/ihs_avdebug.cpp   2012-03-10 09:53:12 UTC (rev 5423)
+++ lmi/trunk/ihs_avdebug.cpp   2012-03-10 10:29:19 UTC (rev 5424)
@@ -96,7 +96,7 @@
         ,eTermAmount
         ,eTermRate
         ,eTermCharge
-        ,eTotalRiderCharge
+        ,eTotalRiderCharges
         ,eTotalMonthlyDeds
         ,eGenAcctIntRate
         ,eGenAcctIntCred
@@ -192,7 +192,7 @@
         v[eTermAmount]          = "Term amount";
         v[eTermRate]            = "Term rate";
         v[eTermCharge]          = "Term charge";
-        v[eTotalRiderCharge]    = "Total rider charge";
+        v[eTotalRiderCharges]   = "Total rider charges";
         v[eTotalMonthlyDeds]    = "Total monthly deductions";
         v[eGenAcctIntRate]      = "Unloaned GA interest rate";
         v[eGenAcctIntCred]      = "Unloaned GA interest credited";
@@ -375,7 +375,7 @@
     SetMonthlyDetail(eTermAmount         ,TermDB                           );
     SetMonthlyDetail(eTermRate           ,YearsTermRate                    );
     SetMonthlyDetail(eTermCharge         ,TermCharge                       );
-    SetMonthlyDetail(eTotalRiderCharge   ,RiderDeductions                  );
+    SetMonthlyDetail(eTotalRiderCharges  ,RiderCharges                     );
     SetMonthlyDetail(eTotalMonthlyDeds   ,MlyDed                           );
 
     SetMonthlyDetail(eGenAcctIntRate     
,ActualMonthlyRate(YearsGenAcctIntRate              ));

Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp     2012-03-10 09:53:12 UTC (rev 5423)
+++ lmi/trunk/ihs_avmly.cpp     2012-03-10 10:29:19 UTC (rev 5424)
@@ -1943,8 +1943,8 @@
         +   DcvWpCharge
         ;
 
-    RiderDeductions = simple_rider_charges + TermCharge + WpCharge;
-    MlyDed = CoiCharge + RiderDeductions;
+    RiderCharges = simple_rider_charges + TermCharge + WpCharge;
+    MlyDed = CoiCharge + RiderCharges;
 
     process_deduction(MlyDed);
     Dcv -= dcv_mly_ded;
@@ -2832,7 +2832,7 @@
     // Perform no-lapse test.
     if(NoLapseActive && ! NoLapseAlwaysActive)
         {
-        CumNoLapsePrem += MlyNoLapsePrem + RiderDeductions;
+        CumNoLapsePrem += MlyNoLapsePrem + RiderCharges;
         if
             (       NoLapseMinAge <= Year + BasicValues::GetIssueAge()
                 &&  NoLapseMinDur <= Year