[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [4849] Prefer MixedCase for major element names
From: |
Greg Chicares |
Subject: |
[lmi-commits] [4849] Prefer MixedCase for major element names |
Date: |
Thu, 22 Apr 2010 00:02:20 +0000 |
Revision: 4849
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4849
Author: chicares
Date: 2010-04-22 00:02:19 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
Prefer MixedCase for major element names
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/ihs_rnddata.cpp
lmi/trunk/stratified_charges.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-04-21 23:41:49 UTC (rev 4848)
+++ lmi/trunk/ChangeLog 2010-04-22 00:02:19 UTC (rev 4849)
@@ -24954,3 +24954,16 @@
return;
in 'ihs_avmly.cpp'; whether that is correct is a different question.
+20100421T2341Z <address@hidden> [756]
+
+ stratified_charges.cpp
+Name "root" element to match file extension. (Other product files
+already did so.)
+
+20100422T0002Z <address@hidden> [756]
+
+ ihs_rnddata.cpp
+ stratified_charges.cpp
+Prefer MixedCase for major element names; '.policy' files already do
+so, as will '.database' files.
+
Modified: lmi/trunk/ihs_rnddata.cpp
===================================================================
--- lmi/trunk/ihs_rnddata.cpp 2010-04-21 23:41:49 UTC (rev 4848)
+++ lmi/trunk/ihs_rnddata.cpp 2010-04-22 00:02:19 UTC (rev 4849)
@@ -115,24 +115,20 @@
xml_lmi::dom_parser parser(a_Filename);
xml::element const& root = parser.root_node(xml_root_name());
-# define GET_ELEMENT(name) xml_serialize::get_element(root, #name,
round_##name##_)
-
- GET_ELEMENT(specamt );
- GET_ELEMENT(death_benefit );
- GET_ELEMENT(naar );
- GET_ELEMENT(coi_rate );
- GET_ELEMENT(coi_charge );
- GET_ELEMENT(gross_premium );
- GET_ELEMENT(net_premium );
- GET_ELEMENT(interest_rate );
- GET_ELEMENT(interest_credit );
- GET_ELEMENT(withdrawal );
- GET_ELEMENT(loan );
- GET_ELEMENT(corridor_factor );
- GET_ELEMENT(surrender_charge);
- GET_ELEMENT(irr );
-
-# undef GET_ELEMENT
+ xml_serialize::get_element(root, "RoundSpecAmt" , round_specamt_
);
+ xml_serialize::get_element(root, "RoundDeathBft" , round_death_benefit_
);
+ xml_serialize::get_element(root, "RoundNaar" , round_naar_
);
+ xml_serialize::get_element(root, "RoundCoiRate" , round_coi_rate_
);
+ xml_serialize::get_element(root, "RoundCoiCharge" , round_coi_charge_
);
+ xml_serialize::get_element(root, "RoundGrossPrem" , round_gross_premium_
);
+ xml_serialize::get_element(root, "RoundNetPrem" , round_net_premium_
);
+ xml_serialize::get_element(root, "RoundIntRate" , round_interest_rate_
);
+ xml_serialize::get_element(root, "RoundIntCredit" , round_interest_credit_
);
+ xml_serialize::get_element(root, "RoundWithdrawal", round_withdrawal_
);
+ xml_serialize::get_element(root, "RoundLoan" , round_loan_
);
+ xml_serialize::get_element(root, "RoundCorrFactor", round_corridor_factor_
);
+ xml_serialize::get_element(root, "RoundSurrCharge",
round_surrender_charge_);
+ xml_serialize::get_element(root, "RoundIRR" , round_irr_
);
}
//============================================================================
@@ -143,25 +139,21 @@
xml_lmi::set_attr(root, "version", "0");
-# define SET_ELEMENT(name) xml_serialize::set_element(root, #name,
round_##name##_)
+ xml_serialize::set_element(root, "RoundSpecAmt" , round_specamt_
);
+ xml_serialize::set_element(root, "RoundDeathBft" , round_death_benefit_
);
+ xml_serialize::set_element(root, "RoundNaar" , round_naar_
);
+ xml_serialize::set_element(root, "RoundCoiRate" , round_coi_rate_
);
+ xml_serialize::set_element(root, "RoundCoiCharge" , round_coi_charge_
);
+ xml_serialize::set_element(root, "RoundGrossPrem" , round_gross_premium_
);
+ xml_serialize::set_element(root, "RoundNetPrem" , round_net_premium_
);
+ xml_serialize::set_element(root, "RoundIntRate" , round_interest_rate_
);
+ xml_serialize::set_element(root, "RoundIntCredit" , round_interest_credit_
);
+ xml_serialize::set_element(root, "RoundWithdrawal", round_withdrawal_
);
+ xml_serialize::set_element(root, "RoundLoan" , round_loan_
);
+ xml_serialize::set_element(root, "RoundCorrFactor", round_corridor_factor_
);
+ xml_serialize::set_element(root, "RoundSurrCharge",
round_surrender_charge_);
+ xml_serialize::set_element(root, "RoundIRR" , round_irr_
);
- SET_ELEMENT(specamt );
- SET_ELEMENT(death_benefit );
- SET_ELEMENT(naar );
- SET_ELEMENT(coi_rate );
- SET_ELEMENT(coi_charge );
- SET_ELEMENT(gross_premium );
- SET_ELEMENT(net_premium );
- SET_ELEMENT(interest_rate );
- SET_ELEMENT(interest_credit );
- SET_ELEMENT(withdrawal );
- SET_ELEMENT(loan );
- SET_ELEMENT(corridor_factor );
- SET_ELEMENT(surrender_charge);
- SET_ELEMENT(irr );
-
-# undef SET_ELEMENT
-
// Instead of this:
// document.save(a_Filename);
// for the nonce, explicitly change the extension, in order to
Modified: lmi/trunk/stratified_charges.cpp
===================================================================
--- lmi/trunk/stratified_charges.cpp 2010-04-21 23:41:49 UTC (rev 4848)
+++ lmi/trunk/stratified_charges.cpp 2010-04-22 00:02:19 UTC (rev 4849)
@@ -461,25 +461,25 @@
{"stratified_first"
,"topic_premium_banded"
- ,"curr_sepacct_load_banded_by_premium"
- ,"guar_sepacct_load_banded_by_premium"
+ ,"CurrSepAcctLoadBandedByPrem"
+ ,"GuarSepAcctLoadBandedByPrem"
,"topic_asset_banded"
- ,"curr_sepacct_load_banded_by_assets"
- ,"guar_sepacct_load_banded_by_assets"
+ ,"CurrSepAcctLoadBandedByAssets"
+ ,"GuarSepAcctLoadBandedByAssets"
,"topic_asset_tiered"
- ,"curr_m_and_e_tiered_by_assets"
- ,"guar_m_and_e_tiered_by_assets"
- ,"asset_based_comp_tiered_by_assets"
- ,"investment_mgmt_fee_tiered_by_assets"
- ,"curr_sepacct_load_tiered_by_assets"
- ,"guar_sepacct_load_tiered_by_assets"
+ ,"CurrMandETieredByAssets"
+ ,"GuarMandETieredByAssets"
+ ,"AssetCompTieredByAssets"
+ ,"InvestmentMgmtFeeTieredByAssets"
+ ,"CurrSepAcctLoadTieredByAssets"
+ ,"GuarSepAcctLoadTieredByAssets"
,"topic_tiered_premium_tax"
- ,"tiered_ak_premium_tax"
- ,"tiered_de_premium_tax"
- ,"tiered_sd_premium_tax"
+ ,"TieredAKPremTax"
+ ,"TieredDEPremTax"
+ ,"TieredSDPremTax"
,"stratified_last"
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [4849] Prefer MixedCase for major element names,
Greg Chicares <=