[lmi-commits] [lmi] master 39bd572 4/5: Rename DB_AnnInterestRate7702 --> DB_AnnIntRate7702

[Greg Chicares]

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

    Rename DB_AnnInterestRate7702 --> DB_AnnIntRate7702
    
    The terser "Int" is more concinnous, especially with two new database
    entities that are about to be added.
---
 db_sort.sed    | 2 +-
 dbdict.cpp     | 6 +++---
 dbdict.hpp     | 2 +-
 dbnames.hpp    | 2 +-
 dbnames.xpp    | 2 +-
 i7702_init.cpp | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index 337e426..705f93b 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -62,7 +62,7 @@
 /DB_AllowCvat\>/                 s/^/B001/
 /DB_AllowGpt\>/                  s/^/B002/
 /DB_AllowNo7702\>/               s/^/B003/
-/DB_AnnInterestRate7702\>/       s/^/B004/
+/DB_AnnIntRate7702\>/            s/^/B004/
 /DB_IgnoreLoanRateFor7702\>/     s/^/B005/
 /DB_MlyDiscountRate7702Whence\>/ s/^/B006/
 /DB_MlyDiscountRate7702\>/       s/^/B007/
diff --git a/dbdict.cpp b/dbdict.cpp
index 2c1ff20..ac876a3 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -147,7 +147,7 @@ void DBDictionary::ascribe_members()
     ascribe("AllowCvat"                 , &DBDictionary::AllowCvat             
    );
     ascribe("AllowGpt"                  , &DBDictionary::AllowGpt              
    );
     ascribe("AllowNo7702"               , &DBDictionary::AllowNo7702           
    );
-    ascribe("AnnInterestRate7702"       , &DBDictionary::AnnInterestRate7702   
    );
+    ascribe("AnnIntRate7702"            , &DBDictionary::AnnIntRate7702        
    );
     ascribe("IgnoreLoanRateFor7702"     , &DBDictionary::IgnoreLoanRateFor7702 
    );
     ascribe("MlyDiscountRate7702Whence" , 
&DBDictionary::MlyDiscountRate7702Whence );
     ascribe("MlyDiscountRate7702"       , &DBDictionary::MlyDiscountRate7702   
    );
@@ -776,7 +776,7 @@ void DBDictionary::InitDB()
 
     // This is determined by law, in a way that varies by product;
     // all pre-2021 products use this default.
-    Add({DB_AnnInterestRate7702 , 0.04});
+    Add({DB_AnnIntRate7702      , 0.04});
     // Should these be specified here?
     //   DB_IgnoreLoanRateFor7702
     //   DB_MlyDiscountRate7702Whence
@@ -1490,7 +1490,7 @@ sample2xyz::sample2xyz()
 #endif // 0
     // This is determined by law, in a way that varies by product;
     // 2021 products use this two-percent rate.
-    Add({DB_AnnInterestRate7702 , 0.02});
+    Add({DB_AnnIntRate7702      , 0.02});
     // Arguably the most complex ledger type.
     Add({DB_LedgerType          , mce_finra});
     // Certain group-quote columns are available only when these two
diff --git a/dbdict.hpp b/dbdict.hpp
index 881b388..f47c599 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -128,7 +128,7 @@ class LMI_SO DBDictionary
     database_entity AllowCvat                 ;
     database_entity AllowGpt                  ;
     database_entity AllowNo7702               ;
-    database_entity AnnInterestRate7702       ;
+    database_entity AnnIntRate7702            ;
     database_entity IgnoreLoanRateFor7702     ;
     database_entity MlyDiscountRate7702Whence ;
     database_entity MlyDiscountRate7702       ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 2b237e2..d758381 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -158,7 +158,7 @@ enum e_database_key
         ,DB_AllowCvat
         ,DB_AllowGpt
         ,DB_AllowNo7702
-        ,DB_AnnInterestRate7702
+        ,DB_AnnIntRate7702
         ,DB_IgnoreLoanRateFor7702
         ,DB_MlyDiscountRate7702Whence
         ,DB_MlyDiscountRate7702
diff --git a/dbnames.xpp b/dbnames.xpp
index dd39cb0..e0d7273 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -68,7 +68,7 @@
 {DB_AllowCvat,DB_Topic_7702And7702A,"AllowCvat","Allow cash value accumulation 
test: 0=no, 1=yes",}, \
 {DB_AllowGpt,DB_Topic_7702And7702A,"AllowGpt","Allow guideline premium test: 
0=no, 1=yes",}, \
 {DB_AllowNo7702,DB_Topic_7702And7702A,"AllowNo7702","Allow 7702 to be ignored 
(foreign): 0=no, 1=yes",}, \
-{DB_AnnInterestRate7702,DB_Topic_7702And7702A,"AnnInterestRate7702","7702(b)(3)
 'applicable accumulation test minimum rate', e.g. 0.04 for pre-2021 
contracts",}, \
+{DB_AnnIntRate7702,DB_Topic_7702And7702A,"AnnIntRate7702","7702(b)(3) 
'applicable accumulation test minimum rate', e.g. 0.04 for pre-2021 
contracts",}, \
 
{DB_IgnoreLoanRateFor7702,DB_Topic_7702And7702A,"IgnoreLoanRateFor7702","Riskily
 don't treat guaranteed net loan rate as a floor for 7702 interest: 0=no, 
1=yes",}, \
 
{DB_MlyDiscountRate7702Whence,DB_Topic_7702And7702A,"MlyDiscountRate7702Whence","Source
 of 7702 NAAR discount rate: 0=first principles, 1=table",}, \
 {DB_MlyDiscountRate7702,DB_Topic_7702And7702A,"MlyDiscountRate7702","Monthly 
rate (12 times i upper 12) for discounting NAAR for 7702 and 7702A only, e.g., 
0.00246627 for a 3% annual rate",}, \
diff --git a/i7702_init.cpp b/i7702_init.cpp
index e59bde8..366d598 100644
--- a/i7702_init.cpp
+++ b/i7702_init.cpp
@@ -83,7 +83,7 @@ i7702::i7702
     // 7702 !! Assert (use_gen_ || use_sep_) for each duration.
 
     // 7702 !! Alternatively, specify A0_ and delta, then calculate A1_?
-    A0_ = database.query<double>(DB_AnnInterestRate7702);
+    A0_ = database.query<double>(DB_AnnIntRate7702);
     A1_ = 0.02 + A0_;
 
     database.query_into(DB_GuarInt, Bgen_);