[lmi-commits] [lmi] master 1611b81 12/13: Expunge several unused ledger scalars

[Greg Chicares]

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

    Expunge several unused ledger scalars
    
    SubstdTable: Reports use only the string 'SubstandardTable'; the enum
    value is never wanted.
    
    GenderDistinct: Apparently a superfluous converse of 'GenderBlended'.
    
    SmokerDistinct: Apparently a superfluous converse of 'SmokerBlended'.
---
 ledger_evaluator.cpp      |  3 ---
 ledger_invariant.cpp      | 16 +++++-----------
 ledger_invariant.hpp      |  3 ---
 ledger_invariant_init.cpp |  4 ----
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index dac2a40..7250899 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -110,7 +110,6 @@ bool unavailable(std::string const& s)
         ,"InforceAsOfDateJdn"    // probably not needed
         ,"InitDacTaxRate"        // used by PrintRosterTabDelimited(); not 
cents
         ,"InitPremTaxRate"       // used by PrintRosterTabDelimited(); not 
cents
-        ,"SubstdTable"           // probably not needed
         ,"InitMlyPolFee"         // used by PrintRosterTabDelimited()
         ,"InitTgtPremHiLoadRate" // used by PrintRosterTabDelimited(); not 
cents
         };
@@ -495,7 +494,6 @@ format_map_t static_formats()
     ,{"ErNotionallyPaysTerm"            , f1}
     ,{"External1035Amount"              , f1}
     ,{"GenderBlended"                   , f1}
-    ,{"GenderDistinct"                  , f1}
     ,{"GreatestLapseDuration"           , f1}
     ,{"GroupIndivSelection"             , f1}
     ,{"Has1035ExchCharge"               , f1}
@@ -528,7 +526,6 @@ format_map_t static_formats()
     ,{"RetAge"                          , f1}
     ,{"SalesLoadRefundAvailable"        , f1}
     ,{"SmokerBlended"                   , f1}
-    ,{"SmokerDistinct"                  , f1}
     ,{"SplitFundAllocation"             , f1}
     ,{"SplitMinPrem"                    , f1}
     ,{"SpouseIssueAge"                  , f1}
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index 5974f70..a2e90f6 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -140,11 +140,8 @@ void LedgerInvariant::Alloc(int len)
     OtherScalars    ["GuarMaxMandE"          ] = &GuarMaxMandE           ;
     OtherScalars    ["InitDacTaxRate"        ] = &InitDacTaxRate         ;
     OtherScalars    ["InitPremTaxRate"       ] = &InitPremTaxRate        ;
-    OtherScalars    ["GenderDistinct"        ] = &GenderDistinct         ;
     OtherScalars    ["GenderBlended"         ] = &GenderBlended          ;
-    OtherScalars    ["SmokerDistinct"        ] = &SmokerDistinct         ;
     OtherScalars    ["SmokerBlended"         ] = &SmokerBlended          ;
-    OtherScalars    ["SubstdTable"           ] = &SubstdTable            ;
     OtherScalars    ["Age"                   ] = &Age                    ;
     OtherScalars    ["RetAge"                ] = &RetAge                 ;
     OtherScalars    ["EndtAge"               ] = &EndtAge                ;
@@ -573,11 +570,11 @@ void LedgerInvariant::Init()
 ///   but averages aren't supported in this simple code yet. However,
 ///   any average would be inaccurate.
 ///
-///   SubstdTable: This generally represents a mortality multiplier,
-///   for which an average might seem somewhat suitable, but that's
-///   hardly possible because substandard tables are quantized. The
-///   average of "L=+300%" and "P=+400%" is not table N (350%) because
-///   no such table is defined.
+///   SubstandardTable: This represents a mortality multiplier, for
+///   which an average might seem somewhat suitable, but that's hardly
+///   possible because substandard tables are quantized. The average
+///   of "L=+300%" and "P=+400%" is not table N (350%) because no such
+///   table is defined.
 ///
 ///   WaiverFootnote: String members in general cannot be composited
 ///   in any more reasonable way than taking the last cell's value.
@@ -634,11 +631,8 @@ LedgerInvariant& LedgerInvariant::PlusEq(LedgerInvariant 
const& a_Addend)
     GuarMaxMandE               = std::max(GuarMaxMandE       , 
a_Addend.GuarMaxMandE);
     InitDacTaxRate             = std::max(InitDacTaxRate     , 
a_Addend.InitDacTaxRate);
     InitPremTaxRate            = std::max(InitPremTaxRate    , 
a_Addend.InitPremTaxRate);
-    GenderDistinct             = a_Addend.GenderDistinct;
     GenderBlended              = a_Addend.GenderBlended;
-    SmokerDistinct             = a_Addend.SmokerDistinct;
     SmokerBlended              = a_Addend.SmokerBlended;
-    SubstdTable                = a_Addend.SubstdTable;
     Age                        = std::min(Age, a_Addend.Age);
     RetAge                     = std::min(RetAge, a_Addend.RetAge);
     EndtAge                    = std::max(EndtAge, a_Addend.EndtAge);
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 9ad38b3..5c0622a 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -131,11 +131,8 @@ class LMI_SO LedgerInvariant final
     double      GuarMaxMandE;
     double      InitDacTaxRate;
     double      InitPremTaxRate;
-    double      GenderDistinct;
     double      GenderBlended;
-    double      SmokerDistinct;
     double      SmokerBlended;
-    double      SubstdTable; // Prefer string 'SubstandardTable'.
     double      Age;
     double      RetAge;
     double      EndtAge;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index fc88729..060a23f 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -179,13 +179,9 @@ void LedgerInvariant::Init(BasicValues const* b)
     GuarMaxMandE               = guar_m_and_e_rate[0];
     InitDacTaxRate             = 
b->Loads_->dac_tax_load()[b->yare_input_.InforceYear];
     InitPremTaxRate            = b->PremiumTax_->maximum_load_rate();
-//  GenderDistinct             = UNUSED ?
     GenderBlended              = b->yare_input_.BlendGender;
-//  SmokerDistinct             = UNUSED ?
     SmokerBlended              = b->yare_input_.BlendSmoking;
 
-    SubstdTable                = b->yare_input_.SubstandardTable;
-
     Age                        = b->yare_input_.IssueAge;
     RetAge                     = b->yare_input_.RetirementAge;
     EndtAge                    = b->yare_input_.IssueAge + b->GetLength();