[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 3e5e3df 4/4: Rename: FINRA succeeded NASD ove
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 3e5e3df 4/4: Rename: FINRA succeeded NASD over a decade ago |
Date: |
Mon, 17 Sep 2018 20:48:32 -0400 (EDT) |
branch: master
commit 3e5e3df2993d23d3142868f00a74eb32f54261f8
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename: FINRA succeeded NASD over a decade ago
Left 'nasd.xsl' alone because all '*.xsl' will soon be expunged.
---
dbdict.cpp | 4 +-
dbnames.xpp | 2 +-
...ption_detail.mst => finra_assumption_detail.mst | 4 +-
nasd_basic.mst => finra_basic.mst | 4 +-
...olumn_headings.mst => finra_column_headings.mst | 2 +-
nasd_footer_lower.mst => finra_footer_lower.mst | 0
nasd_footer_upper.mst => finra_footer_upper.mst | 0
nasd_header.mst => finra_header.mst | 4 +-
nasd_header_lower.mst => finra_header_lower.mst | 0
nasd_header_upper.mst => finra_header_upper.mst | 0
nasd_notes1.mst => finra_notes1.mst | 2 +-
nasd_notes2.mst => finra_notes2.mst | 2 +-
nasd_supp.mst => finra_supp.mst | 2 +-
nasd_supp_report.mst => finra_supp_report.mst | 4 +-
input_harmonization.cpp | 4 +-
interest_rates.hpp | 8 ++--
ledger.cpp | 2 +-
ledger_pdf_generator_wx.cpp | 44 +++++++++++-----------
ledger_xsl.cpp | 2 +-
mc_enum_types.xpp | 4 +-
mc_enum_types_aux.cpp | 12 +++---
mc_enum_types_aux.hpp | 2 +-
product_data.cpp | 6 +--
23 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/dbdict.cpp b/dbdict.cpp
index 29e4b9d..b2d1944 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -966,8 +966,8 @@ void DBDictionary::write_database_files()
z.WriteDB(AddDataDir("sample.database"));
- z.Add(database_entity(DB_LedgerType , mce_nasd));
- z.WriteDB(AddDataDir("sample2nasd.database"));
+ z.Add(database_entity(DB_LedgerType , mce_finra));
+ z.WriteDB(AddDataDir("sample2finra.database"));
z.Add(database_entity(DB_LedgerType ,
mce_group_private_placement));
z.WriteDB(AddDataDir("sample2gpp.database"));
diff --git a/dbnames.xpp b/dbnames.xpp
index 1ba90fb..4654e68 100644
--- a/dbnames.xpp
+++ b/dbnames.xpp
@@ -330,7 +330,7 @@
{DB_ExpRatRiskCoiMult,DB_Topic_ExperienceRating,"ExpRatRiskCoiMult","Maximum
risk charge as a multiple of annual cost of insurance charges",}, \
{DB_ExpRatAmortPeriod,DB_Topic_ExperienceRating,"ExpRatAmortPeriod","Experience
rating amortization period",}, \
{DB_Topic_Miscellanea,DB_FIRST,"Miscellanea","Parameters that don't fit tidily
into other categories",}, \
-{DB_LedgerType,DB_Topic_Miscellanea,"LedgerType","Ledger type: 0=illustration
reg, 1=NASD, 3=group private placement, 6=individual private placement",}, \
+{DB_LedgerType,DB_Topic_Miscellanea,"LedgerType","Ledger type: 0=illustration
reg, 1=FINRA, 3=group private placement, 6=individual private placement",}, \
{DB_Nonillustrated,DB_Topic_Miscellanea,"Nonillustrated","Forbid all
illustrations: 0=no, 1=yes",}, \
{DB_NoLongerIssued,DB_Topic_Miscellanea,"NoLongerIssued","Forbid new-business
illustrations: 0=no, 1=yes",}, \
{DB_AgeLastOrNearest,DB_Topic_Miscellanea,"AgeLastOrNearest","Age calculated
as of last or nearest birthday: 0=ALB, 1=ANB (ties --> older), 2=ANB (ties -->
younger)",}, \
diff --git a/nasd_assumption_detail.mst b/finra_assumption_detail.mst
similarity index 95%
rename from nasd_assumption_detail.mst
rename to finra_assumption_detail.mst
index 761b74b..68177a6 100644
--- a/nasd_assumption_detail.mst
+++ b/finra_assumption_detail.mst
@@ -19,9 +19,9 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header_upper}}
+{{>finra_header_upper}}
<p align="center">Illustration Assumption Detail</p>
-{{>nasd_header_lower}}
+{{>finra_header_lower}}
<br></br>
<br></br>
diff --git a/nasd_basic.mst b/finra_basic.mst
similarity index 95%
rename from nasd_basic.mst
rename to finra_basic.mst
index a0c4122..900634b 100644
--- a/nasd_basic.mst
+++ b/finra_basic.mst
@@ -19,13 +19,13 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header_upper}}
+{{>finra_header_upper}}
{{#IsInforce}}
<p align="center">
In Force Illustration
</p>
{{/IsInforce}}
-{{>nasd_header_lower}}
+{{>finra_header_lower}}
{{>dollar_units}}
diff --git a/nasd_column_headings.mst b/finra_column_headings.mst
similarity index 98%
rename from nasd_column_headings.mst
rename to finra_column_headings.mst
index 71cc54a..85e0cae 100644
--- a/nasd_column_headings.mst
+++ b/finra_column_headings.mst
@@ -19,7 +19,7 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header}}
+{{>finra_header}}
<p align="center"><b>Column Definitions and Key Terms</b></p>
diff --git a/nasd_footer_lower.mst b/finra_footer_lower.mst
similarity index 100%
rename from nasd_footer_lower.mst
rename to finra_footer_lower.mst
diff --git a/nasd_footer_upper.mst b/finra_footer_upper.mst
similarity index 100%
rename from nasd_footer_upper.mst
rename to finra_footer_upper.mst
diff --git a/nasd_header.mst b/finra_header.mst
similarity index 96%
rename from nasd_header.mst
rename to finra_header.mst
index a9bbef6..720acfc 100644
--- a/nasd_header.mst
+++ b/finra_header.mst
@@ -28,5 +28,5 @@
PDF !! The title that's inserted in between can be moved after the header,
which then won't need to be split in two parts.
}}
-{{>nasd_header_upper}}
-{{>nasd_header_lower}}
+{{>finra_header_upper}}
+{{>finra_header_lower}}
diff --git a/nasd_header_lower.mst b/finra_header_lower.mst
similarity index 100%
rename from nasd_header_lower.mst
rename to finra_header_lower.mst
diff --git a/nasd_header_upper.mst b/finra_header_upper.mst
similarity index 100%
rename from nasd_header_upper.mst
rename to finra_header_upper.mst
diff --git a/nasd_notes1.mst b/finra_notes1.mst
similarity index 99%
rename from nasd_notes1.mst
rename to finra_notes1.mst
index 99701e1..af30c81 100644
--- a/nasd_notes1.mst
+++ b/finra_notes1.mst
@@ -19,7 +19,7 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header}}
+{{>finra_header}}
<font size="-1">
diff --git a/nasd_notes2.mst b/finra_notes2.mst
similarity index 99%
rename from nasd_notes2.mst
rename to finra_notes2.mst
index 399d064..1c72843 100644
--- a/nasd_notes2.mst
+++ b/finra_notes2.mst
@@ -19,7 +19,7 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header}}
+{{>finra_header}}
<font size="-1">
diff --git a/nasd_supp.mst b/finra_supp.mst
similarity index 98%
rename from nasd_supp.mst
rename to finra_supp.mst
index 706a1ef..668218b 100644
--- a/nasd_supp.mst
+++ b/finra_supp.mst
@@ -19,7 +19,7 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header}}
+{{>finra_header}}
{{>dollar_units}}
diff --git a/nasd_supp_report.mst b/finra_supp_report.mst
similarity index 95%
rename from nasd_supp_report.mst
rename to finra_supp_report.mst
index 992f3f1..e27195b 100644
--- a/nasd_supp_report.mst
+++ b/finra_supp_report.mst
@@ -19,9 +19,9 @@
snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
}}
-{{>nasd_header_upper}}
+{{>finra_header_upper}}
<p align="center">{{SupplementalReportTitle}}</p>
-{{>nasd_header_lower}}
+{{>finra_header_lower}}
{{>dollar_units}}
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index 3aefcf2..a649edb 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -31,7 +31,7 @@
#include "dbnames.hpp"
#include "global_settings.hpp"
#include "input_sequence.hpp"
-#include "mc_enum_types_aux.hpp" // is_subject_to_ill_reg(),
is_three_rate_nasd()
+#include "mc_enum_types_aux.hpp" // is_subject_to_ill_reg(),
is_three_rate_finra()
#include <algorithm> // min(), max()
#include <utility> // pair
@@ -808,7 +808,7 @@ false // Silly workaround for now.
SolveSeparateAccountBasis.enable(actually_solving && mce_solve_for_non_mec
!= SolveTarget);
SolveSeparateAccountBasis.allow(mce_sep_full, actually_solving);
SolveSeparateAccountBasis.allow(mce_sep_zero, actually_solving &&
allow_sep_acct);
- SolveSeparateAccountBasis.allow(mce_sep_half, actually_solving &&
allow_sep_acct && is_three_rate_nasd(GleanedLedgerType_));
+ SolveSeparateAccountBasis.allow(mce_sep_half, actually_solving &&
allow_sep_acct && is_three_rate_finra(GleanedLedgerType_));
SolveTargetValue.enable(actually_solving && (mce_solve_for_target_csv ==
SolveTarget || mce_solve_for_target_naar == SolveTarget));
diff --git a/interest_rates.hpp b/interest_rates.hpp
index fa6e11c..2193672 100644
--- a/interest_rates.hpp
+++ b/interest_rates.hpp
@@ -61,20 +61,20 @@
// The general account and the loan accounts distinguish current from
// guaranteed rates; illustration-reg formats also require midpoint
// rates for these accounts. The separate account is needed only for
-// NASD formats and generally doesn't have a guaranteed rate at all,
-// but NASD requires distinguishing current from guaranteed separate-
+// FINRA formats and generally doesn't have a guaranteed rate at all,
+// but FINRA requires distinguishing current from guaranteed separate-
// account charges, which affect net interest rates. Therefore, all
// accounts vary across the axis
// {current, [midpoint,] guaranteed}
// where midpoint is used only for illustration-reg formats. For
// simplicity, the present implementation uses the same three-element
// axis for all formats, even though the midpoint basis is not used
-// for NASD formats; perhaps someday it will be useful, e.g. if NAIC
+// for FINRA formats; perhaps someday it will be useful, e.g. if NAIC
// adopts an illustration reg for variable products or if some
// company wants to create a hybrid illustration that satisfies both
// sets of regulations.
-// For the separate account, NASD requires a zero percent rate in
+// For the separate account, FINRA requires a zero percent rate in
// addition to the input interest rate. Some companies may wish to
// show a third rate that is the average of those two: in this
// implementation, separate-account rates vary across the axis
diff --git a/ledger.cpp b/ledger.cpp
index 4ebaecc..4fc57c9 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -95,7 +95,7 @@ void Ledger::SetRunBases(int length)
break;
case mce_group_private_placement: // Deliberately fall through.
case mce_individual_private_placement: // Deliberately fall through.
- case mce_nasd:
+ case mce_finra:
{
l_map_rep[mce_run_gen_curr_sep_full] = LedgerVariant(length);
l_map_rep[mce_run_gen_guar_sep_full] = LedgerVariant(length);
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index af735d3..3ec03f8 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -2139,7 +2139,7 @@ class pdf_illustration_naic : public pdf_illustration
};
// Common base class for basic illustration pages using the same columns in
-// both NASD and private group placement illustrations.
+// both FINRA and private group placement illustrations.
class page_with_basic_tabular_report : public page_with_tabular_report
{
private:
@@ -2309,12 +2309,12 @@ class page_with_basic_tabular_report : public
page_with_tabular_report
}
};
-class nasd_basic : public page_with_basic_tabular_report
+class finra_basic : public page_with_basic_tabular_report
{
private:
std::string get_fixed_page_contents_template_name() const override
{
- return "nasd_basic";
+ return "finra_basic";
}
std::string get_two_column_header
@@ -2342,7 +2342,7 @@ class nasd_basic : public page_with_basic_tabular_report
}
};
-class nasd_supplemental : public page_with_tabular_report
+class finra_supplemental : public page_with_tabular_report
{
private:
enum
@@ -2366,7 +2366,7 @@ class nasd_supplemental : public page_with_tabular_report
std::string get_fixed_page_contents_template_name() const override
{
- return "nasd_supp";
+ return "finra_supp";
}
// When invar.SplitMinPrem is true, this report has twelve columns
@@ -2403,7 +2403,7 @@ class nasd_supplemental : public page_with_tabular_report
{
auto const& invar = ledger.GetLedgerInvariant();
- // The supplemental page in NASD illustrations exists in two versions:
+ // The supplemental page in FINRA illustrations exists in two versions:
// default one and one with split premiums. Hide columns that are not
// needed for the current illustration.
switch(column)
@@ -2441,7 +2441,7 @@ class nasd_supplemental : public page_with_tabular_report
}
};
-class nasd_assumption_detail : public page_with_tabular_report
+class finra_assumption_detail : public page_with_tabular_report
{
private:
enum
@@ -2458,7 +2458,7 @@ class nasd_assumption_detail : public
page_with_tabular_report
std::string get_fixed_page_contents_template_name() const override
{
- return "nasd_assumption_detail";
+ return "finra_assumption_detail";
}
illustration_table_columns const& get_table_columns() const override
@@ -2482,12 +2482,12 @@ class nasd_assumption_detail : public
page_with_tabular_report
// all of its columns, including the "AttainedAge" one, are always shown.
};
-/// Illustration subject to FINRA (formerly NASD) regulation.
+/// Illustration subject to FINRA regulation.
-class pdf_illustration_nasd : public pdf_illustration
+class pdf_illustration_finra : public pdf_illustration
{
public:
- explicit pdf_illustration_nasd(Ledger const& ledger)
+ explicit pdf_illustration_finra(Ledger const& ledger)
:pdf_illustration{ledger}
{
auto const& invar = ledger.GetLedgerInvariant();
@@ -2528,32 +2528,32 @@ class pdf_illustration_nasd : public pdf_illustration
// Add all the pages.
add<cover_page>();
numbered_page::start_numbering();
- add<nasd_basic>();
- add<nasd_supplemental>();
- add<standard_page>("nasd_column_headings");
- add<standard_page>("nasd_notes1");
- add<standard_page>("nasd_notes2");
+ add<finra_basic>();
+ add<finra_supplemental>();
+ add<standard_page>("finra_column_headings");
+ add<standard_page>("finra_notes1");
+ add<standard_page>("finra_notes2");
if(!ledger.is_composite())
{
- add<nasd_assumption_detail>();
+ add<finra_assumption_detail>();
}
if(invar.SupplementalReport)
{
add<standard_supplemental_report>
(get_interpolator()
- ,"nasd_supp_report"
+ ,"finra_supp_report"
);
}
}
std::string get_upper_footer_template_name() const override
{
- return "nasd_footer_upper";
+ return "finra_footer_upper";
}
std::string get_lower_footer_template_name() const override
{
- return "nasd_footer_lower";
+ return "finra_footer_lower";
}
};
@@ -2933,8 +2933,8 @@ void ledger_pdf_generator_wx::write
case mce_ill_reg:
pdf_illustration_naic (ledger).render_all(output);
break;
- case mce_nasd:
- pdf_illustration_nasd (ledger).render_all(output);
+ case mce_finra:
+ pdf_illustration_finra (ledger).render_all(output);
break;
case mce_group_private_placement:
pdf_illustration_reg_d_group (ledger).render_all(output);
diff --git a/ledger_xsl.cpp b/ledger_xsl.cpp
index 64389d1..176cf1c 100644
--- a/ledger_xsl.cpp
+++ b/ledger_xsl.cpp
@@ -47,7 +47,7 @@ std::string xsl_filename(Ledger const& ledger)
switch(z)
{
case mce_ill_reg: return "illustration_reg.xsl";
- case mce_nasd: return "nasd.xsl";
+ case mce_finra: return "nasd.xsl";
case mce_group_private_placement: return "reg_d_group.xsl";
case mce_individual_private_placement: return "reg_d_individual.xsl";
case mce_prospectus_obsolete: // fall through
diff --git a/mc_enum_types.xpp b/mc_enum_types.xpp
index c35daca..7c1b8ee 100644
--- a/mc_enum_types.xpp
+++ b/mc_enum_types.xpp
@@ -152,7 +152,7 @@
#define ledger_type_VALUES \
{mce_ill_reg \
- ,mce_nasd \
+ ,mce_finra \
,mce_prospectus_obsolete \
,mce_group_private_placement \
,mce_offshore_private_placement_obsolete \
@@ -162,7 +162,7 @@
};
#define ledger_type_NAMES \
{"illustration_reg" \
- ,"nasd" \
+ ,"finra" \
,"obsolete ledger type 2--do not use" \
,"group_private_placement" \
,"obsolete ledger type 4--do not use" \
diff --git a/mc_enum_types_aux.cpp b/mc_enum_types_aux.cpp
index 7069101..068aa92 100644
--- a/mc_enum_types_aux.cpp
+++ b/mc_enum_types_aux.cpp
@@ -110,12 +110,12 @@ bool is_subject_to_ill_reg(mcenum_ledger_type z)
return mce_ill_reg == z;
}
-/// NASD illustrations may have three interest bases (e.g. 0, 6, 12%)
-/// instead of only two (e.g. 0, 12%). Three-rate NASD illustrations
+/// FINRA illustrations may have three interest bases (e.g. 0, 6, 12%)
+/// instead of only two (e.g. 0, 12%). Three-rate FINRA illustrations
/// are not fully supported at the moment, so this function simply
/// returns 'false'.
-bool is_three_rate_nasd(mcenum_ledger_type)
+bool is_three_rate_finra(mcenum_ledger_type)
{
return false;
}
@@ -185,7 +185,7 @@ void set_cloven_bases_from_run_basis
/// - a "separate" basis that governs separate-account rates:
/// {full, zero, half} (here, {F, Z, H} for short)
/// where "full" is the undiminished hypothetical rate, and "half"
-/// is used only on NASD illustrations that show three rates instead
+/// is used only on FINRA illustrations that show three rates instead
/// of two.
///
/// To avoid nested loops, it is convenient to represent combinations
@@ -196,8 +196,8 @@ void set_cloven_bases_from_run_basis
/// {CF, GF, MF, CZ, GZ, CH, GH} actually-used bases
/// of which only these subsets are used:
/// {CF, GF, MF } illustration reg
-/// {CF, GF, CZ, GZ } normal NASD
-/// {CF, GF, CZ, GZ, CH, GH} three-rate NASD
+/// {CF, GF, CZ, GZ } normal FINRA
+/// {CF, GF, CZ, GZ, CH, GH} three-rate FINRA
void set_run_basis_from_cloven_bases
(mcenum_run_basis& r
diff --git a/mc_enum_types_aux.hpp b/mc_enum_types_aux.hpp
index 436e240..7a98051 100644
--- a/mc_enum_types_aux.hpp
+++ b/mc_enum_types_aux.hpp
@@ -55,7 +55,7 @@ mcenum_dbopt_7702 effective_dbopt_7702
bool LMI_SO is_subject_to_ill_reg(mcenum_ledger_type);
-bool is_three_rate_nasd(mcenum_ledger_type);
+bool is_three_rate_finra(mcenum_ledger_type);
/// Transform a plain enumerator to its string equivalent.
///
diff --git a/product_data.cpp b/product_data.cpp
index 5bb9bdd..c3723a7 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -432,7 +432,7 @@ void product_data::redintegrate_ex_post
/// XSL with wxPdfDoc, and may be removed when that task is complete.
/// There is one for each supported ledger type:
/// sample2naic mce_ill_reg
-/// sample2nasd mce_nasd
+/// sample2finra mce_finra
/// sample2gpp mce_group_private_placement
/// sample2ipp mce_individual_private_placement
/// and one for group premium quotes with every possible column:
@@ -578,8 +578,8 @@ void product_data::write_policy_files()
z.DatabaseFilename = glossed_string("sample2quo.database");
z.save(AddDataDir("sample2quo.policy"));
- z.DatabaseFilename = glossed_string("sample2nasd.database");
- z.save(AddDataDir("sample2nasd.policy"));
+ z.DatabaseFilename = glossed_string("sample2finra.database");
+ z.save(AddDataDir("sample2finra.policy"));
z.DatabaseFilename = glossed_string("sample2gpp.database");
z.save(AddDataDir("sample2gpp.policy"));