[lmi-commits] [lmi] master 790cfc3 4/6: Expunge DB_BonusInt

[Greg Chicares]

branch: master
commit 790cfc3c91358affbd2444bd9544448e1b2e86fe
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Expunge DB_BonusInt
    
    DB_BonusInt was never used, and its intended purpose is unknown. Its
    name suggests that it might affect 7702 interest rates, in some way that
    is now unclear; it's better to expunge it than to change those rates.
---
 db_sort.sed | 21 ++++++++++-----------
 dbdict.cpp  |  2 --
 dbdict.hpp  |  1 -
 dbnames.hpp |  1 -
 dbnames.xpp |  1 -
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index 4f13a6e..dc4c483 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -129,17 +129,16 @@
 /DB_CurrIntSpread\>/             s/^/D005/
 /DB_CurrMandE\>/                 s/^/D006/
 /DB_GenAcctIntBonus\>/           s/^/D007/
-/DB_BonusInt\>/                  s/^/D008/
-/DB_IntFloor\>/                  s/^/D009/
-/DB_AllowGenAcct\>/              s/^/D010/
-/DB_AllowSepAcct\>/              s/^/D011/
-/DB_AllowGenAcctEarnRate\>/      s/^/D012/
-/DB_AllowSepAcctNetRate\>/       s/^/D013/
-/DB_MaxGenAcctRate\>/            s/^/D014/
-/DB_MaxSepAcctRate\>/            s/^/D015/
-/DB_SepAcctSpreadMethod\>/       s/^/D016/
-/DB_IntSpreadMode\>/             s/^/D017/
-/DB_DynamicMandE\>/              s/^/D018/
+/DB_IntFloor\>/                  s/^/D008/
+/DB_AllowGenAcct\>/              s/^/D009/
+/DB_AllowSepAcct\>/              s/^/D010/
+/DB_AllowGenAcctEarnRate\>/      s/^/D011/
+/DB_AllowSepAcctNetRate\>/       s/^/D012/
+/DB_MaxGenAcctRate\>/            s/^/D013/
+/DB_MaxSepAcctRate\>/            s/^/D014/
+/DB_SepAcctSpreadMethod\>/       s/^/D015/
+/DB_IntSpreadMode\>/             s/^/D016/
+/DB_DynamicMandE\>/              s/^/D017/
 # DB_Topic_AssetCharges
 /DB_AllowAmortPremLoad\>/        s/^/E001/
 /DB_LoadAmortFundCharge\>/       s/^/E002/
diff --git a/dbdict.cpp b/dbdict.cpp
index a7baf1d..d15e327 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -212,7 +212,6 @@ void DBDictionary::ascribe_members()
     ascribe("CurrIntSpread"             , &DBDictionary::CurrIntSpread         
    );
     ascribe("CurrMandE"                 , &DBDictionary::CurrMandE             
    );
     ascribe("GenAcctIntBonus"           , &DBDictionary::GenAcctIntBonus       
    );
-    ascribe("BonusInt"                  , &DBDictionary::BonusInt              
    );
     ascribe("IntFloor"                  , &DBDictionary::IntFloor              
    );
     ascribe("AllowGenAcct"              , &DBDictionary::AllowGenAcct          
    );
     ascribe("AllowSepAcct"              , &DBDictionary::AllowSepAcct          
    );
@@ -930,7 +929,6 @@ sample::sample()
     Add({DB_CurrIntSpread       , 0.01});
     Add({DB_CurrMandE           , 0.009});
     Add({DB_GenAcctIntBonus     , 0.0});
-    Add({DB_BonusInt            , 0.0});
     Add({DB_IntFloor            , 0.0});
     Add({DB_AllowGenAcct        , true});
     Add({DB_AllowSepAcct        , true});
diff --git a/dbdict.hpp b/dbdict.hpp
index 8542563..90d5c75 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -193,7 +193,6 @@ class LMI_SO DBDictionary
     database_entity CurrIntSpread             ;
     database_entity CurrMandE                 ;
     database_entity GenAcctIntBonus           ;
-    database_entity BonusInt                  ;
     database_entity IntFloor                  ;
     database_entity AllowGenAcct              ;
     database_entity AllowSepAcct              ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 20fbad5..0c835b8 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -241,7 +241,6 @@ enum e_database_key
         ,DB_CurrMandE
 
         ,DB_GenAcctIntBonus
-        ,DB_BonusInt
         ,DB_IntFloor
         ,DB_AllowGenAcct
         ,DB_AllowSepAcct
diff --git a/dbnames.xpp b/dbnames.xpp
index e2c7407..9888028 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -135,7 +135,6 @@
 {DB_CurrIntSpread,DB_Topic_Interest,"CurrIntSpread","Current interest spread, 
e.g. .01 = 100bp",}, \
 {DB_CurrMandE,DB_Topic_Interest,"CurrMandE","Current M&&E charge",}, \
 {DB_GenAcctIntBonus,DB_Topic_Interest,"GenAcctIntBonus","Interest bonus added 
to the general account rate",}, \
-{DB_BonusInt,DB_Topic_Interest,"BonusInt","Bonus interest [not yet 
implemented]",}, \
 {DB_IntFloor,DB_Topic_Interest,"IntFloor","[not used]",}, \
 {DB_AllowGenAcct,DB_Topic_Interest,"AllowGenAcct","Allow investment in general 
account: 0=no, 1=yes",}, \
 {DB_AllowSepAcct,DB_Topic_Interest,"AllowSepAcct","Allow investment in 
separate account: 0=no, 1=yes",}, \