[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master e90a3d1 2/9: Rename arguments
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master e90a3d1 2/9: Rename arguments |
Date: |
Tue, 18 Jun 2019 16:43:54 -0400 (EDT) |
branch: master
commit e90a3d19e3b787841e4edbdb40a240f2bcd4b825
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename arguments
Renamed string arguments with a '_str' suffix, so that the original
names can be used for corresponding variables of enumerative type.
---
verify_products.cpp | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/verify_products.cpp b/verify_products.cpp
index ebdf88b..70fab24 100644
--- a/verify_products.cpp
+++ b/verify_products.cpp
@@ -44,14 +44,14 @@ namespace
{
void verify_one_cell
(std::string const& product_name
- ,std::string const& gender
- ,std::string const& smoking
+ ,std::string const& gender_str
+ ,std::string const& smoking_str
)
{
Input input;
input["ProductName"] = product_name;
- input["Gender" ] = gender;
- input["Smoking" ] = smoking;
+ input["Gender" ] = gender_str;
+ input["Smoking" ] = smoking_str;
int const min_age =
product_database(yare_input(input)).query<int>(DB_MinIssAge);
input["IssueAge" ] = value_cast<std::string>(min_age);
@@ -69,9 +69,17 @@ void verify_one_cell
product_data const p(product_name);
- if((!axis_g && "Unisex" != gender) || (!axis_s && "Unismoke" != smoking))
+ if
+ ( (!axis_g && "Unisex" != gender_str )
+ || (!axis_s && "Unismoke" != smoking_str)
+ )
{
- std::cout << " skipping " << gender << ' ' << smoking << std::endl;
+ std::cout
+ << " skipping"
+ << ' ' << gender_str
+ << ' ' << smoking_str
+ << std::endl
+ ;
return;
}
@@ -94,8 +102,8 @@ void verify_one_cell
(era
,oe_orthodox // No other option currently supported for 7702.
,a_b
- ,mce_gender (gender).value()
- ,mce_smoking(smoking).value()
+ ,mce_gender (gender_str).value()
+ ,mce_smoking(smoking_str).value()
,min_age
,omega
);
@@ -108,8 +116,8 @@ void verify_one_cell
std::cout
<< "7702 q okay: builtin "
<< std::string((v0 == v1) ? "validated" : "PROBLEM")
- << ' ' << gender
- << ' ' << smoking
+ << ' ' << gender_str
+ << ' ' << smoking_str
<< std::endl
;
}
@@ -130,8 +138,8 @@ void verify_one_cell
std::cout
<< "7702 q PROBLEM: " << product_name
<< " nonexistent table zero"
- << ' ' << gender
- << ' ' << smoking
+ << ' ' << gender_str
+ << ' ' << smoking_str
<< std::endl
;
return;
@@ -141,8 +149,8 @@ void verify_one_cell
(era
,oe_orthodox // No other option currently supported for 7702.
,a_b
- ,mce_gender (gender).value()
- ,mce_smoking(smoking).value()
+ ,mce_gender (gender_str).value()
+ ,mce_smoking(smoking_str).value()
);
std::string const f = AddDataDir(p.datum("Irc7702QFilename"));
actuarial_table const a(f, t);
@@ -155,8 +163,8 @@ void verify_one_cell
{
std::cout
<< "7702 q okay: table " << t
- << ' ' << gender
- << ' ' << smoking
+ << ' ' << gender_str
+ << ' ' << smoking_str
<< std::endl
;
}
@@ -164,8 +172,8 @@ void verify_one_cell
{
std::cout
<< "7702 q PROBLEM: " << product_name
- << ' ' << gender
- << ' ' << smoking
+ << ' ' << gender_str
+ << ' ' << smoking_str
<< std::endl
;
std::cout
- [lmi-commits] [lmi] master updated (e019e5b -> 246081b), Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master f5bb23f 1/9: Improve product-verifier control flow, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master d89b244 6/9: Make cover page the same for all formats but one, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master ba624fe 4/9: Refactor, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master e90a3d1 2/9: Rename arguments,
Greg Chicares <=
- [lmi-commits] [lmi] master 8af7bed 5/9: Apply a recent FINRA header change to Reg D formats, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master 57bee69 3/9: Remove an ugly expedient, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master b4f5c34 8/9: Present 'AgentPhone' and 'AgentId' on all GUI skins, Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master 246081b 9/9: Use <border> to improve layout of 'skin.xrc', Greg Chicares, 2019/06/18
- [lmi-commits] [lmi] master e030aaa 7/9: Consolidate lower footer templates, Greg Chicares, 2019/06/18