[lmi-commits] [5047] Rectify names, anticipating changes in the meanings of some

[Greg Chicares]

Revision: 5047
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5047
Author:   chicares
Date:     2010-07-21 14:02:31 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Rectify names, anticipating changes in the meanings of some

Modified Paths:
--------------
    lmi/trunk/basic_values.hpp
    lmi/trunk/basicvalues.cpp
    lmi/trunk/ihs_acctval.cpp
    lmi/trunk/ihs_avmly.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ledger_invariant.cpp

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/basic_values.hpp  2010-07-21 14:02:31 UTC (rev 5047)
@@ -111,7 +111,7 @@
     double                PremiumTaxRate()             const;
     double                LowestPremiumTaxLoad()       const;
     double                DomiciliaryPremiumTaxLoad()  const;
-    bool                  IsPremiumTaxLoadTiered()     const;
+    bool                  PremiumTaxLoadIsTiered()     const;
     bool                  IsSubjectToIllustrationReg() const;
     double                InvestmentManagementFee()    const;
 
@@ -370,9 +370,9 @@
     std::vector<double>     TieredMEBands;
     std::vector<double>     TieredMECharges;
 
-    double                  FirstYearPremiumRetaliationLimit;
-    bool                    PremiumTaxLoadIsTieredInStateOfDomicile;
-    bool                    PremiumTaxLoadIsTieredInStateOfJurisdiction;
+    double                  FirstYearPremiumRetaliationLimit_;
+    bool                    PremiumTaxLoadIsTieredInStateOfDomicile_;
+    bool                    PremiumTaxLoadIsTieredInPremiumTaxState_;
 
   private:
     double GetModalPrem
@@ -508,9 +508,9 @@
     return DomiciliaryPremiumTaxLoad_;
 }
 
-inline bool BasicValues::IsPremiumTaxLoadTiered() const
+inline bool BasicValues::PremiumTaxLoadIsTiered() const
 {
-    return PremiumTaxLoadIsTieredInStateOfJurisdiction;
+    return PremiumTaxLoadIsTieredInPremiumTaxState_;
 }
 
 inline bool BasicValues::IsSubjectToIllustrationReg() const
@@ -521,12 +521,12 @@
 double lowest_premium_tax_load
     (product_database   const& db
     ,stratified_charges const& stratified
-    ,mcenum_state              state_of_jurisdiction
+    ,mcenum_state              premium_tax_state
     ,bool                      amortize_premium_load
     );
 
 // TODO ?? Use a configuration file instead. These deprecated
-// functions are used only by the lmi branch.
+// functions are used only by the antediluvian branch.
 char const* CurrentTableFile();
 char const* GuaranteedTableFile();
 

Modified: lmi/trunk/basicvalues.cpp
===================================================================
--- lmi/trunk/basicvalues.cpp   2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/basicvalues.cpp   2010-07-21 14:02:31 UTC (rev 5047)
@@ -88,7 +88,7 @@
 //============================================================================
 void BasicValues::Init()
 {
-    PremiumTaxLoadIsTieredInStateOfJurisdiction = false;
+    PremiumTaxLoadIsTieredInPremiumTaxState_ = false;
 
     // Bind to input and database representing policy form.
 

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/ihs_acctval.cpp   2010-07-21 14:02:31 UTC (rev 5047)
@@ -1586,7 +1586,7 @@
     Month = yare_input_.InforceMonth;
     CoordinateCounters();
     FirstYearPremiumExceedsRetaliationLimit =
-           FirstYearPremiumRetaliationLimit
+           FirstYearPremiumRetaliationLimit_
         <= TaxableFirstYearPlannedPremium()
         ;
 }
@@ -1597,7 +1597,7 @@
     if
         (  0 == Year
         && FirstYearPremiumExceedsRetaliationLimit
-        && CumPmts < FirstYearPremiumRetaliationLimit
+        && CumPmts < FirstYearPremiumRetaliationLimit_
         )
         {
         FirstYearPremiumExceedsRetaliationLimit = false;

Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp     2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/ihs_avmly.cpp     2010-07-21 14:02:31 UTC (rev 5047)
@@ -1481,7 +1481,7 @@
         ;
     HOPEFULLY(0.0 <= sum_of_separate_loads);
     LMI_ASSERT
-        (   PremiumTaxLoadIsTieredInStateOfJurisdiction
+        (   PremiumTaxLoadIsTieredInPremiumTaxState_
         ||  materially_equal(total_load, sum_of_separate_loads)
         );
 
@@ -1503,7 +1503,7 @@
 double AccountValue::GetPremTaxLoad(double payment)
 {
     double tax_in_state_of_jurisdiction = YearsPremTaxLoadRate * payment;
-    if(PremiumTaxLoadIsTieredInStateOfJurisdiction)
+    if(PremiumTaxLoadIsTieredInPremiumTaxState_)
         {
         LMI_ASSERT(0.0 == tax_in_state_of_jurisdiction);
         tax_in_state_of_jurisdiction = StratifiedCharges_->tiered_premium_tax
@@ -1518,7 +1518,7 @@
     if(!FirstYearPremiumExceedsRetaliationLimit)
         {
         tax_in_state_of_domicile = DomiciliaryPremiumTaxLoad() * payment;
-        if(PremiumTaxLoadIsTieredInStateOfDomicile)
+        if(PremiumTaxLoadIsTieredInStateOfDomicile_)
             {
             LMI_ASSERT(0.0 == tax_in_state_of_domicile);
             tax_in_state_of_domicile = StratifiedCharges_->tiered_premium_tax
@@ -1543,8 +1543,8 @@
     if
         (   !FirstYearPremiumExceedsRetaliationLimit
         &&
-            (  PremiumTaxLoadIsTieredInStateOfJurisdiction
-            || PremiumTaxLoadIsTieredInStateOfDomicile
+            (  PremiumTaxLoadIsTieredInPremiumTaxState_
+            || PremiumTaxLoadIsTieredInStateOfDomicile_
             )
         )
         {

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/ihs_basicval.cpp  2010-07-21 14:02:31 UTC (rev 5047)
@@ -254,8 +254,8 @@
     // determined by a strategy.
     InitialTargetPremium = 0.0;
 
-    PremiumTaxLoadIsTieredInStateOfDomicile     = false;
-    PremiumTaxLoadIsTieredInStateOfJurisdiction = false;
+    PremiumTaxLoadIsTieredInStateOfDomicile_ = false;
+    PremiumTaxLoadIsTieredInPremiumTaxState_ = false;
 
     SetPermanentInvariants();
 
@@ -757,7 +757,7 @@
     Database_->Query(CompTarget, DB_CompTarget);
     Database_->Query(CompExcess, DB_CompExcess);
 
-    FirstYearPremiumRetaliationLimit = Database_->Query(DB_PremTaxRetalLimit);
+    FirstYearPremiumRetaliationLimit_ = Database_->Query(DB_PremTaxRetalLimit);
 
     MandEIsDynamic      = Database_->Query(DB_DynamicMandE         );
     SepAcctLoadIsDynamic= Database_->Query(DB_DynamicSepAcctLoad   );
@@ -861,7 +861,7 @@
 double lowest_premium_tax_load
     (product_database   const& db
     ,stratified_charges const& stratified
-    ,mcenum_state              state_of_jurisdiction
+    ,mcenum_state              premium_tax_state
     ,bool                      amortize_premium_load
     )
 {
@@ -910,7 +910,7 @@
             ;
         }
 
-    if(stratified.premium_tax_is_tiered(state_of_jurisdiction))
+    if(stratified.premium_tax_is_tiered(premium_tax_state))
         {
         // TODO ?? TestPremiumTaxLoadConsistency() repeats this test.
         // Probably all the consistency testing should be moved to
@@ -919,7 +919,7 @@
             {
             fatal_error()
                 << "Premium-tax rate is tiered in state "
-                << mc_str(state_of_jurisdiction)
+                << mc_str(premium_tax_state)
                 << ", but the product database specifies a scalar load of "
                 << z
                 << " instead of zero as expected. Probably the database"
@@ -927,7 +927,7 @@
                 << LMI_FLUSH
                 ;
             }
-        z = stratified.minimum_tiered_premium_tax_rate(state_of_jurisdiction);
+        z = stratified.minimum_tiered_premium_tax_rate(premium_tax_state);
         }
 
     return z;
@@ -938,7 +938,7 @@
 {
     if(StratifiedCharges_->premium_tax_is_tiered(GetStateOfJurisdiction()))
         {
-        PremiumTaxLoadIsTieredInStateOfJurisdiction = true;
+        PremiumTaxLoadIsTieredInPremiumTaxState_ = true;
         if(0.0 != Database_->Query(DB_PremTaxLoad))
             {
             fatal_error()
@@ -955,7 +955,7 @@
 
     if(StratifiedCharges_->premium_tax_is_tiered(GetStateOfDomicile()))
         {
-        PremiumTaxLoadIsTieredInStateOfDomicile = true;
+        PremiumTaxLoadIsTieredInStateOfDomicile_ = true;
         if(0.0 != DomiciliaryPremiumTaxLoad())
             {
             fatal_error()

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2010-07-21 12:09:50 UTC (rev 5046)
+++ lmi/trunk/ledger_invariant.cpp      2010-07-21 14:02:31 UTC (rev 5047)
@@ -522,7 +522,7 @@
 
     GenAcctAllocation = 1.0 - premium_allocation_to_sepacct(b->yare_input_);
 
-    PremiumTaxLoadIsTiered  = b->IsPremiumTaxLoadTiered();
+    PremiumTaxLoadIsTiered  = b->PremiumTaxLoadIsTiered();
 
     NoLapseAlwaysActive     = b->Database_->Query(DB_NoLapseAlwaysActive);
     NoLapseMinDur           = b->Database_->Query(DB_NoLapseMinDur);