[lmi-commits] [lmi] master a74799d 06/15: Add a 'GuarCoiWhence' database entity

[Greg Chicares]

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

    Add a 'GuarCoiWhence' database entity
---
 db_sort.sed                | 55 +++++++++++++++++++++++-----------------------
 dbdict.cpp                 |  2 ++
 dbdict.hpp                 |  1 +
 dbnames.hpp                |  1 +
 dbnames.xpp                |  1 +
 oecumenic_enumerations.hpp |  5 +++++
 6 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index 5d1572b..a3795cc 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -90,33 +90,34 @@
 # DB_Topic_MortalityCharges
 /DB_CsoEra\>/              s/^/C01/
 /DB_CsoMisprint\>/         s/^/C02/
-/DB_GuarCoiTable\>/        s/^/C03/
-/DB_GuarCoiIsAnnual\>/     s/^/C04/
-/DB_GuarCoiMultiplier\>/   s/^/C05/
-/DB_CurrCoiTable\>/        s/^/C06/
-/DB_CurrCoiIsAnnual\>/     s/^/C07/
-/DB_MinInputCoiMult\>/     s/^/C08/
-/DB_CurrCoiMultiplier\>/   s/^/C09/
-/DB_UnusualCoiBanding\>/   s/^/C10/
-/DB_CurrCoiTable0Limit\>/  s/^/C11/
-/DB_CurrCoiTable1\>/       s/^/C12/
-/DB_CurrCoiTable1Limit\>/  s/^/C13/
-/DB_CurrCoiTable2\>/       s/^/C14/
-/DB_MdptCoiTable\>/        s/^/C15/
-/DB_MdptCoiIsAnnual\>/     s/^/C16/
-/DB_CoiNyMinTable\>/       s/^/C17/
-/DB_UseNyCoiFloor\>/       s/^/C18/
-/DB_MaxMonthlyCoiRate\>/   s/^/C19/
-/DB_GuarCoiCeiling\>/      s/^/C20/
-/DB_CoiGuarIsMin\>/        s/^/C21/
-/DB_SubstdTableMult\>/     s/^/C22/
-/DB_SubstdTableMultTable\>/s/^/C23/
-/DB_CoiUpper12Method\>/    s/^/C24/
-/DB_CoiInforceReentry\>/   s/^/C25/
-/DB_CoiResetMinDate\>/     s/^/C26/
-/DB_CoiResetMaxDate\>/     s/^/C27/
-/DB_AllowMortBlendSex\>/   s/^/C28/
-/DB_AllowMortBlendSmoke\>/ s/^/C29/
+/DB_GuarCoiWhence\>/       s/^/C03/
+/DB_GuarCoiTable\>/        s/^/C04/
+/DB_GuarCoiIsAnnual\>/     s/^/C05/
+/DB_GuarCoiMultiplier\>/   s/^/C06/
+/DB_CurrCoiTable\>/        s/^/C07/
+/DB_CurrCoiIsAnnual\>/     s/^/C08/
+/DB_MinInputCoiMult\>/     s/^/C09/
+/DB_CurrCoiMultiplier\>/   s/^/C10/
+/DB_UnusualCoiBanding\>/   s/^/C11/
+/DB_CurrCoiTable0Limit\>/  s/^/C12/
+/DB_CurrCoiTable1\>/       s/^/C13/
+/DB_CurrCoiTable1Limit\>/  s/^/C14/
+/DB_CurrCoiTable2\>/       s/^/C15/
+/DB_MdptCoiTable\>/        s/^/C16/
+/DB_MdptCoiIsAnnual\>/     s/^/C17/
+/DB_CoiNyMinTable\>/       s/^/C18/
+/DB_UseNyCoiFloor\>/       s/^/C19/
+/DB_MaxMonthlyCoiRate\>/   s/^/C20/
+/DB_GuarCoiCeiling\>/      s/^/C21/
+/DB_CoiGuarIsMin\>/        s/^/C22/
+/DB_SubstdTableMult\>/     s/^/C23/
+/DB_SubstdTableMultTable\>/s/^/C24/
+/DB_CoiUpper12Method\>/    s/^/C25/
+/DB_CoiInforceReentry\>/   s/^/C26/
+/DB_CoiResetMinDate\>/     s/^/C27/
+/DB_CoiResetMaxDate\>/     s/^/C28/
+/DB_AllowMortBlendSex\>/   s/^/C29/
+/DB_AllowMortBlendSmoke\>/ s/^/C30/
 # DB_Topic_Interest
 /DB_GuarInt\>/             s/^/D01/
 /DB_NaarDiscount\>/        s/^/D02/
diff --git a/dbdict.cpp b/dbdict.cpp
index 6061de2..a093124 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -174,6 +174,7 @@ void DBDictionary::ascribe_members()
     ascribe("WpIsQAB"             , &DBDictionary::WpIsQAB             );
     ascribe("CsoEra"              , &DBDictionary::CsoEra              );
     ascribe("CsoMisprint"         , &DBDictionary::CsoMisprint         );
+    ascribe("GuarCoiWhence"       , &DBDictionary::GuarCoiWhence       );
     ascribe("GuarCoiTable"        , &DBDictionary::GuarCoiTable        );
     ascribe("GuarCoiIsAnnual"     , &DBDictionary::GuarCoiIsAnnual     );
     ascribe("GuarCoiMultiplier"   , &DBDictionary::GuarCoiMultiplier   );
@@ -555,6 +556,7 @@ void DBDictionary::InitDB()
     Add({DB_TermIsQABOrDb7702A  , oe_7702_term_is_db});
     Add({DB_CsoEra              , mce_2017cso});
     Add({DB_CsoMisprint         , oe_orthodox});
+    Add({DB_GuarCoiWhence       , oe_guar_coi_external_table});
     Add({DB_CoiInforceReentry   , e_reenter_never});
     Add({DB_SepAcctSpreadMethod , mce_spread_is_effective_annual});
     Add({DB_IntSpreadMode       , mce_spread_daily});
diff --git a/dbdict.hpp b/dbdict.hpp
index 21aa846..aa469fe 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -153,6 +153,7 @@ class LMI_SO DBDictionary
     database_entity WpIsQAB             ;
     database_entity CsoEra              ;
     database_entity CsoMisprint         ;
+    database_entity GuarCoiWhence       ;
     database_entity GuarCoiTable        ;
     database_entity GuarCoiIsAnnual     ;
     database_entity GuarCoiMultiplier   ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 2f4140a..ee10ee3 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -191,6 +191,7 @@ enum e_database_key
 
         ,DB_CsoEra
         ,DB_CsoMisprint
+        ,DB_GuarCoiWhence
         ,DB_GuarCoiTable
         ,DB_GuarCoiIsAnnual
         ,DB_GuarCoiMultiplier
diff --git a/dbnames.xpp b/dbnames.xpp
index ff106c1..8df7b12 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -96,6 +96,7 @@
 {DB_Topic_MortalityCharges,DB_FIRST,"Mortality charges","Mortality rates, 
limits, conversions, and reentry",}, \
 {DB_CsoEra,DB_Topic_MortalityCharges,"CsoEra","CSO era: 1980, 2001, or 
2017",}, \
 {DB_CsoMisprint,DB_Topic_MortalityCharges,"CsoMisprint","For 1980 CSO ANB MNS, 
use table F with misprinted value at age 71: 0=no, 1=yes",}, \
+{DB_GuarCoiWhence,DB_Topic_MortalityCharges,"GuarCoiWhence","Source of 
guaranteed mortality rates: 0=builtin tables, 1=external tables",}, \
 {DB_GuarCoiTable,DB_Topic_MortalityCharges,"GuarCoiTable","Guaranteed 
mortality charge table (index in mortality table database)",}, \
 {DB_GuarCoiIsAnnual,DB_Topic_MortalityCharges,"GuarCoiIsAnnual","Guaranteed 
cost of insurance table rates are: 0=monthly, 1=annual",}, \
 
{DB_GuarCoiMultiplier,DB_Topic_MortalityCharges,"GuarCoiMultiplier","Multiplier 
applied to guaranteed cost of insurance charges",}, \
diff --git a/oecumenic_enumerations.hpp b/oecumenic_enumerations.hpp
index d419f73..ba19cbc 100644
--- a/oecumenic_enumerations.hpp
+++ b/oecumenic_enumerations.hpp
@@ -91,6 +91,11 @@ enum oenum_glp_or_gsp
     ,oe_gsp
     };
 
+enum oenum_guar_coi_whence
+    {oe_guar_coi_external_table
+    ,oe_guar_coi_builtin
+    };
+
 enum oenum_h_align
     {oe_left
     ,oe_center