[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5191] Rectify names
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5191] Rectify names |
|
Date: |
Mon, 30 May 2011 12:54:10 +0000 |
Revision: 5191
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5191
Author: chicares
Date: 2011-05-30 12:54:10 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Rectify names
Modified Paths:
--------------
lmi/trunk/ihs_basicval.cpp
lmi/trunk/premium_tax.cpp
lmi/trunk/premium_tax.hpp
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2011-05-30 12:08:03 UTC (rev 5190)
+++ lmi/trunk/ihs_basicval.cpp 2011-05-30 12:54:10 UTC (rev 5191)
@@ -810,13 +810,13 @@
void BasicValues::SetPremiumTaxParameters()
{
- PremiumTaxLoadIsTieredInPremiumTaxState_ =
PremiumTax_->PremiumTaxLoadIsTieredInPremiumTaxState();
- PremiumTaxLoadIsTieredInStateOfDomicile_ =
PremiumTax_->PremiumTaxLoadIsTieredInStateOfDomicile();
- premium_tax_is_retaliatory_ =
PremiumTax_->premium_tax_is_retaliatory();
- LowestPremiumTaxLoad_ =
PremiumTax_->LowestPremiumTaxLoad();
- PremiumTaxRate_ = PremiumTax_->PremiumTaxRate();
- PremiumTaxLoad_ = PremiumTax_->PremiumTaxLoad();
- DomiciliaryPremiumTaxLoad_ =
PremiumTax_->DomiciliaryPremiumTaxLoad();
+ PremiumTaxLoadIsTieredInPremiumTaxState_ =
PremiumTax_->load_is_tiered_in_premium_tax_state();
+ PremiumTaxLoadIsTieredInStateOfDomicile_ =
PremiumTax_->load_is_tiered_in_state_of_domicile();
+ premium_tax_is_retaliatory_ =
PremiumTax_->premium_tax_is_retaliatory ();
+ PremiumTaxRate_ = PremiumTax_->levy_rate
();
+ PremiumTaxLoad_ = PremiumTax_->load_rate
();
+ LowestPremiumTaxLoad_ = PremiumTax_->least_load_rate
();
+ DomiciliaryPremiumTaxLoad_ =
PremiumTax_->domiciliary_load_rate ();
}
//============================================================================
Modified: lmi/trunk/premium_tax.cpp
===================================================================
--- lmi/trunk/premium_tax.cpp 2011-05-30 12:08:03 UTC (rev 5190)
+++ lmi/trunk/premium_tax.cpp 2011-05-30 12:54:10 UTC (rev 5191)
@@ -45,7 +45,7 @@
,state_of_domicile_ (state_of_domicile)
,amortize_premium_load_ (amortize_premium_load)
{
- SetPremiumTaxParameters(database, strata);
+ set_parameters(database, strata);
}
premium_tax::~premium_tax()
@@ -68,50 +68,50 @@
/// - DB_PremTaxTierPeriod
/// - DB_PremTaxTierNonDecr
-void premium_tax::SetPremiumTaxParameters
- (product_database const& Database_
- ,stratified_charges const& StratifiedCharges_
+void premium_tax::set_parameters
+ (product_database const& database
+ ,stratified_charges const& strata
)
{
- PremiumTaxLoadIsTieredInStateOfDomicile_ =
StratifiedCharges_.premium_tax_is_tiered(state_of_domicile_);
- PremiumTaxLoadIsTieredInPremiumTaxState_ =
StratifiedCharges_.premium_tax_is_tiered(premium_tax_state_);
+ load_is_tiered_in_premium_tax_state_ =
strata.premium_tax_is_tiered(premium_tax_state_);
+ load_is_tiered_in_state_of_domicile_ =
strata.premium_tax_is_tiered(state_of_domicile_);
premium_tax_is_retaliatory_ = ::premium_tax_is_retaliatory
(premium_tax_state_
,state_of_domicile_
);
- LowestPremiumTaxLoad_ = lowest_premium_tax_load
+ least_load_rate_ = lowest_premium_tax_load
(premium_tax_state_
,state_of_domicile_
,amortize_premium_load_
- ,Database_
- ,StratifiedCharges_
+ ,database
+ ,strata
);
// TODO ?? It would be better not to constrain so many things
// not to vary by duration by using Query(enumerator).
- database_index index = Database_.index().state(premium_tax_state_);
- PremiumTaxRate_ = Database_.Query(DB_PremTaxRate ,
index);
- PremiumTaxLoad_ = Database_.Query(DB_PremTaxLoad ,
index);
+ database_index index = database.index().state(premium_tax_state_);
+ levy_rate_ = database.Query(DB_PremTaxRate, index);
+ load_rate_ = database.Query(DB_PremTaxLoad, index);
{
- database_index index = Database_.index().state(state_of_domicile_);
- DomiciliaryPremiumTaxLoad_ = 0.0;
+ database_index index = database.index().state(state_of_domicile_);
+ domiciliary_load_rate_ = 0.0;
if(!amortize_premium_load_)
{
- double domiciliary_premium_tax_rate = Database_.Query(DB_PremTaxRate,
index);
- DomiciliaryPremiumTaxLoad_ = Database_.Query(DB_PremTaxLoad,
index);
+ double domiciliary_levy_rate = database.Query(DB_PremTaxRate, index);
+ domiciliary_load_rate_ = database.Query(DB_PremTaxLoad, index);
if(premium_tax_is_retaliatory_)
{
- PremiumTaxRate_ = std::max(PremiumTaxRate_,
domiciliary_premium_tax_rate);
- PremiumTaxLoad_ = std::max(PremiumTaxLoad_,
DomiciliaryPremiumTaxLoad_ );
+ levy_rate_ = std::max(levy_rate_, domiciliary_levy_rate );
+ load_rate_ = std::max(load_rate_, domiciliary_load_rate_);
}
}
}
- TestPremiumTaxLoadConsistency();
+ test_consistency();
}
/// Test consistency of premium-tax loads.
@@ -131,17 +131,17 @@
/// attention. If premium tax is not passed through as a load, then
/// there's no problem at all.
-void premium_tax::TestPremiumTaxLoadConsistency() const
+void premium_tax::test_consistency() const
{
- if(PremiumTaxLoadIsTieredInPremiumTaxState_)
+ if(load_is_tiered_in_premium_tax_state_)
{
- if(0.0 != PremiumTaxLoad())
+ if(0.0 != load_rate())
{
fatal_error()
<< "Premium-tax load is tiered in premium-tax state "
<< mc_str(premium_tax_state_)
<< ", but the product database specifies a scalar load of "
- << PremiumTaxLoad()
+ << load_rate()
<< " instead of zero as expected. Probably the database"
<< " is incorrect."
<< LMI_FLUSH
@@ -149,15 +149,15 @@
}
}
- if(PremiumTaxLoadIsTieredInStateOfDomicile_)
+ if(load_is_tiered_in_state_of_domicile_)
{
- if(0.0 != DomiciliaryPremiumTaxLoad())
+ if(0.0 != domiciliary_load_rate())
{
fatal_error()
<< "Premium-tax load is tiered in state of domicile "
<< mc_str(state_of_domicile_)
<< ", but the product database specifies a scalar load of "
- << DomiciliaryPremiumTaxLoad()
+ << domiciliary_load_rate()
<< " instead of zero as expected. Probably the database"
<< " is incorrect."
<< LMI_FLUSH
@@ -193,8 +193,8 @@
static mcenum_state const d[n] = {mce_s_MA, mce_s_MN, mce_s_NY, mce_s_RI};
static std::vector<mcenum_state> const reciprocal_nonretaliation_states(d,
d + n);
bool const reciprocally_nonretaliatory =
- contains(reciprocal_nonretaliation_states, state_of_domicile)
- && contains(reciprocal_nonretaliation_states, premium_tax_state)
+ contains(reciprocal_nonretaliation_states, premium_tax_state)
+ && contains(reciprocal_nonretaliation_states, state_of_domicile)
;
bool const nonretaliatory =
reciprocally_nonretaliatory
Modified: lmi/trunk/premium_tax.hpp
===================================================================
--- lmi/trunk/premium_tax.hpp 2011-05-30 12:08:03 UTC (rev 5190)
+++ lmi/trunk/premium_tax.hpp 2011-05-30 12:54:10 UTC (rev 5191)
@@ -47,34 +47,34 @@
);
~premium_tax();
- double PremiumTaxRate() const; ////
- double PremiumTaxLoad() const; ////
- double LowestPremiumTaxLoad() const; ////
- double DomiciliaryPremiumTaxLoad() const; ////
- bool PremiumTaxLoadIsTiered() const; ////
- bool PremiumTaxLoadIsTieredInPremiumTaxState() const;
- bool PremiumTaxLoadIsTieredInStateOfDomicile() const;
- bool premium_tax_is_retaliatory() const;
+ double levy_rate () const;
+ double load_rate () const;
+ double least_load_rate () const;
+ double domiciliary_load_rate () const;
+ bool PremiumTaxLoadIsTiered() const; ////
+ bool load_is_tiered_in_premium_tax_state() const;
+ bool load_is_tiered_in_state_of_domicile() const;
+ bool premium_tax_is_retaliatory () const;
private:
- void SetPremiumTaxParameters
+ void set_parameters
(product_database const&
,stratified_charges const&
- ); ////
- void TestPremiumTaxLoadConsistency() const; ////
+ );
+ void test_consistency() const;
// Ctor value-arguments.
mcenum_state premium_tax_state_;
mcenum_state state_of_domicile_;
bool amortize_premium_load_;
- double PremiumTaxRate_; ////
- double PremiumTaxLoad_; ////
- double LowestPremiumTaxLoad_; ////
- double DomiciliaryPremiumTaxLoad_; ////
- bool PremiumTaxLoadIsTieredInStateOfDomicile_; ////
- bool PremiumTaxLoadIsTieredInPremiumTaxState_; ////
- bool premium_tax_is_retaliatory_; ////
+ double levy_rate_;
+ double load_rate_;
+ double least_load_rate_;
+ double domiciliary_load_rate_;
+ bool load_is_tiered_in_premium_tax_state_;
+ bool load_is_tiered_in_state_of_domicile_;
+ bool premium_tax_is_retaliatory_;
};
bool premium_tax_is_retaliatory
@@ -90,40 +90,40 @@
,stratified_charges const& stratified
);
-inline double premium_tax::PremiumTaxRate() const ////
+inline double premium_tax::levy_rate() const
{
- return PremiumTaxRate_;
+ return levy_rate_;
}
-inline double premium_tax::PremiumTaxLoad() const ////
+inline double premium_tax::load_rate() const
{
- return PremiumTaxLoad_;
+ return load_rate_;
}
-inline double premium_tax::LowestPremiumTaxLoad() const ////
+inline double premium_tax::least_load_rate() const
{
- return LowestPremiumTaxLoad_;
+ return least_load_rate_;
}
-inline double premium_tax::DomiciliaryPremiumTaxLoad() const ////
+inline double premium_tax::domiciliary_load_rate() const
{
- return DomiciliaryPremiumTaxLoad_;
+ return domiciliary_load_rate_;
}
-//// Identical to the more-appropriately-named
PremiumTaxLoadIsTieredInPremiumTaxState().
+//// Identical to the more-appropriately-named
load_is_tiered_in_premium_tax_state().
inline bool premium_tax::PremiumTaxLoadIsTiered() const ////
{
- return PremiumTaxLoadIsTieredInPremiumTaxState_;
+ return load_is_tiered_in_premium_tax_state_;
}
-inline bool premium_tax::PremiumTaxLoadIsTieredInPremiumTaxState() const
+inline bool premium_tax::load_is_tiered_in_premium_tax_state() const
{
- return PremiumTaxLoadIsTieredInPremiumTaxState_;
+ return load_is_tiered_in_premium_tax_state_;
}
-inline bool premium_tax::PremiumTaxLoadIsTieredInStateOfDomicile() const
+inline bool premium_tax::load_is_tiered_in_state_of_domicile() const
{
- return PremiumTaxLoadIsTieredInStateOfDomicile_;
+ return load_is_tiered_in_state_of_domicile_;
}
inline bool premium_tax::premium_tax_is_retaliatory() const
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5191] Rectify names,
Greg Chicares <=