[lmi-commits] [lmi] valyuta/004 3739e4b 2/6: Merge branch 'master' into valyuta/004

[Greg Chicares]

branch: valyuta/004
commit 3739e4bad014e8ea55a42c4f74382f79e7a55fb3
Merge: 4b776cb c039250
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Merge branch 'master' into valyuta/004
---
 db_sort.sed               |  4 +---
 dbdict.cpp                | 10 ----------
 dbdict.hpp                |  2 --
 dbnames.hpp               |  2 --
 dbnames.xpp               |  2 --
 ledger_invariant.hpp      |  1 -
 ledger_invariant_init.cpp | 50 +----------------------------------------------
 lingo.cpp                 |  2 --
 my_prod.cpp               |  2 --
 product_data.cpp          |  4 ----
 product_data.hpp          |  2 --
 sample.hpp                |  2 --
 version.hpp               |  2 +-
 13 files changed, 3 insertions(+), 82 deletions(-)

diff --git a/db_sort.sed b/db_sort.sed
index c02aa59..709b830 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -348,9 +348,7 @@
 /DB_DefaultProcessOrder\>/       s/^/R08/
 /DB_GroupProxyRateTable\>/       s/^/R09/
 /DB_PartialMortTable\>/          s/^/R10/
-# // LINGO !! expunge
-/DB_UsePolicyFormAlt\>/          s/^/R11/
-/DB_AllowGroupQuote\>/           s/^/R12/
+/DB_AllowGroupQuote\>/           s/^/R11/
 # DB_Topic_Lingo
 /DB_PolicyForm\>/                s/^/S01/
 # DB_Topic_Weights
diff --git a/dbdict.cpp b/dbdict.cpp
index cd78421..a205984 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -418,10 +418,8 @@ void DBDictionary::ascribe_members()
     ascribe("DefaultProcessOrder"       , &DBDictionary::DefaultProcessOrder   
    );
     ascribe("GroupProxyRateTable"       , &DBDictionary::GroupProxyRateTable   
    );
     ascribe("PartialMortTable"          , &DBDictionary::PartialMortTable      
    );
-    ascribe("UsePolicyFormAlt"          , &DBDictionary::UsePolicyFormAlt      
    ); // LINGO !! expunge
     ascribe("AllowGroupQuote"           , &DBDictionary::AllowGroupQuote       
    );
     ascribe("PolicyForm"                , &DBDictionary::PolicyForm            
    );
-    ascribe("PolicyFormAlternative"     , &DBDictionary::PolicyFormAlternative 
    ); // LINGO !! expunge
     ascribe("PolicyMktgName"            , &DBDictionary::PolicyMktgName        
    );
     ascribe("PolicyLegalName"           , &DBDictionary::PolicyLegalName       
    );
     ascribe("InsCoShortName"            , &DBDictionary::InsCoShortName        
    );
@@ -1097,12 +1095,6 @@ sample::sample()
     double T83Gam[3] = {825, 826, 826,}; // f, m, u
     Add({DB_PartialMortTable, e_number_of_axes, dims311, T83Gam});
 
-    // Use alternative policy form name in states beginning with "K". // LINGO 
!! expunge
-    std::vector<double> alt_form(e_max_dim_state); // LINGO !! expunge
-    alt_form[mce_s_KS] = true; // LINGO !! expunge
-    alt_form[mce_s_KY] = true; // LINGO !! expunge
-    Add({DB_UsePolicyFormAlt, premium_tax_dimensions, alt_form}); // LINGO !! 
expunge
-
     Add({DB_AllowGroupQuote     , true});
 
     // Policy form differs in states beginning with "K".
@@ -1110,7 +1102,6 @@ sample::sample()
     policy_form[mce_s_KS] = superior::policy_form_KS_KY;
     policy_form[mce_s_KY] = superior::policy_form_KS_KY;
     Add({DB_PolicyForm, premium_tax_dimensions, policy_form});
-    Add({DB_PolicyFormAlternative      , superior::PolicyFormAlternative}); // 
LINGO !! expunge
     Add({DB_PolicyMktgName             , superior::PolicyMktgName});
     Add({DB_PolicyLegalName            , superior::PolicyLegalName});
     Add({DB_InsCoShortName             , superior::InsCoShortName});
@@ -1288,7 +1279,6 @@ sample2::sample2()
     // LINGO !! Eventually, perhaps these all can be initialized
     // to a corresponding "_term" value using some terse syntax.
     Add({DB_PolicyForm                 , superior::policy_form_term});
-    Add({DB_PolicyFormAlternative      , 
superior::PolicyFormAlternative_term}); // LINGO !! expunge
     Add({DB_PolicyMktgName             , superior::PolicyMktgName_term});
     Add({DB_PolicyLegalName            , superior::PolicyLegalName_term});
     Add({DB_InsCoShortName             , superior::InsCoShortName_term});
diff --git a/dbdict.hpp b/dbdict.hpp
index fb2daf9..c207d6d 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -403,10 +403,8 @@ class LMI_SO DBDictionary
     // make this entity superfluous. 'GroupProxyRateTable' could be
     // treated the same way.
     database_entity PartialMortTable          ;
-    database_entity UsePolicyFormAlt          ; // LINGO !! expunge
     database_entity AllowGroupQuote           ;
     database_entity PolicyForm                ;
-    database_entity PolicyFormAlternative     ; // LINGO !! expunge
     database_entity PolicyMktgName            ;
     database_entity PolicyLegalName           ;
     database_entity InsCoShortName            ;
diff --git a/dbnames.hpp b/dbnames.hpp
index caa7d05..4921ce1 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -524,13 +524,11 @@ enum e_database_key
 
         ,DB_GroupProxyRateTable
         ,DB_PartialMortTable
-        ,DB_UsePolicyFormAlt // LINGO !! expunge
         ,DB_AllowGroupQuote
 
     ,DB_Topic_Lingo
 
         ,DB_PolicyForm
-        ,DB_PolicyFormAlternative // LINGO !! expunge
         ,DB_PolicyMktgName
         ,DB_PolicyLegalName
         ,DB_InsCoShortName
diff --git a/dbnames.xpp b/dbnames.xpp
index 8e75b51..b62870d 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -354,11 +354,9 @@
 {DB_DefaultProcessOrder,DB_Topic_Miscellanea,"DefaultProcessOrder","Default 
processing order: 0=life by life, 1=month by month [not yet implemented]",}, \
 {DB_GroupProxyRateTable,DB_Topic_Miscellanea,"GroupProxyRateTable","Group-term 
proxy rate (index in mortality table database)",}, \
 {DB_PartialMortTable,DB_Topic_Miscellanea,"PartialMortTable","Partial 
mortality table (index in mortality table database)",}, \
-{DB_UsePolicyFormAlt,DB_Topic_Miscellanea,"UsePolicyFormAlt","Use alternative 
policy-form name: 0=no, 1=yes // LINGO !! expunge",}, \
 {DB_AllowGroupQuote,DB_Topic_Miscellanea,"AllowGroupQuote","Allow group 
premium quotes: 0=no, 1=yes",}, \
 {DB_Topic_Lingo,DB_FIRST,"Lingo","Text to be dropped into report templates: 
index into lingo file",}, \
 {DB_PolicyForm,DB_Topic_Lingo,"PolicyForm","Policy form",}, \
-{DB_PolicyFormAlternative,DB_Topic_Lingo,"PolicyFormAlternative","LINGO !! 
expunge",}, \
 {DB_PolicyMktgName,DB_Topic_Lingo,"PolicyMktgName","PolicyMktgName [narrative 
descriptions desired]",}, \
 {DB_PolicyLegalName,DB_Topic_Lingo,"PolicyLegalName","PolicyLegalName",}, \
 {DB_InsCoShortName,DB_Topic_Lingo,"InsCoShortName","InsCoShortName",}, \
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 212eb37..a7b3767 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -191,7 +191,6 @@ class LMI_SO LedgerInvariant final
 
     // Essential strings describing the policy and company.
     std::string PolicyForm;
-    // Ledger needs no member like product_data::PolicyFormAlternative; // 
LINGO !! expunge
     std::string PolicyMktgName;
     std::string PolicyLegalName;
     std::string CsoEra;
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index a1b7315..79a08d1 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -317,11 +317,9 @@ void LedgerInvariant::Init(BasicValues const* b)
     if(!is_antediluvian_fork())
         {
         product_data const& p = b->product();
-        // Accommodate one alternative policy-form name. // LINGO !! expunge 
this block:
-        // DATABASE !! It would be much better, of course, to let all
+        // LINGO !! DATABASE !! It would be much better, of course, to let all
         // strings in class product_data vary across the same axes as
         // database_entity objects.
-        bool alt_form = b->database().query<bool>(DB_UsePolicyFormAlt);
         dbo_name_option1           = p.datum("DboNameLevel"                   
);
         dbo_name_option2           = p.datum("DboNameIncreasing"              
);
         dbo_name_rop               = p.datum("DboNameReturnOfPremium"         
);
@@ -329,55 +327,9 @@ void LedgerInvariant::Init(BasicValues const* b)
 
         // Strings.
 
-        PolicyForm = p.datum(alt_form ? "PolicyFormAlternative" : 
"PolicyForm"); // LINGO !! expunge old implementation here
-
         auto policy_form = b->database().query<int>(DB_PolicyForm);
-        bool const policy_form_is_okay =
-               b->lingo_->lookup(policy_form) == PolicyForm
-            || "{PolicyFormAlternative}" == PolicyForm
-            ;
-        if(!policy_form_is_okay)
-            alarum()
-                << b->lingo_->lookup(policy_form) << " 
b->lingo_->lookup(policy_form)\n"
-                << PolicyForm << " PolicyForm\n"
-                << LMI_FLUSH
-                ;
         PolicyForm = b->lingo_->lookup(policy_form);
 
-        // LINGO !! Temporary expedient: validate all lingo.
-        if(begins_with(ProductName, "sample"))
-            for(auto const& i : p.member_names())
-                {
-                if(ends_with(i, "Filename") || i == "InsCoDomicile")
-                    continue;
-                auto const k = 
static_cast<e_database_key>(db_key_from_name(i));
-                auto const lingo_index = 
b->database().query<e_database_key>(k);
-                std::string const newer = b->lingo_->lookup(lingo_index);
-                std::string const older = p.datum(i);
-                if(newer != older)
-                    {
-                    // Allow an "alternative" policy form for now.
-                    if("PolicyForm" == i)
-                        warning()
-                            << "Expected difference:\n"
-                            << i << " entity\n"
-                            << newer << " newer\n"
-                            << older << " older\n"
-                            << StateOfJurisdiction << " StateOfJurisdiction\n"
-                            << LMI_FLUSH
-                            ;
-                    else
-                        alarum()
-                            << "ERROR:\n"
-                            << i << " entity\n"
-                            << newer << " newer\n"
-                            << older << " older\n"
-                            << StateOfJurisdiction << " StateOfJurisdiction\n"
-                            << LMI_FLUSH
-                            ;
-                    }
-                }
-
         PolicyMktgName             = p.datum("PolicyMktgName"                 
);
         PolicyLegalName            = p.datum("PolicyLegalName"                
);
         CsoEra     = mc_str(b->database().query<mcenum_cso_era>(DB_CsoEra));
diff --git a/lingo.cpp b/lingo.cpp
index 28e0cfa..c2a0469 100644
--- a/lingo.cpp
+++ b/lingo.cpp
@@ -278,8 +278,6 @@ void lingo::write_lingo_files()
         // string that has no lower_case_with_underscores variant:
 //      ,{superior::PolicyForm_term                     , "{PolicyForm}"}
 //      ,{superior::PolicyForm                          , "UL32768-NY"}
-        ,{superior::PolicyFormAlternative_term          , 
"{PolicyFormAlternative}"} // LINGO !! expunge
-        ,{superior::PolicyFormAlternative               , "UL32768-X"} // 
LINGO !! expunge
         ,{superior::PolicyMktgName_term                 , "{PolicyMktgName}"}
         ,{superior::PolicyMktgName                      , "UL Supreme"}
         ,{superior::PolicyLegalName_term                , "{PolicyLegalName}"}
diff --git a/my_prod.cpp b/my_prod.cpp
index 4d83f77..21980ca 100644
--- a/my_prod.cpp
+++ b/my_prod.cpp
@@ -81,8 +81,6 @@ void product_data::write_proprietary_policy_files()
     z.SubstdTblMultFilename      = glossed_string("sample");
     z.CurrSpecAmtLoadFilename    = glossed_string("sample");
     z.GuarSpecAmtLoadFilename    = glossed_string("sample");
-    z.PolicyForm                 = glossed_string("UL32768-NY"); // LINGO !! 
expunge
-    z.PolicyFormAlternative      = glossed_string("UL32768-X"); // LINGO !! 
expunge
     z.PolicyMktgName             = glossed_string("UL Supreme");
     z.PolicyLegalName            = glossed_string("Flexible Premium Adjustable 
Life Insurance Policy");
     z.InsCoShortName             = glossed_string("Superior Life");
diff --git a/product_data.cpp b/product_data.cpp
index 9d0a9aa..e747890 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -236,8 +236,6 @@ void product_data::ascribe_members()
     ascribe("SubstdTblMultFilename"      , 
&product_data::SubstdTblMultFilename         );
     ascribe("CurrSpecAmtLoadFilename"    , 
&product_data::CurrSpecAmtLoadFilename       );
     ascribe("GuarSpecAmtLoadFilename"    , 
&product_data::GuarSpecAmtLoadFilename       );
-    ascribe("PolicyForm"                 , &product_data::PolicyForm           
         ); // LINGO !! expunge
-    ascribe("PolicyFormAlternative"      , 
&product_data::PolicyFormAlternative         ); // LINGO !! expunge
     ascribe("PolicyMktgName"             , &product_data::PolicyMktgName       
         );
     ascribe("PolicyLegalName"            , &product_data::PolicyLegalName      
         );
     ascribe("InsCoShortName"             , &product_data::InsCoShortName       
         );
@@ -677,8 +675,6 @@ sample::sample()
     item("InsCoDomicile")              = glossed_string("WI");
 
     // Substitutable strings.
-    item("PolicyForm")                 = glossed_string("UL32768-NY"); // 
LINGO !! expunge
-    item("PolicyFormAlternative")      = glossed_string("UL32768-X");  // 
LINGO !! expunge
     item("PolicyMktgName")             = glossed_string("UL Supreme");
     item("PolicyLegalName")            = glossed_string("Flexible Premium 
Adjustable Life Insurance Policy");
     item("InsCoShortName")             = glossed_string("Superior Life");
diff --git a/product_data.hpp b/product_data.hpp
index 9bfb068..0009116 100644
--- a/product_data.hpp
+++ b/product_data.hpp
@@ -179,8 +179,6 @@ class LMI_SO product_data
     glossed_string GuarSpecAmtLoadFilename;
 
     // Essential strings describing the policy and company.
-    glossed_string PolicyForm; // LINGO !! expunge
-    glossed_string PolicyFormAlternative; // LINGO !! expunge
     glossed_string PolicyMktgName;
     glossed_string PolicyLegalName;
     glossed_string InsCoShortName;
diff --git a/sample.hpp b/sample.hpp
index a058817..091783c 100644
--- a/sample.hpp
+++ b/sample.hpp
@@ -60,8 +60,6 @@ enum lingo : int
     // string that has no lower_case_with_underscores variant:
 //  ,PolicyForm_term
 //  ,PolicyForm
-    ,PolicyFormAlternative_term // LINGO !! expunge
-    ,PolicyFormAlternative // LINGO !! expunge
     ,PolicyMktgName_term
     ,PolicyMktgName
     ,PolicyLegalName_term
diff --git a/version.hpp b/version.hpp
index 4130e83..59014cb 100644
--- a/version.hpp
+++ b/version.hpp
@@ -22,6 +22,6 @@
 
 #include "config.hpp"
 
-#define LMI_VERSION "20210102T2216Z"
+#define LMI_VERSION "20210108T1700Z"
 
 #endif // version_hpp