[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5604] Rename certain members for clarity and consistency
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5604] Rename certain members for clarity and consistency |
|
Date: |
Sat, 17 Nov 2012 04:07:19 +0000 |
Revision: 5604
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5604
Author: chicares
Date: 2012-11-17 04:07:18 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Rename certain members for clarity and consistency
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/basic_values.hpp
lmi/trunk/ihs_basicval.cpp
lmi/trunk/mec_server.cpp
lmi/trunk/mortality_rates_fetch.cpp
lmi/trunk/my_prod.cpp
lmi/trunk/policy_document.cpp
lmi/trunk/policy_view.xrc
lmi/trunk/product_data.cpp
lmi/trunk/product_data.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/ChangeLog 2012-11-17 04:07:18 UTC (rev 5604)
@@ -30962,3 +30962,30 @@
Correct the name of a statute. See:
http://www.finance.senate.gov/library/reports/conference/download/?id=45731c69-929b-47ae-ab07-0b171333092d
+20121116T2339Z <address@hidden> [556]
+
+ my_prod.cpp
+ policy_document.cpp
+ policy_view.xrc
+ product_data.cpp
+ product_data.hpp
+Expunge a disused member.
+
+20121116T2347Z <address@hidden> [557]
+
+ product_data.hpp
+Mark a defect.
+
+20121117T0407Z <address@hidden> [557]
+
+ basic_values.hpp
+ ihs_basicval.cpp
+ mec_server.cpp
+ mortality_rates_fetch.cpp
+ my_prod.cpp
+ policy_document.cpp
+ policy_view.xrc
+ product_data.cpp
+ product_data.hpp
+Rename certain members for clarity and consistency.
+
Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/basic_values.hpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -162,9 +162,9 @@
std::vector<double> GetCurrentTermRates() const;
std::vector<double> GetGuaranteedTermRates() const;
std::vector<double> GetGroupProxyRates() const;
- std::vector<double> GetTAMRA7PayRates() const;
+ std::vector<double> GetSevenPayRates() const;
std::vector<double> GetTgtPremRates() const;
- std::vector<double> GetIRC7702Rates() const;
+ std::vector<double> GetIrc7702QRates() const;
std::vector<double> GetPartialMortalityRates() const;
std::vector<double> GetSubstdTblMultTable() const;
std::vector<double> GetCurrSpecAmtLoadTable() const;
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/ihs_basicval.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -462,7 +462,7 @@
void BasicValues::Init7702()
{
- Mly7702qc = GetIRC7702Rates();
+ Mly7702qc = GetIrc7702QRates();
double max_coi_rate = Database_->Query(DB_MaxMonthlyCoiRate);
LMI_ASSERT(0.0 != max_coi_rate);
max_coi_rate = 1.0 / max_coi_rate;
@@ -1721,7 +1721,7 @@
std::vector<double> BasicValues::GetCvatCorridorFactors() const
{
return GetTable
- (ProductData_->datum("CorridorFilename")
+ (ProductData_->datum("CvatCorridorFilename")
,DB_CorridorTable
);
}
@@ -1885,10 +1885,10 @@
);
}
-std::vector<double> BasicValues::GetTAMRA7PayRates() const
+std::vector<double> BasicValues::GetSevenPayRates() const
{
return GetTable
- (ProductData_->datum("TAMRA7PayFilename")
+ (ProductData_->datum("SevenPayFilename")
,DB_SevenPayTable
);
}
@@ -1902,10 +1902,10 @@
);
}
-std::vector<double> BasicValues::GetIRC7702Rates() const
+std::vector<double> BasicValues::GetIrc7702QRates() const
{
return GetTable
- (ProductData_->datum("IRC7702Filename")
+ (ProductData_->datum("Irc7702QFilename")
,DB_Irc7702QTable
);
}
Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/mec_server.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -145,7 +145,7 @@
}
std::vector<double> const CvatCorridorFactors = actuarial_table_rates
- (AddDataDir(product_filenames.datum("CorridorFilename"))
+ (AddDataDir(product_filenames.datum("CvatCorridorFilename"))
,static_cast<long int>(database.Query(DB_CorridorTable))
,input.issue_age()
,input.years_to_maturity()
@@ -160,14 +160,14 @@
tabular_Ax.push_back(1.0);
std::vector<double> const tabular_7Px = actuarial_table_rates
- (AddDataDir(product_filenames.datum("TAMRA7PayFilename"))
+ (AddDataDir(product_filenames.datum("SevenPayFilename"))
,static_cast<long int>(database.Query(DB_SevenPayTable))
,input.issue_age()
,input.years_to_maturity()
);
std::vector<double> Mly7702qc = actuarial_table_rates
- (AddDataDir(product_filenames.datum("IRC7702Filename"))
+ (AddDataDir(product_filenames.datum("Irc7702QFilename"))
,static_cast<long int>(database.Query(DB_Irc7702QTable))
,input.issue_age()
,input.years_to_maturity()
Modified: lmi/trunk/mortality_rates_fetch.cpp
===================================================================
--- lmi/trunk/mortality_rates_fetch.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/mortality_rates_fetch.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -102,11 +102,11 @@
CurrentSpouseRiderRates_ = basic_values.GetCurrentSpouseRiderRates();
TargetPremiumRates_ = basic_values.GetTgtPremRates();
- Irc7702Q_ = basic_values.GetIRC7702Rates();
+ Irc7702Q_ = basic_values.GetIrc7702QRates();
GroupProxyRates_ = basic_values.GetGroupProxyRates();
PartialMortalityQ_ = basic_values.GetPartialMortalityRates();
CvatCorridorFactors_ = basic_values.GetCvatCorridorFactors();
- SevenPayRates_ = basic_values.GetTAMRA7PayRates();
+ SevenPayRates_ = basic_values.GetSevenPayRates();
std::transform
(SubstdTblMult_.begin()
Modified: lmi/trunk/my_prod.cpp
===================================================================
--- lmi/trunk/my_prod.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/my_prod.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -66,7 +66,7 @@
z.RoundingFilename = glossed_string("sample.rounding");
z.TierFilename = glossed_string("sample.strata");
- z.CorridorFilename = glossed_string("sample");
+ z.CvatCorridorFilename = glossed_string("sample");
z.CurrCOIFilename = glossed_string("qx_cso");
z.GuarCOIFilename = glossed_string("qx_cso");
z.WPFilename = glossed_string("sample");
@@ -77,9 +77,9 @@
z.CurrTermFilename = glossed_string("qx_cso");
z.GuarTermFilename = glossed_string("qx_cso");
z.GroupProxyFilename = glossed_string("qx_ins");
- z.TAMRA7PayFilename = glossed_string("sample");
+ z.SevenPayFilename = glossed_string("sample");
z.TgtPremFilename = glossed_string("sample");
- z.IRC7702Filename = glossed_string("qx_cso");
+ z.Irc7702QFilename = glossed_string("qx_cso");
z.PartialMortalityFilename = glossed_string("qx_ann");
z.SubstdTblMultFilename = glossed_string("sample");
z.CurrSpecAmtLoadFilename = glossed_string("sample");
Modified: lmi/trunk/policy_document.cpp
===================================================================
--- lmi/trunk/policy_document.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/policy_document.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -45,7 +45,7 @@
{
values_["DatabaseFilename" ] = &product_data_.DatabaseFilename
.datum_;
values_["FundFilename" ] = &product_data_.FundFilename
.datum_;
- values_["CorridorFilename" ] = &product_data_.CorridorFilename
.datum_;
+ values_["CvatCorridorFilename" ] = &product_data_.CvatCorridorFilename
.datum_;
values_["CurrCOIFilename" ] = &product_data_.CurrCOIFilename
.datum_;
values_["GuarCOIFilename" ] = &product_data_.GuarCOIFilename
.datum_;
values_["WPFilename" ] = &product_data_.WPFilename
.datum_;
@@ -56,9 +56,9 @@
values_["CurrTermFilename" ] = &product_data_.CurrTermFilename
.datum_;
values_["GuarTermFilename" ] = &product_data_.GuarTermFilename
.datum_;
values_["GroupProxyFilename" ] = &product_data_.GroupProxyFilename
.datum_;
- values_["TAMRA7PayFilename" ] = &product_data_.TAMRA7PayFilename
.datum_;
+ values_["SevenPayFilename" ] = &product_data_.SevenPayFilename
.datum_;
values_["TgtPremFilename" ] = &product_data_.TgtPremFilename
.datum_;
- values_["IRC7702Filename" ] = &product_data_.IRC7702Filename
.datum_;
+ values_["Irc7702QFilename" ] = &product_data_.Irc7702QFilename
.datum_;
values_["PartialMortalityFilename"] =
&product_data_.PartialMortalityFilename.datum_;
values_["SubstdTblMultFilename" ] = &product_data_.SubstdTblMultFilename
.datum_;
values_["CurrSpecAmtLoadFilename" ] =
&product_data_.CurrSpecAmtLoadFilename .datum_;
Modified: lmi/trunk/policy_view.xrc
===================================================================
--- lmi/trunk/policy_view.xrc 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/policy_view.xrc 2012-11-17 04:07:18 UTC (rev 5604)
@@ -108,13 +108,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
- <label>CorridorFilename</label>
+ <label>CvatCorridorFilename</label>
</object>
<option>0</option>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxGROW</flag>
- <object class="wxTextCtrl"
name="CorridorFilename"/>
+ <object class="wxTextCtrl"
name="CvatCorridorFilename"/>
<minsize>160,-1</minsize>
<option>1</option>
</object>
@@ -251,13 +251,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
- <label>TAMRA7PayFilename</label>
+ <label>SevenPayFilename</label>
</object>
<option>0</option>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxGROW</flag>
- <object class="wxTextCtrl"
name="TAMRA7PayFilename"/>
+ <object class="wxTextCtrl"
name="SevenPayFilename"/>
<minsize>160,-1</minsize>
<option>1</option>
</object>
@@ -277,13 +277,13 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
- <label>IRC7702Filename</label>
+ <label>Irc7702QFilename</label>
</object>
<option>0</option>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxGROW</flag>
- <object class="wxTextCtrl"
name="IRC7702Filename"/>
+ <object class="wxTextCtrl"
name="Irc7702QFilename"/>
<minsize>160,-1</minsize>
<option>1</option>
</object>
Modified: lmi/trunk/product_data.cpp
===================================================================
--- lmi/trunk/product_data.cpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/product_data.cpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -178,7 +178,7 @@
ascribe("FundFilename" , &product_data::FundFilename
);
ascribe("RoundingFilename" , &product_data::RoundingFilename
);
ascribe("TierFilename" , &product_data::TierFilename
);
- ascribe("CorridorFilename" , &product_data::CorridorFilename
);
+ ascribe("CvatCorridorFilename" ,
&product_data::CvatCorridorFilename );
ascribe("CurrCOIFilename" , &product_data::CurrCOIFilename
);
ascribe("GuarCOIFilename" , &product_data::GuarCOIFilename
);
ascribe("WPFilename" , &product_data::WPFilename
);
@@ -189,9 +189,9 @@
ascribe("CurrTermFilename" , &product_data::CurrTermFilename
);
ascribe("GuarTermFilename" , &product_data::GuarTermFilename
);
ascribe("GroupProxyFilename" ,
&product_data::GroupProxyFilename );
- ascribe("TAMRA7PayFilename" , &product_data::TAMRA7PayFilename
);
+ ascribe("SevenPayFilename" , &product_data::SevenPayFilename
);
ascribe("TgtPremFilename" , &product_data::TgtPremFilename
);
- ascribe("IRC7702Filename" , &product_data::IRC7702Filename
);
+ ascribe("Irc7702QFilename" , &product_data::Irc7702QFilename
);
ascribe("PartialMortalityFilename" ,
&product_data::PartialMortalityFilename );
ascribe("SubstdTblMultFilename" ,
&product_data::SubstdTblMultFilename );
ascribe("CurrSpecAmtLoadFilename" ,
&product_data::CurrSpecAmtLoadFilename );
@@ -403,7 +403,7 @@
z.RoundingFilename = glossed_string("sample.rounding");
z.TierFilename = glossed_string("sample.strata");
- z.CorridorFilename = glossed_string("sample");
+ z.CvatCorridorFilename = glossed_string("sample");
z.CurrCOIFilename = glossed_string("qx_cso");
z.GuarCOIFilename = glossed_string("qx_cso");
z.WPFilename = glossed_string("sample");
@@ -414,9 +414,9 @@
z.CurrTermFilename = glossed_string("qx_cso");
z.GuarTermFilename = glossed_string("qx_cso");
z.GroupProxyFilename = glossed_string("qx_ins");
- z.TAMRA7PayFilename = glossed_string("sample");
+ z.SevenPayFilename = glossed_string("sample");
z.TgtPremFilename = glossed_string("sample");
- z.IRC7702Filename = glossed_string("qx_cso");
+ z.Irc7702QFilename = glossed_string("qx_cso");
z.PartialMortalityFilename = glossed_string("qx_ann");
z.SubstdTblMultFilename = glossed_string("sample");
z.CurrSpecAmtLoadFilename = glossed_string("sample");
Modified: lmi/trunk/product_data.hpp
===================================================================
--- lmi/trunk/product_data.hpp 2012-11-16 23:47:50 UTC (rev 5603)
+++ lmi/trunk/product_data.hpp 2012-11-17 04:07:18 UTC (rev 5604)
@@ -146,7 +146,7 @@
glossed_string TierFilename;
// Names of rate-table files.
- glossed_string CorridorFilename;
+ glossed_string CvatCorridorFilename;
glossed_string CurrCOIFilename;
glossed_string GuarCOIFilename;
glossed_string WPFilename;
@@ -157,9 +157,9 @@
glossed_string CurrTermFilename;
glossed_string GuarTermFilename;
glossed_string GroupProxyFilename;
- glossed_string TAMRA7PayFilename;
+ glossed_string SevenPayFilename;
glossed_string TgtPremFilename;
- glossed_string IRC7702Filename;
+ glossed_string Irc7702QFilename;
glossed_string PartialMortalityFilename;
glossed_string SubstdTblMultFilename;
glossed_string CurrSpecAmtLoadFilename;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5604] Rename certain members for clarity and consistency,
Greg Chicares <=