[lmi-commits] [lmi] master 791ccce 02/15: Expunge disused stable-value fund charge from database

[Greg Chicares]

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

    Expunge disused stable-value fund charge from database
    
    Rationale: see preceding commit.
    
    DB_StableValueFootnote is retained because it actually is used, and
    might be used for future products, even though any stable-value charge
    be subsumed into Input::ExtraCompensationOnAssets.
---
 db_sort.sed | 7 +++----
 dbdict.cpp  | 2 --
 dbdict.hpp  | 1 -
 dbnames.hpp | 1 -
 dbnames.xpp | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index 6b4fd6a..069e499 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -144,10 +144,9 @@
 /DB_LoadAmortFundCharge\>/       s/^/E002/
 /DB_AllowImfOverride\>/          s/^/E003/
 /DB_AssetChargeType\>/           s/^/E004/
-/DB_StableValFundCharge\>/       s/^/E005/
-/DB_GuarFundAdminChg\>/          s/^/E006/
-/DB_CurrFundAdminChg\>/          s/^/E007/
-/DB_FundCharge\>/                s/^/E008/
+/DB_GuarFundAdminChg\>/          s/^/E005/
+/DB_CurrFundAdminChg\>/          s/^/E006/
+/DB_FundCharge\>/                s/^/E007/
 # DB_Topic_Loads
 /DB_GuarMonthlyPolFee\>/         s/^/F001/
 /DB_GuarAnnualPolFee\>/          s/^/F002/
diff --git a/dbdict.cpp b/dbdict.cpp
index 665cf42..7f35da5 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -226,7 +226,6 @@ void DBDictionary::ascribe_members()
     ascribe("LoadAmortFundCharge"       , &DBDictionary::LoadAmortFundCharge   
    );
     ascribe("AllowImfOverride"          , &DBDictionary::AllowImfOverride      
    );
     ascribe("AssetChargeType"           , &DBDictionary::AssetChargeType       
    );
-    ascribe("StableValFundCharge"       , &DBDictionary::StableValFundCharge   
    );
     ascribe("GuarFundAdminChg"          , &DBDictionary::GuarFundAdminChg      
    );
     ascribe("CurrFundAdminChg"          , &DBDictionary::CurrFundAdminChg      
    );
     ascribe("FundCharge"                , &DBDictionary::FundCharge            
    );
@@ -942,7 +941,6 @@ sample::sample()
     Add({DB_LoadAmortFundCharge , 0.0030});
     Add({DB_AllowImfOverride    , false});
     Add({DB_AssetChargeType     , oe_asset_charge_spread});
-    Add({DB_StableValFundCharge , 0.0});
     Add({DB_GuarFundAdminChg    , 0.0});
     Add({DB_CurrFundAdminChg    , 0.0});
     Add({DB_FundCharge          , 0.0});
diff --git a/dbdict.hpp b/dbdict.hpp
index 574413a..4508759 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -207,7 +207,6 @@ class LMI_SO DBDictionary
     database_entity LoadAmortFundCharge       ;
     database_entity AllowImfOverride          ;
     database_entity AssetChargeType           ;
-    database_entity StableValFundCharge       ;
     database_entity GuarFundAdminChg          ;
     database_entity CurrFundAdminChg          ;
     database_entity FundCharge                ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 1cf5160..5c7fadc 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -260,7 +260,6 @@ enum e_database_key
 
         ,DB_AllowImfOverride
         ,DB_AssetChargeType
-        ,DB_StableValFundCharge
 
         ,DB_GuarFundAdminChg
         ,DB_CurrFundAdminChg
diff --git a/dbnames.xpp b/dbnames.xpp
index 0773c3f..a8a363f 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -150,7 +150,6 @@
 {DB_LoadAmortFundCharge,DB_Topic_AssetCharges,"LoadAmortFundCharge","Asset 
charge for amortized premium load",}, \
 {DB_AllowImfOverride,DB_Topic_AssetCharges,"AllowImfOverride","Allow custom 
fund with input investment management fee: 0=no, 1=yes",}, \
 {DB_AssetChargeType,DB_Topic_AssetCharges,"AssetChargeType","Treatment of 
input extra separate-account asset charge: 0=interest spread, 1=account-value 
load after monthly deduction",}, \
-{DB_StableValFundCharge,DB_Topic_AssetCharges,"StableValFundCharge","Stable 
value fund charge [obsolete]",}, \
 {DB_GuarFundAdminChg,DB_Topic_AssetCharges,"GuarFundAdminChg","Guaranteed fund 
administration charge [not used]",}, \
 {DB_CurrFundAdminChg,DB_Topic_AssetCharges,"CurrFundAdminChg","Current fund 
administration charge [not used]",}, \
 {DB_FundCharge,DB_Topic_AssetCharges,"FundCharge","[not used]",}, \