[lmi-commits] [5590] Eradicate dead code

[Greg Chicares]

Revision: 5590
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5590
Author:   chicares
Date:     2012-11-09 13:11:24 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Eradicate dead code

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/dbdict.hpp
    lmi/trunk/dbnames.hpp
    lmi/trunk/dbnames.xpp
    lmi/trunk/input_harmonization.cpp
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp
    lmi/trunk/ledger_xml_io.cpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/dbdict.cpp        2012-11-09 13:11:24 UTC (rev 5590)
@@ -361,11 +361,9 @@
     ascribe("ExpRatAmortPeriod"   , &DBDictionary::ExpRatAmortPeriod   );
     ascribe("LedgerType"          , &DBDictionary::LedgerType          );
     ascribe("AgeLastOrNearest"    , &DBDictionary::AgeLastOrNearest    );
-    ascribe("MaxIllusAge"         , &DBDictionary::MaxIllusAge         );
     ascribe("MaturityAge"         , &DBDictionary::MaturityAge         );
     ascribe("LapseIgnoresSurrChg" , &DBDictionary::LapseIgnoresSurrChg );
     ascribe("DefaultProcessOrder" , &DBDictionary::DefaultProcessOrder );
-    ascribe("NominallyPar"        , &DBDictionary::NominallyPar        );
     ascribe("TableYTable"         , &DBDictionary::TableYTable         );
     ascribe("Gam83Table"          , &DBDictionary::Gam83Table          );
     ascribe("WeightClass"         , &DBDictionary::WeightClass         );
@@ -979,7 +977,6 @@
     Add(database_entity(DB_NoLapseMinDur, 0.0));
     Add(database_entity(DB_NoLapseMinAge, 0.0));
 
-    Add(database_entity(DB_NominallyPar, 0.0));
     Add(database_entity(DB_Has1035ExchCharge, 0.0));
     Add(database_entity(DB_SmokeOrTobacco, 0.0));
     Add(database_entity(DB_DacTaxFundCharge, 0.0));

Modified: lmi/trunk/dbdict.hpp
===================================================================
--- lmi/trunk/dbdict.hpp        2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/dbdict.hpp        2012-11-09 13:11:24 UTC (rev 5590)
@@ -338,11 +338,9 @@
     database_entity ExpRatAmortPeriod   ;
     database_entity LedgerType          ;
     database_entity AgeLastOrNearest    ;
-    database_entity MaxIllusAge         ;
     database_entity MaturityAge         ;
     database_entity LapseIgnoresSurrChg ;
     database_entity DefaultProcessOrder ;
-    database_entity NominallyPar        ;
     database_entity TableYTable         ;
     database_entity Gam83Table          ;
     database_entity WeightClass         ;

Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp       2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/dbnames.hpp       2012-11-09 13:11:24 UTC (rev 5590)
@@ -445,12 +445,10 @@
         ,DB_LedgerType
 
         ,DB_AgeLastOrNearest     // DATABASE !! Add more options...
-        ,DB_MaxIllusAge
         ,DB_MaturityAge
 
         ,DB_LapseIgnoresSurrChg
         ,DB_DefaultProcessOrder
-        ,DB_NominallyPar         // DATABASE !! Use a footnote instead.
 
         ,DB_TableYTable
         ,DB_Gam83Table

Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp       2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/dbnames.xpp       2012-11-09 13:11:24 UTC (rev 5590)
@@ -286,11 +286,9 @@
 {DB_Topic_Miscellanea,DB_FIRST,"Miscellanea","Parameters that don't fit tidily 
into other categories",}, \
 {DB_LedgerType,DB_Topic_Miscellanea,"LedgerType","Ledger type: 0=illustration 
reg, 1=NASD, 2=prospectus illustration, 3=group private placement, 4=offshore 
private placement, 5=private placement subject to illustration reg, 
6=individual private placement, 7=variable annuity",}, \
 {DB_AgeLastOrNearest,DB_Topic_Miscellanea,"AgeLastOrNearest","Age calculated 
as of last or nearest birthday: 0=ALB, 1=ANB (ties --> older), 2=ANB (ties --> 
younger)",}, \
-{DB_MaxIllusAge,DB_Topic_Miscellanea,"MaxIllusAge","Highest attained age 
illustrated [not yet implemented]",}, \
 {DB_MaturityAge,DB_Topic_Miscellanea,"MaturityAge","Normal maturity age",}, \
 {DB_LapseIgnoresSurrChg,DB_Topic_Miscellanea,"LapseIgnoresSurrChg","Ignore 
tabular surrender charge for lapse processing",}, \
 {DB_DefaultProcessOrder,DB_Topic_Miscellanea,"DefaultProcessOrder","Default 
processing order: 0=life by life, 1=month by month [not yet implemented]",}, \
-{DB_NominallyPar,DB_Topic_Miscellanea,"NominallyPar","Nominally participating, 
but dividends expected to be zero",}, \
 {DB_TableYTable,DB_Topic_Miscellanea,"TableYTable","New York table Y (index in 
mortality table database)",}, \
 {DB_Gam83Table,DB_Topic_Miscellanea,"Gam83Table","1983 Group Annuitant 
Mortality table (index in mortality table database)",}, \
 {DB_Topic_Weights,DB_FIRST,"Weights","Weights for profit analysis cells [not 
yet implemented]",}, \

Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp   2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/input_harmonization.cpp   2012-11-09 13:11:24 UTC (rev 5590)
@@ -308,10 +308,6 @@
         ,maximum_birthdate(IssueAge.minimum(), EffectiveDate.value(), use_anb)
         );
 
-    // DATABASE !! DB_MaxIllusAge might be more appropriate here than
-    // DB_MaturityAge, but it's not yet implemented, and perhaps there
-    // is no good reason for it even to exist--aren't DB_MaturityAge
-    // and DB_MaxIssAge sufficient?
     int max_age = static_cast<int>(database_->Query(DB_MaturityAge));
     InforceAsOfDate.minimum_and_maximum
         (EffectiveDate.value()

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/ledger_invariant.cpp      2012-11-09 13:11:24 UTC (rev 5590)
@@ -177,7 +177,6 @@
     OtherScalars    ["NoLapseAlwaysActive"   ] = &NoLapseAlwaysActive    ;
     OtherScalars    ["NoLapseMinDur"         ] = &NoLapseMinDur          ;
     OtherScalars    ["NoLapseMinAge"         ] = &NoLapseMinAge          ;
-    OtherScalars    ["NominallyPar"          ] = &NominallyPar           ;
     OtherScalars    ["Has1035ExchCharge"     ] = &Has1035ExchCharge      ;
     OtherScalars    ["EffDateJdn"            ] = &EffDateJdn             ;
     OtherScalars    ["GenAcctAllocation"     ] = &GenAcctAllocation      ;
@@ -384,7 +383,6 @@
     NoLapseMinDur       = 100;
     NoLapseMinAge       = 100;
     NoLapseAlwaysActive = false;
-    NominallyPar        = false;
     Has1035ExchCharge   = false;
 
     SupplementalReport  = false;
@@ -522,7 +520,6 @@
     NoLapseAlwaysActive     = b->Database_->Query(DB_NoLapseAlwaysActive);
     NoLapseMinDur           = b->Database_->Query(DB_NoLapseMinDur);
     NoLapseMinAge           = b->Database_->Query(DB_NoLapseMinAge);
-    NominallyPar            = b->Database_->Query(DB_NominallyPar);
     Has1035ExchCharge       = b->Database_->Query(DB_Has1035ExchCharge);
 
     InitBaseSpecAmt         = b->DeathBfts_->specamt()[0];
@@ -1007,7 +1004,6 @@
     NoLapseMinDur      = std::min(a_Addend.NoLapseMinDur, NoLapseMinDur);
     NoLapseMinAge      = std::min(a_Addend.NoLapseMinAge, NoLapseMinAge);
     NoLapseAlwaysActive= a_Addend.NoLapseAlwaysActive|| NoLapseAlwaysActive;
-    NominallyPar       = a_Addend.NominallyPar       || NominallyPar;
     Has1035ExchCharge  = a_Addend.Has1035ExchCharge  || Has1035ExchCharge;
 
     // Logical OR because IsInforce is a taint that prevents us from

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/ledger_invariant.hpp      2012-11-09 13:11:24 UTC (rev 5590)
@@ -190,7 +190,6 @@
     double          NoLapseAlwaysActive;
     double          NoLapseMinDur;
     double          NoLapseMinAge;
-    double          NominallyPar;
     double          Has1035ExchCharge;
     double          EffDateJdn;
     double          GenAcctAllocation;

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2012-11-08 12:53:19 UTC (rev 5589)
+++ lmi/trunk/ledger_xml_io.cpp 2012-11-09 13:11:24 UTC (rev 5590)
@@ -437,7 +437,6 @@
     format_map["NoLapseAlwaysActive"               ] = f1;
     format_map["NoLapseMinAge"                     ] = f1;
     format_map["NoLapseMinDur"                     ] = f1;
-    format_map["NominallyPar"                      ] = f1;
     format_map["RetAge"                            ] = f1;
     format_map["SmokerBlended"                     ] = f1;
     format_map["SmokerDistinct"                    ] = f1;