[lmi-commits] [lmi] master ff52d09 3/5: Rename DB_CurrAcctValLoad --> DB_CurrSepAcctLoad

[Greg Chicares]

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

    Rename DB_CurrAcctValLoad --> DB_CurrSepAcctLoad
---
 db_sort.sed    | 2 +-
 dbdict.cpp     | 4 ++--
 dbdict.hpp     | 2 +-
 dbnames.hpp    | 2 +-
 dbnames.xpp    | 2 +-
 i7702_init.cpp | 3 +--
 loads.cpp      | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index dc4c483..337e426 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -165,7 +165,7 @@
 /DB_CurrPremLoadExcRfd\>/        s/^/F015/
 /DB_CurrSpecAmtLoad\>/           s/^/F016/
 /DB_CurrSpecAmtLoadTable\>/      s/^/F017/
-/DB_CurrAcctValLoad\>/           s/^/F018/
+/DB_CurrSepAcctLoad\>/           s/^/F018/
 /DB_TgtPremMonthlyPolFee\>/      s/^/F019/
 /DB_LoadRfdProportion\>/         s/^/F020/
 /DB_SpecAmtLoadLimit\>/          s/^/F021/
diff --git a/dbdict.cpp b/dbdict.cpp
index d15e327..2c1ff20 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -246,7 +246,7 @@ void DBDictionary::ascribe_members()
     ascribe("CurrPremLoadExcRfd"        , &DBDictionary::CurrPremLoadExcRfd    
    );
     ascribe("CurrSpecAmtLoad"           , &DBDictionary::CurrSpecAmtLoad       
    );
     ascribe("CurrSpecAmtLoadTable"      , &DBDictionary::CurrSpecAmtLoadTable  
    );
-    ascribe("CurrAcctValLoad"           , &DBDictionary::CurrAcctValLoad       
    );
+    ascribe("CurrSepAcctLoad"           , &DBDictionary::CurrSepAcctLoad       
    );
     ascribe("TgtPremMonthlyPolFee"      , &DBDictionary::TgtPremMonthlyPolFee  
    );
     ascribe("LoadRfdProportion"         , &DBDictionary::LoadRfdProportion     
    );
     ascribe("SpecAmtLoadLimit"          , &DBDictionary::SpecAmtLoadLimit      
    );
@@ -961,7 +961,7 @@ sample::sample()
     Add({DB_CurrPremLoadTgtRfd  , 0.00});
     Add({DB_CurrPremLoadExcRfd  , 0.00});
     Add({DB_CurrSpecAmtLoad     , 0.0});
-    Add({DB_CurrAcctValLoad     , 0.0});
+    Add({DB_CurrSepAcctLoad     , 0.0});
     Add({DB_TgtPremMonthlyPolFee, 0.0});
     Add({DB_LoadRfdProportion   , 0.0});
     Add({DB_SpecAmtLoadLimit    , 10000000.0});
diff --git a/dbdict.hpp b/dbdict.hpp
index 90d5c75..881b388 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -227,7 +227,7 @@ class LMI_SO DBDictionary
     database_entity CurrPremLoadExcRfd        ;
     database_entity CurrSpecAmtLoad           ;
     database_entity CurrSpecAmtLoadTable      ;
-    database_entity CurrAcctValLoad           ;
+    database_entity CurrSepAcctLoad           ;
     database_entity TgtPremMonthlyPolFee      ;
     database_entity LoadRfdProportion         ;
     database_entity SpecAmtLoadLimit          ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 0c835b8..2b237e2 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -291,7 +291,7 @@ enum e_database_key
         ,DB_CurrSpecAmtLoad
         ,DB_CurrSpecAmtLoadTable
 
-        ,DB_CurrAcctValLoad
+        ,DB_CurrSepAcctLoad
 
         ,DB_TgtPremMonthlyPolFee
         ,DB_LoadRfdProportion
diff --git a/dbnames.xpp b/dbnames.xpp
index 6fd5457..dd39cb0 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -171,7 +171,7 @@
 {DB_CurrPremLoadExcRfd,DB_Topic_Loads,"CurrPremLoadExcRfd","Current load on 
premium in excess of target, refundable on lapse",}, \
 {DB_CurrSpecAmtLoad,DB_Topic_Loads,"CurrSpecAmtLoad","Current charge per $1 of 
specified amount, in addition to 'CurrSpecAmtLoadTable'",}, \
 {DB_CurrSpecAmtLoadTable,DB_Topic_Loads,"CurrSpecAmtLoadTable","Current charge 
per $1 of specified amount (index in mortality table database)",}, \
-{DB_CurrAcctValLoad,DB_Topic_Loads,"CurrAcctValLoad","Expense charge as 
proportion of separate account value",}, \
+{DB_CurrSepAcctLoad,DB_Topic_Loads,"CurrSepAcctLoad","Expense charge as 
proportion of separate account value",}, \
 {DB_TgtPremMonthlyPolFee,DB_Topic_Loads,"TgtPremMonthlyPolFee","Target-premium 
monthly policy fee",}, \
 {DB_LoadRfdProportion,DB_Topic_Loads,"LoadRfdProportion","Proportion of sales 
load refundable on full surrender",}, \
 {DB_SpecAmtLoadLimit,DB_Topic_Loads,"SpecAmtLoadLimit","Maximum specified 
amount to which load per $1 of specified amount can apply",}, \
diff --git a/i7702_init.cpp b/i7702_init.cpp
index fa97d38..e59bde8 100644
--- a/i7702_init.cpp
+++ b/i7702_init.cpp
@@ -102,8 +102,7 @@ i7702::i7702
     // the issue date constitutes a short-term guarantee that must be
     // reflected in the 7702 interest rates (excluding the GLP rate).
 
-    // 7702 !! DB_CurrAcctValLoad is sepacct only: change its name
-    database.query_into(DB_CurrAcctValLoad, Dsep_);
+    database.query_into(DB_CurrSepAcctLoad, Dsep_);
     Dsep_ += stratified.minimum_tiered_sepacct_load_for_7702();
 
     // Eckley's 'ig' represents the interest rate by which death
diff --git a/loads.cpp b/loads.cpp
index 022b2df..d063533 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -152,7 +152,7 @@ void Loads::Initialize(product_database const& database, 
load_details const& det
     database.query_into(DB_CurrMonthlyPolFee , monthly_policy_fee_   
[mce_gen_curr]);
     database.query_into(DB_CurrAnnualPolFee  , annual_policy_fee_    
[mce_gen_curr]);
     database.query_into(DB_CurrSpecAmtLoad   , 
specified_amount_load_[mce_gen_curr]);
-    database.query_into(DB_CurrAcctValLoad   , 
separate_account_load_[mce_gen_curr]);
+    database.query_into(DB_CurrSepAcctLoad   , 
separate_account_load_[mce_gen_curr]);
     database.query_into(DB_CurrPremLoadTgt   , target_premium_load_  
[mce_gen_curr]);
     database.query_into(DB_CurrPremLoadExc   , excess_premium_load_  
[mce_gen_curr]);
     database.query_into(DB_CurrPremLoadTgtRfd, target_sales_load_    
[mce_gen_curr]);