[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master d3a8e75 2/2: Mark old 'PolicyForm' implementa
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master d3a8e75 2/2: Mark old 'PolicyForm' implementation for expunction |
|
Date: |
Tue, 17 Nov 2020 15:39:08 -0500 (EST) |
branch: master
commit d3a8e759b66a3ec92b87a671c19c9f33df4a3fcb
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Mark old 'PolicyForm' implementation for expunction
---
db_sort.sed | 1 +
dbdict.cpp | 12 ++++++------
dbdict.hpp | 2 +-
dbnames.hpp | 2 +-
dbnames.xpp | 2 +-
ledger_invariant.hpp | 2 +-
ledger_invariant_init.cpp | 4 ++--
my_prod.cpp | 4 ++--
policy_document.cpp | 4 ++--
policy_view.xrc | 1 +
product_data.cpp | 8 ++++----
product_data.hpp | 4 ++--
test_coding_rules.cpp | 1 +
13 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/db_sort.sed b/db_sort.sed
index 6498236..4ffb009 100644
--- a/db_sort.sed
+++ b/db_sort.sed
@@ -348,6 +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_Topic_Lingo
diff --git a/dbdict.cpp b/dbdict.cpp
index 75e3f94..5ae3100 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -418,7 +418,7 @@ void DBDictionary::ascribe_members()
ascribe("DefaultProcessOrder" , &DBDictionary::DefaultProcessOrder
);
ascribe("GroupProxyRateTable" , &DBDictionary::GroupProxyRateTable
);
ascribe("PartialMortTable" , &DBDictionary::PartialMortTable
);
- ascribe("UsePolicyFormAlt" , &DBDictionary::UsePolicyFormAlt
);
+ ascribe("UsePolicyFormAlt" , &DBDictionary::UsePolicyFormAlt
); // LINGO !! expunge
ascribe("AllowGroupQuote" , &DBDictionary::AllowGroupQuote
);
ascribe("PolicyForm" , &DBDictionary::PolicyForm
);
ascribe("WeightClass" , &DBDictionary::WeightClass
);
@@ -926,11 +926,11 @@ 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".
- std::vector<double> alt_form(e_max_dim_state);
- alt_form[mce_s_KS] = true;
- alt_form[mce_s_KY] = true;
- Add({DB_UsePolicyFormAlt, premium_tax_dimensions, alt_form});
+ // 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});
diff --git a/dbdict.hpp b/dbdict.hpp
index ad82601..c0679ac 100644
--- a/dbdict.hpp
+++ b/dbdict.hpp
@@ -401,7 +401,7 @@ class LMI_SO DBDictionary
// make this entity superfluous. 'GroupProxyRateTable' could be
// treated the same way.
database_entity PartialMortTable ;
- database_entity UsePolicyFormAlt ;
+ database_entity UsePolicyFormAlt ; // LINGO !! expunge
database_entity AllowGroupQuote ;
database_entity PolicyForm ;
database_entity WeightClass ;
diff --git a/dbnames.hpp b/dbnames.hpp
index 98ec253..c5bf7a0 100644
--- a/dbnames.hpp
+++ b/dbnames.hpp
@@ -524,7 +524,7 @@ enum e_database_key
,DB_GroupProxyRateTable
,DB_PartialMortTable
- ,DB_UsePolicyFormAlt
+ ,DB_UsePolicyFormAlt // LINGO !! expunge
,DB_AllowGroupQuote
,DB_Topic_Lingo
diff --git a/dbnames.xpp b/dbnames.xpp
index 6afe3d2..c871302 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -354,7 +354,7 @@
{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",}, \
+{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",}, \
diff --git a/ledger_invariant.hpp b/ledger_invariant.hpp
index 760cd6e..8d2e071 100644
--- a/ledger_invariant.hpp
+++ b/ledger_invariant.hpp
@@ -191,7 +191,7 @@ class LMI_SO LedgerInvariant final
// Essential strings describing the policy and company.
std::string PolicyForm;
- // Ledger needs no member like product_data::PolicyFormAlternative;
+ // 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 2721723..9117d25 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -313,7 +313,7 @@ void LedgerInvariant::Init(BasicValues const* b)
if(!is_antediluvian_fork())
{
product_data const& p = b->product();
- // Accommodate one alternative policy-form name.
+ // Accommodate one alternative policy-form name. // LINGO !! expunge
this block:
// 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.
@@ -325,7 +325,7 @@ void LedgerInvariant::Init(BasicValues const* b)
// Strings.
- PolicyForm = p.datum(alt_form ? "PolicyFormAlternative" :
"PolicyForm");
+ 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 =
diff --git a/my_prod.cpp b/my_prod.cpp
index 03993b2..a0f6d9e 100644
--- a/my_prod.cpp
+++ b/my_prod.cpp
@@ -81,8 +81,8 @@ 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");
- z.PolicyFormAlternative = glossed_string("UL32768-X");
+ 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/policy_document.cpp b/policy_document.cpp
index ef4afe0..f11186b 100644
--- a/policy_document.cpp
+++ b/policy_document.cpp
@@ -62,8 +62,8 @@ PolicyDocument::PolicyDocument()
values_["GuarSpecAmtLoadFilename" ] =
&product_data_.GuarSpecAmtLoadFilename .datum_;
values_["RoundingFilename" ] = &product_data_.RoundingFilename
.datum_;
values_["TierFilename" ] = &product_data_.TierFilename
.datum_;
- values_["PolicyForm" ] = &product_data_.PolicyForm
.datum_;
- values_["PolicyFormAlternative" ] = &product_data_.PolicyFormAlternative
.datum_;
+ values_["PolicyForm" ] = &product_data_.PolicyForm
.datum_; // LINGO !! expunge
+ values_["PolicyFormAlternative" ] = &product_data_.PolicyFormAlternative
.datum_; // LINGO !! expunge
values_["PolicyMktgName" ] = &product_data_.PolicyMktgName
.datum_;
values_["PolicyLegalName" ] = &product_data_.PolicyLegalName
.datum_;
values_["InsCoShortName" ] = &product_data_.InsCoShortName
.datum_;
diff --git a/policy_view.xrc b/policy_view.xrc
index f0aae7c..1aa853a 100644
--- a/policy_view.xrc
+++ b/policy_view.xrc
@@ -324,6 +324,7 @@
<growablecols>1</growablecols>
<hgap>8</hgap>
<vgap>4</vgap>
+ <!-- LINGO !! expunge next two textctrls
-->
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
diff --git a/product_data.cpp b/product_data.cpp
index 6040520..ab38c57 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -206,8 +206,8 @@ 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
);
- ascribe("PolicyFormAlternative" ,
&product_data::PolicyFormAlternative );
+ 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
);
@@ -647,8 +647,8 @@ sample::sample()
item("InsCoDomicile") = glossed_string("WI");
// Substitutable strings.
- item("PolicyForm") = glossed_string("UL32768-NY");
- item("PolicyFormAlternative") = glossed_string("UL32768-X");
+ 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 52d750f..50dd596 100644
--- a/product_data.hpp
+++ b/product_data.hpp
@@ -169,8 +169,8 @@ class LMI_SO product_data
glossed_string GuarSpecAmtLoadFilename;
// Essential strings describing the policy and company.
- glossed_string PolicyForm;
- glossed_string PolicyFormAlternative;
+ glossed_string PolicyForm; // LINGO !! expunge
+ glossed_string PolicyFormAlternative; // LINGO !! expunge
glossed_string PolicyMktgName;
glossed_string PolicyLegalName;
glossed_string InsCoShortName;
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index 4c79296..3c9639f 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -715,6 +715,7 @@ void check_defect_markers(file const& f)
&& "IHS " != z[1]
&& "INELEGANT " != z[1]
&& "INPUT " != z[1]
+ && "LINGO " != z[1]
&& "MD5 " != z[1]
&& "PDF " != z[1]
&& "PORT " != z[1]