[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5049] Refactor
From: |
Greg Chicares |
Subject: |
[lmi-commits] [5049] Refactor |
Date: |
Wed, 21 Jul 2010 21:29:46 +0000 |
Revision: 5049
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5049
Author: chicares
Date: 2010-07-21 21:29:46 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
Refactor
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/ihs_basicval.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-07-21 16:12:56 UTC (rev 5048)
+++ lmi/trunk/ChangeLog 2010-07-21 21:29:46 UTC (rev 5049)
@@ -26415,3 +26415,29 @@
Refactor. This depends on the 20100720T2351Z change, without which the
data member now used would not necessarily have been set correctly.
+20100721T1209Z <address@hidden> [688]
+
+ ihs_avmly.cpp
+Assert formerly-tacit assumptions; improve documentation.
+
+20100721T1402Z <address@hidden> [688]
+
+ basic_values.hpp
+ basicvalues.cpp
+ ihs_acctval.cpp
+ ihs_avmly.cpp
+ ihs_basicval.cpp
+ ledger_invariant.cpp
+Rectify names, anticipating changes in the meanings of some.
+
+20100721T1612Z <address@hidden> [688]
+
+ basic_values.hpp
+ ihs_basicval.cpp
+Rename a function in anticipation of refactoring.
+
+20100721T2129Z <address@hidden> [688]
+
+ ihs_basicval.cpp
+Refactor.
+
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2010-07-21 16:12:56 UTC (rev 5048)
+++ lmi/trunk/ihs_basicval.cpp 2010-07-21 21:29:46 UTC (rev 5049)
@@ -254,9 +254,6 @@
// determined by a strategy.
InitialTargetPremium = 0.0;
- PremiumTaxLoadIsTieredInStateOfDomicile_ = false;
- PremiumTaxLoadIsTieredInPremiumTaxState_ = false;
-
SetPermanentInvariants();
Init7702();
@@ -686,28 +683,6 @@
//============================================================================
void BasicValues::SetPermanentInvariants()
{
- // TODO ?? It would be better not to constrain so many things
- // not to vary by duration by using Query(enumerator).
- StateOfDomicile_ =
mc_state_from_string(ProductData_->datum("InsCoDomicile"));
-
- // TODO ?? Perhaps we want the premium-tax load instead of the
- // premium-tax rate here; or maybe we want neither as a member
- // variable, since the premium-tax load is in the loads class.
- PremiumTaxRate_ = Database_->Query(DB_PremTaxRate);
-
- {
- yare_input YI(*Input_);
- YI.State = GetStateOfDomicile();
- YI.CorporationState = GetStateOfDomicile();
- product_database TempDatabase(YI);
- DomiciliaryPremiumTaxLoad_ = 0.0;
- if(!yare_input_.AmortizePremiumLoad)
- {
- DomiciliaryPremiumTaxLoad_ = TempDatabase.Query(DB_PremTaxLoad);
- }
- }
- TestPremiumTaxLoadConsistency();
-
MinRenlBaseFace = Database_->Query(DB_MinRenlBaseSpecAmt );
MinRenlFace = Database_->Query(DB_MinRenlSpecAmt );
NoLapseOpt1Only = Database_->Query(DB_NoLapseDbo1Only );
@@ -757,8 +732,6 @@
Database_->Query(CompTarget, DB_CompTarget);
Database_->Query(CompExcess, DB_CompExcess);
- FirstYearPremiumRetaliationLimit_ = Database_->Query(DB_PremTaxRetalLimit);
-
MandEIsDynamic = Database_->Query(DB_DynamicMandE );
SepAcctLoadIsDynamic= Database_->Query(DB_DynamicSepAcctLoad );
@@ -849,6 +822,9 @@
void BasicValues::SetPremiumTaxParameters()
{
+ PremiumTaxLoadIsTieredInStateOfDomicile_ = false;
+ PremiumTaxLoadIsTieredInPremiumTaxState_ = false;
+
LMI_ASSERT(Database_ .get());
LMI_ASSERT(StratifiedCharges_.get());
LowestPremiumTaxLoad_ = lowest_premium_tax_load
@@ -857,6 +833,30 @@
,StateOfJurisdiction_
,yare_input_.AmortizePremiumLoad
);
+
+ // TODO ?? It would be better not to constrain so many things
+ // not to vary by duration by using Query(enumerator).
+ StateOfDomicile_ =
mc_state_from_string(ProductData_->datum("InsCoDomicile"));
+
+ // TODO ?? Perhaps we want the premium-tax load instead of the
+ // premium-tax rate here; or maybe we want neither as a member
+ // variable, since the premium-tax load is in the loads class.
+ PremiumTaxRate_ = Database_->Query(DB_PremTaxRate);
+
+ {
+ yare_input YI(*Input_);
+ YI.State = GetStateOfDomicile();
+ YI.CorporationState = GetStateOfDomicile();
+ product_database TempDatabase(YI);
+ DomiciliaryPremiumTaxLoad_ = 0.0;
+ if(!yare_input_.AmortizePremiumLoad)
+ {
+ DomiciliaryPremiumTaxLoad_ = TempDatabase.Query(DB_PremTaxLoad);
+ }
+ }
+ TestPremiumTaxLoadConsistency();
+
+ FirstYearPremiumRetaliationLimit_ = Database_->Query(DB_PremTaxRetalLimit);
}
/// Lowest premium-tax load, for 7702 and 7702A purposes.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5049] Refactor,
Greg Chicares <=