[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/uniform_i12n 2eeed9c 2/2: Use uniform initializa
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] odd/uniform_i12n 2eeed9c 2/2: Use uniform initialization in ctor-initializers |
|
Date: |
Tue, 28 Aug 2018 06:14:15 -0400 (EDT) |
branch: odd/uniform_i12n
commit 2eeed9cad30b88bce93f966baaaec22a2835b984
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Use uniform initialization in ctor-initializers
As an exception, use parentheses to pass the arguments of a subobject's
ctor.
This branch parallels VZ's similarly-named branch. All differences from
that branch are deliberate and intentional, including files changed
there but not here. In particular:
- This branch includes some whitespace changes, which should perhaps
be applied separately.
- This branch modifies the more abstruse product-editor files very
conservatively, as that code is difficult to understand.
---
accountvalue.cpp | 20 +-
actuarial_table.cpp | 16 +-
alert.cpp | 2 +-
any_member.hpp | 18 +-
any_member_test.cpp | 12 +-
authenticity_test.cpp | 6 +-
basicvalues.cpp | 48 ++---
calendar_date.cpp | 18 +-
ce_product_name.cpp | 8 +-
ce_skin_name.cpp | 8 +-
census_view.cpp | 28 ++-
commutation_functions.cpp | 14 +-
configurable_settings.cpp | 32 ++--
crc32.cpp | 2 +-
currency.hpp | 2 +-
database_document.cpp | 2 +-
database_view.cpp | 8 +-
database_view_editor.cpp | 4 +-
datum_boolean.cpp | 2 +-
datum_sequence.cpp | 6 +-
datum_string.cpp | 2 +-
dbvalue.cpp | 18 +-
death_benefits.cpp | 2 +-
docmanager_ex.cpp | 4 +-
emit_ledger.cpp | 4 +-
fenv_lmi_x86.hpp | 2 +-
financial.hpp | 8 +-
fund_data.cpp | 8 +-
getopt.cpp | 40 ++--
gpt_commutation_functions.cpp | 12 +-
gpt_input.cpp | 100 +++++-----
gpt_specamt.cpp | 16 +-
gpt_xml_document.cpp | 4 +-
group_values.hpp | 6 +-
html.hpp | 10 +-
ihs_acctval.cpp | 30 +--
ihs_avsolve.cpp | 2 +-
ihs_basicval.cpp | 36 ++--
ihs_irc7702.cpp | 82 ++++-----
ihs_irc7702a.cpp | 70 +++----
ihs_mortal.cpp | 2 +-
ihs_server7702.cpp | 6 +-
illustrator.cpp | 8 +-
input.cpp | 392 ++++++++++++++++++++--------------------
input_sequence.cpp | 13 +-
input_sequence_entry.cpp | 14 +-
input_sequence_parser.cpp | 16 +-
interest_rates.cpp | 32 ++--
interpolate_string.cpp | 4 +-
ledger.cpp | 14 +-
ledger_base.cpp | 8 +-
ledger_evaluator.hpp | 4 +-
ledger_invariant.cpp | 12 +-
ledger_pdf_generator_wx.cpp | 26 +--
ledger_text_formats.cpp | 10 +-
ledger_text_formats.hpp | 12 +-
ledger_variant.cpp | 18 +-
ledgervalues.cpp | 2 +-
loads_impl.hpp | 32 ++--
loads_test.cpp | 6 +-
main_wx_test.cpp | 18 +-
mc_enum.tpp | 12 +-
mec_input.cpp | 80 ++++----
mec_xml_document.cpp | 4 +-
miscellany.hpp | 4 +-
mortality_rates_test.cpp | 30 +--
multidimgrid_any.cpp | 2 +-
multidimgrid_any.hpp | 2 +-
mvc_controller.cpp | 12 +-
outlay.cpp | 18 +-
policy_document.cpp | 6 +-
premium_tax.cpp | 72 ++++----
product_data.cpp | 4 +-
progress_meter.cpp | 10 +-
progress_meter_cli.cpp | 4 +-
rate_table.cpp | 34 ++--
rate_table.hpp | 2 +-
rate_table_test.cpp | 4 +-
round_to.hpp | 10 +-
rounding_document.cpp | 6 +-
rounding_rules.cpp | 6 +-
rounding_view_editor.cpp | 10 +-
single_cell_document.cpp | 4 +-
single_choice_popup_menu.cpp | 2 +-
skeleton.cpp | 8 +-
stratified_charges.cpp | 10 +-
test_coding_rules.cpp | 10 +-
tier_document.cpp | 4 +-
tier_view.cpp | 8 +-
tier_view_editor.hpp | 12 +-
timer.cpp | 8 +-
timer.hpp | 4 +-
tn_range.tpp | 18 +-
transferor.cpp | 6 +-
vector_test.cpp | 2 +-
wx_table_generator.cpp | 20 +-
wx_test_benchmark_census.cpp | 4 +-
wx_test_calculation_summary.cpp | 4 +-
wx_test_document.hpp | 2 +-
wx_test_input_sequences.cpp | 2 +-
wx_test_input_validation.cpp | 2 +-
wx_test_output.hpp | 2 +-
wx_test_validate_output.cpp | 6 +-
xml_lmi.cpp | 2 +-
104 files changed, 922 insertions(+), 911 deletions(-)
diff --git a/accountvalue.cpp b/accountvalue.cpp
index f83191f..7fd3ef9 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -108,16 +108,16 @@ showing {accesses, modifies current year, modifies future
years}
//============================================================================
AccountValue::AccountValue(Input const& input)
:BasicValues (Input::consummate(input))
- ,DebugFilename ("anonymous.monthly_trace")
- ,ledger_(new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(),
BasicValues::nonillustrated(), BasicValues::no_can_issue(), false))
- ,ledger_invariant_ (new LedgerInvariant(BasicValues::GetLength()))
- ,ledger_variant_ (new LedgerVariant (BasicValues::GetLength()))
- ,RunBasis_ (mce_run_gen_curr_sep_full)
- ,GenBasis_ (mce_gen_curr)
- ,SepBasis_ (mce_sep_full)
- ,pmt_mode (mce_annual)
- ,OldDBOpt (mce_option1)
- ,YearsDBOpt (mce_option1)
+ ,DebugFilename {"anonymous.monthly_trace"}
+ ,ledger_{new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(),
BasicValues::nonillustrated(), BasicValues::no_can_issue(), false)}
+ ,ledger_invariant_ {new LedgerInvariant(BasicValues::GetLength())}
+ ,ledger_variant_ {new LedgerVariant (BasicValues::GetLength())}
+ ,RunBasis_ {mce_run_gen_curr_sep_full}
+ ,GenBasis_ {mce_gen_curr}
+ ,SepBasis_ {mce_sep_full}
+ ,pmt_mode {mce_annual}
+ ,OldDBOpt {mce_option1}
+ ,YearsDBOpt {mce_option1}
{
GrossPmts .resize(12);
NetPmts .resize(12);
diff --git a/actuarial_table.cpp b/actuarial_table.cpp
index bdac70a..0d92352 100644
--- a/actuarial_table.cpp
+++ b/actuarial_table.cpp
@@ -82,14 +82,14 @@ namespace
} // Unnamed namespace.
actuarial_table::actuarial_table(std::string const& filename, int table_number)
- :filename_ (filename)
- ,table_number_ (table_number)
- ,table_type_ (-1)
- ,min_age_ (-1)
- ,max_age_ (-1)
- ,select_period_ (-1)
- ,max_select_age_ (-1)
- ,table_offset_ (-1)
+ :filename_ {filename}
+ ,table_number_ {table_number}
+ ,table_type_ {-1}
+ ,min_age_ {-1}
+ ,max_age_ {-1}
+ ,select_period_ {-1}
+ ,max_select_age_ {-1}
+ ,table_offset_ {-1}
{
// Binary tables in the SOA format are not portable; this code
// presumably works only on little-endian hardware.
diff --git a/alert.cpp b/alert.cpp
index b5c0ec8..4ccfd7b 100644
--- a/alert.cpp
+++ b/alert.cpp
@@ -119,7 +119,7 @@ class alert_buf
{
protected:
alert_buf()
- :std::stringbuf()
+ :std::stringbuf {}
{
if(!all_function_pointers_have_been_set())
{
diff --git a/any_member.hpp b/any_member.hpp
index a7750db..e18ed21 100644
--- a/any_member.hpp
+++ b/any_member.hpp
@@ -141,8 +141,8 @@ class holder
template<typename ClassType, typename ValueType>
holder<ClassType,ValueType>::holder(ClassType* object, ValueType const& value)
- :object_(object)
- ,held_(value)
+ :object_ {object}
+ ,held_ {value}
{}
template<typename ClassType, typename ValueType>
@@ -273,15 +273,15 @@ class any_member final
template<typename ClassType>
any_member<ClassType>::any_member()
- :object_ (nullptr)
- ,content_(nullptr)
+ :object_ {nullptr}
+ ,content_ {nullptr}
{}
template<typename ClassType>
any_member<ClassType>::any_member(any_member const& other)
- :any_entity (other)
- ,object_ (other.object_)
- ,content_ (other.content_ ? other.content_->clone() : nullptr)
+ :any_entity {other}
+ ,object_ {other.object_}
+ ,content_ {other.content_ ? other.content_->clone() : nullptr}
{}
template<typename ClassType>
@@ -293,8 +293,8 @@ any_member<ClassType>::~any_member()
template<typename ClassType>
template<typename ValueType>
any_member<ClassType>::any_member(ClassType* object, ValueType const& value)
- :object_(object)
- ,content_(new holder<ClassType,ValueType>(object, value))
+ :object_ {object}
+ ,content_ {new holder<ClassType,ValueType>(object, value)}
{}
template<typename ClassType>
diff --git a/any_member_test.cpp b/any_member_test.cpp
index d39f725..16c6304 100644
--- a/any_member_test.cpp
+++ b/any_member_test.cpp
@@ -124,9 +124,9 @@ class S
};
S::S()
- :i0(0)
- ,i1(0)
- ,d0(0.0)
+ :i0 {0}
+ ,i1 {0}
+ ,d0 {0.0}
{
ascribe("i0", &S::i0);
ascribe("i1", &S::i1);
@@ -185,9 +185,9 @@ struct T : public Q, public MemberSymbolTable<T>
std::string s0;
T()
- :i0(0)
- ,i1(0)
- ,d0(0.0)
+ :i0 {0}
+ ,i1 {0}
+ ,d0 {0.0}
{
ascribe_members();
}
diff --git a/authenticity_test.cpp b/authenticity_test.cpp
index fa5ae32..2ac67b6 100644
--- a/authenticity_test.cpp
+++ b/authenticity_test.cpp
@@ -87,9 +87,9 @@ class PasskeyTest
/// copies can cause spurious error reports.
PasskeyTest::PasskeyTest()
- :BeginDate_(ymd_t(20010101))
- ,EndDate_ (ymd_t(20010103))
- ,Pwd_ (fs::current_path())
+ :BeginDate_ {ymd_t(20010101)}
+ ,EndDate_ {ymd_t(20010103)}
+ ,Pwd_ {fs::current_path()}
{
EnsureMd5sumBinaryIsFound();
RemoveTestFiles(__FILE__, __LINE__);
diff --git a/basicvalues.cpp b/basicvalues.cpp
index c303d51..aa8b198 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -49,30 +49,30 @@ char const* GuaranteedTableFile() {return
"/opt/lmi/data/qx_cso";}
//============================================================================
BasicValues::BasicValues(Input const& input)
- :yare_input_ (input)
- ,StateOfJurisdiction_ (mce_s_CT)
- ,StateOfDomicile_ (mce_s_CT)
- ,PremiumTaxState_ (mce_s_CT)
- ,round_specamt_ (0, r_upward )
- ,round_death_benefit_ (2, r_to_nearest)
- ,round_naar_ (2, r_to_nearest)
- ,round_coi_rate_ (8, r_downward )
- ,round_coi_charge_ (2, r_to_nearest)
- ,round_gross_premium_ (2, r_to_nearest)
- ,round_net_premium_ (2, r_to_nearest)
- ,round_interest_rate_ (0, r_not_at_all)
- ,round_interest_credit_ (2, r_to_nearest)
- ,round_withdrawal_ (2, r_to_nearest)
- ,round_loan_ (2, r_to_nearest)
- ,round_interest_rate_7702_(0, r_not_at_all)
- ,round_corridor_factor_ (2, r_to_nearest)
- ,round_surrender_charge_ (2, r_to_nearest)
- ,round_irr_ (4, r_downward )
- ,round_min_specamt_ (0, r_upward )
- ,round_max_specamt_ (0, r_downward )
- ,round_min_premium_ (2, r_upward )
- ,round_max_premium_ (2, r_downward )
- ,round_min_init_premium_ (2, r_upward )
+ :yare_input_ {input}
+ ,StateOfJurisdiction_ {mce_s_CT}
+ ,StateOfDomicile_ {mce_s_CT}
+ ,PremiumTaxState_ {mce_s_CT}
+ ,round_specamt_ {0, r_upward }
+ ,round_death_benefit_ {2, r_to_nearest}
+ ,round_naar_ {2, r_to_nearest}
+ ,round_coi_rate_ {8, r_downward }
+ ,round_coi_charge_ {2, r_to_nearest}
+ ,round_gross_premium_ {2, r_to_nearest}
+ ,round_net_premium_ {2, r_to_nearest}
+ ,round_interest_rate_ {0, r_not_at_all}
+ ,round_interest_credit_ {2, r_to_nearest}
+ ,round_withdrawal_ {2, r_to_nearest}
+ ,round_loan_ {2, r_to_nearest}
+ ,round_interest_rate_7702_{0, r_not_at_all}
+ ,round_corridor_factor_ {2, r_to_nearest}
+ ,round_surrender_charge_ {2, r_to_nearest}
+ ,round_irr_ {4, r_downward }
+ ,round_min_specamt_ {0, r_upward }
+ ,round_max_specamt_ {0, r_downward }
+ ,round_min_premium_ {2, r_upward }
+ ,round_max_premium_ {2, r_downward }
+ ,round_min_init_premium_ {2, r_upward }
{
Init();
}
diff --git a/calendar_date.cpp b/calendar_date.cpp
index 3e06a29..e48f234 100644
--- a/calendar_date.cpp
+++ b/calendar_date.cpp
@@ -191,19 +191,19 @@ jdn_t YmdToJdn(ymd_t z)
}
calendar_date::calendar_date()
- :jdn_(today().julian_day_number())
+ :jdn_ {today().julian_day_number()}
{
cache_gregorian_elements();
}
calendar_date::calendar_date(jdn_t z)
- :jdn_(z.value())
+ :jdn_ {z.value()}
{
cache_gregorian_elements();
}
calendar_date::calendar_date(ymd_t z)
- :jdn_(YmdToJdn(z).value())
+ :jdn_ {YmdToJdn(z).value()}
{
cache_gregorian_elements();
}
@@ -715,12 +715,12 @@ class birthdate_limit
,oenum_alb_or_anb alb_anb
,root_bias bias
)
- :as_of_date_ (as_of_date)
- ,limit_age_ (limit_age)
- ,alb_anb_ (alb_anb)
- ,bias_ (bias)
- ,a_priori_minimum_ (calendar_date::gregorian_epoch_jdn)
- ,a_priori_maximum_ (calendar_date::last_yyyy_date_jdn)
+ :as_of_date_ {as_of_date}
+ ,limit_age_ {limit_age}
+ ,alb_anb_ {alb_anb}
+ ,bias_ {bias}
+ ,a_priori_minimum_ {calendar_date::gregorian_epoch_jdn}
+ ,a_priori_maximum_ {calendar_date::last_yyyy_date_jdn}
{
if(bias_lower == bias_)
{
diff --git a/ce_product_name.cpp b/ce_product_name.cpp
index 9b535c4..3966139 100644
--- a/ce_product_name.cpp
+++ b/ce_product_name.cpp
@@ -97,13 +97,13 @@ std::string const& default_product_name()
} // Unnamed namespace.
ce_product_name::ce_product_name()
- :mc_enum_base(product_names().size())
- ,value_(default_product_name())
+ :mc_enum_base (lmi::ssize(product_names()))
+ ,value_ {default_product_name()}
{}
ce_product_name::ce_product_name(std::string const& s)
- :mc_enum_base(product_names().size())
- ,value_(product_names()[ordinal(s)])
+ :mc_enum_base (lmi::ssize(product_names()))
+ ,value_ {product_names()[ordinal(s)]}
{}
ce_product_name& ce_product_name::operator=(std::string const& s)
diff --git a/ce_skin_name.cpp b/ce_skin_name.cpp
index 949f3c5..94be41e 100644
--- a/ce_skin_name.cpp
+++ b/ce_skin_name.cpp
@@ -94,13 +94,13 @@ std::string const& default_skin_name()
} // Unnamed namespace.
ce_skin_name::ce_skin_name()
- :mc_enum_base(skin_names().size())
- ,value_(default_skin_name())
+ :mc_enum_base (lmi::ssize(skin_names()))
+ ,value_ {default_skin_name()}
{}
ce_skin_name::ce_skin_name(std::string const& s)
- :mc_enum_base(skin_names().size())
- ,value_(skin_names()[ordinal(s)])
+ :mc_enum_base (lmi::ssize(skin_names()))
+ ,value_ {skin_names()[ordinal(s)]}
{}
ce_skin_name& ce_skin_name::operator=(std::string const& s)
diff --git a/census_view.cpp b/census_view.cpp
index f410bd0..d81bec2 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -93,12 +93,16 @@ struct tn_range_variant_data
:public wxVariantData
{
tn_range_variant_data(std::string const& a_value, double a_min, double
a_max)
- :value(a_value), min(a_min), max(a_max)
+ :value {a_value}
+ ,min {a_min}
+ ,max {a_max}
{
}
tn_range_variant_data(tn_range_base const& r)
- :value(r.str()), min(r.universal_minimum()), max(r.universal_maximum())
+ :value {r.str()}
+ ,min {r.universal_minimum()}
+ ,max {r.universal_maximum()}
{
}
@@ -382,8 +386,14 @@ std::string DateRenderer::DoGetValueFromEditor(wxWindow*
editor)
struct input_sequence_variant_data
:public wxVariantData
{
- input_sequence_variant_data(std::string const& a_value, Input const*
a_input, std::string const& a_field)
- :value(a_value), input(a_input), field(a_field)
+ input_sequence_variant_data
+ (std::string const& a_value
+ ,Input const* a_input
+ ,std::string const& a_field
+ )
+ :value {a_value}
+ ,input {a_input}
+ ,field {a_field}
{
}
@@ -808,7 +818,7 @@ class CensusViewDataViewModel : public
wxDataViewIndexListModel
static int const Col_CellNum = 0;
CensusViewDataViewModel(CensusView& view)
- :view_(view)
+ :view_ {view}
{
}
@@ -971,10 +981,10 @@ BEGIN_EVENT_TABLE(CensusView, ViewEx)
END_EVENT_TABLE()
CensusView::CensusView()
- :ViewEx ()
- ,autosize_columns_ (false)
- ,list_window_ (nullptr)
- ,list_model_ (new(wx) CensusViewDataViewModel(*this))
+ :ViewEx {}
+ ,autosize_columns_ {false}
+ ,list_window_ {nullptr}
+ ,list_model_ {new(wx) CensusViewDataViewModel(*this)}
{
}
diff --git a/commutation_functions.cpp b/commutation_functions.cpp
index c780c54..9d7da3d 100644
--- a/commutation_functions.cpp
+++ b/commutation_functions.cpp
@@ -46,8 +46,8 @@ OLCommFns::OLCommFns
(std::vector<double> const& a_q
,std::vector<double> const& a_i
)
- :q(a_q)
- ,i(a_i)
+ :q {a_q}
+ ,i {a_i}
{
Length = q.size();
LMI_ASSERT(i.size() == q.size());
@@ -120,11 +120,11 @@ ULCommFns::ULCommFns
,mcenum_dbopt_7702 dbo
,mcenum_mode mode
)
- :qc (a_qc)
- ,ic (a_ic)
- ,ig (a_ig)
- ,dbo_ (dbo)
- ,mode_ (mode)
+ :qc {a_qc}
+ ,ic {a_ic}
+ ,ig {a_ig}
+ ,dbo_ {dbo}
+ ,mode_ {mode}
{
Length = qc.size();
LMI_ASSERT(ic.size() == qc.size());
diff --git a/configurable_settings.cpp b/configurable_settings.cpp
index 9ea4186..8bde156 100644
--- a/configurable_settings.cpp
+++ b/configurable_settings.cpp
@@ -127,22 +127,22 @@ std::string const& configuration_filepath()
}
configurable_settings::configurable_settings()
- :calculation_summary_columns_
(default_calculation_summary_columns())
- ,census_paste_palimpsestically_ (true
)
- ,cgi_bin_log_filename_ ("cgi_bin.log"
)
- ,custom_input_0_filename_ ("custom.ini"
)
- ,custom_input_1_filename_ ("custom.inix"
)
- ,custom_output_0_filename_ ("custom.out0"
)
- ,custom_output_1_filename_ ("custom.out1"
)
- ,default_input_filename_ ("/etc/opt/lmi/default.ill"
)
- ,libraries_to_preload_ (""
)
- ,offer_hobsons_choice_ (false
)
- ,print_directory_ ("/var/opt/lmi/spool"
)
- ,seconds_to_pause_between_printouts_ (10
)
- ,skin_filename_ ("skin.xrc"
)
- ,spreadsheet_file_extension_ (".gnumeric"
)
- ,use_builtin_calculation_summary_ (false
)
- ,xsl_fo_command_ ("fo"
)
+ :calculation_summary_columns_
{default_calculation_summary_columns()}
+ ,census_paste_palimpsestically_ {true
}
+ ,cgi_bin_log_filename_ {"cgi_bin.log"
}
+ ,custom_input_0_filename_ {"custom.ini"
}
+ ,custom_input_1_filename_ {"custom.inix"
}
+ ,custom_output_0_filename_ {"custom.out0"
}
+ ,custom_output_1_filename_ {"custom.out1"
}
+ ,default_input_filename_ {"/etc/opt/lmi/default.ill"
}
+ ,libraries_to_preload_ {""
}
+ ,offer_hobsons_choice_ {false
}
+ ,print_directory_ {"/var/opt/lmi/spool"
}
+ ,seconds_to_pause_between_printouts_ {10
}
+ ,skin_filename_ {"skin.xrc"
}
+ ,spreadsheet_file_extension_ {".gnumeric"
}
+ ,use_builtin_calculation_summary_ {false
}
+ ,xsl_fo_command_ {"fo"
}
{
ascribe_members();
load();
diff --git a/crc32.cpp b/crc32.cpp
index e908068..ef01fc7 100644
--- a/crc32.cpp
+++ b/crc32.cpp
@@ -118,7 +118,7 @@ namespace
//============================================================================
CRC::CRC()
- :value_(0xffffffffU)
+ :value_ {0xffffffffU}
{
}
diff --git a/currency.hpp b/currency.hpp
index b9bd8ad..95e4210 100644
--- a/currency.hpp
+++ b/currency.hpp
@@ -188,7 +188,7 @@ class currency
/// expose it publicly.
explicit currency(amount_type cents)
- :cents_(cents)
+ :cents_ {cents}
{
}
diff --git a/database_document.cpp b/database_document.cpp
index 4754bc0..67ff8f7 100644
--- a/database_document.cpp
+++ b/database_document.cpp
@@ -29,7 +29,7 @@
IMPLEMENT_DYNAMIC_CLASS(DatabaseDocument, ProductEditorDocument)
DatabaseDocument::DatabaseDocument()
- :ProductEditorDocument()
+ :ProductEditorDocument {}
{
db_.InitDB();
}
diff --git a/database_view.cpp b/database_view.cpp
index 65c29b9..ae35cb8 100644
--- a/database_view.cpp
+++ b/database_view.cpp
@@ -120,8 +120,8 @@ class database_tree_item_data
};
database_tree_item_data::database_tree_item_data(db_names const& names)
- :db_names_(names)
- ,axes_selected_(wxNOT_FOUND, wxNOT_FOUND)
+ :db_names_ {names}
+ ,axes_selected_ {wxNOT_FOUND, wxNOT_FOUND}
{
}
@@ -146,8 +146,8 @@ BEGIN_EVENT_TABLE(DatabaseView, TreeGridViewBase)
END_EVENT_TABLE()
DatabaseView::DatabaseView()
- :TreeGridViewBase()
- ,table_adapter_(new DatabaseTableAdapter())
+ :TreeGridViewBase {}
+ ,table_adapter_ {new DatabaseTableAdapter()}
{
}
diff --git a/database_view_editor.cpp b/database_view_editor.cpp
index 1137d51..af7cedd 100644
--- a/database_view_editor.cpp
+++ b/database_view_editor.cpp
@@ -104,8 +104,8 @@ class DatabaseDurationAxis
};
DatabaseTableAdapter::DatabaseTableAdapter(database_entity* db_value)
- :db_value_(db_value)
- ,modified_(false)
+ :db_value_ {db_value}
+ ,modified_ {false}
{
indexes_.resize(eda_max);
}
diff --git a/datum_boolean.cpp b/datum_boolean.cpp
index bb0168e..4c59a2b 100644
--- a/datum_boolean.cpp
+++ b/datum_boolean.cpp
@@ -24,7 +24,7 @@
#include "datum_boolean.hpp"
datum_boolean::datum_boolean(bool value)
- :value_(value)
+ :value_ {value}
{
}
diff --git a/datum_sequence.cpp b/datum_sequence.cpp
index 9c101b8..5aa35bd 100644
--- a/datum_sequence.cpp
+++ b/datum_sequence.cpp
@@ -30,7 +30,7 @@
/// Throws if insane.
datum_sequence::datum_sequence()
- :keyword_values_are_blocked_(false)
+ :keyword_values_are_blocked_ {false}
{
assert_sanity();
}
@@ -40,8 +40,8 @@ datum_sequence::datum_sequence()
/// Throws if insane.
datum_sequence::datum_sequence(std::string const& s)
- :datum_string(s)
- ,keyword_values_are_blocked_(false)
+ :datum_string {s}
+ ,keyword_values_are_blocked_ {false}
{
assert_sanity();
}
diff --git a/datum_string.cpp b/datum_string.cpp
index 936d943..cbb7f54 100644
--- a/datum_string.cpp
+++ b/datum_string.cpp
@@ -26,7 +26,7 @@
#include "facets.hpp"
datum_string::datum_string(std::string const& value)
- :value_(value)
+ :value_ {value}
{
}
diff --git a/dbvalue.cpp b/dbvalue.cpp
index d932519..c1b90ee 100644
--- a/dbvalue.cpp
+++ b/dbvalue.cpp
@@ -49,7 +49,7 @@ int const MaxPossibleElements =
std::numeric_limits<int>::max();
/// Default ctor.
database_entity::database_entity()
- :key_ (0)
+ :key_ {0}
,axis_lengths_ (e_number_of_axes, 1)
,data_values_ (1)
{
@@ -65,8 +65,8 @@ database_entity::database_entity
,double const* data
,std::string const& gloss
)
- :key_ (key)
- ,gloss_ (gloss)
+ :key_ {key}
+ ,gloss_ {gloss}
{
axis_lengths_ .assign(dims, dims + ndims);
data_values_ .assign(data, data + getndata());
@@ -79,10 +79,10 @@ database_entity::database_entity
,std::vector<double> const& data
,std::string const& gloss
)
- :key_ (key)
- ,axis_lengths_ (dims)
- ,data_values_ (data)
- ,gloss_ (gloss)
+ :key_ {key}
+ ,axis_lengths_ {dims}
+ ,data_values_ {data}
+ ,gloss_ {gloss}
{
assert_invariants();
}
@@ -94,8 +94,8 @@ database_entity::database_entity
,double datum
,std::string const& gloss
)
- :key_ (key)
- ,gloss_ (gloss)
+ :key_ {key}
+ ,gloss_ {gloss}
{
axis_lengths_ .assign(ScalarDims, ScalarDims + e_number_of_axes);
data_values_ .push_back(datum);
diff --git a/death_benefits.cpp b/death_benefits.cpp
index 1f7436d..5e5652a 100644
--- a/death_benefits.cpp
+++ b/death_benefits.cpp
@@ -30,7 +30,7 @@
//============================================================================
death_benefits::death_benefits(int length, yare_input const& yi)
- :length_(length)
+ :length_ {length}
{
// In the antediluvian branch, the vector in the input class
// is padded to a greater length.
diff --git a/docmanager_ex.cpp b/docmanager_ex.cpp
index 4b65169..8e9b30b 100644
--- a/docmanager_ex.cpp
+++ b/docmanager_ex.cpp
@@ -65,8 +65,8 @@ END_EVENT_TABLE()
DocManagerEx::DocManagerEx(long int flags, bool initialize)
:wxDocManager (flags, initialize)
- ,print_data_ (new(wx) wxPrintData)
- ,page_setup_data_ (new(wx) wxPageSetupDialogData)
+ ,print_data_ {new(wx) wxPrintData}
+ ,page_setup_data_ {new(wx) wxPageSetupDialogData}
{
}
diff --git a/emit_ledger.cpp b/emit_ledger.cpp
index 2dddb93..3e64016 100644
--- a/emit_ledger.cpp
+++ b/emit_ledger.cpp
@@ -53,8 +53,8 @@ ledger_emitter::ledger_emitter
(fs::path const& case_filepath
,mcenum_emission emission
)
- :case_filepath_ (case_filepath)
- ,emission_ (emission)
+ :case_filepath_ {case_filepath}
+ ,emission_ {emission}
{
LMI_ASSERT(!case_filepath_.empty());
diff --git a/fenv_lmi_x86.hpp b/fenv_lmi_x86.hpp
index 942687e..68ee405 100644
--- a/fenv_lmi_x86.hpp
+++ b/fenv_lmi_x86.hpp
@@ -228,7 +228,7 @@ class control_word
template<typename X>
control_word(control_word<X> x)
- :cw_(ControlWordType::reserved_values)
+ :cw_ {ControlWordType::reserved_values}
{
im() = x.im();
dm() = x.dm();
diff --git a/financial.hpp b/financial.hpp
index b1f489a..c72f7a2 100644
--- a/financial.hpp
+++ b/financial.hpp
@@ -102,10 +102,10 @@ class irr_helper
,long double x
,int decimals
)
- :first_ (first)
- ,last_ (last)
- ,x_ (x)
- ,decimals_ (decimals)
+ :first_ {first}
+ ,last_ {last}
+ ,x_ {x}
+ ,decimals_ {decimals}
{}
long double operator()(long double i)
diff --git a/fund_data.cpp b/fund_data.cpp
index ca776cf..3809e6b 100644
--- a/fund_data.cpp
+++ b/fund_data.cpp
@@ -41,10 +41,10 @@ FundInfo::FundInfo
,std::string const& LongName
,std::string const& gloss
)
- :ScalarIMF_(ScalarIMF)
- ,ShortName_(ShortName)
- ,LongName_ (LongName)
- ,gloss_ (gloss)
+ :ScalarIMF_ {ScalarIMF}
+ ,ShortName_ {ShortName}
+ ,LongName_ {LongName}
+ ,gloss_ {gloss}
{
}
diff --git a/getopt.cpp b/getopt.cpp
index 9062c46..cb3e1ec 100644
--- a/getopt.cpp
+++ b/getopt.cpp
@@ -114,32 +114,32 @@ int GetOpt::first_nonopt = 0;
int GetOpt::last_nonopt = 0;
GetOpt::GetOpt(int argc, char** argv, char const* optstring)
- :list_option (nullptr)
- ,list_option_first (0)
- ,optindvalue (EOF)
- ,opterr (true)
- ,nargc (argc)
- ,nargv (argv)
- ,noptstring (optstring)
- ,nlongopts (nullptr)
- ,nlongind (nullptr)
- ,nlong_only (0)
+ :list_option {nullptr}
+ ,list_option_first {0}
+ ,optindvalue {EOF}
+ ,opterr {true}
+ ,nargc {argc}
+ ,nargv {argv}
+ ,noptstring {optstring}
+ ,nlongopts {nullptr}
+ ,nlongind {nullptr}
+ ,nlong_only {0}
{
Initialize(noptstring);
}
GetOpt::GetOpt(int argc, char** argv, char const* optstring,
Option const* longopts, int* longind, int long_only)
- :list_option (nullptr)
- ,list_option_first (0)
- ,optindvalue (EOF)
- ,opterr (true)
- ,nargc (argc)
- ,nargv (argv)
- ,noptstring (optstring)
- ,nlongopts (longopts)
- ,nlongind (longind)
- ,nlong_only (long_only)
+ :list_option {nullptr}
+ ,list_option_first {0}
+ ,optindvalue {EOF}
+ ,opterr {true}
+ ,nargc {argc}
+ ,nargv {argv}
+ ,noptstring {optstring}
+ ,nlongopts {longopts}
+ ,nlongind {longind}
+ ,nlong_only {long_only}
{
// Automatically register any short-option alii for long options.
for(Option const* i = nlongopts; nullptr != i->name; ++i)
diff --git a/gpt_commutation_functions.cpp b/gpt_commutation_functions.cpp
index 1290e0d..07576f2 100644
--- a/gpt_commutation_functions.cpp
+++ b/gpt_commutation_functions.cpp
@@ -86,9 +86,9 @@ gpt_commfns::gpt_commfns
,mcenum_dbopt_7702 const dbo
,gpt_vector_parms const& charges
)
- :length_ (qc.size())
+ :length_ {lmi::ssize(qc)}
,M_ (length_)
- ,D_endt_ (0.0)
+ ,D_endt_ {0.0}
,D_net_tgt_ (length_)
,D_net_exc_ (length_)
,N_net_tgt_ (length_)
@@ -204,10 +204,10 @@ gpt_cf_triad::gpt_cf_triad
,std::vector<double> const& gsp_ig
,gpt_vector_parms const& charges
)
- :length_ (qc.size())
- ,cf_glp_dbo_1(qc, glp_ic, glp_ig, mce_option1_for_7702, charges)
- ,cf_glp_dbo_2(qc, glp_ic, glp_ig, mce_option2_for_7702, charges)
- ,cf_gsp (qc, gsp_ic, gsp_ig, mce_option1_for_7702, charges)
+ :length_ {lmi::ssize(qc)}
+ ,cf_glp_dbo_1 {qc, glp_ic, glp_ig, mce_option1_for_7702, charges}
+ ,cf_glp_dbo_2 {qc, glp_ic, glp_ig, mce_option2_for_7702, charges}
+ ,cf_gsp {qc, gsp_ic, gsp_ig, mce_option1_for_7702, charges}
{
}
diff --git a/gpt_input.cpp b/gpt_input.cpp
index 815d08e..5e32ada 100644
--- a/gpt_input.cpp
+++ b/gpt_input.cpp
@@ -78,53 +78,53 @@ std::string realize_sequence_string
/// UDT defaults are presently appropriate.
gpt_input::gpt_input()
- :Use7702ATables ("No")
- ,IssueAge ("45")
- ,OldGender ("Male")
- ,NewGender ("Male")
- ,OldSmoking ("Nonsmoker")
- ,NewSmoking ("Nonsmoker")
- ,UnderwritingClass ("Standard")
-// ,DateOfBirth ("")
-// ,OldSubstandardTable ("")
-// ,NewSubstandardTable ("")
-// ,ProductName ("")
-// ,External1035ExchangeAmount ("")
-// ,External1035ExchangeFromMec ("")
-// ,Internal1035ExchangeAmount ("")
-// ,Internal1035ExchangeFromMec ("")
-// ,EffectiveDate ("")
- ,DefinitionOfLifeInsurance ("GPT")
- ,DefinitionOfMaterialChange ("GPT adjustment event")
-// ,GroupUnderwritingType ("")
-// ,Comments ("")
-// ,InforceAsOfDate ("")
-// ,InforceYear ("")
-// ,InforceMonth ("")
- ,InforceTargetSpecifiedAmount ("1000000")
-// ,InforceAccountValue ("")
-// ,InforceIsMec ("")
-// ,LastMaterialChangeDate ("")
-// ,InforceContractYear ("")
-// ,InforceContractMonth ("")
-// ,InforceAvBeforeLastMc ("")
-// ,InforceDcv ("")
- ,InforceLeastDeathBenefit ("1000000")
- ,PaymentHistory ("0")
- ,BenefitHistory ("1000000")
- ,StateOfJurisdiction ("CT")
- ,PremiumTaxState ("CT")
- ,OldFlatExtra ("0")
- ,NewFlatExtra ("0")
-// ,UseDOB ("")
- ,Payment ("0")
- ,OldDbo ("A")
- ,NewDbo ("A")
- ,OldDeathBft ("1000000")
- ,NewDeathBft ("1000000")
- ,OldSpecAmt ("1000000")
- ,NewSpecAmt ("1000000")
- ,BenefitAmount ("1000000")
+ :Use7702ATables {"No"}
+ ,IssueAge {"45"}
+ ,OldGender {"Male"}
+ ,NewGender {"Male"}
+ ,OldSmoking {"Nonsmoker"}
+ ,NewSmoking {"Nonsmoker"}
+ ,UnderwritingClass {"Standard"}
+// ,DateOfBirth {""}
+// ,OldSubstandardTable {""}
+// ,NewSubstandardTable {""}
+// ,ProductName {""}
+// ,External1035ExchangeAmount {""}
+// ,External1035ExchangeFromMec {""}
+// ,Internal1035ExchangeAmount {""}
+// ,Internal1035ExchangeFromMec {""}
+// ,EffectiveDate {""}
+ ,DefinitionOfLifeInsurance {"GPT"}
+ ,DefinitionOfMaterialChange {"GPT adjustment event"}
+// ,GroupUnderwritingType {""}
+// ,Comments {""}
+// ,InforceAsOfDate {""}
+// ,InforceYear {""}
+// ,InforceMonth {""}
+ ,InforceTargetSpecifiedAmount {"1000000"}
+// ,InforceAccountValue {""}
+// ,InforceIsMec {""}
+// ,LastMaterialChangeDate {""}
+// ,InforceContractYear {""}
+// ,InforceContractMonth {""}
+// ,InforceAvBeforeLastMc {""}
+// ,InforceDcv {""}
+ ,InforceLeastDeathBenefit {"1000000"}
+ ,PaymentHistory {"0"}
+ ,BenefitHistory {"1000000"}
+ ,StateOfJurisdiction {"CT"}
+ ,PremiumTaxState {"CT"}
+ ,OldFlatExtra {"0"}
+ ,NewFlatExtra {"0"}
+// ,UseDOB {""}
+ ,Payment {"0"}
+ ,OldDbo {"A"}
+ ,NewDbo {"A"}
+ ,OldDeathBft {"1000000"}
+ ,NewDeathBft {"1000000"}
+ ,OldSpecAmt {"1000000"}
+ ,NewSpecAmt {"1000000"}
+ ,BenefitAmount {"1000000"}
{
AscribeMembers();
DoAdaptExternalities(); // Initialize database, e.g.
@@ -132,9 +132,9 @@ gpt_input::gpt_input()
}
gpt_input::gpt_input(gpt_input const& z)
- :xml_serializable <gpt_input>()
- ,MvcModel ()
- ,MemberSymbolTable <gpt_input>()
+ :xml_serializable <gpt_input> {}
+ ,MvcModel {}
+ ,MemberSymbolTable <gpt_input> {}
{
AscribeMembers();
MemberSymbolTable<gpt_input>::assign(z);
diff --git a/gpt_specamt.cpp b/gpt_specamt.cpp
index ad89896..d83bc4c 100644
--- a/gpt_specamt.cpp
+++ b/gpt_specamt.cpp
@@ -85,14 +85,14 @@ class FindSpecAmt
,double a_NetPmtFactorTgt
,double a_NetPmtFactorExc
)
- :Values_ (a_Values)
- ,Irc7702_ (a_IRC7702)
- ,EIOBasis_ (a_EIOBasis)
- ,Duration (a_Duration)
- ,Premium (a_Premium)
- ,NetPmtFactorTgt (a_NetPmtFactorTgt)
- ,NetPmtFactorExc (a_NetPmtFactorExc)
- ,SpecAmt (0.0)
+ :Values_ {a_Values}
+ ,Irc7702_ {a_IRC7702}
+ ,EIOBasis_ {a_EIOBasis}
+ ,Duration {a_Duration}
+ ,Premium {a_Premium}
+ ,NetPmtFactorTgt {a_NetPmtFactorTgt}
+ ,NetPmtFactorExc {a_NetPmtFactorExc}
+ ,SpecAmt {0.0}
{
}
double operator()(double a_Trial)
diff --git a/gpt_xml_document.cpp b/gpt_xml_document.cpp
index 44f2858..6b716b1 100644
--- a/gpt_xml_document.cpp
+++ b/gpt_xml_document.cpp
@@ -33,13 +33,13 @@
//============================================================================
gpt_xml_document::gpt_xml_document(gpt_input const& z)
- :input_data_(z)
+ :input_data_ {z}
{
}
//============================================================================
gpt_xml_document::gpt_xml_document(std::string const& filename)
- :input_data_()
+ :input_data_ {}
{
xml_lmi::dom_parser parser(filename);
parse(parser);
diff --git a/group_values.hpp b/group_values.hpp
index 33198bc..ccc8bc3 100644
--- a/group_values.hpp
+++ b/group_values.hpp
@@ -49,9 +49,9 @@ class Ledger;
struct census_run_result
{
census_run_result()
- :completed_normally_ (true)
- ,seconds_for_calculations_ (0.0)
- ,seconds_for_output_ (0.0)
+ :completed_normally_ {true}
+ ,seconds_for_calculations_ {0.0}
+ ,seconds_for_output_ {0.0}
{}
bool completed_normally_;
diff --git a/html.hpp b/html.hpp
index f7c90f9..fbb2be8 100644
--- a/html.hpp
+++ b/html.hpp
@@ -125,7 +125,7 @@ class text
private:
// This move ctor is private and does not perform any escaping.
explicit text(std::string&& html)
- :html_{html}
+ :html_ {html}
{
}
@@ -138,7 +138,7 @@ class attribute
{
public:
explicit attribute(char const* name)
- :name_{name}
+ :name_ {name}
{
}
@@ -151,8 +151,8 @@ class attribute
private:
attribute(char const* name, std::string&& value)
- :name_{name}
- ,value_{std::move(value)}
+ :name_ {name}
+ ,value_ {std::move(value)}
{
}
@@ -168,7 +168,7 @@ class LMI_SO any_element
public:
// Ctor should only be used with literal strings as argument.
explicit any_element(char const* name)
- :name_(name)
+ :name_ {name}
{
}
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index e779f89..aad477b 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -86,21 +86,21 @@ showing {accesses, modifies current year, modifies future
years}
//============================================================================
AccountValue::AccountValue(Input const& input)
:BasicValues (Input::consummate(input))
- ,DebugFilename ("anonymous.monthly_trace")
- ,Debugging (false)
- ,Solving (mce_solve_none !=
BasicValues::yare_input_.SolveType)
- ,SolvingForGuarPremium (false)
- ,ItLapsed (false)
- ,ledger_(new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(),
BasicValues::nonillustrated(), BasicValues::no_can_issue(), false))
- ,ledger_invariant_ (new LedgerInvariant(BasicValues::GetLength()))
- ,ledger_variant_ (new LedgerVariant (BasicValues::GetLength()))
- ,SolveGenBasis_ (mce_gen_curr)
- ,SolveSepBasis_ (mce_sep_full)
- ,RunBasis_ (mce_run_gen_curr_sep_full)
- ,GenBasis_ (mce_gen_curr)
- ,SepBasis_ (mce_sep_full)
- ,OldDBOpt (mce_option1)
- ,YearsDBOpt (mce_option1)
+ ,DebugFilename {"anonymous.monthly_trace"}
+ ,Debugging {false}
+ ,Solving {mce_solve_none !=
BasicValues::yare_input_.SolveType}
+ ,SolvingForGuarPremium {false}
+ ,ItLapsed {false}
+ ,ledger_{new Ledger(BasicValues::GetLength(), BasicValues::ledger_type(),
BasicValues::nonillustrated(), BasicValues::no_can_issue(), false)}
+ ,ledger_invariant_ {new LedgerInvariant(BasicValues::GetLength())}
+ ,ledger_variant_ {new LedgerVariant (BasicValues::GetLength())}
+ ,SolveGenBasis_ {mce_gen_curr}
+ ,SolveSepBasis_ {mce_sep_full}
+ ,RunBasis_ {mce_run_gen_curr_sep_full}
+ ,GenBasis_ {mce_gen_curr}
+ ,SepBasis_ {mce_sep_full}
+ ,OldDBOpt {mce_option1}
+ ,YearsDBOpt {mce_option1}
{
// Explicitly initialize antediluvian members. It's generally
// better to do this in the initializer-list, but here they can
diff --git a/ihs_avsolve.cpp b/ihs_avsolve.cpp
index aeb8eb4..1c7bcf5 100644
--- a/ihs_avsolve.cpp
+++ b/ihs_avsolve.cpp
@@ -57,7 +57,7 @@ class SolveHelper
AccountValue& av;
public:
SolveHelper(AccountValue& a_av)
- :av(a_av)
+ :av {a_av}
{
}
double operator()(double a_CandidateValue)
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 27a685f..8bbc317 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -63,14 +63,14 @@
//============================================================================
BasicValues::BasicValues(Input const& input)
:yare_input_ (input)
- ,DefnLifeIns_ (mce_cvat)
- ,DefnMaterialChange_ (mce_unnecessary_premium)
- ,Equiv7702DBO3 (mce_option1_for_7702)
- ,MaxWDDed_ (mce_twelve_times_last)
- ,MaxLoanDed_ (mce_twelve_times_last)
- ,StateOfJurisdiction_(mce_s_CT)
- ,StateOfDomicile_ (mce_s_CT)
- ,PremiumTaxState_ (mce_s_CT)
+ ,DefnLifeIns_ {mce_cvat}
+ ,DefnMaterialChange_ {mce_unnecessary_premium}
+ ,Equiv7702DBO3 {mce_option1_for_7702}
+ ,MaxWDDed_ {mce_twelve_times_last}
+ ,MaxLoanDed_ {mce_twelve_times_last}
+ ,StateOfJurisdiction_{mce_s_CT}
+ ,StateOfDomicile_ {mce_s_CT}
+ ,PremiumTaxState_ {mce_s_CT}
{
Init();
}
@@ -91,16 +91,16 @@ BasicValues::BasicValues
,double a_TargetPremium
// TODO ?? Need loan rate type here?
)
- :yare_input_ (Input())
- ,DefnLifeIns_ (mce_cvat)
- ,DefnMaterialChange_ (mce_unnecessary_premium)
- ,Equiv7702DBO3 (a_DBOptFor7702)
- ,MaxWDDed_ (mce_twelve_times_last)
- ,MaxLoanDed_ (mce_twelve_times_last)
- ,StateOfJurisdiction_(a_StateOfJurisdiction)
- ,StateOfDomicile_ (a_StateOfJurisdiction)
- ,PremiumTaxState_ (a_StateOfJurisdiction)
- ,InitialTargetPremium(a_TargetPremium)
+ :yare_input_ (Input{})
+ ,DefnLifeIns_ {mce_cvat}
+ ,DefnMaterialChange_ {mce_unnecessary_premium}
+ ,Equiv7702DBO3 {a_DBOptFor7702}
+ ,MaxWDDed_ {mce_twelve_times_last}
+ ,MaxLoanDed_ {mce_twelve_times_last}
+ ,StateOfJurisdiction_{a_StateOfJurisdiction}
+ ,StateOfDomicile_ {a_StateOfJurisdiction}
+ ,PremiumTaxState_ {a_StateOfJurisdiction}
+ ,InitialTargetPremium{a_TargetPremium}
{
yare_input_.IssueAge = a_IssueAge ;
yare_input_.RetirementAge = a_IssueAge ;
diff --git a/ihs_irc7702.cpp b/ihs_irc7702.cpp
index 0eee5cb..31ec186 100644
--- a/ihs_irc7702.cpp
+++ b/ihs_irc7702.cpp
@@ -142,47 +142,47 @@ Irc7702::Irc7702
,double a_InforceGSP
,double a_InforceCumPremsPaid
)
- :Test7702 (a_Test7702)
- ,IssueAge (a_IssueAge)
- ,EndtAge (a_EndtAge)
- ,Qc (a_Qc)
- ,GLPic (a_GLPic)
- ,GSPic (a_GSPic)
- ,Ig (a_Ig)
- ,IntDed (a_IntDed)
- ,PresentBftAmt (a_PresentBftAmt)
- ,PriorBftAmt (a_PresentBftAmt)
- ,PresentSpecAmt (a_PresentSpecAmt)
- ,PriorSpecAmt (a_PresentSpecAmt)
- ,LeastBftAmtEver (a_LeastBftAmtEver)
- ,PresentDBOpt (a_PresentDBOpt)
- ,PriorDBOpt (a_PresentDBOpt)
- ,AnnChgPol (a_AnnChgPol)
- ,MlyChgPol (a_MlyChgPol)
- ,MlyChgSpecAmt (a_MlyChgSpecAmt)
- ,SpecAmtLoadLimit (a_SpecAmtLoadLimit)
- ,MlyChgADD (a_MlyChgADD)
- ,ADDLimit (a_ADDLimit)
- ,LoadTgt (a_LoadTgt)
- ,LoadExc (a_LoadExc)
- ,TargetPremium (a_TargetPremium)
- ,round_min_premium (a_round_min_premium)
- ,round_max_premium (a_round_max_premium)
- ,round_min_specamt (a_round_min_specamt)
- ,round_max_specamt (a_round_max_specamt)
- ,InforceYear (a_InforceYear)
- ,InforceMonth (a_InforceMonth)
- ,InforceGLP (a_InforceGLP)
- ,InforceCumGLP (a_InforceCumGLP)
- ,InforceGSP (a_InforceGSP)
- ,InforceCumPremsPaid(a_InforceCumPremsPaid)
- ,PresentGLP (a_InforceGLP)
- ,PriorGLP (a_InforceGLP)
- ,CumGLP (a_InforceCumGLP)
- ,PresentGSP (a_InforceGSP)
- ,PriorGSP (a_InforceGSP)
- ,GptLimit (std::max(a_InforceCumGLP, a_InforceGSP))
- ,CumPmts (a_InforceCumPremsPaid)
+ :Test7702 {a_Test7702}
+ ,IssueAge {a_IssueAge}
+ ,EndtAge {a_EndtAge}
+ ,Qc {a_Qc}
+ ,GLPic {a_GLPic}
+ ,GSPic {a_GSPic}
+ ,Ig {a_Ig}
+ ,IntDed {a_IntDed}
+ ,PresentBftAmt {a_PresentBftAmt}
+ ,PriorBftAmt {a_PresentBftAmt}
+ ,PresentSpecAmt {a_PresentSpecAmt}
+ ,PriorSpecAmt {a_PresentSpecAmt}
+ ,LeastBftAmtEver {a_LeastBftAmtEver}
+ ,PresentDBOpt {a_PresentDBOpt}
+ ,PriorDBOpt {a_PresentDBOpt}
+ ,AnnChgPol {a_AnnChgPol}
+ ,MlyChgPol {a_MlyChgPol}
+ ,MlyChgSpecAmt {a_MlyChgSpecAmt}
+ ,SpecAmtLoadLimit {a_SpecAmtLoadLimit}
+ ,MlyChgADD {a_MlyChgADD}
+ ,ADDLimit {a_ADDLimit}
+ ,LoadTgt {a_LoadTgt}
+ ,LoadExc {a_LoadExc}
+ ,TargetPremium {a_TargetPremium}
+ ,round_min_premium {a_round_min_premium}
+ ,round_max_premium {a_round_max_premium}
+ ,round_min_specamt {a_round_min_specamt}
+ ,round_max_specamt {a_round_max_specamt}
+ ,InforceYear {a_InforceYear}
+ ,InforceMonth {a_InforceMonth}
+ ,InforceGLP {a_InforceGLP}
+ ,InforceCumGLP {a_InforceCumGLP}
+ ,InforceGSP {a_InforceGSP}
+ ,InforceCumPremsPaid{a_InforceCumPremsPaid}
+ ,PresentGLP {a_InforceGLP}
+ ,PriorGLP {a_InforceGLP}
+ ,CumGLP {a_InforceCumGLP}
+ ,PresentGSP {a_InforceGSP}
+ ,PriorGSP {a_InforceGSP}
+ ,GptLimit {std::max(a_InforceCumGLP, a_InforceGSP)}
+ ,CumPmts {a_InforceCumPremsPaid}
{
LMI_ASSERT(a_PresentSpecAmt <= a_PresentBftAmt );
LMI_ASSERT(a_LeastBftAmtEver <= a_PresentSpecAmt);
diff --git a/ihs_irc7702a.cpp b/ihs_irc7702a.cpp
index 5d00424..caa742a 100644
--- a/ihs_irc7702a.cpp
+++ b/ihs_irc7702a.cpp
@@ -62,41 +62,41 @@ Irc7702A::Irc7702A
,std::vector<double> const& a_NSPVec
,round_to<double> const& a_RoundNonMecPrem
)
- :state_ ()
- ,DefnLifeIns (a_DefnLifeIns)
- ,DefnMaterialChange (a_DefnMaterialChange)
- ,UnnecPremIsMatChg (false)
- ,ElectiveIncrIsMatChg (true)
- ,CorrHidesIncr (false) // TAXATION !! DATABASE !! This should
either be eliminated or moved to the database.
- ,IsSurvivorship (a_IsSurvivorship)
- ,AvoidMec (a_AvoidMec)
- ,Use7PPTable (a_Use7PPTable)
- ,UseNSPTable (a_UseNSPTable)
- ,SevenPPRateVec (a_SevenPPRateVec)
- ,NSPVec (a_NSPVec)
- ,RoundNonMecPrem (a_RoundNonMecPrem)
- ,DBDefn (e_specamt_7702A)
- ,Ignore (false)
- ,IsMec (false)
- ,IsMatChg (false)
- ,SevenPP (0.0)
- ,CumSevenPP (0.0)
- ,CumPmts (0.0)
- ,LowestBft (0.0)
- ,UnnecPrem (0.0)
- ,UnnecPremPaid (false)
- ,TestPeriodLen (months_per_year * usual_test_period_length)
- ,TestPeriodDur (0)
- ,PolicyYear (0)
- ,PolicyMonth (0)
- ,AssumedBft (0.0)
- ,Saved7PPRate (0.0)
- ,SavedAVBeforeMatChg (0.0)
- ,SavedNecPrem (0.0)
- ,SavedNSP (0.0)
- ,SavedDCV (0.0)
- ,NetNecessaryPrem (0.0)
- ,GrossNecessaryPrem (0.0)
+ :state_ {}
+ ,DefnLifeIns {a_DefnLifeIns}
+ ,DefnMaterialChange {a_DefnMaterialChange}
+ ,UnnecPremIsMatChg {false}
+ ,ElectiveIncrIsMatChg {true}
+ ,CorrHidesIncr {false} // TAXATION !! DATABASE !! This should
either be eliminated or moved to the database.
+ ,IsSurvivorship {a_IsSurvivorship}
+ ,AvoidMec {a_AvoidMec}
+ ,Use7PPTable {a_Use7PPTable}
+ ,UseNSPTable {a_UseNSPTable}
+ ,SevenPPRateVec {a_SevenPPRateVec}
+ ,NSPVec {a_NSPVec}
+ ,RoundNonMecPrem {a_RoundNonMecPrem}
+ ,DBDefn {e_specamt_7702A}
+ ,Ignore {false}
+ ,IsMec {false}
+ ,IsMatChg {false}
+ ,SevenPP {0.0}
+ ,CumSevenPP {0.0}
+ ,CumPmts {0.0}
+ ,LowestBft {0.0}
+ ,UnnecPrem {0.0}
+ ,UnnecPremPaid {false}
+ ,TestPeriodLen {months_per_year * usual_test_period_length}
+ ,TestPeriodDur {0}
+ ,PolicyYear {0}
+ ,PolicyMonth {0}
+ ,AssumedBft {0.0}
+ ,Saved7PPRate {0.0}
+ ,SavedAVBeforeMatChg {0.0}
+ ,SavedNecPrem {0.0}
+ ,SavedNSP {0.0}
+ ,SavedDCV {0.0}
+ ,NetNecessaryPrem {0.0}
+ ,GrossNecessaryPrem {0.0}
{
if(mce_cvat != DefnLifeIns && mce_gpt != DefnLifeIns)
{
diff --git a/ihs_mortal.cpp b/ihs_mortal.cpp
index 10d5a4f..d5248bd 100644
--- a/ihs_mortal.cpp
+++ b/ihs_mortal.cpp
@@ -33,7 +33,7 @@
//============================================================================
MortalityRates::MortalityRates(BasicValues const& basic_values)
- :Length_(basic_values.GetLength())
+ :Length_ {basic_values.GetLength()}
{
reserve_vectors();
fetch_parameters(basic_values);
diff --git a/ihs_server7702.cpp b/ihs_server7702.cpp
index e89d276..e05cb96 100644
--- a/ihs_server7702.cpp
+++ b/ihs_server7702.cpp
@@ -53,9 +53,9 @@ Server7702Output RunServer7702FromStruct(gpt_input a_Input)
//============================================================================
Server7702::Server7702(gpt_input& a_Input)
- :Input(a_Input)
- ,IsIssuedToday(false)
- ,IsPossibleAdjustableEvent(false)
+ :Input {a_Input}
+ ,IsIssuedToday {false}
+ ,IsPossibleAdjustableEvent {false}
{
}
diff --git a/illustrator.cpp b/illustrator.cpp
index 2562d37..3e58b95 100644
--- a/illustrator.cpp
+++ b/illustrator.cpp
@@ -45,10 +45,10 @@
#include <string>
illustrator::illustrator(mcenum_emission emission)
- :emission_ (emission)
- ,seconds_for_input_ (0.0)
- ,seconds_for_calculations_ (0.0)
- ,seconds_for_output_ (0.0)
+ :emission_ {emission}
+ ,seconds_for_input_ {0.0}
+ ,seconds_for_calculations_ {0.0}
+ ,seconds_for_output_ {0.0}
{
}
diff --git a/input.cpp b/input.cpp
index 32a6257..fc70d41 100644
--- a/input.cpp
+++ b/input.cpp
@@ -33,205 +33,205 @@
/// UDT defaults are presently appropriate.
Input::Input()
- :IssueAge ("45")
- ,RetirementAge ("65")
- ,Gender ("Male")
- ,Smoking ("Nonsmoker")
- ,UnderwritingClass ("Standard")
-// ,WaiverOfPremiumBenefit ("")
-// ,AccidentalDeathBenefit ("")
-// ,TermRider ("")
-// ,TermRiderAmount ("")
- ,TotalSpecifiedAmount ("1000000")
-// ,TermRiderProportion ("")
-// ,TermRiderUseProportion ("")
-// ,DateOfBirth ("")
-// ,SubstandardTable ("")
-// ,ProductName ("")
-// ,Dumpin ("")
-// ,External1035ExchangeAmount ("")
-// ,External1035ExchangeTaxBasis ("")
-// ,External1035ExchangeFromMec ("")
-// ,Internal1035ExchangeAmount ("")
-// ,Internal1035ExchangeTaxBasis ("")
-// ,Internal1035ExchangeFromMec ("")
-// ,SolveTargetAge ("95")
-// ,SolveBeginAge ("")
-// ,SolveEndAge ("95")
-// ,SolveType ("")
-// ,SolveBeginYear ("")
-// ,SolveEndYear ("50")
-// ,SolveTarget ("")
-// ,SolveTargetValue ("")
-// ,SolveTargetYear ("50")
-// ,SolveExpenseGeneralAccountBasis ("")
-// ,SolveSeparateAccountBasis ("")
- ,UseCurrentDeclaredRate ("Yes")
-// ,GeneralAccountRateType ("Credited rate")
- ,SeparateAccountRateType ("Gross rate")
- ,LoanRate ("0.06")
-// ,LoanRateType ("")
- ,OverrideExperienceReserveRate ("Yes")
- ,ExperienceReserveRate ("0.02")
- ,ExperienceRatingInitialKFactor ("1")
-// ,WithdrawToBasisThenLoan ("")
-// ,UseAverageOfAllFunds ("")
-// ,OverrideFundManagementFee ("")
- ,FundChoiceType ("Choose funds")
-// ,InputFundManagementFee ("")
-// ,RunOrder ("")
- ,NumberOfIdenticalLives ("1")
-// ,UseExperienceRating ("")
-// ,UsePartialMortality ("")
-// ,PartialMortalityTable ("")
-// ,InsuredName ("")
-// ,Address ("")
-// ,City ("")
- ,State ("CT")
-// ,ZipCode ("")
-// ,EmployeeClass ("")
-// ,CorporationName ("")
-// ,CorporationAddress ("")
-// ,CorporationCity ("")
- ,CorporationState ("CT")
-// ,CorporationZipCode ("")
- ,AgentName ("*** REQUIRED FIELD MISSING ***")
- ,AgentAddress ("*** REQUIRED FIELD MISSING ***")
- ,AgentCity ("*** REQUIRED FIELD MISSING ***")
- ,AgentState ("CT")
-// ,AgentZipCode ("")
-// ,AgentPhone ("")
- ,AgentId ("*** REQUIRED FIELD MISSING ***")
-// ,InsuredPremiumTableNumber ("")
- ,InsuredPremiumTableFactor ("1")
-// ,CorporationPremiumTableNumber ("")
- ,CorporationPremiumTableFactor ("1")
-// ,EffectiveDate ("")
-// ,DefinitionOfLifeInsurance ("")
-// ,DefinitionOfMaterialChange ("")
-// ,AvoidMecMethod ("")
-// ,RetireesCanEnroll ("")
-// ,GroupUnderwritingType ("")
-// ,LastCoiReentryDate ("")
- ,ListBillDate ("2440588") // Assume no inforce so old
-// ,BlendGender ("")
-// ,BlendSmoking ("")
- ,MaleProportion ("1")
- ,NonsmokerProportion ("1")
- ,TermAdjustmentMethod ("Adjust base first")
- ,IncludeInComposite ("Yes")
-// ,Comments ("")
-// ,AmortizePremiumLoad ("")
-// ,ContractNumber ("")
-// ,MasterContractNumber ("")
-// ,IsInforce ("")
-// ,InforceAsOfDate ("")
-// ,InforceYear ("")
-// ,InforceMonth ("")
-// ,InforceAnnualTargetPremium ("")
-// ,InforceYtdGrossPremium ("")
-// ,InforceGeneralAccountValue ("")
-// ,InforceSeparateAccountValue ("")
-// ,InforceRegularLoanValue ("")
-// ,InforcePreferredLoanValue ("")
-// ,InforceRegularLoanBalance ("")
-// ,InforcePreferredLoanBalance ("")
-// ,InforceNoLapseActive ("")
-// ,InforceMonthlyNoLapsePremium ("")
-// ,InforceCumulativeNoLapsePremium ("")
-// ,InforceCumulativeNoLapsePayments ("")
-// ,InforceCumulativeRopPayments ("")
-// ,InforceYtdTaxablePremium ("")
-// ,InforceCumulativeSalesLoad ("")
-// ,InforceSpecAmtLoadBase ("")
-// ,InforceHoneymoonValue ("")
-// ,InforceCorporationStake ("")
-// ,InforceNetExperienceReserve ("")
-// ,InforceYtdNetCoiCharge ("")
-// ,InforceTaxBasis ("")
-// ,InforceGlp ("")
-// ,InforceCumulativeGlp ("")
-// ,InforceGsp ("")
-// ,InforceCumulativeGptPremiumsPaid ("")
-// ,InforceIsMec ("")
-// ,InforceSevenPayPremium ("")
-// ,LastMaterialChangeDate ("")
-// ,InforceContractYear ("")
-// ,InforceContractMonth ("")
-// ,InforceAvBeforeLastMc ("")
-// ,InforceDcv ("")
-// ,InforceLeastDeathBenefit ("")
- ,Inforce7702AAmountsPaidHistory ("0")
- ,Country ("US")
-// ,OverrideCoiMultiplier ("")
- ,CountryCoiMultiplier ("1")
- ,SurviveToType ("Survive to age limit")
- ,SurviveToYear ("100")
- ,SurviveToAge ("99")
- ,MaximumNaar ("1000000000")
-// ,ChildRider ("")
-// ,ChildRiderAmount ("")
-// ,SpouseRider ("")
-// ,SpouseRiderAmount ("")
- ,SpouseIssueAge ("45")
- ,StateOfJurisdiction ("CT")
- ,PremiumTaxState ("CT")
- ,SalarySpecifiedAmountFactor ("1")
- ,SalarySpecifiedAmountCap ("100000")
- ,SalarySpecifiedAmountOffset ("50000")
-// ,HoneymoonEndorsement ("")
-// ,PostHoneymoonSpread ("")
- ,ExtraMonthlyCustodialFee ("0")
- ,ExtraCompensationOnAssets ("0")
- ,ExtraCompensationOnPremium ("0")
- ,PartialMortalityMultiplier ("1")
- ,CurrentCoiMultiplier ("1")
-// ,CorporationTaxBracket ("")
-// ,TaxBracket ("")
- ,ProjectedSalary ("100000")
- ,SpecifiedAmount ("1000000")
- ,SupplementalAmount ("0")
- ,DeathBenefitOption ("a")
- ,Payment ("20000")
- ,PaymentMode ("annual")
- ,CorporationPayment ("0")
- ,CorporationPaymentMode ("annual")
-// ,GeneralAccountRate ("") // See DoCustomizeInitialValues().
- ,SeparateAccountRate ("0.08")
- ,NewLoan ("0")
- ,Withdrawal ("0")
- ,FlatExtra ("0")
-// ,PolicyLevelFlatExtra ("")
- ,HoneymoonValueSpread ("0")
- ,FundAllocations ("0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0")
- ,CashValueEnhancementRate ("0")
+ :IssueAge {"45"}
+ ,RetirementAge {"65"}
+ ,Gender {"Male"}
+ ,Smoking {"Nonsmoker"}
+ ,UnderwritingClass {"Standard"}
+// ,WaiverOfPremiumBenefit {""}
+// ,AccidentalDeathBenefit {""}
+// ,TermRider {""}
+// ,TermRiderAmount {""}
+ ,TotalSpecifiedAmount {"1000000"}
+// ,TermRiderProportion {""}
+// ,TermRiderUseProportion {""}
+// ,DateOfBirth {""}
+// ,SubstandardTable {""}
+// ,ProductName {""}
+// ,Dumpin {""}
+// ,External1035ExchangeAmount {""}
+// ,External1035ExchangeTaxBasis {""}
+// ,External1035ExchangeFromMec {""}
+// ,Internal1035ExchangeAmount {""}
+// ,Internal1035ExchangeTaxBasis {""}
+// ,Internal1035ExchangeFromMec {""}
+// ,SolveTargetAge {"95"}
+// ,SolveBeginAge {""}
+// ,SolveEndAge {"95"}
+// ,SolveType {""}
+// ,SolveBeginYear {""}
+// ,SolveEndYear {"50"}
+// ,SolveTarget {""}
+// ,SolveTargetValue {""}
+// ,SolveTargetYear {"50"}
+// ,SolveExpenseGeneralAccountBasis {""}
+// ,SolveSeparateAccountBasis {""}
+ ,UseCurrentDeclaredRate {"Yes"}
+// ,GeneralAccountRateType {"Credited rate"}
+ ,SeparateAccountRateType {"Gross rate"}
+ ,LoanRate {"0.06"}
+// ,LoanRateType {""}
+ ,OverrideExperienceReserveRate {"Yes"}
+ ,ExperienceReserveRate {"0.02"}
+ ,ExperienceRatingInitialKFactor {"1"}
+// ,WithdrawToBasisThenLoan {""}
+// ,UseAverageOfAllFunds {""}
+// ,OverrideFundManagementFee {""}
+ ,FundChoiceType {"Choose funds"}
+// ,InputFundManagementFee {""}
+// ,RunOrder {""}
+ ,NumberOfIdenticalLives {"1"}
+// ,UseExperienceRating {""}
+// ,UsePartialMortality {""}
+// ,PartialMortalityTable {""}
+// ,InsuredName {""}
+// ,Address {""}
+// ,City {""}
+ ,State {"CT"}
+// ,ZipCode {""}
+// ,EmployeeClass {""}
+// ,CorporationName {""}
+// ,CorporationAddress {""}
+// ,CorporationCity {""}
+ ,CorporationState {"CT"}
+// ,CorporationZipCode {""}
+ ,AgentName {"*** REQUIRED FIELD MISSING ***"}
+ ,AgentAddress {"*** REQUIRED FIELD MISSING ***"}
+ ,AgentCity {"*** REQUIRED FIELD MISSING ***"}
+ ,AgentState {"CT"}
+// ,AgentZipCode {""}
+// ,AgentPhone {""}
+ ,AgentId {"*** REQUIRED FIELD MISSING ***"}
+// ,InsuredPremiumTableNumber {""}
+ ,InsuredPremiumTableFactor {"1"}
+// ,CorporationPremiumTableNumber {""}
+ ,CorporationPremiumTableFactor {"1"}
+// ,EffectiveDate {""}
+// ,DefinitionOfLifeInsurance {""}
+// ,DefinitionOfMaterialChange {""}
+// ,AvoidMecMethod {""}
+// ,RetireesCanEnroll {""}
+// ,GroupUnderwritingType {""}
+// ,LastCoiReentryDate {""}
+ ,ListBillDate {"2440588"} // Assume no inforce so old
+// ,BlendGender {""}
+// ,BlendSmoking {""}
+ ,MaleProportion {"1"}
+ ,NonsmokerProportion {"1"}
+ ,TermAdjustmentMethod {"Adjust base first"}
+ ,IncludeInComposite {"Yes"}
+// ,Comments {""}
+// ,AmortizePremiumLoad {""}
+// ,ContractNumber {""}
+// ,MasterContractNumber {""}
+// ,IsInforce {""}
+// ,InforceAsOfDate {""}
+// ,InforceYear {""}
+// ,InforceMonth {""}
+// ,InforceAnnualTargetPremium {""}
+// ,InforceYtdGrossPremium {""}
+// ,InforceGeneralAccountValue {""}
+// ,InforceSeparateAccountValue {""}
+// ,InforceRegularLoanValue {""}
+// ,InforcePreferredLoanValue {""}
+// ,InforceRegularLoanBalance {""}
+// ,InforcePreferredLoanBalance {""}
+// ,InforceNoLapseActive {""}
+// ,InforceMonthlyNoLapsePremium {""}
+// ,InforceCumulativeNoLapsePremium {""}
+// ,InforceCumulativeNoLapsePayments {""}
+// ,InforceCumulativeRopPayments {""}
+// ,InforceYtdTaxablePremium {""}
+// ,InforceCumulativeSalesLoad {""}
+// ,InforceSpecAmtLoadBase {""}
+// ,InforceHoneymoonValue {""}
+// ,InforceCorporationStake {""}
+// ,InforceNetExperienceReserve {""}
+// ,InforceYtdNetCoiCharge {""}
+// ,InforceTaxBasis {""}
+// ,InforceGlp {""}
+// ,InforceCumulativeGlp {""}
+// ,InforceGsp {""}
+// ,InforceCumulativeGptPremiumsPaid {""}
+// ,InforceIsMec {""}
+// ,InforceSevenPayPremium {""}
+// ,LastMaterialChangeDate {""}
+// ,InforceContractYear {""}
+// ,InforceContractMonth {""}
+// ,InforceAvBeforeLastMc {""}
+// ,InforceDcv {""}
+// ,InforceLeastDeathBenefit {""}
+ ,Inforce7702AAmountsPaidHistory {"0"}
+ ,Country {"US"}
+// ,OverrideCoiMultiplier {""}
+ ,CountryCoiMultiplier {"1"}
+ ,SurviveToType {"Survive to age limit"}
+ ,SurviveToYear {"100"}
+ ,SurviveToAge {"99"}
+ ,MaximumNaar {"1000000000"}
+// ,ChildRider {""}
+// ,ChildRiderAmount {""}
+// ,SpouseRider {""}
+// ,SpouseRiderAmount {""}
+ ,SpouseIssueAge {"45"}
+ ,StateOfJurisdiction {"CT"}
+ ,PremiumTaxState {"CT"}
+ ,SalarySpecifiedAmountFactor {"1"}
+ ,SalarySpecifiedAmountCap {"100000"}
+ ,SalarySpecifiedAmountOffset {"50000"}
+// ,HoneymoonEndorsement {""}
+// ,PostHoneymoonSpread {""}
+ ,ExtraMonthlyCustodialFee {"0"}
+ ,ExtraCompensationOnAssets {"0"}
+ ,ExtraCompensationOnPremium {"0"}
+ ,PartialMortalityMultiplier {"1"}
+ ,CurrentCoiMultiplier {"1"}
+// ,CorporationTaxBracket {""}
+// ,TaxBracket {""}
+ ,ProjectedSalary {"100000"}
+ ,SpecifiedAmount {"1000000"}
+ ,SupplementalAmount {"0"}
+ ,DeathBenefitOption {"a"}
+ ,Payment {"20000"}
+ ,PaymentMode {"annual"}
+ ,CorporationPayment {"0"}
+ ,CorporationPaymentMode {"annual"}
+// ,GeneralAccountRate {""} // See DoCustomizeInitialValues().
+ ,SeparateAccountRate {"0.08"}
+ ,NewLoan {"0"}
+ ,Withdrawal {"0"}
+ ,FlatExtra {"0"}
+// ,PolicyLevelFlatExtra {""}
+ ,HoneymoonValueSpread {"0"}
+ ,FundAllocations {"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0"}
+ ,CashValueEnhancementRate {"0"}
// ,AdditionalReports
// ,SupplementalIllustrationType
// ,SplitDollarAccumulateInterest
- ,SplitDollarLoanRate ("0")
+ ,SplitDollarLoanRate {"0"}
// ,SplitDollarRolloutAge
// ,SplitDollarRolloutAtWhich
// ,SplitDollarRolloutYear
-// ,CreateSupplementalReport ("")
-// ,SupplementalReportColumn00 ("")
-// ,SupplementalReportColumn01 ("")
-// ,SupplementalReportColumn02 ("")
-// ,SupplementalReportColumn03 ("")
-// ,SupplementalReportColumn04 ("")
-// ,SupplementalReportColumn05 ("")
-// ,SupplementalReportColumn06 ("")
-// ,SupplementalReportColumn07 ("")
-// ,SupplementalReportColumn08 ("")
-// ,SupplementalReportColumn09 ("")
-// ,SupplementalReportColumn10 ("")
-// ,SupplementalReportColumn11 ("")
- ,SolveTgtAtWhich ("Maturity")
- ,SolveFromWhich ("Issue")
- ,SolveToWhich ("Retirement")
-// ,UseDOB ("")
-// ,EffectiveDateToday ("")
-// ,SpecifiedAmountStrategyFromIssue ("")
-// ,IndividualPaymentStrategy ("")
+// ,CreateSupplementalReport {""}
+// ,SupplementalReportColumn00 {""}
+// ,SupplementalReportColumn01 {""}
+// ,SupplementalReportColumn02 {""}
+// ,SupplementalReportColumn03 {""}
+// ,SupplementalReportColumn04 {""}
+// ,SupplementalReportColumn05 {""}
+// ,SupplementalReportColumn06 {""}
+// ,SupplementalReportColumn07 {""}
+// ,SupplementalReportColumn08 {""}
+// ,SupplementalReportColumn09 {""}
+// ,SupplementalReportColumn10 {""}
+// ,SupplementalReportColumn11 {""}
+ ,SolveTgtAtWhich {"Maturity"}
+ ,SolveFromWhich {"Issue"}
+ ,SolveToWhich {"Retirement"}
+// ,UseDOB {""}
+// ,EffectiveDateToday {""}
+// ,SpecifiedAmountStrategyFromIssue {""}
+// ,IndividualPaymentStrategy {""}
{
AscribeMembers();
DoAdaptExternalities(); // Initialize database, e.g.
@@ -239,9 +239,9 @@ Input::Input()
}
Input::Input(Input const& z)
- :xml_serializable <Input>()
- ,MvcModel ()
- ,MemberSymbolTable <Input>()
+ :xml_serializable <Input> {}
+ ,MvcModel {}
+ ,MemberSymbolTable <Input> {}
{
AscribeMembers();
MemberSymbolTable<Input>::assign(z);
diff --git a/input_sequence.cpp b/input_sequence.cpp
index 8a3e763..a17cfd0 100644
--- a/input_sequence.cpp
+++ b/input_sequence.cpp
@@ -29,6 +29,7 @@
#include "assert_lmi.hpp"
#include "contains.hpp"
#include "input_sequence_parser.hpp"
+#include "ssize_lmi.hpp"
#include "value_cast.hpp"
#include <algorithm> // fill()
@@ -75,8 +76,8 @@ InputSequence::InputSequence
,bool a_keywords_only
,std::string const& a_default_keyword
)
- :years_to_maturity_ (a_years_to_maturity)
- ,issue_age_ (a_issue_age)
+ :years_to_maturity_ {a_years_to_maturity}
+ ,issue_age_ {a_issue_age}
,seriatim_keywords_ (a_years_to_maturity, a_default_keyword)
,seriatim_numbers_ (a_years_to_maturity)
{
@@ -138,8 +139,8 @@ InputSequence::InputSequence
/// one might be, someday.
InputSequence::InputSequence(std::vector<std::string> const& v)
- :years_to_maturity_ (v.size())
- ,seriatim_keywords_ (v)
+ :years_to_maturity_ {lmi::ssize(v)}
+ ,seriatim_keywords_ {v}
{
initialize_from_vector(v);
assert_sane_and_ordered_partition(intervals_, years_to_maturity_);
@@ -161,8 +162,8 @@ InputSequence::InputSequence(std::vector<std::string>
const& v)
/// RLE representation would work correctly.
InputSequence::InputSequence(std::vector<double> const& v)
- :years_to_maturity_ (v.size())
- ,seriatim_numbers_ (v)
+ :years_to_maturity_ {lmi::ssize(v)}
+ ,seriatim_numbers_ {v}
{
initialize_from_vector(v);
assert_sane_and_ordered_partition(intervals_, years_to_maturity_);
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 0eac2ea..2caf96b 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -222,7 +222,7 @@ class InputSequenceEditor
{
public:
explicit LayoutOnceGuard(InputSequenceEditor* editor)
- :editor_(editor)
+ :editor_ {editor}
{
++editor_->layout_freeze_count_;
}
@@ -364,10 +364,10 @@ InputSequenceEditor::InputSequenceEditor(wxWindow*
parent, wxString const& title
,wxDefaultSize
,wxDEFAULT_DIALOG_STYLE
)
- ,layout_freeze_count_(1) // It will be thawed when sequence() is called.
- ,input_ (input)
- ,keywords_only_(false)
- ,rows_count_ (0)
+ ,layout_freeze_count_ {1} // It will be thawed when sequence() is
called.
+ ,input_ {input}
+ ,keywords_only_ {false}
+ ,rows_count_ {0}
{
wxSizer* top = new(wx) wxBoxSizer(wxVERTICAL);
@@ -1384,7 +1384,7 @@ InputSequenceEntry::InputSequenceEntry
,wxWindowID id
,wxString const& name
)
- :input_(nullptr)
+ :input_ {nullptr}
{
Create(parent, id, name);
}
@@ -1606,7 +1606,7 @@ void InputSequenceEntry::DoOpenEditor()
IMPLEMENT_DYNAMIC_CLASS(InputSequenceEntryXmlHandler, wxXmlResourceHandler)
InputSequenceEntryXmlHandler::InputSequenceEntryXmlHandler()
- :wxXmlResourceHandler()
+ :wxXmlResourceHandler {}
{
AddWindowStyles();
}
diff --git a/input_sequence_parser.cpp b/input_sequence_parser.cpp
index 2c90426..c624e6b 100644
--- a/input_sequence_parser.cpp
+++ b/input_sequence_parser.cpp
@@ -41,14 +41,14 @@ SequenceParser::SequenceParser
,std::vector<std::string> const& a_allowed_keywords
,bool a_keywords_only
)
- :input_stream_ (input_expression)
- ,years_to_maturity_ (a_years_to_maturity)
- ,issue_age_ (a_issue_age)
- ,retirement_age_ (a_retirement_age)
- ,inforce_duration_ (a_inforce_duration)
- ,effective_year_ (a_effective_year)
- ,allowed_keywords_ (a_allowed_keywords)
- ,keywords_only_ (a_keywords_only)
+ :input_stream_ {input_expression}
+ ,years_to_maturity_ {a_years_to_maturity}
+ ,issue_age_ {a_issue_age}
+ ,retirement_age_ {a_retirement_age}
+ ,inforce_duration_ {a_inforce_duration}
+ ,effective_year_ {a_effective_year}
+ ,allowed_keywords_ {a_allowed_keywords}
+ ,keywords_only_ {a_keywords_only}
{
stifle_warning_for_unused_value(inforce_duration_);
stifle_warning_for_unused_value(effective_year_);
diff --git a/interest_rates.cpp b/interest_rates.cpp
index d6e233e..565bd07 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -250,23 +250,23 @@ bool need_loan_rates(yare_input const& yi)
} // Unnamed namespace.
InterestRates::InterestRates(BasicValues const& v)
- :Length_ (v.GetLength())
- ,RoundIntRate_ (v.round_interest_rate())
- ,Round7702Rate_ (v.round_interest_rate_7702())
+ :Length_ {v.GetLength()}
+ ,RoundIntRate_ {v.round_interest_rate()}
+ ,Round7702Rate_ {v.round_interest_rate_7702()}
,Zero_ (Length_)
- ,NeedMidpointRates_ (v.IsSubjectToIllustrationReg())
- ,GenAcctRateType_ (v.yare_input_.GeneralAccountRateType)
- ,NeedSepAcctRates_ (v.Database_->Query(DB_AllowSepAcct))
- ,SepAcctRateType_ (v.yare_input_.SeparateAccountRateType)
-
,SepAcctSpreadMethod_(static_cast<mcenum_spread_method>(static_cast<int>(v.Database_->Query(DB_SepAcctSpreadMethod))))
- ,AmortLoad_ (Zero_)
- ,ExtraSepAcctCharge_ (Zero_)
-// ,NeedLoanRates_ (need_loan_rates(v.yare_input_))
- ,NeedLoanRates_ (true) // DEPRECATED
- ,LoanRateType_ (v.yare_input_.LoanRateType)
- ,NeedPrefLoanRates_ (v.Database_->Query(DB_AllowPrefLoan))
- ,NeedHoneymoonRates_ (v.yare_input_.HoneymoonEndorsement)
- ,SpreadFor7702_ (v.SpreadFor7702())
+ ,NeedMidpointRates_ {v.IsSubjectToIllustrationReg()}
+ ,GenAcctRateType_ {v.yare_input_.GeneralAccountRateType}
+ ,NeedSepAcctRates_ {0.0 != v.Database_->Query(DB_AllowSepAcct)}
+ ,SepAcctRateType_ {v.yare_input_.SeparateAccountRateType}
+
,SepAcctSpreadMethod_{static_cast<mcenum_spread_method>(static_cast<int>(v.Database_->Query(DB_SepAcctSpreadMethod)))}
+ ,AmortLoad_ {Zero_}
+ ,ExtraSepAcctCharge_ {Zero_}
+// ,NeedLoanRates_ {need_loan_rates(v.yare_input_)}
+ ,NeedLoanRates_ {true} // DEPRECATED
+ ,LoanRateType_ {v.yare_input_.LoanRateType}
+ ,NeedPrefLoanRates_ {0.0 != v.Database_->Query(DB_AllowPrefLoan)}
+ ,NeedHoneymoonRates_ {v.yare_input_.HoneymoonEndorsement}
+ ,SpreadFor7702_ {v.SpreadFor7702()}
{
Initialize(v);
}
diff --git a/interpolate_string.cpp b/interpolate_string.cpp
index 6abadd0..818f2cf 100644
--- a/interpolate_string.cpp
+++ b/interpolate_string.cpp
@@ -36,8 +36,8 @@ namespace
struct section_info
{
section_info(std::string const& name, bool active)
- :name_(name)
- ,active_(active)
+ :name_ {name}
+ ,active_ {active}
{
}
diff --git a/ledger.cpp b/ledger.cpp
index 31fb955..4ebaecc 100644
--- a/ledger.cpp
+++ b/ledger.cpp
@@ -69,13 +69,13 @@ Ledger::Ledger
,bool no_can_issue
,bool is_composite
)
- :ledger_type_ (ledger_type)
- ,nonillustrated_ (nonillustrated)
- ,no_can_issue_ (no_can_issue)
- ,is_composite_ (is_composite)
- ,composite_lapse_year_ (0.0)
- ,ledger_map_ (new ledger_map_holder)
- ,ledger_invariant_ (new LedgerInvariant(length))
+ :ledger_type_ {ledger_type}
+ ,nonillustrated_ {nonillustrated}
+ ,no_can_issue_ {no_can_issue}
+ ,is_composite_ {is_composite}
+ ,composite_lapse_year_ {0.0}
+ ,ledger_map_ {new ledger_map_holder}
+ ,ledger_invariant_ {new LedgerInvariant(length)}
{
SetRunBases(length);
}
diff --git a/ledger_base.cpp b/ledger_base.cpp
index 3f3e95e..b67c010 100644
--- a/ledger_base.cpp
+++ b/ledger_base.cpp
@@ -35,16 +35,16 @@
//============================================================================
LedgerBase::LedgerBase(int a_Length)
- :scale_power_(0)
- ,scale_unit_ ("")
+ :scale_power_ {0}
+ ,scale_unit_ {""}
{
Initialize(a_Length);
}
//============================================================================
LedgerBase::LedgerBase(LedgerBase const& obj)
- :scale_power_(obj.scale_power_)
- ,scale_unit_ (obj.scale_unit_)
+ :scale_power_ {obj.scale_power_}
+ ,scale_unit_ {obj.scale_unit_}
{
Initialize(obj.GetLength());
Copy(obj);
diff --git a/ledger_evaluator.hpp b/ledger_evaluator.hpp
index 2d9ea82..cb1d282 100644
--- a/ledger_evaluator.hpp
+++ b/ledger_evaluator.hpp
@@ -46,8 +46,8 @@ class LMI_SO ledger_evaluator
// Objects of this class can only be created by Ledger::make_evaluator().
ledger_evaluator(all_scalars&& scalars, all_vectors&& vectors)
- :scalars_(scalars)
- ,vectors_(vectors)
+ :scalars_ {scalars}
+ ,vectors_ {vectors}
{
}
diff --git a/ledger_invariant.cpp b/ledger_invariant.cpp
index a6bf514..83fbb21 100644
--- a/ledger_invariant.cpp
+++ b/ledger_invariant.cpp
@@ -53,18 +53,18 @@
//============================================================================
LedgerInvariant::LedgerInvariant(int len)
- :LedgerBase(len)
- ,irr_initialized_(false)
- ,FullyInitialized(false)
+ :LedgerBase (len)
+ ,irr_initialized_ {false}
+ ,FullyInitialized {false}
{
Alloc(len);
}
//============================================================================
LedgerInvariant::LedgerInvariant(LedgerInvariant const& obj)
- :LedgerBase(obj)
- ,irr_initialized_(false)
- ,FullyInitialized(false)
+ :LedgerBase {obj}
+ ,irr_initialized_ {false}
+ ,FullyInitialized {false}
{
Alloc(obj.GetLength());
Copy(obj);
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 583ca30..414aaac 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -117,7 +117,7 @@ class html_interpolator
// Ctor takes the object used to interpolate the variables not explicitly
// defined using add_variable().
explicit html_interpolator(ledger_evaluator&& evaluator)
- :evaluator_(evaluator)
+ :evaluator_ {evaluator}
{
}
@@ -527,9 +527,9 @@ class scaled_image_cell : public html_cell_for_pdf_output
,wxString const& src
,double scale_factor
)
- :image_(image)
- ,src_(src)
- ,scale_factor_(scale_factor)
+ :image_ {image}
+ ,src_ {src}
+ ,scale_factor_ {scale_factor}
{
m_Width = wxRound(image.GetWidth () / scale_factor);
m_Height = wxRound(image.GetHeight() / scale_factor);
@@ -687,8 +687,8 @@ class pdf_illustration : protected html_interpolator
{
public:
explicit pdf_illustration(Ledger const& ledger)
- :html_interpolator(ledger.make_evaluator())
- ,ledger_(ledger)
+ :html_interpolator {ledger.make_evaluator()}
+ ,ledger_ {ledger}
{
init_variables();
}
@@ -1195,7 +1195,7 @@ class standard_page : public numbered_page
// to use anything else.
template<int N>
explicit standard_page(char const (&page_template_name)[N])
- :page_template_name_(page_template_name)
+ :page_template_name_ {page_template_name}
{
}
@@ -1920,8 +1920,8 @@ class standard_supplemental_report : public
page_with_tabular_report
(html_interpolator const& interpolate_html
,std::string const& page_template
)
- :columns_(build_columns(interpolate_html))
- ,page_template_(page_template)
+ :columns_ {build_columns(interpolate_html)}
+ ,page_template_ {page_template}
{
}
@@ -1987,7 +1987,7 @@ class pdf_illustration_regular : public pdf_illustration
{
public:
explicit pdf_illustration_regular(Ledger const& ledger)
- :pdf_illustration(ledger)
+ :pdf_illustration{ledger}
{
auto const& invar = ledger.GetLedgerInvariant();
auto const& policy_name = invar.PolicyLegalName;
@@ -2488,7 +2488,7 @@ class pdf_illustration_nasd : public pdf_illustration
{
public:
explicit pdf_illustration_nasd(Ledger const& ledger)
- :pdf_illustration(ledger)
+ :pdf_illustration{ledger}
{
auto const& invar = ledger.GetLedgerInvariant();
@@ -2588,7 +2588,7 @@ class pdf_illustration_reg_d_group : public
pdf_illustration
{
public:
explicit pdf_illustration_reg_d_group(Ledger const& ledger)
- :pdf_illustration(ledger)
+ :pdf_illustration{ledger}
{
// Define variables specific to this illustration.
auto const& invar = ledger.GetLedgerInvariant();
@@ -2862,7 +2862,7 @@ class pdf_illustration_reg_d_individual : public
pdf_illustration
{
public:
explicit pdf_illustration_reg_d_individual(Ledger const& ledger)
- :pdf_illustration(ledger)
+ :pdf_illustration{ledger}
{
auto const& invar = ledger.GetLedgerInvariant();
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 7122005..11fa2ee 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -162,9 +162,9 @@ class calculation_summary_formatter final
calculation_summary_formatter::calculation_summary_formatter
(Ledger const& ledger_values
)
- :ledger_ (ledger_values)
- ,invar_ (ledger_values.GetLedgerInvariant())
- ,max_length_(ledger_values.GetMaxLength())
+ :ledger_ {ledger_values}
+ ,invar_ {ledger_values.GetLedgerInvariant()}
+ ,max_length_ {ledger_values.GetMaxLength()}
{
columns_ = effective_calculation_summary_columns();
std::vector<std::string>::iterator p = std::find
@@ -896,8 +896,8 @@ FlatTextLedgerPrinter::FlatTextLedgerPrinter
(Ledger const& ledger
,std::ostream& os
)
- :ledger_(ledger)
- ,os_ (os)
+ :ledger_ {ledger}
+ ,os_ {os}
{
}
diff --git a/ledger_text_formats.hpp b/ledger_text_formats.hpp
index 4389af6..f537bad 100644
--- a/ledger_text_formats.hpp
+++ b/ledger_text_formats.hpp
@@ -61,9 +61,9 @@ std::vector<std::string> LMI_SO ledger_format
struct ledger_metadata
{
ledger_metadata()
- :decimals_ (0)
- ,style_ (oe_format_normal)
- ,legend_ ("")
+ :decimals_ {0}
+ ,style_ {oe_format_normal}
+ ,legend_ {""}
{}
ledger_metadata
@@ -71,9 +71,9 @@ struct ledger_metadata
,oenum_format_style style
,std::string legend
)
- :decimals_ (decimals)
- ,style_ (style)
- ,legend_ (legend)
+ :decimals_ {decimals}
+ ,style_ {style}
+ ,legend_ {legend}
{}
int decimals_;
diff --git a/ledger_variant.cpp b/ledger_variant.cpp
index e05a862..52b04be 100644
--- a/ledger_variant.cpp
+++ b/ledger_variant.cpp
@@ -37,20 +37,20 @@
//============================================================================
LedgerVariant::LedgerVariant(int len)
- :LedgerBase (len)
- ,GenBasis_ (mce_gen_curr)
- ,SepBasis_ (mce_sep_full)
- ,FullyInitialized(false)
+ :LedgerBase (len)
+ ,GenBasis_ {mce_gen_curr}
+ ,SepBasis_ {mce_sep_full}
+ ,FullyInitialized {false}
{
Alloc(len);
}
//============================================================================
LedgerVariant::LedgerVariant(LedgerVariant const& obj)
- :LedgerBase(obj)
- ,GenBasis_ (mce_gen_curr)
- ,SepBasis_ (mce_sep_full)
- ,FullyInitialized(false)
+ :LedgerBase {obj}
+ ,GenBasis_ {mce_gen_curr}
+ ,SepBasis_ {mce_sep_full}
+ ,FullyInitialized {false}
{
Alloc(obj.GetLength());
Copy(obj);
@@ -362,7 +362,7 @@ void LedgerVariant::Spew(std::ostream& os) const
}
ledger_map_holder::ledger_map_holder(ledger_map_t const& z)
- :held_(z)
+ :held_ {z}
{
}
diff --git a/ledgervalues.cpp b/ledgervalues.cpp
index 28ba063..857d318 100644
--- a/ledgervalues.cpp
+++ b/ledgervalues.cpp
@@ -30,7 +30,7 @@
#include "ledger.hpp"
IllusVal::IllusVal(std::string const& filename)
- :filename_ (filename)
+ :filename_ {filename}
{
}
diff --git a/loads_impl.hpp b/loads_impl.hpp
index 43d4202..00bc3de 100644
--- a/loads_impl.hpp
+++ b/loads_impl.hpp
@@ -98,22 +98,22 @@ struct load_details
,std::vector<double> const& TabularGuarSpecAmtLoad
,std::vector<double> const& TabularCurrSpecAmtLoad
)
- :length_ (length)
- ,AmortizePremLoad_ (AmortizePremLoad)
- ,premium_tax_load_ (premium_tax_load)
- ,maximum_premium_tax_load_rate_ (maximum_premium_tax_load_rate)
- ,minimum_premium_tax_load_rate_ (minimum_premium_tax_load_rate)
- ,premium_tax_rate_ (premium_tax_rate)
- ,premium_tax_amortization_rate_ (premium_tax_amortization_rate)
- ,premium_tax_amortization_period_ (premium_tax_amortization_period)
- ,asset_charge_type_ (asset_charge_type)
- ,NeedMidpointRates_ (NeedMidpointRates)
- ,round_interest_rate_ (round_interest_rate)
- ,VectorExtraCompLoad_ (VectorExtraCompLoad)
- ,VectorExtraAssetComp_ (VectorExtraAssetComp)
- ,VectorExtraPolFee_ (VectorExtraPolFee)
- ,TabularGuarSpecAmtLoad_ (TabularGuarSpecAmtLoad)
- ,TabularCurrSpecAmtLoad_ (TabularCurrSpecAmtLoad)
+ :length_ {length}
+ ,AmortizePremLoad_ {AmortizePremLoad}
+ ,premium_tax_load_ {premium_tax_load}
+ ,maximum_premium_tax_load_rate_ {maximum_premium_tax_load_rate}
+ ,minimum_premium_tax_load_rate_ {minimum_premium_tax_load_rate}
+ ,premium_tax_rate_ {premium_tax_rate}
+ ,premium_tax_amortization_rate_ {premium_tax_amortization_rate}
+ ,premium_tax_amortization_period_ {premium_tax_amortization_period}
+ ,asset_charge_type_ {asset_charge_type}
+ ,NeedMidpointRates_ {NeedMidpointRates}
+ ,round_interest_rate_ {round_interest_rate}
+ ,VectorExtraCompLoad_ {VectorExtraCompLoad}
+ ,VectorExtraAssetComp_ {VectorExtraAssetComp}
+ ,VectorExtraPolFee_ {VectorExtraPolFee}
+ ,TabularGuarSpecAmtLoad_ {TabularGuarSpecAmtLoad}
+ ,TabularCurrSpecAmtLoad_ {TabularCurrSpecAmtLoad}
{}
int length_;
diff --git a/loads_test.cpp b/loads_test.cpp
index 2ba4248..206db95 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -62,9 +62,9 @@ double premium_tax::minimum_load_rate() const {return 0.0;}
struct LoadsTest
{
LoadsTest(load_details const& details)
- :details_ (details)
- ,database_(details.length_)
- ,loads_ ()
+ :details_ {details}
+ ,database_ (details.length_)
+ ,loads_ {}
{}
void Allocate () {loads_.Allocate(details_.length_);}
diff --git a/main_wx_test.cpp b/main_wx_test.cpp
index 4ea8b9e..b02b6ff 100644
--- a/main_wx_test.cpp
+++ b/main_wx_test.cpp
@@ -127,10 +127,10 @@ class test_skipped_exception
struct TestsResults
{
TestsResults()
- :total(0)
- ,passed(0)
- ,skipped(0)
- ,failed(0)
+ :total {0}
+ ,passed {0}
+ ,skipped {0}
+ ,failed {0}
{
}
@@ -203,8 +203,8 @@ class application_test final
{
// The pointer must be non-NULL but we don't take ownership of it.
test_descriptor(wx_base_test_case* t)
- :test(t)
- ,run(run_default)
+ :test {t}
+ ,run {run_default}
{
}
@@ -520,7 +520,7 @@ void application_test::list_tests()
} // Unnamed namespace.
wx_base_test_case::wx_base_test_case(char const* name)
- :name_(name)
+ :name_ {name}
{
application_test::instance().add_test(this);
}
@@ -615,7 +615,7 @@ class SkeletonTest : public Skeleton
{
public:
SkeletonTest()
- :is_running_tests_(false)
+ :is_running_tests_ {false}
{
}
@@ -783,7 +783,7 @@ void SkeletonTest::RunTheTests()
{
public:
explicit ensure_top_window_closed(wxApp* app)
- :app_(app)
+ :app_ {app}
{
}
diff --git a/mc_enum.tpp b/mc_enum.tpp
index bd92346..f3ca523 100644
--- a/mc_enum.tpp
+++ b/mc_enum.tpp
@@ -36,8 +36,8 @@
template<typename T>
mc_enum<T>::mc_enum()
- :mc_enum_base(n())
- ,value_(e()[0])
+ :mc_enum_base (n())
+ ,value_ {e()[0]}
{
typedef mc_enum_key<T> metadata;
static_assert(0 < metadata::n_);
@@ -45,14 +45,14 @@ mc_enum<T>::mc_enum()
template<typename T>
mc_enum<T>::mc_enum(T t)
- :mc_enum_base(n())
- ,value_(t)
+ :mc_enum_base (n())
+ ,value_ {t}
{}
template<typename T>
mc_enum<T>::mc_enum(std::string const& s)
- :mc_enum_base(n())
- ,value_(e()[ordinal(s)])
+ :mc_enum_base (n())
+ ,value_ {e()[ordinal(s)]}
{}
template<typename T>
diff --git a/mec_input.cpp b/mec_input.cpp
index 91f4c0e..e1f08b6 100644
--- a/mec_input.cpp
+++ b/mec_input.cpp
@@ -78,43 +78,43 @@ std::string realize_sequence_string
/// UDT defaults are presently appropriate.
mec_input::mec_input()
- :Use7702ATables ("No")
- ,IssueAge ("45")
- ,Gender ("Male")
- ,Smoking ("Nonsmoker")
- ,UnderwritingClass ("Standard")
-// ,DateOfBirth ("")
-// ,SubstandardTable ("")
-// ,ProductName ("")
-// ,External1035ExchangeAmount ("")
-// ,External1035ExchangeFromMec ("")
-// ,Internal1035ExchangeAmount ("")
-// ,Internal1035ExchangeFromMec ("")
-// ,EffectiveDate ("")
-// ,DefinitionOfLifeInsurance ("")
- ,DefinitionOfMaterialChange ("Unnecessary premium")
-// ,GroupUnderwritingType ("")
-// ,Comments ("")
-// ,InforceAsOfDate ("")
-// ,InforceYear ("")
-// ,InforceMonth ("")
- ,InforceTargetSpecifiedAmount ("1000000")
-// ,InforceAccountValue ("")
-// ,InforceIsMec ("")
-// ,LastMaterialChangeDate ("")
-// ,InforceContractYear ("")
-// ,InforceContractMonth ("")
-// ,InforceAvBeforeLastMc ("")
-// ,InforceDcv ("")
- ,InforceLeastDeathBenefit ("1000000")
- ,PaymentHistory ("0")
- ,BenefitHistory ("1000000")
- ,StateOfJurisdiction ("CT")
- ,PremiumTaxState ("CT")
- ,FlatExtra ("0")
-// ,UseDOB ("")
- ,Payment ("0")
- ,BenefitAmount ("1000000")
+ :Use7702ATables {"No"}
+ ,IssueAge {"45"}
+ ,Gender {"Male"}
+ ,Smoking {"Nonsmoker"}
+ ,UnderwritingClass {"Standard"}
+// ,DateOfBirth {""}
+// ,SubstandardTable {""}
+// ,ProductName {""}
+// ,External1035ExchangeAmount {""}
+// ,External1035ExchangeFromMec {""}
+// ,Internal1035ExchangeAmount {""}
+// ,Internal1035ExchangeFromMec {""}
+// ,EffectiveDate {""}
+// ,DefinitionOfLifeInsurance {""}
+ ,DefinitionOfMaterialChange {"Unnecessary premium"}
+// ,GroupUnderwritingType {""}
+// ,Comments {""}
+// ,InforceAsOfDate {""}
+// ,InforceYear {""}
+// ,InforceMonth {""}
+ ,InforceTargetSpecifiedAmount {"1000000"}
+// ,InforceAccountValue {""}
+// ,InforceIsMec {""}
+// ,LastMaterialChangeDate {""}
+// ,InforceContractYear {""}
+// ,InforceContractMonth {""}
+// ,InforceAvBeforeLastMc {""}
+// ,InforceDcv {""}
+ ,InforceLeastDeathBenefit {"1000000"}
+ ,PaymentHistory {"0"}
+ ,BenefitHistory {"1000000"}
+ ,StateOfJurisdiction {"CT"}
+ ,PremiumTaxState {"CT"}
+ ,FlatExtra {"0"}
+// ,UseDOB {""}
+ ,Payment {"0"}
+ ,BenefitAmount {"1000000"}
{
AscribeMembers();
DoAdaptExternalities(); // Initialize database, e.g.
@@ -122,9 +122,9 @@ mec_input::mec_input()
}
mec_input::mec_input(mec_input const& z)
- :xml_serializable <mec_input>()
- ,MvcModel ()
- ,MemberSymbolTable <mec_input>()
+ :xml_serializable <mec_input> {}
+ ,MvcModel {}
+ ,MemberSymbolTable <mec_input> {}
{
AscribeMembers();
MemberSymbolTable<mec_input>::assign(z);
diff --git a/mec_xml_document.cpp b/mec_xml_document.cpp
index 123cb90..d6c4f85 100644
--- a/mec_xml_document.cpp
+++ b/mec_xml_document.cpp
@@ -33,13 +33,13 @@
//============================================================================
mec_xml_document::mec_xml_document(mec_input const& z)
- :input_data_(z)
+ :input_data_ {z}
{
}
//============================================================================
mec_xml_document::mec_xml_document(std::string const& filename)
- :input_data_()
+ :input_data_ {}
{
xml_lmi::dom_parser parser(filename);
parse(parser);
diff --git a/miscellany.hpp b/miscellany.hpp
index f4e102b..a8f14d5 100644
--- a/miscellany.hpp
+++ b/miscellany.hpp
@@ -96,8 +96,8 @@ class minmax
{
public:
minmax()
- :minimum_(std::numeric_limits<T>::max())
- ,maximum_(std::numeric_limits<T>::min())
+ :minimum_ {std::numeric_limits<T>::max()}
+ ,maximum_ {std::numeric_limits<T>::min()}
{
}
diff --git a/mortality_rates_test.cpp b/mortality_rates_test.cpp
index f962649..9b4bb91 100644
--- a/mortality_rates_test.cpp
+++ b/mortality_rates_test.cpp
@@ -81,21 +81,21 @@ std::vector<double> monthly_rates()
void MortalityRates::fetch_parameters(BasicValues const&) {throw "Error";}
MortalityRates::MortalityRates()
- :Length_ (0)
- ,AllowAdb_ (false)
- ,AllowChild_ (false)
- ,AllowFlatExtras_ (false)
- ,AllowSpouse_ (false)
- ,AllowSubstdTable_ (false)
- ,AllowTerm_ (false)
- ,AllowWp_ (false)
- ,CCoiIsAnnual_ (false)
- ,GCoiIsAnnual_ (false)
- ,IsTgtPremTabular_ (false)
- ,MaxMonthlyCoiRate_ (1.0)
- ,CountryCoiMultiplier_ (1.0)
- ,IsPolicyRated_ (false)
- ,SubstandardTable_ (mce_table_none)
+ :Length_ {0}
+ ,AllowAdb_ {false}
+ ,AllowChild_ {false}
+ ,AllowFlatExtras_ {false}
+ ,AllowSpouse_ {false}
+ ,AllowSubstdTable_ {false}
+ ,AllowTerm_ {false}
+ ,AllowWp_ {false}
+ ,CCoiIsAnnual_ {false}
+ ,GCoiIsAnnual_ {false}
+ ,IsTgtPremTabular_ {false}
+ ,MaxMonthlyCoiRate_ {1.0}
+ ,CountryCoiMultiplier_ {1.0}
+ ,IsPolicyRated_ {false}
+ ,SubstandardTable_ {mce_table_none}
,round_coi_rate_ (0, r_not_at_all)
{
}
diff --git a/multidimgrid_any.cpp b/multidimgrid_any.cpp
index b8ae746..5d182a4 100644
--- a/multidimgrid_any.cpp
+++ b/multidimgrid_any.cpp
@@ -214,7 +214,7 @@ class GridRefreshTableDataGuard
};
inline GridRefreshTableDataGuard::GridRefreshTableDataGuard(MultiDimGrid& grid)
- :grid_(grid)
+ :grid_ {grid}
{
++grid_.table_data_refresh_counter_;
}
diff --git a/multidimgrid_any.hpp b/multidimgrid_any.hpp
index a986671..8168273 100644
--- a/multidimgrid_any.hpp
+++ b/multidimgrid_any.hpp
@@ -217,7 +217,7 @@ class MultiDimAxisAny
};
inline MultiDimAxisAny::MultiDimAxisAny(std::string const& name)
- :name_(name)
+ :name_ {name}
{
}
diff --git a/mvc_controller.cpp b/mvc_controller.cpp
index 727aa8c..fdd34e7 100644
--- a/mvc_controller.cpp
+++ b/mvc_controller.cpp
@@ -83,12 +83,12 @@ MvcController::MvcController
,MvcModel& model
,MvcView const& view
)
- :model_ (model)
- ,view_ (view)
- ,last_focused_window_ (parent)
- ,unit_test_idle_processing_completed_ (false)
- ,unit_test_refocus_event_pending_ (false)
- ,unit_test_under_way_ (false)
+ :model_ {model}
+ ,view_ {view}
+ ,last_focused_window_ {parent}
+ ,unit_test_idle_processing_completed_ {false}
+ ,unit_test_refocus_event_pending_ {false}
+ ,unit_test_under_way_ {false}
{
model_.TestInitialConsistency();
diff --git a/outlay.cpp b/outlay.cpp
index 893d6c3..02acf0f 100644
--- a/outlay.cpp
+++ b/outlay.cpp
@@ -29,15 +29,15 @@
#include <algorithm>
modal_outlay::modal_outlay(yare_input const& yi)
- :dumpin_ (yi.Dumpin)
- ,external_1035_amount_ (yi.External1035ExchangeAmount)
- ,internal_1035_amount_ (yi.Internal1035ExchangeAmount)
- ,ee_modal_premiums_ (yi.Payment)
- ,ee_premium_modes_ (yi.PaymentMode)
- ,er_modal_premiums_ (yi.CorporationPayment)
- ,er_premium_modes_ (yi.CorporationPaymentMode)
- ,new_cash_loans_ (yi.NewLoan)
- ,withdrawals_ (yi.Withdrawal)
+ :dumpin_ {yi.Dumpin}
+ ,external_1035_amount_ {yi.External1035ExchangeAmount}
+ ,internal_1035_amount_ {yi.Internal1035ExchangeAmount}
+ ,ee_modal_premiums_ {yi.Payment}
+ ,ee_premium_modes_ {yi.PaymentMode}
+ ,er_modal_premiums_ {yi.CorporationPayment}
+ ,er_premium_modes_ {yi.CorporationPaymentMode}
+ ,new_cash_loans_ {yi.NewLoan}
+ ,withdrawals_ {yi.Withdrawal}
{
}
diff --git a/policy_document.cpp b/policy_document.cpp
index e90d436..3a05229 100644
--- a/policy_document.cpp
+++ b/policy_document.cpp
@@ -34,9 +34,9 @@
IMPLEMENT_DYNAMIC_CLASS(PolicyDocument, ProductEditorDocument)
PolicyDocument::PolicyDocument()
- :ProductEditorDocument()
- ,product_data_()
- ,values_()
+ :ProductEditorDocument {}
+ ,product_data_ {}
+ ,values_ {}
{
values_["DatabaseFilename" ] = &product_data_.DatabaseFilename
.datum_;
values_["FundFilename" ] = &product_data_.FundFilename
.datum_;
diff --git a/premium_tax.cpp b/premium_tax.cpp
index 3d771e6..1129bbe 100644
--- a/premium_tax.cpp
+++ b/premium_tax.cpp
@@ -92,24 +92,24 @@ premium_tax::premium_tax
,product_database const& db
,stratified_charges const& strata
)
- :tax_state_ (tax_state)
- ,domicile_ (domicile)
- ,amortize_premium_load_ (amortize_premium_load)
- ,levy_rate_ (0.0) // Reset below.
- ,load_rate_ (0.0) // Reset below.
- ,tax_state_load_rate_ (0.0) // Reset below.
- ,domiciliary_load_rate_ (0.0) // Reset below.
- ,maximum_load_rate_ (0.0) // Reset below.
- ,minimum_load_rate_ (0.0) // Reset below.
- ,is_tiered_in_tax_state_ (false) // Reset below.
- ,is_tiered_in_domicile_ (false) // Reset below.
- ,is_retaliatory_ (false) // Reset below.
- ,varies_by_state_ (false) // Reset below.
- ,load_rate_is_levy_rate_ (false) // Reset below.
- ,ytd_taxable_premium_ (0.0)
- ,ytd_load_ (0.0)
- ,ytd_load_in_tax_state_ (0.0)
- ,ytd_load_in_domicile_ (0.0)
+ :tax_state_ {tax_state}
+ ,domicile_ {domicile}
+ ,amortize_premium_load_ {amortize_premium_load}
+ ,levy_rate_ {0.0} // Reset below.
+ ,load_rate_ {0.0} // Reset below.
+ ,tax_state_load_rate_ {0.0} // Reset below.
+ ,domiciliary_load_rate_ {0.0} // Reset below.
+ ,maximum_load_rate_ {0.0} // Reset below.
+ ,minimum_load_rate_ {0.0} // Reset below.
+ ,is_tiered_in_tax_state_ {false} // Reset below.
+ ,is_tiered_in_domicile_ {false} // Reset below.
+ ,is_retaliatory_ {false} // Reset below.
+ ,varies_by_state_ {false} // Reset below.
+ ,load_rate_is_levy_rate_ {false} // Reset below.
+ ,ytd_taxable_premium_ {0.0}
+ ,ytd_load_ {0.0}
+ ,ytd_load_in_tax_state_ {0.0}
+ ,ytd_load_in_domicile_ {0.0}
{
is_tiered_in_tax_state_ = strata.premium_tax_is_tiered(tax_state_);
is_tiered_in_domicile_ = strata.premium_tax_is_tiered(domicile_ );
@@ -155,24 +155,24 @@ premium_tax::premium_tax
(mcenum_state tax_state
,product_database const& db
)
- :tax_state_ (tax_state)
- ,domicile_ (mce_s_XX) // Doesn't matter.
- ,amortize_premium_load_ (false)
- ,levy_rate_ (0.0) // Reset below.
- ,load_rate_ (0.0)
- ,tax_state_load_rate_ (0.0)
- ,domiciliary_load_rate_ (0.0)
- ,maximum_load_rate_ (0.0)
- ,minimum_load_rate_ (0.0)
- ,is_tiered_in_tax_state_ (false)
- ,is_tiered_in_domicile_ (false)
- ,is_retaliatory_ (false)
- ,varies_by_state_ (false)
- ,load_rate_is_levy_rate_ (false)
- ,ytd_taxable_premium_ (0.0)
- ,ytd_load_ (0.0)
- ,ytd_load_in_tax_state_ (0.0)
- ,ytd_load_in_domicile_ (0.0)
+ :tax_state_ {tax_state}
+ ,domicile_ {mce_s_XX} // Doesn't matter.
+ ,amortize_premium_load_ {false}
+ ,levy_rate_ {0.0} // Reset below.
+ ,load_rate_ {0.0}
+ ,tax_state_load_rate_ {0.0}
+ ,domiciliary_load_rate_ {0.0}
+ ,maximum_load_rate_ {0.0}
+ ,minimum_load_rate_ {0.0}
+ ,is_tiered_in_tax_state_ {false}
+ ,is_tiered_in_domicile_ {false}
+ ,is_retaliatory_ {false}
+ ,varies_by_state_ {false}
+ ,load_rate_is_levy_rate_ {false}
+ ,ytd_taxable_premium_ {0.0}
+ ,ytd_load_ {0.0}
+ ,ytd_load_in_tax_state_ {0.0}
+ ,ytd_load_in_domicile_ {0.0}
{
database_index index = db.index().state(tax_state_);
levy_rate_ = db.Query(DB_PremTaxRate, index);
diff --git a/product_data.cpp b/product_data.cpp
index 6e4d7c1..5bb9bdd 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -91,8 +91,8 @@ glossed_string::glossed_string
(std::string const& datum
,std::string const& gloss
)
- :datum_(datum)
- ,gloss_(gloss)
+ :datum_ {datum}
+ ,gloss_ {gloss}
{}
glossed_string& glossed_string::operator=(std::string const& s)
diff --git a/progress_meter.cpp b/progress_meter.cpp
index 40dcfb4..64df241 100644
--- a/progress_meter.cpp
+++ b/progress_meter.cpp
@@ -70,11 +70,11 @@ progress_meter::progress_meter
,std::string const& title
,enum_display_mode display_mode
)
- :count_ (0)
- ,max_count_ (max_count)
- ,title_ (title)
- ,display_mode_ (display_mode)
- ,was_cancelled_ (false)
+ :count_ {0}
+ ,max_count_ {max_count}
+ ,title_ {title}
+ ,display_mode_ {display_mode}
+ ,was_cancelled_ {false}
{
}
diff --git a/progress_meter_cli.cpp b/progress_meter_cli.cpp
index 415443e..a023e86 100644
--- a/progress_meter_cli.cpp
+++ b/progress_meter_cli.cpp
@@ -88,8 +88,8 @@ concrete_progress_meter::concrete_progress_meter
,std::string const& title
,progress_meter::enum_display_mode display_mode
)
- :progress_meter(max_count, title, display_mode)
- ,os_ (select_streambuf(display_mode))
+ :progress_meter (max_count, title, display_mode)
+ ,os_ {select_streambuf(display_mode)}
{
os_ << title << std::flush;
}
diff --git a/rate_table.cpp b/rate_table.cpp
index 94d7e52..6852b2b 100644
--- a/rate_table.cpp
+++ b/rate_table.cpp
@@ -344,8 +344,8 @@ char const* table_type_as_string(table_type tt)
struct location_info
{
explicit location_info(int line_num = 0, int position = 0)
- :line_num_(line_num)
- ,position_(position)
+ :line_num_ {line_num}
+ ,position_ {position}
{
}
@@ -2390,9 +2390,9 @@ class database_impl final
,std::uint32_t offset
,std::shared_ptr<table_impl> table
)
- :number_(bourn_cast<std::uint32_t>(number.value()))
- ,offset_(offset)
- ,table_ (table)
+ :number_ {bourn_cast<std::uint32_t>(number.value())}
+ ,offset_ {offset}
+ ,table_ {table}
{
}
@@ -2465,7 +2465,7 @@ class database_impl final
};
database_impl::database_impl(fs::path const& path)
- :path_(path)
+ :path_ {path}
{
if(path_.empty())
{
@@ -2492,7 +2492,7 @@ database_impl::database_impl
(std::istream& index_is
,std::shared_ptr<std::istream> data_is
)
- :data_is_(data_is)
+ :data_is_ {data_is}
{
read_index(index_is);
}
@@ -2716,9 +2716,9 @@ void database_impl::save(fs::path const& path)
// Try to set up things for saving a database to the given path, throws
// on failure.
explicit safe_database_output(fs::path const& path)
- :path_ (path)
- ,index_ (path, "index" , ".ndx")
- ,database_(path, "database", ".dat")
+ :path_ {path}
+ ,index_ {path, "index" , ".ndx"}
+ ,database_ {path, "database", ".dat"}
{
}
@@ -2864,13 +2864,13 @@ void database_impl::save(fs::path const& path)
,char const* description
,char const* extension
)
- :path_(fs::change_extension(path, extension))
+ :path_ {fs::change_extension(path, extension)}
,temp_path_
- (fs::exists(path_)
+ {fs::exists(path_)
? unique_filepath(path_, extension +
std::string(".tmp"))
: path_
- )
- ,description_(description)
+ }
+ ,description_ {description}
{
ofs_.open(temp_path_, ios_out_trunc_binary());
if(!ofs_) alarum() << "Unable to open '" << temp_path_ << "'." <<
LMI_FLUSH;
@@ -2996,13 +2996,13 @@ bool database::exists(fs::path const& path)
}
database::database()
- :impl_(new database_impl(fs::path()))
+ :impl_ {new database_impl(fs::path())}
{
}
database::database(fs::path const& path)
try
- :impl_(new database_impl(path))
+ :impl_ {new database_impl(path)}
{
}
catch(std::runtime_error const& e)
@@ -3020,7 +3020,7 @@ database::database
,std::shared_ptr<std::istream> data_is
)
try
- :impl_(new database_impl(index_is, data_is))
+ :impl_ {new database_impl(index_is, data_is)}
{
}
catch(std::runtime_error const& e)
diff --git a/rate_table.hpp b/rate_table.hpp
index 35e1862..ecb7cb2 100644
--- a/rate_table.hpp
+++ b/rate_table.hpp
@@ -94,7 +94,7 @@ class table
private:
// Private ctor used only by database.
explicit table(std::shared_ptr<table_impl> const& impl)
- :impl_(impl)
+ :impl_ {impl}
{
}
diff --git a/rate_table_test.cpp b/rate_table_test.cpp
index 2044854..91db325 100644
--- a/rate_table_test.cpp
+++ b/rate_table_test.cpp
@@ -50,7 +50,7 @@ class std_out_redirector
{
public:
std_out_redirector()
- :orig_streambuf_(std::cout.rdbuf(stream_out_.rdbuf()))
+ :orig_streambuf_ {std::cout.rdbuf(stream_out_.rdbuf())}
{
}
@@ -89,7 +89,7 @@ class test_file_eraser
{
public:
explicit test_file_eraser(fs::path const& path)
- :path_(path)
+ :path_ {path}
{
}
diff --git a/round_to.hpp b/round_to.hpp
index 94b0306..f3c0967 100644
--- a/round_to.hpp
+++ b/round_to.hpp
@@ -306,11 +306,11 @@ class round_to
template<typename RealType>
round_to<RealType>::round_to(int decimals, rounding_style a_style)
- :decimals_ (decimals)
- ,style_ (a_style)
- ,scale_fwd_ (detail::perform_pow(max_prec_real(10.0), decimals))
- ,scale_back_ (max_prec_real(1.0) / scale_fwd_)
- ,rounding_function_ (select_rounding_function(a_style))
+ :decimals_ {decimals}
+ ,style_ {a_style}
+ ,scale_fwd_ {detail::perform_pow(max_prec_real(10.0), decimals)}
+ ,scale_back_ {max_prec_real(1.0) / scale_fwd_}
+ ,rounding_function_ {select_rounding_function(a_style)}
{
/*
// TODO ?? This might improve accuracy slightly, but would prevent
diff --git a/rounding_document.cpp b/rounding_document.cpp
index 694f7e8..c9854f6 100644
--- a/rounding_document.cpp
+++ b/rounding_document.cpp
@@ -33,9 +33,9 @@
IMPLEMENT_DYNAMIC_CLASS(RoundingDocument, ProductEditorDocument)
RoundingDocument::RoundingDocument()
- :ProductEditorDocument()
- ,rounding_rules_()
- ,values_()
+ :ProductEditorDocument {}
+ ,rounding_rules_ {}
+ ,values_ {}
{
values_["specamt" ] = &rounding_rules_.round_specamt_ ;
values_["death_benefit" ] = &rounding_rules_.round_death_benefit_ ;
diff --git a/rounding_rules.cpp b/rounding_rules.cpp
index 788333b..83e1fc4 100644
--- a/rounding_rules.cpp
+++ b/rounding_rules.cpp
@@ -97,9 +97,9 @@ rounding_parameters::rounding_parameters
,rounding_style style
,std::string const& gloss
)
- :decimals_ (decimals)
- ,style_ (style )
- ,gloss_ (gloss )
+ :decimals_ {decimals}
+ ,style_ {style }
+ ,gloss_ {gloss }
{
}
diff --git a/rounding_view_editor.cpp b/rounding_view_editor.cpp
index 4b7b193..fbd964b 100644
--- a/rounding_view_editor.cpp
+++ b/rounding_view_editor.cpp
@@ -154,8 +154,8 @@ BEGIN_EVENT_TABLE(RoundingButtons, wxPanel)
END_EVENT_TABLE()
RoundingButtons::RoundingButtons()
- :wxPanel()
- ,previous_value_(0, r_not_at_all)
+ :wxPanel {}
+ ,previous_value_ (0, r_not_at_all)
{
}
@@ -167,8 +167,8 @@ RoundingButtons::RoundingButtons
,long int style
,std::string const& name
)
- :wxPanel()
- ,previous_value_(0, r_not_at_all)
+ :wxPanel {}
+ ,previous_value_ (0, r_not_at_all)
{
Create(parent, id, pos, size, style, name);
}
@@ -363,7 +363,7 @@ wxBitmapButton& RoundingButtons::button_downward() const
IMPLEMENT_DYNAMIC_CLASS(RoundingButtonsXmlHandler, wxXmlResourceHandler)
RoundingButtonsXmlHandler::RoundingButtonsXmlHandler()
- :wxXmlResourceHandler()
+ :wxXmlResourceHandler {}
{
AddWindowStyles();
}
diff --git a/single_cell_document.cpp b/single_cell_document.cpp
index cd048fd..85fa315 100644
--- a/single_cell_document.cpp
+++ b/single_cell_document.cpp
@@ -41,14 +41,14 @@
/// Copy constructor.
single_cell_document::single_cell_document(Input const& z)
- :input_data_(z)
+ :input_data_ {z}
{
}
/// This ctor is used to read the default input file.
single_cell_document::single_cell_document(std::string const& filename)
- :input_data_()
+ :input_data_ {}
{
xml_lmi::dom_parser parser(filename);
parse(parser);
diff --git a/single_choice_popup_menu.cpp b/single_choice_popup_menu.cpp
index 4fba416..b8c7685 100644
--- a/single_choice_popup_menu.cpp
+++ b/single_choice_popup_menu.cpp
@@ -33,7 +33,7 @@ SingleChoicePopupMenu::SingleChoicePopupMenu
,wxString const& title
,wxTopLevelWindow& parent
)
- :parent_(parent)
+ :parent_ {parent}
{
if(!title.IsEmpty())
{
diff --git a/skeleton.cpp b/skeleton.cpp
index 94b3d6e..d1ce005 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -196,10 +196,10 @@ END_EVENT_TABLE()
/// the "AppName" (but not the "AppDisplayName").
Skeleton::Skeleton()
- :config_ (nullptr)
- ,doc_manager_ (nullptr)
- ,frame_ (nullptr)
- ,timer_ (this)
+ :config_ {nullptr}
+ ,doc_manager_ {nullptr}
+ ,frame_ {nullptr}
+ ,timer_ {this}
{
SetAppName("lmi_wx");
diff --git a/stratified_charges.cpp b/stratified_charges.cpp
index 5cffae5..8431af3 100644
--- a/stratified_charges.cpp
+++ b/stratified_charges.cpp
@@ -90,9 +90,9 @@ stratified_entity::stratified_entity
,std::vector<double> const& values
,std::string const& gloss
)
- :limits_(limits)
- ,values_(values)
- ,gloss_ (gloss)
+ :limits_ {limits}
+ ,values_ {values}
+ ,gloss_ {gloss}
{
assert_validity();
}
@@ -175,8 +175,8 @@ stratified_charges::stratified_charges(std::string const&
filename)
}
stratified_charges::stratified_charges(stratified_charges const& z)
- :xml_serializable <stratified_charges>()
- ,MemberSymbolTable <stratified_charges>()
+ :xml_serializable <stratified_charges> {}
+ ,MemberSymbolTable <stratified_charges> {}
{
ascribe_members();
MemberSymbolTable<stratified_charges>::assign(z);
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index e31da09..efca3e8 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -132,11 +132,11 @@ class file final
/// assign files to that phylum last, and only if they fit no other.
file::file(std::string const& file_path)
- :path_ (file_path)
- ,full_name_(file_path)
- ,leaf_name_(path_.leaf())
- ,extension_(fs::extension(path_))
- ,phylum_ (e_no_phylum)
+ :path_ {file_path}
+ ,full_name_ {file_path}
+ ,leaf_name_ {path_.leaf()}
+ ,extension_ {fs::extension(path_)}
+ ,phylum_ {e_no_phylum}
{
if(!fs::exists(path_))
{
diff --git a/tier_document.cpp b/tier_document.cpp
index 4d30bce..4bc963f 100644
--- a/tier_document.cpp
+++ b/tier_document.cpp
@@ -30,8 +30,8 @@
IMPLEMENT_DYNAMIC_CLASS(TierDocument, ProductEditorDocument)
TierDocument::TierDocument()
- :ProductEditorDocument()
- ,charges_()
+ :ProductEditorDocument {}
+ ,charges_ {}
{
initialize_charges();
}
diff --git a/tier_view.cpp b/tier_view.cpp
index b824d9a..508c1ea 100644
--- a/tier_view.cpp
+++ b/tier_view.cpp
@@ -78,8 +78,8 @@ class tier_tree_item_data
};
tier_tree_item_data::tier_tree_item_data(tier_entity_info const& entity_info)
- :wxTreeItemData()
- ,entity_info_(entity_info)
+ :wxTreeItemData {}
+ ,entity_info_ {entity_info}
{
}
@@ -97,8 +97,8 @@ BEGIN_EVENT_TABLE(TierView, TreeGridViewBase)
END_EVENT_TABLE()
TierView::TierView()
- :TreeGridViewBase()
- ,table_adapter_(new TierTableAdapter())
+ :TreeGridViewBase {}
+ ,table_adapter_ {new TierTableAdapter()}
{
}
diff --git a/tier_view_editor.hpp b/tier_view_editor.hpp
index c2115f7..73d6e70 100644
--- a/tier_view_editor.hpp
+++ b/tier_view_editor.hpp
@@ -105,8 +105,8 @@ inline bool tier_entity_adapter::is_void() const
}
inline tier_entity_adapter::tier_entity_adapter()
- :limits_(nullptr)
- ,values_(nullptr)
+ :limits_ {nullptr}
+ ,values_ {nullptr}
{
}
@@ -114,8 +114,8 @@ inline tier_entity_adapter::tier_entity_adapter
(std::vector<double>& limits
,std::vector<double>& values
)
- :limits_(&limits)
- ,values_(&values)
+ :limits_ (&limits)
+ ,values_ (&values)
{
if(limits.size() != values.size())
{
@@ -248,8 +248,8 @@ class TierTableAdapter
};
inline TierTableAdapter::TierTableAdapter(tier_entity_adapter entity)
- :entity_()
- ,modified_(false)
+ :entity_ {}
+ ,modified_ {false}
{
SetTierEntity(entity);
}
diff --git a/timer.cpp b/timer.cpp
index 423335d..a82bce5 100644
--- a/timer.cpp
+++ b/timer.cpp
@@ -74,10 +74,10 @@ void lmi_sleep(int seconds) {Sleep(bourn_cast<unsigned
int>(1000 * seconds));}
/// cannot be determined.
Timer::Timer()
- :elapsed_time_ (0)
- ,is_running_ (false)
- ,time_when_started_ (0)
- ,time_when_stopped_ (0)
+ :elapsed_time_ {0}
+ ,is_running_ {false}
+ ,time_when_started_ {0}
+ ,time_when_stopped_ {0}
{
frequency_ = calibrate();
if(frequency_ <= 0)
diff --git a/timer.hpp b/timer.hpp
index 5569a05..709ab3c 100644
--- a/timer.hpp
+++ b/timer.hpp
@@ -146,8 +146,8 @@ class AliquotTimer
template<typename F>
AliquotTimer<F>::AliquotTimer(F f, double max_seconds)
- :f_ (f)
- ,max_seconds_(max_seconds)
+ :f_ {f}
+ ,max_seconds_ {max_seconds}
{
Timer timer;
if(max_seconds_ * timer.frequency_ < 1.0)
diff --git a/tn_range.tpp b/tn_range.tpp
index f1a76e6..c5270e0 100644
--- a/tn_range.tpp
+++ b/tn_range.tpp
@@ -351,27 +351,27 @@ T trammel_base<T>::maximum_maximorum() const
template<typename Number, typename Trammel>
tn_range<Number,Trammel>::tn_range()
- :minimum_ (trammel_.minimum_minimorum())
- ,maximum_ (trammel_.maximum_maximorum())
- ,value_ (trammel_.default_initializer())
+ :minimum_ {trammel_.minimum_minimorum()}
+ ,maximum_ {trammel_.maximum_maximorum()}
+ ,value_ {trammel_.default_initializer()}
{
trammel_.assert_sanity();
}
template<typename Number, typename Trammel>
tn_range<Number,Trammel>::tn_range(Number n)
- :minimum_ (trammel_.minimum_minimorum())
- ,maximum_ (trammel_.maximum_maximorum())
- ,value_ (curb(n))
+ :minimum_ {trammel_.minimum_minimorum()}
+ ,maximum_ {trammel_.maximum_maximorum()}
+ ,value_ {curb(n)}
{
trammel_.assert_sanity();
}
template<typename Number, typename Trammel>
tn_range<Number,Trammel>::tn_range(std::string const& s)
- :minimum_ (trammel_.minimum_minimorum())
- ,maximum_ (trammel_.maximum_maximorum())
- ,value_ (curb(value_cast<Number>(s)))
+ :minimum_ {trammel_.minimum_minimorum()}
+ ,maximum_ {trammel_.maximum_maximorum()}
+ ,value_ {curb(value_cast<Number>(s))}
{
trammel_.assert_sanity();
}
diff --git a/transferor.cpp b/transferor.cpp
index 8de8a3e..7887a27 100644
--- a/transferor.cpp
+++ b/transferor.cpp
@@ -85,9 +85,9 @@ namespace
} // Unnamed namespace.
Transferor::Transferor(std::string& data, std::string const& name)
- :wxValidator()
- ,data_(data)
- ,name_(name)
+ :wxValidator {}
+ ,data_ {data}
+ ,name_ {name}
{
}
diff --git a/vector_test.cpp b/vector_test.cpp
index fcce46d..5631125 100644
--- a/vector_test.cpp
+++ b/vector_test.cpp
@@ -171,7 +171,7 @@ class simple_array0
{
public:
simple_array0(int n, double d = 0.0)
- :length_(n)
+ :length_ {n}
{
data_ = new double[length_];
for(int j = 0; j < length_; ++j) data_[j] = d;
diff --git a/wx_table_generator.cpp b/wx_table_generator.cpp
index be44227..4ec91b8 100644
--- a/wx_table_generator.cpp
+++ b/wx_table_generator.cpp
@@ -94,16 +94,16 @@ wx_table_generator::wx_table_generator
,int left_margin
,int total_width
)
- :indices_ (indices)
- ,dc_ (dc)
- ,left_margin_ (left_margin)
- ,total_width_ (total_width)
- ,char_height_ (dc_.GetCharHeight())
- ,row_height_ (char_height_)
- ,one_em_ (dc_.GetTextExtent("M").x)
- ,max_header_lines_ (1)
- ,draw_separators_ (false)
- ,use_bold_headers_ (false)
+ :indices_ {indices}
+ ,dc_ {dc}
+ ,left_margin_ {left_margin}
+ ,total_width_ {total_width}
+ ,char_height_ {dc_.GetCharHeight()}
+ ,row_height_ {char_height_}
+ ,one_em_ {dc_.GetTextExtent("M").x}
+ ,max_header_lines_ {1}
+ ,draw_separators_ {false}
+ ,use_bold_headers_ {false}
{
for(auto const& i : vc)
{
diff --git a/wx_test_benchmark_census.cpp b/wx_test_benchmark_census.cpp
index e214684..214457d 100644
--- a/wx_test_benchmark_census.cpp
+++ b/wx_test_benchmark_census.cpp
@@ -43,8 +43,8 @@ class census_benchmark
{
public:
explicit census_benchmark(fs::path const& path)
- :status_(get_main_window_statusbar())
- ,name_(path.leaf())
+ :status_ {get_main_window_statusbar()}
+ ,name_ {path.leaf()}
{
wxUIActionSimulator z;
z.Char('o', wxMOD_CONTROL); // "File|Open"
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index 094eeed..cc3c218 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -86,8 +86,8 @@ class expect_preferences_dialog_base
{
public:
expect_preferences_dialog_base()
- :dialog_(nullptr)
- ,use_checkbox_(nullptr)
+ :dialog_ {nullptr}
+ ,use_checkbox_ {nullptr}
{
}
diff --git a/wx_test_document.hpp b/wx_test_document.hpp
index 80f5ea4..853061d 100644
--- a/wx_test_document.hpp
+++ b/wx_test_document.hpp
@@ -56,7 +56,7 @@ class wx_test_document_base
{
public:
wx_test_document_base()
- :opened_(false)
+ :opened_ {false}
{
}
diff --git a/wx_test_input_sequences.cpp b/wx_test_input_sequences.cpp
index eb41a97..9f34f62 100644
--- a/wx_test_input_sequences.cpp
+++ b/wx_test_input_sequences.cpp
@@ -88,7 +88,7 @@ LMI_WX_TEST_CASE(input_sequences)
struct test_sequence_dialog : public wxExpectModalBase<MvcController>
{
explicit test_sequence_dialog(input_sequence_test_data const&
test_data)
- :test_data_(test_data)
+ :test_data_ {test_data}
{}
int OnInvoked(MvcController* dialog) const override
diff --git a/wx_test_input_validation.cpp b/wx_test_input_validation.cpp
index c4ffa09..89b452b 100644
--- a/wx_test_input_validation.cpp
+++ b/wx_test_input_validation.cpp
@@ -94,7 +94,7 @@ LMI_WX_TEST_CASE(input_validation)
struct test_coi_multiplier_dialog : public wxExpectModalBase<MvcController>
{
explicit test_coi_multiplier_dialog(char const* value)
- :value_(value)
+ :value_ {value}
{}
test_coi_multiplier_dialog(test_coi_multiplier_dialog const&) = delete;
diff --git a/wx_test_output.hpp b/wx_test_output.hpp
index 6b430f3..54ce577 100644
--- a/wx_test_output.hpp
+++ b/wx_test_output.hpp
@@ -36,7 +36,7 @@ class output_file_existence_checker
{
public:
output_file_existence_checker(fs::path const& path)
- :path_(path)
+ :path_ {path}
{
fs::remove(path_);
}
diff --git a/wx_test_validate_output.cpp b/wx_test_validate_output.cpp
index d21e1df..52a4ca0 100644
--- a/wx_test_validate_output.cpp
+++ b/wx_test_validate_output.cpp
@@ -68,7 +68,7 @@ struct enter_comments_in_case_defaults_dialog
:public wxExpectModalBase<MvcController>
{
enter_comments_in_case_defaults_dialog(std::string const& comments)
- :comments_(comments)
+ :comments_ {comments}
{
}
@@ -125,7 +125,7 @@ void init_test_census
{
change_corp_in_case_defaults_dialog(std::string const& corp_name)
:enter_comments_in_case_defaults_dialog("idiosyncrasyZ")
- ,corp_name_(corp_name)
+ ,corp_name_ {corp_name}
{
}
@@ -158,7 +158,7 @@ void init_test_census
:public wxExpectModalBase<MvcController>
{
change_name_in_cell_dialog(std::string const& insured_name)
- :insured_name_(insured_name)
+ :insured_name_ {insured_name}
{
}
diff --git a/xml_lmi.cpp b/xml_lmi.cpp
index c0041ee..49a5963 100644
--- a/xml_lmi.cpp
+++ b/xml_lmi.cpp
@@ -202,7 +202,7 @@ xml::element const& xml_lmi::dom_parser::root_node
}
xml_lmi::xml_document::xml_document(std::string const& root_node_name)
- :document_(new xml_lmi::Document(xml::element(root_node_name.c_str())))
+ :document_ {new xml_lmi::Document(xml::element(root_node_name.c_str()))}
{
}