[lmi-commits] [5193] Remove a misbegotten ledger variable that no xsl template uses

[Greg Chicares]

Revision: 5193
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5193
Author:   chicares
Date:     2011-05-30 14:47:09 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Remove a misbegotten ledger variable that no xsl template uses

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/basic_values.hpp
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp
    lmi/trunk/ledger_xml_io.cpp
    lmi/trunk/premium_tax.cpp
    lmi/trunk/premium_tax.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/ChangeLog 2011-05-30 14:47:09 UTC (rev 5193)
@@ -27876,3 +27876,59 @@
   ihs_basicval.cpp
 Set state of domicile with other 'state' members.
 
+20110528T1636Z <address@hidden> [650]
+
+  basic_values.hpp
+  premium_tax.hpp
+Annotate and copy members to be moved.
+
+20110528T1657Z <address@hidden> [650]
+
+  basic_values.hpp
+  ihs_basicval.cpp
+Instantiate premium-tax class.
+
+20110529T1429Z <address@hidden> [650]
+
+  premium_tax.cpp
+  premium_tax.hpp
+Store ctor value-arguments as members.
+
+20110529T1521Z <address@hidden> [650]
+
+  basic_values.hpp
+  ihs_basicval.cpp
+  premium_tax.cpp
+  premium_tax.hpp
+Move premium-tax implementation.
+
+20110530T1208Z <address@hidden> [650]
+
+  ihs_basicval.cpp
+Remove code made redundant 20110529T1521Z.
+
+20110530T1254Z <address@hidden> [650]
+
+  ihs_basicval.cpp
+  premium_tax.cpp
+  premium_tax.hpp
+Rectify names.
+
+20110530T1323Z <address@hidden> [650]
+
+  premium_tax.cpp
+  premium_tax.hpp
+Refactor. Triviality is not sufficient reason to write functions
+inline in a header.
+
+20110530T1447Z <address@hidden> [650]
+
+  basic_values.hpp
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_xml_io.cpp
+  premium_tax.cpp
+  premium_tax.hpp
+Remove a misbegotten ledger variable that no xsl template uses. Any
+potential use in pdf output is probably more trouble than it's worth.
+

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/basic_values.hpp  2011-05-30 14:47:09 UTC (rev 5193)
@@ -114,7 +114,6 @@
     double                PremiumTaxLoad()             const; ////
     double                LowestPremiumTaxLoad()       const; ////
     double                DomiciliaryPremiumTaxLoad()  const; ////
-    bool                  PremiumTaxLoadIsTiered()     const; ////
     bool                  IsSubjectToIllustrationReg() const;
     double                InvestmentManagementFee()    const;
 
@@ -524,11 +523,6 @@
     return DomiciliaryPremiumTaxLoad_;
 }
 
-inline bool BasicValues::PremiumTaxLoadIsTiered() const ////
-{
-    return PremiumTaxLoadIsTieredInPremiumTaxState_;
-}
-
 inline bool BasicValues::IsSubjectToIllustrationReg() const
 {
     return IsSubjectToIllustrationReg_;

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/ledger_invariant.cpp      2011-05-30 14:47:09 UTC (rev 5193)
@@ -174,7 +174,6 @@
     OtherScalars    ["InitAnnLoanDueRate"    ] = &InitAnnLoanDueRate     ;
     OtherScalars    ["IsInforce"             ] = &IsInforce              ;
     OtherScalars    ["CountryCOIMultiplier"  ] = &CountryCOIMultiplier   ;
-    OtherScalars    ["PremiumTaxLoadIsTiered"] = &PremiumTaxLoadIsTiered ;
     OtherScalars    ["NoLapseAlwaysActive"   ] = &NoLapseAlwaysActive    ;
     OtherScalars    ["NoLapseMinDur"         ] = &NoLapseMinDur          ;
     OtherScalars    ["NoLapseMinAge"         ] = &NoLapseMinAge          ;
@@ -520,8 +519,6 @@
 
     GenAcctAllocation = 1.0 - premium_allocation_to_sepacct(b->yare_input_);
 
-    PremiumTaxLoadIsTiered  = b->PremiumTaxLoadIsTiered();
-
     NoLapseAlwaysActive     = b->Database_->Query(DB_NoLapseAlwaysActive);
     NoLapseMinDur           = b->Database_->Query(DB_NoLapseMinDur);
     NoLapseMinAge           = b->Database_->Query(DB_NoLapseMinAge);
@@ -1005,11 +1002,6 @@
     HasHoneymoon = HasHoneymoon || a_Addend.HasHoneymoon ;
     AllowDbo3    = AllowDbo3    || a_Addend.AllowDbo3    ;
 
-    PremiumTaxLoadIsTiered =
-            a_Addend.PremiumTaxLoadIsTiered
-        ||  PremiumTaxLoadIsTiered
-        ;
-
     NoLapseMinDur      = std::min(a_Addend.NoLapseMinDur, NoLapseMinDur);
     NoLapseMinAge      = std::min(a_Addend.NoLapseMinAge, NoLapseMinAge);
     NoLapseAlwaysActive= a_Addend.NoLapseAlwaysActive|| NoLapseAlwaysActive;

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/ledger_invariant.hpp      2011-05-30 14:47:09 UTC (rev 5193)
@@ -187,7 +187,6 @@
     double          AllowDbo3;
     double          IsInforce;
     double          CountryCOIMultiplier;
-    double          PremiumTaxLoadIsTiered;
     double          NoLapseAlwaysActive;
     double          NoLapseMinDur;
     double          NoLapseMinAge;

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/ledger_xml_io.cpp 2011-05-30 14:47:09 UTC (rev 5193)
@@ -437,7 +437,6 @@
     format_map["NoLapseMinAge"                     ] = f1;
     format_map["NoLapseMinDur"                     ] = f1;
     format_map["NominallyPar"                      ] = f1;
-    format_map["PremiumTaxLoadIsTiered"            ] = f1;
     format_map["RetAge"                            ] = f1;
     format_map["SmokerBlended"                     ] = f1;
     format_map["SmokerDistinct"                    ] = f1;

Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp   2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/premium_tax.cpp   2011-05-30 14:47:09 UTC (rev 5193)
@@ -308,12 +308,6 @@
     return domiciliary_load_rate_;
 }
 
-//// Identical to the more-appropriately-named 
load_is_tiered_in_premium_tax_state().
-bool premium_tax::PremiumTaxLoadIsTiered() const ////
-{
-    return load_is_tiered_in_premium_tax_state_;
-}
-
 bool premium_tax::load_is_tiered_in_premium_tax_state() const
 {
     return load_is_tiered_in_premium_tax_state_;

Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp   2011-05-30 13:23:20 UTC (rev 5192)
+++ lmi/trunk/premium_tax.hpp   2011-05-30 14:47:09 UTC (rev 5193)
@@ -51,7 +51,6 @@
     double load_rate                          () const;
     double least_load_rate                    () const;
     double domiciliary_load_rate              () const;
-    bool   PremiumTaxLoadIsTiered() const; ////
     bool   load_is_tiered_in_premium_tax_state() const;
     bool   load_is_tiered_in_state_of_domicile() const;
     bool   premium_tax_is_retaliatory         () const;