[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c79894b: Hoist prospectus ledger type from ob
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master c79894b: Hoist prospectus ledger type from obsoleteness into abeyance |
Date: |
Tue, 26 Feb 2019 22:02:23 -0500 (EST) |
branch: master
commit c79894ba1667d3ecd8a258aabd03a7c0647180e2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Hoist prospectus ledger type from obsoleteness into abeyance
---
dbdict.cpp | 7 +++++++
ledger.cpp | 8 +++-----
mc_enum_types.xpp | 4 ++--
pdf_command_wx.cpp | 2 +-
product_data.cpp | 4 ++++
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/dbdict.cpp b/dbdict.cpp
index 0e487fe..dbcac98 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -608,6 +608,7 @@ void DBDictionary::InitDB()
class sample : public DBDictionary {public: sample();};
class sample2finra : public sample {public: sample2finra();};
+class sample2prosp : public sample {public: sample2prosp();};
class sample2gpp : public sample {public: sample2gpp ();};
class sample2ipp : public sample {public: sample2ipp ();};
class sample2xyz : public sample {public: sample2xyz ();};
@@ -900,6 +901,11 @@ sample2finra::sample2finra()
Add({DB_LedgerType , mce_finra});
}
+sample2prosp::sample2prosp()
+{
+ Add({DB_LedgerType , mce_prospectus_abeyed});
+}
+
sample2gpp::sample2gpp()
{
Add({DB_LedgerType , mce_group_private_placement});
@@ -933,6 +939,7 @@ void DBDictionary::write_database_files()
{
sample ().WriteDB(AddDataDir("sample.database"));
sample2finra().WriteDB(AddDataDir("sample2finra.database"));
+ sample2prosp().WriteDB(AddDataDir("sample2prosp.database"));
sample2gpp ().WriteDB(AddDataDir("sample2gpp.database"));
sample2ipp ().WriteDB(AddDataDir("sample2ipp.database"));
sample2xyz ().WriteDB(AddDataDir("sample2xyz.database"));
diff --git a/ledger.cpp b/ledger.cpp
index 53a68e8..79f4aaa 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -118,13 +118,13 @@ void Ledger::SetRunBases(int length)
l_map_rep[mce_run_gen_guar_sep_zero] = LedgerVariant(length);
}
break;
-#if 0
// Formerly, three-rate illustrations were required for
// prospectuses. Since this code was written, that requirement
// has become inoperative, but the code is preserved in case
// such a format becomes desirable for some other reason.
- //
- case mce_prospectus_obsolete: // {curr, 0% int, 1/2 int%} X {guar,
curr}
+ // For now, the difference from mce_finra is seen only in
+ // regression testing ('emit_test_data' output only).
+ case mce_prospectus_abeyed: // {curr, 0% int, 1/2 int%} X {guar, curr}
{
l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
@@ -134,8 +134,6 @@ void Ledger::SetRunBases(int length)
l_map_rep[mce_run_gen_guar_sep_half] = LedgerVariant(length);
}
break;
-#endif
- case mce_prospectus_obsolete: // fall through
case mce_offshore_private_placement_obsolete: // fall through
case mce_ill_reg_private_placement_obsolete: // fall through
case mce_variable_annuity_obsolete:
diff --git a/mc_enum_types.xpp b/mc_enum_types.xpp
index 6725717..d0658e2 100644
--- a/mc_enum_types.xpp
+++ b/mc_enum_types.xpp
@@ -153,7 +153,7 @@
#define ledger_type_VALUES \
{mce_ill_reg \
,mce_finra \
- ,mce_prospectus_obsolete \
+ ,mce_prospectus_abeyed \
,mce_group_private_placement \
,mce_offshore_private_placement_obsolete \
,mce_ill_reg_private_placement_obsolete \
@@ -163,7 +163,7 @@
#define ledger_type_NAMES \
{"illustration_reg" \
,"finra" \
- ,"obsolete ledger type 2--do not use" \
+ ,"prospectus" \
,"group_private_placement" \
,"obsolete ledger type 4--do not use" \
,"obsolete ledger type 5--do not use" \
diff --git a/pdf_command_wx.cpp b/pdf_command_wx.cpp
index 898e8c5..886e80b 100644
--- a/pdf_command_wx.cpp
+++ b/pdf_command_wx.cpp
@@ -3243,6 +3243,7 @@ void concrete_pdf_command(Ledger const& ledger, fs::path
const& pdf_out_file)
case mce_ill_reg:
pdf_illustration_naic (ledger, pdf_out_file).render_all();
break;
+ case mce_prospectus_abeyed: // fall through
case mce_finra:
pdf_illustration_finra (ledger, pdf_out_file).render_all();
break;
@@ -3252,7 +3253,6 @@ void concrete_pdf_command(Ledger const& ledger, fs::path
const& pdf_out_file)
case mce_individual_private_placement:
pdf_illustration_reg_d_indiv (ledger, pdf_out_file).render_all();
break;
- case mce_prospectus_obsolete: // fall through
case mce_offshore_private_placement_obsolete: // fall through
case mce_ill_reg_private_placement_obsolete: // fall through
case mce_variable_annuity_obsolete:
diff --git a/product_data.cpp b/product_data.cpp
index 69fc8d9..cb6c1af 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -443,6 +443,7 @@ void product_data::redintegrate_ex_post
/// There is one for each supported ledger type:
/// sample2naic mce_ill_reg
/// sample2finra mce_finra
+/// sample2prosp mce_prospectus_abeyed ['emit_test_data' only]
/// sample2gpp mce_group_private_placement
/// sample2ipp mce_individual_private_placement
/// and one for exotica:
@@ -593,6 +594,9 @@ void product_data::write_policy_files()
z.DatabaseFilename = glossed_string("sample2finra.database");
z.save(AddDataDir("sample2finra.policy"));
+ z.DatabaseFilename = glossed_string("sample2prosp.database");
+ z.save(AddDataDir("sample2prosp.policy"));
+
z.DatabaseFilename = glossed_string("sample2gpp.database");
z.save(AddDataDir("sample2gpp.policy"));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [lmi] master c79894b: Hoist prospectus ledger type from obsoleteness into abeyance,
Greg Chicares <=