[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 9fa58dc 3/5: Improve a variable name
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 9fa58dc 3/5: Improve a variable name |
|
Date: |
Wed, 25 Apr 2018 10:53:48 -0400 (EDT) |
branch: master
commit 9fa58dc21d6f2c33bbe17231060d3584a459a799
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Improve a variable name
'\<values\>' occurred many times as a variable, and many times as
English text in comments, making it difficult to trace the origin of
the second argument given to output_row().
---
group_quote_pdf_gen_wx.cpp | 24 ++++++++++++------------
ledger_pdf_generator_wx.cpp | 14 +++++++-------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index f786259..f302e36 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -346,7 +346,7 @@ class group_quote_pdf_generator_wx
struct row_data
{
- std::string values[e_col_max];
+ std::string output_values[e_col_max];
};
std::vector<row_data> rows_;
@@ -546,22 +546,22 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger
const& ledger)
case e_col_number:
{
// Row numbers shown to human beings should be 1-based.
- rd.values[col] = wxString::Format("%d", row_num_ +
1).ToStdString();
+ rd.output_values[col] = wxString::Format("%d", row_num_ +
1).ToStdString();
}
break;
case e_col_name:
{
- rd.values[col] = invar.Insured1;
+ rd.output_values[col] = invar.Insured1;
}
break;
case e_col_age:
{
- rd.values[col] = wxString::Format("%.0f",
invar.Age).ToStdString();
+ rd.output_values[col] = wxString::Format("%.0f",
invar.Age).ToStdString();
}
break;
case e_col_dob:
{
- rd.values[col] = ConvertDateToWx
+ rd.output_values[col] = ConvertDateToWx
(jdn_t(static_cast<int>(invar.DateOfBirthJdn))
).FormatDate().ToStdString(wxConvUTF8);
}
@@ -569,7 +569,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_basic_face_amount:
{
double const z = invar.SpecAmt.at(year);
- rd.values[col] = '$' + ledger_format(z, f0);
+ rd.output_values[col] = '$' + ledger_format(z, f0);
if(is_composite)
{
totals_.total(col, z);
@@ -579,7 +579,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_basic_premium:
{
double const z = invar.ErModalMinimumPremium.at(year);
- rd.values[col] = '$' + ledger_format(z, f2);
+ rd.output_values[col] = '$' + ledger_format(z, f2);
if(is_composite)
{
totals_.total(col, z);
@@ -589,7 +589,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_supplemental_face_amount:
{
double const z = invar.TermSpecAmt.at(year);
- rd.values[col] = '$' + ledger_format(z, f0);
+ rd.output_values[col] = '$' + ledger_format(z, f0);
if(is_composite)
{
totals_.total(col, z);
@@ -599,7 +599,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_additional_premium:
{
double const z = invar.EeModalMinimumPremium.at(year) +
invar.ModalMinimumDumpin;
- rd.values[col] = '$' + ledger_format(z, f2);
+ rd.output_values[col] = '$' + ledger_format(z, f2);
if(is_composite)
{
totals_.total(col, z);
@@ -609,7 +609,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_total_face_amount:
{
double const z = invar.SpecAmt.at(year) +
invar.TermSpecAmt.at(year);
- rd.values[col] = '$' + ledger_format(z, f0);
+ rd.output_values[col] = '$' + ledger_format(z, f0);
if(is_composite)
{
totals_.total(col, z);
@@ -619,7 +619,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const&
ledger)
case e_col_total_premium:
{
double const z = invar.ModalMinimumPremium.at(year) +
invar.ModalMinimumDumpin;
- rd.values[col] = '$' + ledger_format(z, f2);
+ rd.output_values[col] = '$' + ledger_format(z, f2);
if(is_composite)
{
totals_.total(col, z);
@@ -762,7 +762,7 @@ void group_quote_pdf_generator_wx::save(std::string const&
output_filename)
for(auto const& i : rows_)
{
- table_gen.output_row(&pos_y, i.values);
+ table_gen.output_row(&pos_y, i.output_values);
if(last_row_y <= pos_y)
{
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index eff074e..11adec1 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1448,7 +1448,7 @@ class numeric_summary_table_cell
// And now the table values themselves.
auto const& columns = get_table_columns();
- std::vector<std::string> values(columns.size());
+ std::vector<std::string> output_values(columns.size());
auto const& invar = ledger.GetLedgerInvariant();
auto const& interpolate_html =
pdf_context_for_html_output.interpolate_html();
@@ -1498,20 +1498,20 @@ class numeric_summary_table_cell
{
std::ostringstream oss;
oss << "Age " << age_last;
- values[col] = oss.str();
+ output_values[col] = oss.str();
continue;
}
}
// Special hack for the dummy columns whose value is
always
// empty as it's used only as separator.
- values[col] = variable_name.empty()
+ output_values[col] = variable_name.empty()
? std::string{}
: interpolate_html.evaluate(variable_name, year -
1)
;
}
- table.output_row(&pos_y, values.data());
+ table.output_row(&pos_y, output_values.data());
break;
}
}
@@ -1610,7 +1610,7 @@ class page_with_tabular_report
auto const row_height = table.row_height();
auto const page_bottom = get_footer_top();
auto const rows_per_group =
illustration_table_generator::rows_per_group;
- std::vector<std::string> values(columns.size());
+ std::vector<std::string> output_values(columns.size());
// The table may need several pages, loop over them.
int const year_max = ledger.GetMaxLength();
@@ -1632,13 +1632,13 @@ class page_with_tabular_report
// Special hack for the dummy columns used in some reports,
// whose value is always empty as it's used only as
// separator.
- values[col] = variable_name.empty()
+ output_values[col] = variable_name.empty()
? std::string{}
: interpolate_html.evaluate(variable_name, year)
;
}
- table.output_row(&pos_y, values.data());
+ table.output_row(&pos_y, output_values.data());
++year;
if(year == year_max)