[lmi-commits] [lmi] master 1f8f31a 1/2: Expunge database entities for weird surrender charges

[Greg Chicares]

branch: master
commit 1f8f31a274733e2e0780a2a83f1d081e88f40682
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Expunge database entities for weird surrender charges
---
 dbdict.cpp  | 16 ----------------
 dbdict.hpp  |  5 -----
 dbnames.hpp |  5 -----
 dbnames.xpp |  5 -----
 4 files changed, 31 deletions(-)

diff --git a/dbdict.cpp b/dbdict.cpp
index 8fc8370..382c881 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -248,11 +248,6 @@ void DBDictionary::ascribe_members()
     ascribe("PremTaxAmortIntRate" , &DBDictionary::PremTaxAmortIntRate );
     ascribe("PremTaxRate"         , &DBDictionary::PremTaxRate         );
     ascribe("PremTaxState"        , &DBDictionary::PremTaxState        );
-    ascribe("SurrChgAcctValMult"  , &DBDictionary::SurrChgAcctValMult  );
-    ascribe("SurrChgAcctValSlope" , &DBDictionary::SurrChgAcctValSlope );
-    ascribe("SurrChgSpecAmtMult"  , &DBDictionary::SurrChgSpecAmtMult  );
-    ascribe("SurrChgSpecAmtSlope" , &DBDictionary::SurrChgSpecAmtSlope );
-    ascribe("SurrChgPremMult"     , &DBDictionary::SurrChgPremMult     );
     ascribe("SurrChgOnIncr"       , &DBDictionary::SurrChgOnIncr       );
     ascribe("SurrChgOnDecr"       , &DBDictionary::SurrChgOnDecr       );
     ascribe("Has1035ExchCharge"   , &DBDictionary::Has1035ExchCharge   );
@@ -522,8 +517,6 @@ void DBDictionary::InitDB()
     Add(database_entity(DB_CurrCoiMultiplier   , 1.0));
     Add(database_entity(DB_GuarCoiMultiplier   , 1.0));
     Add(database_entity(DB_SubstdTableMult     , 1.0));
-    Add(database_entity(DB_SurrChgSpecAmtSlope , 1.0));
-    Add(database_entity(DB_SurrChgAcctValSlope , 1.0));
     Add(database_entity(DB_MaxWdGenAcctValMult , 1.0));
     Add(database_entity(DB_MaxWdSepAcctValMult , 1.0));
 
@@ -751,7 +744,6 @@ void DBDictionary::write_database_files()
     z.Add(database_entity(DB_SurrChgNlpMult      , 0.0));
     z.Add(database_entity(DB_SurrChgNlpMax       , 0.0));
     z.Add(database_entity(DB_SurrChgEaMax        , 0.0));
-    z.Add(database_entity(DB_SurrChgPremMult     , 0.0));
     z.Add(database_entity(DB_SurrChgAmort        , 0.0));
 
     int ptd[e_number_of_axes] = {1, 1, 1, 1, 1, e_max_dim_state, 1};
@@ -914,7 +906,6 @@ void DBDictionary::write_database_files()
     z.Add(database_entity(DB_MaxGenAcctRate      , 0.06));
     z.Add(database_entity(DB_MaxSepAcctRate      , 0.12));
     z.Add(database_entity(DB_MinVlrRate          , 0.04));
-    z.Add(database_entity(DB_SurrChgAcctValMult  , 0.0));
     z.Add(database_entity(DB_IntSpreadMode       , mce_spread_daily));
     z.Add(database_entity(DB_StateApproved       , true));
     z.Add(database_entity(DB_AllowStateXX        , true));
@@ -940,7 +931,6 @@ void DBDictionary::write_database_files()
     z.Add(database_entity(DB_ChildRiderIsQAB     , false));
     z.Add(database_entity(DB_WpIsQAB             , false));
     z.Add(database_entity(DB_ExpRatRiskCoiMult   , 0));
-    z.Add(database_entity(DB_SurrChgSpecAmtMult  , 0.0));
     z.Add(database_entity(DB_AllowSpouseRider    , true));
     z.Add(database_entity(DB_AllowChildRider     , true));
 
@@ -1065,12 +1055,6 @@ void DBDictionary::InitAntediluvian()
     Add(database_entity(DB_AllowChangeToDbo2, 1.0));
     Add(database_entity(DB_AllowDbo3, 1.0));
 
-    Add(database_entity(DB_SurrChgPremMult, 0.0));
-    Add(database_entity(DB_SurrChgAcctValMult, 0.0));
-    Add(database_entity(DB_SurrChgSpecAmtMult, 0.0));
-    Add(database_entity(DB_SurrChgAcctValSlope, 1.0));
-    Add(database_entity(DB_SurrChgSpecAmtSlope, 1.0));
-
     Add(database_entity(DB_LedgerType, mce_ill_reg));
 
     Add(database_entity(DB_NoLapseAlwaysActive, 0.0));
diff --git a/dbdict.hpp b/dbdict.hpp
index 9059111..583bad9 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -232,11 +232,6 @@ class LMI_SO DBDictionary final
     database_entity PremTaxAmortIntRate ;
     database_entity PremTaxRate         ;
     database_entity PremTaxState        ;
-    database_entity SurrChgAcctValMult  ;
-    database_entity SurrChgAcctValSlope ;
-    database_entity SurrChgSpecAmtMult  ;
-    database_entity SurrChgSpecAmtSlope ;
-    database_entity SurrChgPremMult     ;
     database_entity SurrChgOnIncr       ;
     database_entity SurrChgOnDecr       ;
     database_entity Has1035ExchCharge   ;
diff --git a/dbnames.hpp b/dbnames.hpp
index d062b14..a48c14e 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -310,11 +310,6 @@ enum e_database_key
 
     ,DB_Topic_SurrenderCharges
 
-        ,DB_SurrChgAcctValMult
-        ,DB_SurrChgAcctValSlope
-        ,DB_SurrChgSpecAmtMult
-        ,DB_SurrChgSpecAmtSlope
-        ,DB_SurrChgPremMult
         ,DB_SurrChgOnIncr
         ,DB_SurrChgOnDecr
         ,DB_Has1035ExchCharge
diff --git a/dbnames.xpp b/dbnames.xpp
index f05da77..8e6ef65 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -183,11 +183,6 @@
 {DB_PremTaxRate,DB_Topic_DacAndPremiumTax,"PremTaxRate","Scalar premium tax 
rate paid by insurance company--distinct from premium load due to premium 
tax",}, \
 {DB_PremTaxState,DB_Topic_DacAndPremiumTax,"PremTaxState","[Obsolete--retained 
only for backward compatibility] State that formerly determined premium tax 
rate: 0=insured state, 1=corporation state",}, \
 {DB_Topic_SurrenderCharges,DB_FIRST,"Surrender charges","Surrender-charge 
rates and parameters",}, \
-{DB_SurrChgAcctValMult,DB_Topic_SurrenderCharges,"SurrChgAcctValMult","Multiple
 of account value for formulaic surrender charges",}, \
-{DB_SurrChgAcctValSlope,DB_Topic_SurrenderCharges,"SurrChgAcctValSlope","Durational
 factor applied to multiple-of-account-value surrender charge",}, \
-{DB_SurrChgSpecAmtMult,DB_Topic_SurrenderCharges,"SurrChgSpecAmtMult","Multiple
 of initial spec amt for formulaic surrender charges",}, \
-{DB_SurrChgSpecAmtSlope,DB_Topic_SurrenderCharges,"SurrChgSpecAmtSlope","Durational
 factor applied to multiple-of-specified-amount surrender charge",}, \
-{DB_SurrChgPremMult,DB_Topic_SurrenderCharges,"SurrChgPremMult","Multiple of 
paid premium for formulaic surrender charges [not yet implemented]",}, \
 {DB_SurrChgOnIncr,DB_Topic_SurrenderCharges,"SurrChgOnIncr","Specified-amount 
increases engender a new surrender layer: 0=no, 1=yes [support withdrawn]",}, \
 {DB_SurrChgOnDecr,DB_Topic_SurrenderCharges,"SurrChgOnDecr","Specified-amount 
decreases engender a new surrender layer: 0=no, 1=yes [support withdrawn]",}, \
 {DB_Has1035ExchCharge,DB_Topic_SurrenderCharges,"Has1035ExchCharge","Surrender 
charge or market-value adjustment on 1035 exchange: 0=no, 1=yes",}, \