[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [4973] Rename numerous database entities to improve concin
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [4973] Rename numerous database entities to improve concinnity |
|
Date: |
Fri, 04 Jun 2010 20:21:37 +0000 |
Revision: 4973
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4973
Author: chicares
Date: 2010-06-04 20:21:36 +0000 (Fri, 04 Jun 2010)
Log Message:
-----------
Rename numerous database entities to improve concinnity
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/basicvalues.cpp
lmi/trunk/database.cpp
lmi/trunk/dbdict.cpp
lmi/trunk/dbnames.hpp
lmi/trunk/dbnames.xpp
lmi/trunk/dbvalue.hpp
lmi/trunk/ihs_acctval.cpp
lmi/trunk/ihs_avstrtgy.cpp
lmi/trunk/ihs_basicval.cpp
lmi/trunk/input_harmonization.cpp
lmi/trunk/input_realization.cpp
lmi/trunk/input_test.cpp
lmi/trunk/interest_rates.cpp
lmi/trunk/ledger_invariant.cpp
lmi/trunk/loads.cpp
lmi/trunk/mec_input.cpp
lmi/trunk/mec_server.cpp
lmi/trunk/mortality_rates.cpp
lmi/trunk/mortality_rates_fetch.cpp
lmi/trunk/my_db.cpp
lmi/trunk/surrchg_rates.cpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/ChangeLog 2010-06-04 20:21:36 UTC (rev 4973)
@@ -25910,3 +25910,33 @@
Fix date calculations. See:
http://lists.nongnu.org/archive/html/lmi/2010-06/msg00001.html
+20100604T1620Z <address@hidden> [704]
+
+ authenticity_test.cpp
+Update unit test to reflect diagnostics changed 20100601T2004Z.
+
+20100604T2021Z <address@hidden> [704]
+
+ basicvalues.cpp
+ database.cpp
+ dbdict.cpp
+ dbnames.hpp
+ dbnames.xpp
+ dbvalue.hpp
+ ihs_acctval.cpp
+ ihs_avstrtgy.cpp
+ ihs_basicval.cpp
+ input_harmonization.cpp
+ input_realization.cpp
+ input_test.cpp
+ interest_rates.cpp
+ ledger_invariant.cpp
+ loads.cpp
+ mec_input.cpp
+ mec_server.cpp
+ mortality_rates.cpp
+ mortality_rates_fetch.cpp
+ my_db.cpp
+ surrchg_rates.cpp
+Rename numerous database entities to improve concinnity.
+
Modified: lmi/trunk/basicvalues.cpp
===================================================================
--- lmi/trunk/basicvalues.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/basicvalues.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -108,8 +108,8 @@
)
);
- // The database class constrains endowment age to be scalar.
- EndtAge = static_cast<int>(Database_->Query(DB_EndtAge));
+ // The database class constrains maturity age to be scalar.
+ EndtAge = static_cast<int>(Database_->Query(DB_MaturityAge));
Length = EndtAge - IssueAge;
LedgerType_ =
@@ -134,9 +134,9 @@
PremiumTaxRate_ = Database_->Query(DB_PremTaxRate);
MinSpecAmt = Database_->Query(DB_MinSpecAmt);
- MinWD = Database_->Query(DB_MinWD );
- WDFee = Database_->Query(DB_WDFee );
- WDFeeRate = Database_->Query(DB_WDFeeRate );
+ MinWD = Database_->Query(DB_MinWd );
+ WDFee = Database_->Query(DB_WdFee );
+ WDFeeRate = Database_->Query(DB_WdFeeRate );
// The antediluvian branch leaves FundData_, StratifiedCharges_, and
// ProductData initialized to null pointers.
Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/database.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -224,7 +224,7 @@
void product_database::initialize()
{
index_ = database_index(Gender, Class, Smoker, IssueAge, UWBasis, State);
- length_ = static_cast<int>(Query(DB_EndtAge)) - IssueAge;
+ length_ = static_cast<int>(Query(DB_MaturityAge)) - IssueAge;
LMI_ASSERT(0 < length_ && length_ <= methuselah);
}
Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/dbdict.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -259,11 +259,11 @@
}
// It would be dangerous to set these to zero.
- Add(database_entity(DB_CCOIMultiplier , 1.0));
- Add(database_entity(DB_GCOIMultiplier , 1.0));
- Add(database_entity(DB_SubstdTblMult , 1.0));
- Add(database_entity(DB_SurrChgSADurFactor , 1.0));
- Add(database_entity(DB_SurrChgAVDurFactor , 1.0));
+ Add(database_entity(DB_CurrCoiMultiplier , 1.0));
+ Add(database_entity(DB_GuarCoiMultiplier , 1.0));
+ Add(database_entity(DB_SubstdTableMult , 1.0));
+ Add(database_entity(DB_SurrChgSpecAmtSlope , 1.0));
+ Add(database_entity(DB_SurrChgAcctValSlope , 1.0));
// Usually the maximum is a reciprocal, e.g., 1/11 or 1/12; for
// greatest precision, store the reciprocal of that reciprocal,
@@ -272,15 +272,15 @@
Add(database_entity(DB_GuarIntSpread , bignum));
- Add(database_entity(DB_CurrCOITable0Limit , bignum));
- Add(database_entity(DB_CurrCOITable1 , 999));
- Add(database_entity(DB_CurrCOITable1Limit , bignum));
- Add(database_entity(DB_CurrCOITable2 , 999));
+ Add(database_entity(DB_CurrCoiTable0Limit , bignum));
+ Add(database_entity(DB_CurrCoiTable1 , 999));
+ Add(database_entity(DB_CurrCoiTable1Limit , bignum));
+ Add(database_entity(DB_CurrCoiTable2 , 999));
Add(database_entity(DB_SpecAmtLoadLimit , bignum));
Add(database_entity(DB_DynSepAcctLoadLimit , bignum));
- Add(database_entity(DB_ADDLimit , bignum));
- Add(database_entity(DB_ExpPerKLimit , bignum));
+ Add(database_entity(DB_AdbLimit , bignum));
+ Add(database_entity(DB_ExpSpecAmtLimit , bignum));
// SD Chapter 260 (HB 1200), signed 2008-02-19, amended 58-6-70
// by removing the former million-dollar threshold.
@@ -321,51 +321,51 @@
void DBDictionary::WriteSampleDBFile()
{
InitDB();
- Add(database_entity(DB_GuarPolFee , 8.00));
+ Add(database_entity(DB_GuarMonthlyPolFee , 8.00));
Add(database_entity(DB_GuarSpecAmtLoad , 0.0));
- Add(database_entity(DB_GuarIssueFee , 0.0));
+ Add(database_entity(DB_GuarAnnualPolFee , 0.0));
Add(database_entity(DB_GuarFundAdminChg , 0.0));
Add(database_entity(DB_GuarPremLoadTgt , 0.07));
Add(database_entity(DB_GuarPremLoadExc , 0.04));
Add(database_entity(DB_GuarPremLoadTgtRfd , 0.00));
Add(database_entity(DB_GuarPremLoadExcRfd , 0.00));
- Add(database_entity(DB_GuarAcctValLoadAMD , 0.0));
- Add(database_entity(DB_CurrPolFee , 5.00));
+ Add(database_entity(DB_GuarAcctValLoad , 0.0));
+ Add(database_entity(DB_CurrMonthlyPolFee , 5.00));
Add(database_entity(DB_CurrSpecAmtLoad , 0.0));
- Add(database_entity(DB_CurrIssueFee , 0.0));
+ Add(database_entity(DB_CurrAnnualPolFee , 0.0));
Add(database_entity(DB_CurrFundAdminChg , 0.0));
Add(database_entity(DB_CurrPremLoadTgt , 0.05));
Add(database_entity(DB_CurrPremLoadExc , 0.02));
Add(database_entity(DB_CurrPremLoadTgtRfd , 0.00));
Add(database_entity(DB_CurrPremLoadExcRfd , 0.00));
- Add(database_entity(DB_CurrAcctValLoadAMD , 0.0));
- Add(database_entity(DB_DACTaxPremLoad , 0.01));
+ Add(database_entity(DB_CurrAcctValLoad , 0.0));
+ Add(database_entity(DB_DacTaxPremLoad , 0.01));
Add(database_entity(DB_FundCharge , 0.0));
Add(database_entity(DB_PremTaxFundCharge , 0.0));
- Add(database_entity(DB_DACTaxFundCharge , 0.0));
- Add(database_entity(DB_WaivePmTxInt1035 , true));
- Add(database_entity(DB_FirstWDYear , 0.0));
- Add(database_entity(DB_MaxWDAVMult , 1.0));
- Add(database_entity(DB_MaxWDDed , mce_to_next_anniversary));
- Add(database_entity(DB_MinWD , 100.0));
- Add(database_entity(DB_WDFee , 25.0));
- Add(database_entity(DB_WDFeeRate , 0.02));
- Add(database_entity(DB_WDCanDecrSADBO1 , true));
- Add(database_entity(DB_WDCanDecrSADBO2 , true));
- Add(database_entity(DB_WDCanDecrSADBO3 , true));
+ Add(database_entity(DB_DacTaxFundCharge , 0.0));
+ Add(database_entity(DB_WaivePremTaxInt1035 , true));
+ Add(database_entity(DB_FirstWdYear , 0.0));
+ Add(database_entity(DB_MaxWdAcctValMult , 1.0));
+ Add(database_entity(DB_MaxWdDed , mce_to_next_anniversary));
+ Add(database_entity(DB_MinWd , 100.0));
+ Add(database_entity(DB_WdFee , 25.0));
+ Add(database_entity(DB_WdFeeRate , 0.02));
+ Add(database_entity(DB_WdCanDecrSpecAmtDbo1, true));
+ Add(database_entity(DB_WdCanDecrSpecAmtDbo2, true));
+ Add(database_entity(DB_WdCanDecrSpecAmtDbo3, true));
Add(database_entity(DB_FirstLoanYear , 0.0));
Add(database_entity(DB_AllowPrefLoan , false));
Add(database_entity(DB_AllowFixedLoan , true));
Add(database_entity(DB_FixedLoanRate , 0.06));
- Add(database_entity(DB_AllowVLR , true));
- Add(database_entity(DB_MaxLoanAVMult , 1.0));
+ Add(database_entity(DB_AllowVlr , true));
+ Add(database_entity(DB_MaxLoanAcctValMult , 1.0));
Add(database_entity(DB_MaxLoanDed , mce_to_next_anniversary));
Add(database_entity(DB_GuarPrefLoanSpread , 0.0));
Add(database_entity(DB_GuarRegLoanSpread , 0.04));
Add(database_entity(DB_CurrPrefLoanSpread , 0.0));
Add(database_entity(DB_CurrRegLoanSpread , 0.02));
Add(database_entity(DB_GuarInt , 0.03));
- Add(database_entity(DB_NAARDiscount , 0.00246627));
+ Add(database_entity(DB_NaarDiscount , 0.00246627));
Add(database_entity(DB_GuarIntSpread , 0.03));
Add(database_entity(DB_GuarMandE , 0.009));
Add(database_entity(DB_CurrIntSpread , 0.01));
@@ -390,10 +390,10 @@
// For now at least, just use (a multiple of) guaranteed COI rates
// as current.
- Add(database_entity(DB_CurrCOITable, e_number_of_axes, dims313, TgCOI));
- Add(database_entity(DB_GuarCOITable, e_number_of_axes, dims313, TgCOI));
+ Add(database_entity(DB_CurrCoiTable, e_number_of_axes, dims313, TgCOI));
+ Add(database_entity(DB_GuarCoiTable, e_number_of_axes, dims313, TgCOI));
- Add(database_entity(DB_COINYMinTable , 0.0));
+ Add(database_entity(DB_CoiNyMinTable , 0.0));
double coimult[9] =
{
@@ -401,15 +401,15 @@
0.60, 0.50, 0.55, // male: sm ns us
0.50, 0.40, 0.45, // unisex: sm ns us
};
- Add(database_entity(DB_CCOIMultiplier, e_number_of_axes, dims313,
coimult));
+ Add(database_entity(DB_CurrCoiMultiplier, e_number_of_axes, dims313,
coimult));
- Add(database_entity(DB_UseNYCOIFloor , 0.0));
- Add(database_entity(DB_GuarCOICeiling , 0.0));
- Add(database_entity(DB_COIGuarIsMin , 0.0));
- Add(database_entity(DB_COINonforfIsGuar , 0.0));
- Add(database_entity(DB_CCoiIsAnnual , true));
- Add(database_entity(DB_GCoiIsAnnual , true));
- Add(database_entity(DB_MCoiIsAnnual , true));
+ Add(database_entity(DB_UseNyCoiFloor , 0.0));
+ Add(database_entity(DB_GuarCoiCeiling , 0.0));
+ Add(database_entity(DB_CoiGuarIsMin , 0.0));
+ Add(database_entity(DB_CoiSnflIsGuar , 0.0));
+ Add(database_entity(DB_CurrCoiIsAnnual , true));
+ Add(database_entity(DB_GuarCoiIsAnnual , true));
+ Add(database_entity(DB_MdptCoiIsAnnual , true));
Add(database_entity(DB_AgeLastOrNearest , 0, "0 = ALB")); // ALB
Add(database_entity(DB_AllowRetirees , true));
Add(database_entity(DB_MinSpecAmt , 100000.0));
@@ -430,24 +430,24 @@
Add(database_entity(DB_AllowSexDistinct , true));
Add(database_entity(DB_AllowUnismoke , true));
Add(database_entity(DB_AllowSmokeDistinct , true));
- Add(database_entity(DB_AllowFullUW , true));
- Add(database_entity(DB_AllowSimpUW , true));
- Add(database_entity(DB_AllowGuarUW , true));
+ Add(database_entity(DB_AllowFullUw , true));
+ Add(database_entity(DB_AllowSimpUw , true));
+ Add(database_entity(DB_AllowGuarUw , true));
Add(database_entity(DB_AllowMortBlendSex , true));
Add(database_entity(DB_AllowMortBlendSmoke , true));
- Add(database_entity(DB_AllowRatedWP , true));
- Add(database_entity(DB_AllowRatedADD , true));
+ Add(database_entity(DB_AllowRatedWp , true));
+ Add(database_entity(DB_AllowRatedAdb , true));
Add(database_entity(DB_AllowRatedTerm , true));
Add(database_entity(DB_Allowable , true));
Add(database_entity(DB_AllowPreferredClass , true));
- Add(database_entity(DB_AllowCVAT , true));
- Add(database_entity(DB_AllowGPT , true));
+ Add(database_entity(DB_AllowCvat , true));
+ Add(database_entity(DB_AllowGpt , true));
// This is just a sample product, so we make do with plausible
// all-male seven-pay premiums, and use GPT corridor factors for
// CVAT.
Add(database_entity(DB_CorridorTable , 7));
- Add(database_entity(DB_TAMRA7PayTable , 10));
+ Add(database_entity(DB_SevenPayTable , 10));
// Following IRS Notice 88-128, use only the male and female
// tables with no smoker distinction, and a unisex table where
@@ -458,23 +458,23 @@
// which contains a numerical error but was adopted by NAIC.
int dims311[e_number_of_axes] = {3, 1, 1, 1, 1, 1, 1}; // gender
double T7702q[9] = {35, 41, 107,}; // Female, male, unisex.
- Add(database_entity(DB_IRC7702QTable, e_number_of_axes, dims311, T7702q));
+ Add(database_entity(DB_Irc7702QTable, e_number_of_axes, dims311, T7702q));
Add(database_entity(DB_PremLoad7702 , 0.02));
- Add(database_entity(DB_AllowDBO1 , true));
- Add(database_entity(DB_AllowDBO2 , true));
- Add(database_entity(DB_AllowDBO3 , true));
- Add(database_entity(DB_OptChgCanIncrSA , true));
- Add(database_entity(DB_OptChgCanDecrSA , true));
- Add(database_entity(DB_NonforfQTable , 0.0));
+ Add(database_entity(DB_AllowDbo1 , true));
+ Add(database_entity(DB_AllowDbo2 , true));
+ Add(database_entity(DB_AllowDbo3 , true));
+ Add(database_entity(DB_DboChgCanIncrSpecAmt, true));
+ Add(database_entity(DB_DboChgCanDecrSpecAmt, true));
+ Add(database_entity(DB_SnflQTable , 0.0));
Add(database_entity(DB_SurrChgByFormula , 0.0));
Add(database_entity(DB_SurrChgPeriod , 0.0));
Add(database_entity(DB_SurrChgZeroDur , 0.0));
- Add(database_entity(DB_SurrChgNLPMult , 0.0));
- Add(database_entity(DB_SurrChgNLPMax , 0.0));
- Add(database_entity(DB_SurrChgEAMax , 0.0));
+ Add(database_entity(DB_SurrChgNlpMult , 0.0));
+ Add(database_entity(DB_SurrChgNlpMax , 0.0));
+ Add(database_entity(DB_SurrChgEaMax , 0.0));
Add(database_entity(DB_SurrChgPremMult , 0.0));
- Add(database_entity(DB_SurrChgIsMly , 0.0));
+ Add(database_entity(DB_SurrChgAmort , 0.0));
// These aren't actual premium tax rates. Actual rates change
// often, and depend on the insurer's domicile because of
@@ -517,19 +517,19 @@
);
Add(database_entity(DB_PremTaxState , oe_ee_state));
- Add(database_entity(DB_EndtAge , 100));
+ Add(database_entity(DB_MaturityAge , 100));
Add(database_entity(DB_AllowExtEndt , true));
Add(database_entity(DB_AllowGenAcct , true));
Add(database_entity(DB_AllowSepAcct , true));
Add(database_entity(DB_MinPremType , oe_monthly_deduction));
Add(database_entity(DB_TgtPremType , oe_modal_nonmec));
- Add(database_entity(DB_TgtPmFixedAtIssue , false));
- Add(database_entity(DB_TgtPmIgnoreSubstd , true));
+ Add(database_entity(DB_TgtPremFixedAtIssue , false));
+ Add(database_entity(DB_TgtPremIgnoreSubstd , true));
Add(database_entity(DB_NoLapseMinDur , 0.0));
Add(database_entity(DB_NoLapseMinAge , 0.0));
Add(database_entity(DB_NoLapseUnratedOnly , false));
- Add(database_entity(DB_NoLapseOpt1Only , false));
- Add(database_entity(DB_PremRefund , 0.0));
+ Add(database_entity(DB_NoLapseDbo1Only , false));
+ Add(database_entity(DB_LoadRfdProportion , 0.0));
// Reuse current COI rates as current and guaranteed term rates.
Add(database_entity(DB_TermTable, e_number_of_axes, dims313, TgCOI));
Add(database_entity(DB_GuarTermTable, e_number_of_axes, dims313, TgCOI));
@@ -538,23 +538,23 @@
Add(database_entity(DB_TermMaxIssAge , 0.0));
Add(database_entity(DB_TermForcedConvAge , 0.0));
Add(database_entity(DB_MaxTermProportion , 0.0));
- Add(database_entity(DB_TermCOIRate , 0.0));
+ Add(database_entity(DB_TermCoiRate , 0.0));
Add(database_entity(DB_TermPremRate , 0.0));
- Add(database_entity(DB_WPTable , 8));
- Add(database_entity(DB_AllowWP , true));
- Add(database_entity(DB_WPMinIssAge , 0.0));
- Add(database_entity(DB_WPMaxIssAge , 0.0));
- Add(database_entity(DB_WPMax , 0.0));
- Add(database_entity(DB_WPCOIRate , 0.0));
- Add(database_entity(DB_WPPremRate , 0.0));
+ Add(database_entity(DB_WpTable , 8));
+ Add(database_entity(DB_AllowWp , true));
+ Add(database_entity(DB_WpMinIssAge , 0.0));
+ Add(database_entity(DB_WpMaxIssAge , 0.0));
+ Add(database_entity(DB_WpMax , 0.0));
+ Add(database_entity(DB_WpCoiRate , 0.0));
+ Add(database_entity(DB_WpPremRate , 0.0));
// SOA qx_ins table 708 is 70-75 US ADB experience.
- Add(database_entity(DB_ADDTable , 708));
- Add(database_entity(DB_AllowADD , true));
- Add(database_entity(DB_ADDMinIssAge , 0.0));
- Add(database_entity(DB_ADDMaxIssAge , 0.0));
- Add(database_entity(DB_ADDLimit , 1000000.0));
- Add(database_entity(DB_ADDCOIRate , 0.0));
- Add(database_entity(DB_ADDPremRate , 0.0));
+ Add(database_entity(DB_AdbTable , 708));
+ Add(database_entity(DB_AllowAdb , true));
+ Add(database_entity(DB_AdbMinIssAge , 0.0));
+ Add(database_entity(DB_AdbMaxIssAge , 0.0));
+ Add(database_entity(DB_AdbLimit , 1000000.0));
+ Add(database_entity(DB_AdbCoiRate , 0.0));
+ Add(database_entity(DB_AdbPremRate , 0.0));
Add(database_entity(DB_WeightClass , 0.0));
Add(database_entity(DB_WeightGender , 0.0));
Add(database_entity(DB_WeightSmoking , 0.0));
@@ -564,13 +564,13 @@
Add(database_entity(DB_FullExpPol , 0.0));
Add(database_entity(DB_FullExpPrem , 0.0));
Add(database_entity(DB_FullExpDumpin , 0.0));
- Add(database_entity(DB_FullExpPerK , 0.0));
+ Add(database_entity(DB_FullExpSpecAmt , 0.0));
Add(database_entity(DB_VarExpPol , 0.0));
Add(database_entity(DB_VarExpPrem , 0.0));
Add(database_entity(DB_VarExpDumpin , 0.0));
- Add(database_entity(DB_VarExpPerK , 0.0));
+ Add(database_entity(DB_VarExpSpecAmt , 0.0));
Add(database_entity(DB_MedicalProportion , 0.0));
- Add(database_entity(DB_UWTestCost , 0.0));
+ Add(database_entity(DB_UwTestCost , 0.0));
Add(database_entity(DB_VxBasicQTable , 0.0));
Add(database_entity(DB_VxDeficQTable , 0.0));
Add(database_entity(DB_VxTaxQTable , 0.0));
@@ -579,16 +579,16 @@
Add(database_entity(DB_StatVxQ , 0.0));
Add(database_entity(DB_TaxVxQ , 0.0));
Add(database_entity(DB_DefVxQ , 0.0));
- Add(database_entity(DB_NonforfQ , 0.0));
+ Add(database_entity(DB_SnflQ , 0.0));
Add(database_entity(DB_CompTarget , 0.0));
Add(database_entity(DB_CompExcess , 0.0));
Add(database_entity(DB_CompChargeBack , 0.0));
Add(database_entity(DB_LapseRate , 0.0));
- Add(database_entity(DB_ReqSurpNAAR , 0.0));
+ Add(database_entity(DB_ReqSurpNaar , 0.0));
Add(database_entity(DB_ReqSurpVx , 0.0));
- Add(database_entity(DB_LICFitRate , 0.0));
+ Add(database_entity(DB_LicFitRate , 0.0));
Add(database_entity(DB_LicDacTaxRate , 0.0));
- Add(database_entity(DB_GDBVxMethod , 0.0));
+ Add(database_entity(DB_GdbVxMethod , 0.0));
Add(database_entity(DB_PrimaryHurdle , 0.0));
Add(database_entity(DB_SecondaryHurdle , 0.0));
Add(database_entity(DB_LedgerType , mce_ill_reg));
@@ -603,7 +603,7 @@
// DATABASE !! Hence, the entity is misnamed; it really means
// something like "group proxy rate". However, what's really
// wanted is a choice among tables. The same can be said of
- // 'DB_83GamTable', which really means "partial-mortality table";
+ // 'DB_Gam83Table', which really means "partial-mortality table";
// this support request:
// http://savannah.nongnu.org/support/?105593
// would offer a choice and make that database entity unnecessary.
@@ -611,22 +611,22 @@
// Use male rates for unisex--1983 GAM seems to have no unisex version.
double T83Gam[3] = {825, 826, 826,};
- Add(database_entity(DB_83GamTable, e_number_of_axes, dims311, T83Gam, "Use
male rates for unisex--1983 GAM seems to have no unisex version."));
+ Add(database_entity(DB_Gam83Table, e_number_of_axes, dims311, T83Gam, "Use
male rates for unisex--1983 GAM seems to have no unisex version."));
- Add(database_entity(DB_AllowWD , true));
+ Add(database_entity(DB_AllowWd , true));
Add(database_entity(DB_AllowLoan , true));
- Add(database_entity(DB_AllowChangeToDBO2 , true));
- Add(database_entity(DB_AllowSAIncr , true));
+ Add(database_entity(DB_AllowChangeToDbo2 , true));
+ Add(database_entity(DB_AllowSpecAmtIncr , true));
Add(database_entity(DB_NoLapseAlwaysActive , false));
Add(database_entity(DB_PrefOrSelect , oe_called_select));
Add(database_entity(DB_ExpRatStdDevMult , 0.0));
- Add(database_entity(DB_ExpRatIBNRMult , 0.0));
- Add(database_entity(DB_ExpRatCOIRetention , 0.0));
+ Add(database_entity(DB_ExpRatIbnrMult , 0.0));
+ Add(database_entity(DB_ExpRatCoiRetention , 0.0));
Add(database_entity(DB_StableValFundCharge , 0.0));
- Add(database_entity(DB_AmortPmLdFundCharge , 0.0030));
+ Add(database_entity(DB_LoadAmortFundCharge , 0.0030));
Add(database_entity(DB_AllowAmortPremLoad , false));
- Add(database_entity(DB_PmTxAmortPeriod , 0));
- Add(database_entity(DB_PmTxAmortIntRate , 0.0));
+ Add(database_entity(DB_PremTaxAmortPeriod , 0));
+ Add(database_entity(DB_PremTaxAmortIntRate , 0.0));
// Pass through premium tax.
Add
(database_entity
@@ -639,40 +639,40 @@
Add(database_entity(DB_AllowHoneymoon , true));
// Set target equal to seven-pay premium.
Add(database_entity(DB_TgtPremTable , 10));
- Add(database_entity(DB_TgtPremPolFee , 0.0));
+ Add(database_entity(DB_TgtPremMonthlyPolFee, 0.0));
Add(database_entity(DB_AllowExtraAssetComp , true));
Add(database_entity(DB_AllowExtraPremComp , true));
Add(database_entity(DB_AssetChargeType , oe_asset_charge_spread));
Add(database_entity(DB_AllowUltraPrefClass , false));
Add(database_entity(DB_MaxGenAcctRate , 0.06));
Add(database_entity(DB_MaxSepAcctRate , 0.12));
- Add(database_entity(DB_MaxVLRRate , 0.18));
- Add(database_entity(DB_SurrChgAVMult , 0.0));
- Add(database_entity(DB_IntSpreadFreq , mce_spread_daily));
+ Add(database_entity(DB_MaxVlrRate , 0.18));
+ Add(database_entity(DB_SurrChgAcctValMult , 0.0));
+ Add(database_entity(DB_IntSpreadMode , mce_spread_daily));
Add(database_entity(DB_StateApproved , true));
Add(database_entity(DB_AllowStateXX , true));
Add(database_entity(DB_AllowForeign , true));
- Add(database_entity(DB_AllowCustomFund , false));
+ Add(database_entity(DB_AllowImfOverride , false));
Add(database_entity(DB_AllowNo7702 , false));
- Add(database_entity(DB_EnforceNAARLimit , true));
+ Add(database_entity(DB_EnforceNaarLimit , true));
Add(database_entity(DB_DynamicSepAcctLoad , false));
Add(database_entity(DB_SpecAmtLoadLimit , 10000000.0));
- Add(database_entity(DB_Equiv7702DBO3 , 0));
- Add(database_entity(DB_ExpRatRiskCOIMult , 0));
- Add(database_entity(DB_SurrChgSAMult , 0.0));
- Add(database_entity(DB_AllowSpouse , false));
- Add(database_entity(DB_AllowChild , false));
+ Add(database_entity(DB_Equiv7702Dbo3 , 0));
+ Add(database_entity(DB_ExpRatRiskCoiMult , 0));
+ Add(database_entity(DB_SurrChgSpecAmtMult , 0.0));
+ Add(database_entity(DB_AllowSpouseRider , false));
+ Add(database_entity(DB_AllowChildRider , false));
// Spouse and child riders unavailable, so it doesn't matter
// what table we specify.
Add(database_entity(DB_SpouseRiderTable , 708));
Add(database_entity(DB_ChildRiderTable , 708));
- Add(database_entity(DB_GAIntBonus , 0.0));
+ Add(database_entity(DB_GenAcctIntBonus , 0.0));
// Allow experience rating.
Add(database_entity(DB_AllowExpRating , 1.0));
- Add(database_entity(DB_ExpRatIBNRMult , 6.0));
+ Add(database_entity(DB_ExpRatIbnrMult , 6.0));
Add(database_entity(DB_ExpRatAmortPeriod , 4.0));
WriteDB(AddDataDir("sample.database"));
@@ -684,7 +684,7 @@
{
dictionary_.clear();
- // Zero is inappropriate for some entities ("DB_CCOIMultiplier",
+ // Zero is inappropriate for some entities ("DB_CurrCoiMultiplier",
// e.g.), but the antediluvian branch doesn't actually use most
// database entities.
for(int j = DB_FIRST; j < DB_LAST; ++j)
@@ -706,23 +706,23 @@
// premium loads
- Add(database_entity(DB_GuarPolFee, 12.00));
+ Add(database_entity(DB_GuarMonthlyPolFee, 12.00));
Add(database_entity(DB_GuarSpecAmtLoad, 0.0));
Add(database_entity(DB_GuarPremLoadTgt, 0.025));
Add(database_entity(DB_GuarPremLoadExc, 0.025));
- Add(database_entity(DB_CurrPolFee, 5.00));
+ Add(database_entity(DB_CurrMonthlyPolFee, 5.00));
Add(database_entity(DB_CurrSpecAmtLoad, 0.0));
Add(database_entity(DB_CurrPremLoadTgt, 0.025));
Add(database_entity(DB_CurrPremLoadExc, 0.025));
- Add(database_entity(DB_MinWD, 100.0));
- Add(database_entity(DB_WDFee, 5.0));
- Add(database_entity(DB_WDFeeRate, 0.01));
+ Add(database_entity(DB_MinWd, 100.0));
+ Add(database_entity(DB_WdFee, 5.0));
+ Add(database_entity(DB_WdFeeRate, 0.01));
int guar_coi_dims[e_number_of_axes] = {1, 1, 3, 1, 1, 1, 1};
// smoker, nonsmoker, unismoke
double guar_coi_tables[3] = {111, 109, 107};
- Add(database_entity(DB_GuarCOITable, e_number_of_axes, guar_coi_dims,
guar_coi_tables));
+ Add(database_entity(DB_GuarCoiTable, e_number_of_axes, guar_coi_dims,
guar_coi_tables));
int curr_coi_dims[e_number_of_axes] = {1, 4, 3, 1, 1, 1, 1};
// preferred, standard, rated, ultrapreferred by smoker, nonsmoker,
unismoke
@@ -733,12 +733,12 @@
5, 6, 4, // rated sm ns us
0, 0, 0, // ultra sm ns us
};
- Add(database_entity(DB_CurrCOITable, e_number_of_axes, curr_coi_dims,
curr_coi_tables));
+ Add(database_entity(DB_CurrCoiTable, e_number_of_axes, curr_coi_dims,
curr_coi_tables));
Add(database_entity(DB_CorridorTable, 7));
- Add(database_entity(DB_WPTable, 8));
- Add(database_entity(DB_ADDTable, 9));
- Add(database_entity(DB_EndtAge, 100));
+ Add(database_entity(DB_WpTable, 8));
+ Add(database_entity(DB_AdbTable, 9));
+ Add(database_entity(DB_MaturityAge, 100));
Add(database_entity(DB_AgeLastOrNearest, 1.0));
Add(database_entity(DB_MinSpecAmt, 10000.0));
@@ -746,16 +746,16 @@
Add(database_entity(DB_MaxSepAcctRate, 0.12));
Add(database_entity(DB_AllowLoan, 1.0));
- Add(database_entity(DB_AllowWD, 1.0));
+ Add(database_entity(DB_AllowWd, 1.0));
Add(database_entity(DB_AllowFlatExtras, 1.0));
- Add(database_entity(DB_AllowChangeToDBO2, 1.0));
- Add(database_entity(DB_AllowDBO3, 1.0));
+ Add(database_entity(DB_AllowChangeToDbo2, 1.0));
+ Add(database_entity(DB_AllowDbo3, 1.0));
Add(database_entity(DB_SurrChgPremMult, 0.0));
- Add(database_entity(DB_SurrChgAVMult, 0.0));
- Add(database_entity(DB_SurrChgSAMult, 0.0));
- Add(database_entity(DB_SurrChgAVDurFactor, 1.0));
- Add(database_entity(DB_SurrChgSADurFactor, 1.0));
+ Add(database_entity(DB_SurrChgAcctValMult, 0.0));
+ Add(database_entity(DB_SurrChgSpecAmtMult, 0.0));
+ Add(database_entity(DB_SurrChgAcctValSlope, 1.0));
+ Add(database_entity(DB_SurrChgSpecAmtSlope, 1.0));
Add(database_entity(DB_LedgerType, mce_ill_reg));
@@ -766,11 +766,11 @@
Add(database_entity(DB_NominallyPar, 0.0));
Add(database_entity(DB_Has1035ExchCharge, 0.0));
Add(database_entity(DB_SmokeOrTobacco, 0.0));
- Add(database_entity(DB_DACTaxFundCharge, 0.0));
- Add(database_entity(DB_AllowWP, 0.0));
- Add(database_entity(DB_AllowADD, 0.0));
- Add(database_entity(DB_AllowSpouse, 0.0));
- Add(database_entity(DB_AllowChild, 0.0));
+ Add(database_entity(DB_DacTaxFundCharge, 0.0));
+ Add(database_entity(DB_AllowWp, 0.0));
+ Add(database_entity(DB_AllowAdb, 0.0));
+ Add(database_entity(DB_AllowSpouseRider, 0.0));
+ Add(database_entity(DB_AllowChildRider, 0.0));
Add(database_entity(DB_ExpRatAmortPeriod, 4.0));
}
Modified: lmi/trunk/dbnames.hpp
===================================================================
--- lmi/trunk/dbnames.hpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/dbnames.hpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -32,6 +32,70 @@
#include <vector>
/// See 'dbnames.xpp' for the definition of each entity.
+///
+/// Partial lexicon:
+/// - Adb Accidental death benefit
+/// - Acct Account
+/// - Amort Amortization
+/// - Amt Amount
+/// - Chg Charge
+/// - Coi Cost of insurance
+/// - Comp Compensation
+/// - Conv Conversion
+/// - Curr Current
+/// - Dac Deferred acquisition cost
+/// - Dbo Death benefit option
+/// - Decr Decrease
+/// - Ded Deduction
+/// - Dur Duration
+/// - Dyn Dynamic
+/// - Ea Expense allowance (SNFL)
+/// - Ee Employee
+/// - Endt Endowment
+/// - Er Employer
+/// - Exc Excess (over target)
+/// - Exch Exchange
+/// - Exp Expense or experience
+/// - Ext Extended (as in 'extended endowment')
+/// - Fit Federal income tax
+/// - Gdb Guaranteed death benefit
+/// - Gen General (as in 'general account')
+/// - Guar Guaranteed
+/// - Ibnr Incurred but not reported (reserve)
+/// - Imf Investment management fee
+/// - Incr Increase
+/// - Int Interest; more rarely, internal
+/// - Irc Internal revenue code
+/// - Iss Issue
+/// - Lic Life insurance company
+/// - MandE Mortality and expense charge
+/// - Max Maximum
+/// - Mdpt Midpoint
+/// - Min Minimum
+/// - Mort Mortality
+/// - Mult Multiplier
+/// - Naar Net amount at risk
+/// - Nlp Net level premium
+/// - Ny New York
+/// - Pmt Payment
+/// - Pol Policy
+/// - Pref Preferred
+/// - Prem Premium
+/// - Q Death rate
+/// - Reg Regular or regulation
+/// - Renl Renewal
+/// - Retal Retaliation
+/// - Rfd Refund or refundable
+/// - Sep Separate (as in 'separate account')
+/// - Snfl Standard nonforfeiture law
+/// - Spec Specified (as in 'specified amount')
+/// - Tgt Target
+/// - Uw Underwriting
+/// - Val Value
+/// - Vlr Variable loan rate
+/// - Vx Reserve
+/// - Wd Withdrawal
+/// - Wp Waiver of premium
enum e_database_key
{DB_FIRST
@@ -42,9 +106,9 @@
,DB_MaxIssAge
,DB_MaxIncrAge
- ,DB_AllowFullUW
- ,DB_AllowSimpUW
- ,DB_AllowGuarUW
+ ,DB_AllowFullUw
+ ,DB_AllowSimpUw
+ ,DB_AllowGuarUw
,DB_SmokeOrTobacco // DATABASE !! Move to '.policy'
,DB_PrefOrSelect // DATABASE !! Move to '.policy'
,DB_AllowPreferredClass
@@ -52,8 +116,8 @@
,DB_AllowSubstdTable
,DB_AllowFlatExtras
- ,DB_AllowRatedWP
- ,DB_AllowRatedADD
+ ,DB_AllowRatedWp
+ ,DB_AllowRatedAdb
,DB_AllowRatedTerm
,DB_AllowRetirees
@@ -70,43 +134,43 @@
,DB_Topic_7702And7702A
- ,DB_AllowCVAT
- ,DB_AllowGPT
+ ,DB_AllowCvat
+ ,DB_AllowGpt
,DB_AllowNo7702
,DB_CorridorTable
- ,DB_TAMRA7PayTable
- ,DB_IRC7702QTable
+ ,DB_SevenPayTable
+ ,DB_Irc7702QTable
,DB_PremLoad7702
- ,DB_Equiv7702DBO3
+ ,DB_Equiv7702Dbo3
,DB_Topic_MortalityCharges
- ,DB_GuarCOITable // DATABASE !! s/COI/Coi/ (passim)
- ,DB_GCoiIsAnnual
- ,DB_GCOIMultiplier
+ ,DB_GuarCoiTable
+ ,DB_GuarCoiIsAnnual
+ ,DB_GuarCoiMultiplier
- ,DB_CurrCOITable
- ,DB_CCoiIsAnnual
- ,DB_CCOIMultiplier
- ,DB_UnusualCOIBanding
- ,DB_CurrCOITable0Limit
- ,DB_CurrCOITable1
- ,DB_CurrCOITable1Limit
- ,DB_CurrCOITable2
+ ,DB_CurrCoiTable
+ ,DB_CurrCoiIsAnnual
+ ,DB_CurrCoiMultiplier
+ ,DB_UnusualCoiBanding
+ ,DB_CurrCoiTable0Limit
+ ,DB_CurrCoiTable1
+ ,DB_CurrCoiTable1Limit
+ ,DB_CurrCoiTable2
- ,DB_MdptCOITable
- ,DB_MCoiIsAnnual
+ ,DB_MdptCoiTable
+ ,DB_MdptCoiIsAnnual
- ,DB_COINYMinTable
- ,DB_UseNYCOIFloor
+ ,DB_CoiNyMinTable
+ ,DB_UseNyCoiFloor
,DB_MaxMonthlyCoiRate
- ,DB_GuarCOICeiling
- ,DB_COIGuarIsMin
+ ,DB_GuarCoiCeiling
+ ,DB_CoiGuarIsMin
- ,DB_SubstdTblMult
- ,DB_SubstdTblMultTable
+ ,DB_SubstdTableMult
+ ,DB_SubstdTableMultTable
,DB_CoiUpper12Method
,DB_CoiInforceReentry
@@ -117,7 +181,7 @@
,DB_Topic_Interest
,DB_GuarInt
- ,DB_NAARDiscount
+ ,DB_NaarDiscount
,DB_GuarIntSpread
,DB_GuarMandE
@@ -125,22 +189,22 @@
,DB_CurrIntSpread
,DB_CurrMandE
- ,DB_GAIntBonus
+ ,DB_GenAcctIntBonus
,DB_BonusInt
,DB_IntFloor
,DB_MaxGenAcctRate
,DB_MaxSepAcctRate
,DB_SepAcctSpreadMethod
- ,DB_IntSpreadFreq
+ ,DB_IntSpreadMode
,DB_DynamicMandE
,DB_Topic_AssetCharges
,DB_AllowAmortPremLoad
- ,DB_AmortPmLdFundCharge
+ ,DB_LoadAmortFundCharge
- ,DB_AllowCustomFund // DATABASE !! DB_AllowImfOverride
+ ,DB_AllowImfOverride
,DB_AssetChargeType
,DB_StableValFundCharge
@@ -150,8 +214,8 @@
,DB_Topic_Loads
- ,DB_GuarPolFee // DATABASE !! DB_GuarMonthlyPolFee
- ,DB_GuarIssueFee // DATABASE !! DB_GuarAnnualPolFee
+ ,DB_GuarMonthlyPolFee
+ ,DB_GuarAnnualPolFee
,DB_GuarPremLoadTgt
,DB_GuarPremLoadExc
@@ -161,10 +225,10 @@
,DB_GuarSpecAmtLoad
,DB_GuarSpecAmtLoadTable
- ,DB_GuarAcctValLoadAMD // DATABASE !! Lose the "AMD" suffix.
+ ,DB_GuarAcctValLoad
- ,DB_CurrPolFee // DATABASE !! DB_CurrMonthlyPolFee
- ,DB_CurrIssueFee // DATABASE !! DB_CurrAnnualPolFee
+ ,DB_CurrMonthlyPolFee
+ ,DB_CurrAnnualPolFee
,DB_CurrPremLoadTgt
,DB_CurrPremLoadExc
@@ -174,29 +238,29 @@
,DB_CurrSpecAmtLoad
,DB_CurrSpecAmtLoadTable
- ,DB_CurrAcctValLoadAMD // DATABASE !! Lose the "AMD" suffix.
+ ,DB_CurrAcctValLoad
- ,DB_TgtPremPolFee
- ,DB_PremRefund // DATABASE !! DB_RefundablePremLoad
+ ,DB_TgtPremMonthlyPolFee
+ ,DB_LoadRfdProportion
,DB_SpecAmtLoadLimit
,DB_DynamicSepAcctLoad
,DB_DynSepAcctLoadLimit
,DB_Topic_DacAndPremiumTax
- ,DB_DACTaxFundCharge
- ,DB_DACTaxPremLoad
+ ,DB_DacTaxFundCharge
+ ,DB_DacTaxPremLoad
,DB_PremTaxFundCharge
,DB_PremTaxLoad
- ,DB_WaivePmTxInt1035
+ ,DB_WaivePremTaxInt1035
,DB_PremTaxRetalLimit
,DB_PremTaxTierGroup
,DB_PremTaxTierPeriod
,DB_PremTaxTierNonDecr
- ,DB_PmTxAmortPeriod
- ,DB_PmTxAmortIntRate
+ ,DB_PremTaxAmortPeriod
+ ,DB_PremTaxAmortIntRate
,DB_PremTaxRate
,DB_PremTaxState
@@ -204,30 +268,30 @@
,DB_Topic_SurrenderCharges
- ,DB_SurrChgAVMult
- ,DB_SurrChgAVDurFactor
- ,DB_SurrChgSAMult
- ,DB_SurrChgSADurFactor
+ ,DB_SurrChgAcctValMult
+ ,DB_SurrChgAcctValSlope
+ ,DB_SurrChgSpecAmtMult
+ ,DB_SurrChgSpecAmtSlope
,DB_SurrChgPremMult
,DB_SurrChgOnIncr
,DB_SurrChgOnDecr
- ,DB_Has1035ExchCharge // DATABASE !! DB_1035ExchCharge
+ ,DB_Has1035ExchCharge
- ,DB_NonforfQTable // DATABASE !! s/Nonforf/Snfl/ (passim)
- ,DB_COINonforfIsGuar
+ ,DB_SnflQTable
+ ,DB_CoiSnflIsGuar
,DB_SurrChgByFormula
,DB_SurrChgPeriod
,DB_SurrChgZeroDur
- ,DB_SurrChgNLPMult
- ,DB_SurrChgNLPMax
- ,DB_SurrChgEAMax
- ,DB_SurrChgIsMly
+ ,DB_SurrChgNlpMult
+ ,DB_SurrChgNlpMax
+ ,DB_SurrChgEaMax
+ ,DB_SurrChgAmort
,DB_Topic_DeathBenefits
- ,DB_AllowSAIncr
+ ,DB_AllowSpecAmtIncr
,DB_MinSpecAmtIncr
- ,DB_EnforceNAARLimit
+ ,DB_EnforceNaarLimit
,DB_MinSpecAmt
,DB_MinIssSpecAmt
@@ -236,14 +300,14 @@
,DB_MaxIssSpecAmt
,DB_MaxRenlSpecAmt
- ,DB_AllowDBO1
- ,DB_AllowDBO2
- ,DB_AllowDBO3
- ,DB_AllowChangeToDBO2
- ,DB_OptChgCanIncrSA
- ,DB_OptChgCanDecrSA
+ ,DB_AllowDbo1
+ ,DB_AllowDbo2
+ ,DB_AllowDbo3
+ ,DB_AllowChangeToDbo2
+ ,DB_DboChgCanIncrSpecAmt
+ ,DB_DboChgCanDecrSpecAmt
- ,DB_AllowExtEndt // DATABASE !! DB_CovgBeyondMaturity
+ ,DB_AllowExtEndt
,DB_Topic_Riders
@@ -254,60 +318,60 @@
,DB_TermMaxIssAge
,DB_TermForcedConvAge
,DB_MaxTermProportion
- ,DB_TermCOIRate
+ ,DB_TermCoiRate
,DB_TermPremRate
- ,DB_AllowWP
- ,DB_WPTable
- ,DB_WPMinIssAge
- ,DB_WPMaxIssAge
- ,DB_WPMax
- ,DB_WPCOIRate
- ,DB_WPPremRate
- ,DB_WPChargeMethod
+ ,DB_AllowWp
+ ,DB_WpTable
+ ,DB_WpMinIssAge
+ ,DB_WpMaxIssAge
+ ,DB_WpMax
+ ,DB_WpCoiRate
+ ,DB_WpPremRate
+ ,DB_WpChargeMethod
- ,DB_AllowADD
- ,DB_ADDTable
- ,DB_ADDMinIssAge
- ,DB_ADDMaxIssAge
- ,DB_ADDLimit
- ,DB_ADDCOIRate
- ,DB_ADDPremRate
+ ,DB_AllowAdb
+ ,DB_AdbTable
+ ,DB_AdbMinIssAge
+ ,DB_AdbMaxIssAge
+ ,DB_AdbLimit
+ ,DB_AdbCoiRate
+ ,DB_AdbPremRate
- ,DB_AllowSpouse
+ ,DB_AllowSpouseRider
,DB_SpouseRiderGuarTable
,DB_SpouseRiderTable
- ,DB_AllowChild
+ ,DB_AllowChildRider
,DB_ChildRiderTable
,DB_Topic_Withdrawals
- ,DB_AllowWD
- ,DB_WDFee
- ,DB_WDFeeRate
+ ,DB_AllowWd
+ ,DB_WdFee
+ ,DB_WdFeeRate
- ,DB_FreeWDProportion
- ,DB_MinWD
- ,DB_MaxWDAVMult
- ,DB_MaxWDDed
+ ,DB_FreeWdProportion
+ ,DB_MinWd
+ ,DB_MaxWdAcctValMult
+ ,DB_MaxWdDed
- ,DB_WDCanDecrSADBO1
- ,DB_WDCanDecrSADBO2
- ,DB_WDCanDecrSADBO3
+ ,DB_WdCanDecrSpecAmtDbo1
+ ,DB_WdCanDecrSpecAmtDbo2
+ ,DB_WdCanDecrSpecAmtDbo3
- ,DB_FirstWDYear
+ ,DB_FirstWdYear
,DB_Topic_Loans
,DB_AllowLoan
,DB_AllowPrefLoan
,DB_AllowFixedLoan
- ,DB_AllowVLR
+ ,DB_AllowVlr
,DB_FixedLoanRate
- ,DB_MaxVLRRate
+ ,DB_MaxVlrRate
- ,DB_MaxLoanAVMult
+ ,DB_MaxLoanAcctValMult
,DB_MaxLoanDed
,DB_GuarPrefLoanSpread
@@ -324,8 +388,8 @@
,DB_MinPremIntSpread
,DB_TgtPremType
,DB_TgtPremTable
- ,DB_TgtPmFixedAtIssue
- ,DB_TgtPmIgnoreSubstd
+ ,DB_TgtPremFixedAtIssue
+ ,DB_TgtPremIgnoreSubstd
,DB_MinPmt
,DB_Topic_SecondaryGuarantees
@@ -333,7 +397,7 @@
,DB_NoLapseMinDur
,DB_NoLapseMinAge
,DB_NoLapseUnratedOnly
- ,DB_NoLapseOpt1Only
+ ,DB_NoLapseDbo1Only
,DB_NoLapseAlwaysActive
,DB_AllowHoneymoon
@@ -364,9 +428,9 @@
,DB_AllowExpRating
,DB_ExpRatStdDevMult
- ,DB_ExpRatIBNRMult
- ,DB_ExpRatCOIRetention
- ,DB_ExpRatRiskCOIMult
+ ,DB_ExpRatIbnrMult
+ ,DB_ExpRatCoiRetention
+ ,DB_ExpRatRiskCoiMult
,DB_ExpRatAmortPeriod
,DB_Topic_Miscellanea
@@ -375,14 +439,14 @@
,DB_AgeLastOrNearest // DATABASE !! Add more options...
,DB_MaxIllusAge
- ,DB_EndtAge // DATABASE !! DB_MaturityAge
+ ,DB_MaturityAge
,DB_LapseIgnoresSurrChg
,DB_DefaultProcessOrder
,DB_NominallyPar // DATABASE !! Use a footnote instead.
,DB_TableYTable
- ,DB_83GamTable
+ ,DB_Gam83Table
,DB_Topic_Weights
@@ -398,17 +462,17 @@
,DB_FullExpPol
,DB_FullExpPrem
,DB_FullExpDumpin
- ,DB_FullExpPerK
+ ,DB_FullExpSpecAmt
,DB_VarExpPol
,DB_VarExpPrem
,DB_VarExpDumpin
- ,DB_VarExpPerK
+ ,DB_VarExpSpecAmt
- ,DB_ExpPerKLimit
+ ,DB_ExpSpecAmtLimit
,DB_MedicalProportion
- ,DB_UWTestCost
+ ,DB_UwTestCost
,DB_Topic_Reserves
@@ -422,16 +486,16 @@
,DB_StatVxQ
,DB_TaxVxQ
,DB_DefVxQ
- ,DB_NonforfQ
+ ,DB_SnflQ
,DB_Topic_OtherAssumptions
,DB_LapseRate
- ,DB_ReqSurpNAAR
+ ,DB_ReqSurpNaar
,DB_ReqSurpVx
- ,DB_LICFitRate
+ ,DB_LicFitRate
,DB_LicDacTaxRate
- ,DB_GDBVxMethod
+ ,DB_GdbVxMethod
,DB_PrimaryHurdle
,DB_SecondaryHurdle
Modified: lmi/trunk/dbnames.xpp
===================================================================
--- lmi/trunk/dbnames.xpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/dbnames.xpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -27,17 +27,17 @@
{DB_MinIssAge,DB_Topic_Underwriting,"MinIssAge","Minimum issue age",}, \
{DB_MaxIssAge,DB_Topic_Underwriting,"MaxIssAge","Maximum issue age",}, \
{DB_MaxIncrAge,DB_Topic_Underwriting,"MaxIncrAge","Maximum age at which
specified amount increases are permitted",}, \
-{DB_AllowFullUW,DB_Topic_Underwriting,"AllowFullUW","Allow full underwriting:
0=no, 1=yes",}, \
-{DB_AllowSimpUW,DB_Topic_Underwriting,"AllowSimpUW","Allow simplified
underwriting: 0=no, 1=yes",}, \
-{DB_AllowGuarUW,DB_Topic_Underwriting,"AllowGuarUW","Allow guaranteed
underwriting: 0=no, 1=yes",}, \
+{DB_AllowFullUw,DB_Topic_Underwriting,"AllowFullUw","Allow full underwriting:
0=no, 1=yes",}, \
+{DB_AllowSimpUw,DB_Topic_Underwriting,"AllowSimpUw","Allow simplified
underwriting: 0=no, 1=yes",}, \
+{DB_AllowGuarUw,DB_Topic_Underwriting,"AllowGuarUw","Allow guaranteed
underwriting: 0=no, 1=yes",}, \
{DB_SmokeOrTobacco,DB_Topic_Underwriting,"SmokeOrTobacco","Distinguish
mortality by: 0=smoking, 1=tobacco use",}, \
{DB_PrefOrSelect,DB_Topic_Underwriting,"PrefOrSelect","Underwriting class more
restrictive than standard is called: 0=preferred, 1=select",}, \
{DB_AllowPreferredClass,DB_Topic_Underwriting,"AllowPreferredClass","Allow
preferred class: 0=no, 1=yes",}, \
{DB_AllowUltraPrefClass,DB_Topic_Underwriting,"AllowUltraPrefClass","Allow
ultra-preferred class: 0=no, 1=yes",}, \
{DB_AllowSubstdTable,DB_Topic_Underwriting,"AllowSubstdTable","Allow
substandard table ratings: 0=no, 1=yes",}, \
{DB_AllowFlatExtras,DB_Topic_Underwriting,"AllowFlatExtras","Allow substandard
flat extra ratings: 0=no, 1=yes",}, \
-{DB_AllowRatedWP,DB_Topic_Underwriting,"AllowRatedWP","Waiver benefit can be
rated: 0=no, 1=yes",}, \
-{DB_AllowRatedADD,DB_Topic_Underwriting,"AllowRatedADD","Accidental death
benefit can be rated: 0=no, 1=yes",}, \
+{DB_AllowRatedWp,DB_Topic_Underwriting,"AllowRatedWp","Waiver benefit can be
rated: 0=no, 1=yes",}, \
+{DB_AllowRatedAdb,DB_Topic_Underwriting,"AllowRatedAdb","Accidental death
benefit can be rated: 0=no, 1=yes",}, \
{DB_AllowRatedTerm,DB_Topic_Underwriting,"AllowRatedTerm","Term rider can be
rated: 0=no, 1=yes",}, \
{DB_AllowRetirees,DB_Topic_Underwriting,"AllowRetirees","Retirees may be
issued: 0=no, 1=yes",}, \
{DB_AllowUnisex,DB_Topic_Underwriting,"AllowUnisex","Allow unisex rating:
0=no, 1=yes",}, \
@@ -49,137 +49,137 @@
{DB_AllowForeign,DB_Topic_Underwriting,"AllowForeign","Allow foreign-country
multiplier for cost of insurance charges: 0=no, 1=yes [not yet implemented]",},
\
{DB_Allowable,DB_Topic_Underwriting,"Allowable","A catchall category for rules
not otherwise expressible",}, \
{DB_Topic_7702And7702A,DB_FIRST,"7702 and 7702A","Internal Revenue Code
sections 7702 and 7702A",}, \
-{DB_AllowCVAT,DB_Topic_7702And7702A,"AllowCVAT","Allow cash value accumulation
test: 0=no, 1=yes",}, \
-{DB_AllowGPT,DB_Topic_7702And7702A,"AllowGPT","Allow guideline premium test:
0=no, 1=yes",}, \
+{DB_AllowCvat,DB_Topic_7702And7702A,"AllowCvat","Allow cash value accumulation
test: 0=no, 1=yes",}, \
+{DB_AllowGpt,DB_Topic_7702And7702A,"AllowGpt","Allow guideline premium test:
0=no, 1=yes",}, \
{DB_AllowNo7702,DB_Topic_7702And7702A,"AllowNo7702","Allow 7702 to be ignored
(foreign): 0=no, 1=yes",}, \
{DB_CorridorTable,DB_Topic_7702And7702A,"CorridorTable","Cash value
accumulation test 'corridor' factor (index in mortality table database)",}, \
-{DB_TAMRA7PayTable,DB_Topic_7702And7702A,"TAMRA7PayTable","7702A table of
annual seven-pay premium rates per $1 (index in mortality table database)",}, \
-{DB_IRC7702QTable,DB_Topic_7702And7702A,"IRC7702QTable","7702 and 7702A annual
mortality rate (index in mortality table database)",}, \
+{DB_SevenPayTable,DB_Topic_7702And7702A,"SevenPayTable","7702A table of annual
seven-pay premium rates per $1 (index in mortality table database)",}, \
+{DB_Irc7702QTable,DB_Topic_7702And7702A,"Irc7702QTable","7702 and 7702A annual
mortality rate (index in mortality table database)",}, \
{DB_PremLoad7702,DB_Topic_7702And7702A,"PremLoad7702","Premium load for 7702
and 7702A (may be lower than current premium load for simplicity)",}, \
-{DB_Equiv7702DBO3,DB_Topic_7702And7702A,"Equiv7702DBO3","For 7702, treat
return of premium death benefit option same as: 0=level 1=increasing",}, \
+{DB_Equiv7702Dbo3,DB_Topic_7702And7702A,"Equiv7702Dbo3","For 7702, treat
return of premium death benefit option same as: 0=level 1=increasing",}, \
{DB_Topic_MortalityCharges,DB_FIRST,"Mortality charges","Mortality rates,
limits, conversions, and reentry",}, \
-{DB_GuarCOITable,DB_Topic_MortalityCharges,"GuarCOITable","Guaranteed
mortality charge table (index in mortality table database)",}, \
-{DB_GCoiIsAnnual,DB_Topic_MortalityCharges,"GCoiIsAnnual","Guaranteed cost of
insurance table rates are: 0=monthly, 1=annual",}, \
-{DB_GCOIMultiplier,DB_Topic_MortalityCharges,"GCOIMultiplier","Multiplier
applied to guaranteed cost of insurance charges",}, \
-{DB_CurrCOITable,DB_Topic_MortalityCharges,"CurrCOITable","Current mortality
charge table (index in mortality table database)",}, \
-{DB_CCoiIsAnnual,DB_Topic_MortalityCharges,"CCoiIsAnnual","Current cost of
insurance table rates are: 0=monthly, 1=annual",}, \
-{DB_CCOIMultiplier,DB_Topic_MortalityCharges,"CCOIMultiplier","Multiplier
applied to current cost of insurance charges",}, \
-{DB_UnusualCOIBanding,DB_Topic_MortalityCharges,"UnusualCOIBanding","Use
idiosyncratic COI banding (read the source): 0=no, 1=yes",}, \
-{DB_CurrCOITable0Limit,DB_Topic_MortalityCharges,"CurrCOITable0Limit","Idiosyncratic
banding: breakpoint between first and second bands, included in second
band",}, \
-{DB_CurrCOITable1,DB_Topic_MortalityCharges,"CurrCOITable1","Idiosyncratic
banding: second-band current mortality charge table (index in mortality table
database)",}, \
-{DB_CurrCOITable1Limit,DB_Topic_MortalityCharges,"CurrCOITable1Limit","Idiosyncratic
banding: breakpoint between second and third bands, included in third band",},
\
-{DB_CurrCOITable2,DB_Topic_MortalityCharges,"CurrCOITable2","Idiosyncratic
banding: third-band current mortality charge table (index in mortality table
database)",}, \
-{DB_MdptCOITable,DB_Topic_MortalityCharges,"MdptCOITable","Midpoint mortality
charge table (index in mortality table database) [not used--calculated as mean
of current and guaranteed]",}, \
-{DB_MCoiIsAnnual,DB_Topic_MortalityCharges,"MCoiIsAnnual","Midpoint cost of
insurance table rates are: 0=monthly, 1=annual [not used--calculated as mean of
current and guaranteed]",}, \
-{DB_COINYMinTable,DB_Topic_MortalityCharges,"COINYMinTable","New York minimum
mortality table (index in mortality table database) [not yet implemented]",}, \
-{DB_UseNYCOIFloor,DB_Topic_MortalityCharges,"UseNYCOIFloor","Dynamically
increase cost of insurance rates to COINYMinTable wherever they would otherwise
be lower [not yet implemented]",}, \
+{DB_GuarCoiTable,DB_Topic_MortalityCharges,"GuarCoiTable","Guaranteed
mortality charge table (index in mortality table database)",}, \
+{DB_GuarCoiIsAnnual,DB_Topic_MortalityCharges,"GuarCoiIsAnnual","Guaranteed
cost of insurance table rates are: 0=monthly, 1=annual",}, \
+{DB_GuarCoiMultiplier,DB_Topic_MortalityCharges,"GuarCoiMultiplier","Multiplier
applied to guaranteed cost of insurance charges",}, \
+{DB_CurrCoiTable,DB_Topic_MortalityCharges,"CurrCoiTable","Current mortality
charge table (index in mortality table database)",}, \
+{DB_CurrCoiIsAnnual,DB_Topic_MortalityCharges,"CurrCoiIsAnnual","Current cost
of insurance table rates are: 0=monthly, 1=annual",}, \
+{DB_CurrCoiMultiplier,DB_Topic_MortalityCharges,"CurrCoiMultiplier","Multiplier
applied to current cost of insurance charges",}, \
+{DB_UnusualCoiBanding,DB_Topic_MortalityCharges,"UnusualCoiBanding","Use
idiosyncratic COI banding (read the source): 0=no, 1=yes",}, \
+{DB_CurrCoiTable0Limit,DB_Topic_MortalityCharges,"CurrCoiTable0Limit","Idiosyncratic
banding: breakpoint between first and second bands, included in second
band",}, \
+{DB_CurrCoiTable1,DB_Topic_MortalityCharges,"CurrCoiTable1","Idiosyncratic
banding: second-band current mortality charge table (index in mortality table
database)",}, \
+{DB_CurrCoiTable1Limit,DB_Topic_MortalityCharges,"CurrCoiTable1Limit","Idiosyncratic
banding: breakpoint between second and third bands, included in third band",},
\
+{DB_CurrCoiTable2,DB_Topic_MortalityCharges,"CurrCoiTable2","Idiosyncratic
banding: third-band current mortality charge table (index in mortality table
database)",}, \
+{DB_MdptCoiTable,DB_Topic_MortalityCharges,"MdptCoiTable","Midpoint mortality
charge table (index in mortality table database) [not used--calculated as mean
of current and guaranteed]",}, \
+{DB_MdptCoiIsAnnual,DB_Topic_MortalityCharges,"MdptCoiIsAnnual","Midpoint cost
of insurance table rates are: 0=monthly, 1=annual [not used--calculated as mean
of current and guaranteed]",}, \
+{DB_CoiNyMinTable,DB_Topic_MortalityCharges,"CoiNyMinTable","New York minimum
mortality table (index in mortality table database) [not yet implemented]",}, \
+{DB_UseNyCoiFloor,DB_Topic_MortalityCharges,"UseNyCoiFloor","Dynamically
increase cost of insurance rates to CoiNyMinTable wherever they would otherwise
be lower [not yet implemented]",}, \
{DB_MaxMonthlyCoiRate,DB_Topic_MortalityCharges,"MaxMonthlyCoiRate","Reciprocal
of maximum monthly COI rate per $1 of specified amount, e.g. 12.0 (typically
the maximum is specified as a reciprocal such as 1/12)",}, \
-{DB_GuarCOICeiling,DB_Topic_MortalityCharges,"GuarCOICeiling","Dynamically
decrease current cost of insurance rates to guaranteed wherever they would
otherwise be higher [not yet implemented]",}, \
-{DB_COIGuarIsMin,DB_Topic_MortalityCharges,"COIGuarIsMin","[not used]",}, \
-{DB_SubstdTblMult,DB_Topic_MortalityCharges,"SubstdTblMult","Substandard
table-rating multiplier applied to both guaranteed and current cost of
insurance and term rider charges (also multiplied by 'SubstdTblMultTable')",}, \
-{DB_SubstdTblMultTable,DB_Topic_MortalityCharges,"SubstdTblMultTable","Substandard
table-rating multiplier applied to both guaranteed and current cost of
insurance and term rider charges (index in mortality table database)",}, \
+{DB_GuarCoiCeiling,DB_Topic_MortalityCharges,"GuarCoiCeiling","Dynamically
decrease current cost of insurance rates to guaranteed wherever they would
otherwise be higher [not yet implemented]",}, \
+{DB_CoiGuarIsMin,DB_Topic_MortalityCharges,"CoiGuarIsMin","[not used]",}, \
+{DB_SubstdTableMult,DB_Topic_MortalityCharges,"SubstdTableMult","Substandard
table-rating multiplier applied to both guaranteed and current cost of
insurance and term rider charges (also multiplied by
'SubstdTableMultTable')",}, \
+{DB_SubstdTableMultTable,DB_Topic_MortalityCharges,"SubstdTableMultTable","Substandard
table-rating multiplier applied to both guaranteed and current cost of
insurance and term rider charges (index in mortality table database)",}, \
{DB_CoiUpper12Method,DB_Topic_MortalityCharges,"CoiUpper12Method","Method to
derive monthly from annual COI rates: 0=exponential, 1=linear [not yet
implemented]",}, \
{DB_CoiInforceReentry,DB_Topic_MortalityCharges,"CoiInforceReentry","Reenter
COI table: 0=never, 1=at beginning of inforce year, 2=on anniversary >= input
reset date",}, \
{DB_AllowMortBlendSex,DB_Topic_MortalityCharges,"AllowMortBlendSex","Mortality
rating can be blended by gender: 0=no, 1=yes",}, \
{DB_AllowMortBlendSmoke,DB_Topic_MortalityCharges,"AllowMortBlendSmoke","Mortality
rating can be blended by smoking/tobacco use: 0=no, 1=yes",}, \
{DB_Topic_Interest,DB_FIRST,"Interest","Interest rates, limits, spreads, and
bonuses",}, \
{DB_GuarInt,DB_Topic_Interest,"GuarInt","Guaranteed interest rate",}, \
-{DB_NAARDiscount,DB_Topic_Interest,"NAARDiscount","Monthly rate (i over i
upper 12) for discounting net amount at risk, e.g. 0.00246627 for 3% annual
rate (because that's how it's often specified in contracts)",}, \
+{DB_NaarDiscount,DB_Topic_Interest,"NaarDiscount","Monthly rate (i over i
upper 12) for discounting net amount at risk, e.g. 0.00246627 for 3% annual
rate (because that's how it's often specified in contracts)",}, \
{DB_GuarIntSpread,DB_Topic_Interest,"GuarIntSpread","Guaranteed interest
spread, e.g. .02 = 200bp [not yet implemented]",}, \
{DB_GuarMandE,DB_Topic_Interest,"GuarMandE","Guaranteed M&&E charge",}, \
{DB_CurrIntSpread,DB_Topic_Interest,"CurrIntSpread","Current interest spread,
e.g. .01 = 100bp",}, \
{DB_CurrMandE,DB_Topic_Interest,"CurrMandE","Current M&&E charge",}, \
-{DB_GAIntBonus,DB_Topic_Interest,"GAIntBonus","Interest bonus added to the
general account rate",}, \
+{DB_GenAcctIntBonus,DB_Topic_Interest,"GenAcctIntBonus","Interest bonus added
to the general account rate",}, \
{DB_BonusInt,DB_Topic_Interest,"BonusInt","Bonus interest [not yet
implemented]",}, \
{DB_IntFloor,DB_Topic_Interest,"IntFloor","[not used]",}, \
{DB_MaxGenAcctRate,DB_Topic_Interest,"MaxGenAcctRate","Maximum general account
interest rate",}, \
{DB_MaxSepAcctRate,DB_Topic_Interest,"MaxSepAcctRate","Maximum separate
account interest rate",}, \
{DB_SepAcctSpreadMethod,DB_Topic_Interest,"SepAcctSpreadMethod","Separate-account
spread and fee subtraction: 0=annual (effective), 1=daily (nominal)",}, \
-{DB_IntSpreadFreq,DB_Topic_Interest,"IntSpreadFreq","Interest spread frequency
[not yet implemented]",}, \
+{DB_IntSpreadMode,DB_Topic_Interest,"IntSpreadMode","Interest spread
period--e.g., some mutual-fund charges are quarterly [not yet implemented]",}, \
{DB_DynamicMandE,DB_Topic_Interest,"DynamicMandE","M&&E dynamically determined
based on total case assets: 0=no, 1=yes",}, \
{DB_Topic_AssetCharges,DB_FIRST,"Asset charges","Charges deducted from
separate account in proportion to assets",}, \
{DB_AllowAmortPremLoad,DB_Topic_AssetCharges,"AllowAmortPremLoad","Allow
premium load amortization: 0=no, 1=yes",}, \
-{DB_AmortPmLdFundCharge,DB_Topic_AssetCharges,"AmortPmLdFundCharge","Asset
charge for premium load when it's amortized",}, \
-{DB_AllowCustomFund,DB_Topic_AssetCharges,"AllowCustomFund","Allow custom fund
with input investment management fee: 0=no, 1=yes",}, \
+{DB_LoadAmortFundCharge,DB_Topic_AssetCharges,"LoadAmortFundCharge","Asset
charge for amortized premium load",}, \
+{DB_AllowImfOverride,DB_Topic_AssetCharges,"AllowImfOverride","Allow custom
fund with input investment management fee: 0=no, 1=yes",}, \
{DB_AssetChargeType,DB_Topic_AssetCharges,"AssetChargeType","Treatment of
input extra separate-account asset charge: 0=interest spread, 1=account-value
load after monthly deduction",}, \
{DB_StableValFundCharge,DB_Topic_AssetCharges,"StableValFundCharge","Stable
value fund charge",}, \
{DB_GuarFundAdminChg,DB_Topic_AssetCharges,"GuarFundAdminChg","Guaranteed fund
administration charge [not used]",}, \
{DB_CurrFundAdminChg,DB_Topic_AssetCharges,"CurrFundAdminChg","Current fund
administration charge [not used]",}, \
{DB_FundCharge,DB_Topic_AssetCharges,"FundCharge","[not used]",}, \
{DB_Topic_Loads,DB_FIRST,"Loads","Loads and expense charges deducted from
payments and account value",}, \
-{DB_GuarPolFee,DB_Topic_Loads,"GuarPolFee","Guaranteed monthly policy fee",}, \
-{DB_GuarIssueFee,DB_Topic_Loads,"GuarIssueFee","Guaranteed annual policy
fee",}, \
+{DB_GuarMonthlyPolFee,DB_Topic_Loads,"GuarMonthlyPolFee","Guaranteed monthly
policy fee",}, \
+{DB_GuarAnnualPolFee,DB_Topic_Loads,"GuarAnnualPolFee","Guaranteed annual
policy fee",}, \
{DB_GuarPremLoadTgt,DB_Topic_Loads,"GuarPremLoadTgt","Guaranteed load on
premium up to target",}, \
{DB_GuarPremLoadExc,DB_Topic_Loads,"GuarPremLoadExc","Guaranteed load on
premium in excess of target",}, \
{DB_GuarPremLoadTgtRfd,DB_Topic_Loads,"GuarPremLoadTgtRfd","Guaranteed load on
premium up to target, refundable on lapse",}, \
{DB_GuarPremLoadExcRfd,DB_Topic_Loads,"GuarPremLoadExcRfd","Guaranteed load on
premium in excess of target, refundable on lapse",}, \
{DB_GuarSpecAmtLoad,DB_Topic_Loads,"GuarSpecAmtLoad","Guaranteed charge per $1
of specified amount, in addition to 'GuarSpecAmtLoadTable'",}, \
{DB_GuarSpecAmtLoadTable,DB_Topic_Loads,"GuarSpecAmtLoadTable","Guaranteed
charge per $1 of specified amount (index in mortality table database)",}, \
-{DB_GuarAcctValLoadAMD,DB_Topic_Loads,"GuarAcctValLoadAMD","Guaranteed maximum
for expense charge as proportion of separate account value",}, \
-{DB_CurrPolFee,DB_Topic_Loads,"CurrPolFee","Current monthly policy fee",}, \
-{DB_CurrIssueFee,DB_Topic_Loads,"CurrIssueFee","Current annual policy fee",}, \
+{DB_GuarAcctValLoad,DB_Topic_Loads,"GuarAcctValLoad","Guaranteed maximum for
expense charge as proportion of separate account value",}, \
+{DB_CurrMonthlyPolFee,DB_Topic_Loads,"CurrMonthlyPolFee","Current monthly
policy fee",}, \
+{DB_CurrAnnualPolFee,DB_Topic_Loads,"CurrAnnualPolFee","Current annual policy
fee",}, \
{DB_CurrPremLoadTgt,DB_Topic_Loads,"CurrPremLoadTgt","Current load on premium
up to target",}, \
{DB_CurrPremLoadExc,DB_Topic_Loads,"CurrPremLoadExc","Current load on premium
in excess of target",}, \
{DB_CurrPremLoadTgtRfd,DB_Topic_Loads,"CurrPremLoadTgtRfd","Current load on
premium up to target, refundable on lapse",}, \
{DB_CurrPremLoadExcRfd,DB_Topic_Loads,"CurrPremLoadExcRfd","Current load on
premium in excess of target, refundable on lapse",}, \
{DB_CurrSpecAmtLoad,DB_Topic_Loads,"CurrSpecAmtLoad","Current charge per $1 of
specified amount, in addition to 'CurrSpecAmtLoadTable'",}, \
{DB_CurrSpecAmtLoadTable,DB_Topic_Loads,"CurrSpecAmtLoadTable","Current charge
per $1 of specified amount (index in mortality table database)",}, \
-{DB_CurrAcctValLoadAMD,DB_Topic_Loads,"CurrAcctValLoadAMD","Expense charge as
proportion of separate account value",}, \
-{DB_TgtPremPolFee,DB_Topic_Loads,"TgtPremPolFee","Target-premium monthly
policy fee",}, \
-{DB_PremRefund,DB_Topic_Loads,"PremRefund","Proportion of sales load
refundable on full surrender",}, \
+{DB_CurrAcctValLoad,DB_Topic_Loads,"CurrAcctValLoad","Expense charge as
proportion of separate account value",}, \
+{DB_TgtPremMonthlyPolFee,DB_Topic_Loads,"TgtPremMonthlyPolFee","Target-premium
monthly policy fee",}, \
+{DB_LoadRfdProportion,DB_Topic_Loads,"LoadRfdProportion","Proportion of sales
load refundable on full surrender",}, \
{DB_SpecAmtLoadLimit,DB_Topic_Loads,"SpecAmtLoadLimit","Limit up to which
charge per $1 of specified amount applies",}, \
{DB_DynamicSepAcctLoad,DB_Topic_Loads,"DynamicSepAcctLoad","Separate account
AV load dynamically determined based on total case assets: 0=no, 1=yes",}, \
{DB_DynSepAcctLoadLimit,DB_Topic_Loads,"DynSepAcctLoadLimit","Highest
separate-account balance subject to dynamic AV load",}, \
{DB_Topic_DacAndPremiumTax,DB_FIRST,"DAC and premium tax","DAC and premium tax
parameters and charges",}, \
-{DB_DACTaxFundCharge,DB_Topic_DacAndPremiumTax,"DACTaxFundCharge","DAC tax
fund charge [not supported yet]",}, \
-{DB_DACTaxPremLoad,DB_Topic_DacAndPremiumTax,"DACTaxPremLoad","DAC tax premium
load",}, \
+{DB_DacTaxFundCharge,DB_Topic_DacAndPremiumTax,"DacTaxFundCharge","DAC tax
fund charge [not supported yet]",}, \
+{DB_DacTaxPremLoad,DB_Topic_DacAndPremiumTax,"DacTaxPremLoad","DAC tax premium
load",}, \
{DB_PremTaxFundCharge,DB_Topic_DacAndPremiumTax,"PremTaxFundCharge","Premium
tax fund charge [not supported yet]",}, \
{DB_PremTaxLoad,DB_Topic_DacAndPremiumTax,"PremTaxLoad","Scalar premium load
due to premium tax",}, \
-{DB_WaivePmTxInt1035,DB_Topic_DacAndPremiumTax,"WaivePmTxInt1035","Waive
premium tax charge on internal 1035 exchanges: 0=no, 1=yes",}, \
+{DB_WaivePremTaxInt1035,DB_Topic_DacAndPremiumTax,"WaivePremTaxInt1035","Waive
premium tax charge on internal 1035 exchanges: 0=no, 1=yes",}, \
{DB_PremTaxRetalLimit,DB_Topic_DacAndPremiumTax,"PremTaxRetalLimit","Premium
tax: first-year premium threshold to waive retaliation",}, \
{DB_PremTaxTierGroup,DB_Topic_DacAndPremiumTax,"PremTaxTierGroup","Apply
tiered premium tax to all contracts in a group aggregated together: 0=no,
1=yes",}, \
{DB_PremTaxTierPeriod,DB_Topic_DacAndPremiumTax,"PremTaxTierPeriod","Apply
tiered premium tax to premiums aggregated by: 0=policy year, 1=calendar
year",}, \
{DB_PremTaxTierNonDecr,DB_Topic_DacAndPremiumTax,"PremTaxTierNonDecr","Tiered
premium tax effective rate constrained not to decrease from one year to the
next: 0=no, 1=yes",}, \
-{DB_PmTxAmortPeriod,DB_Topic_DacAndPremiumTax,"PmTxAmortPeriod","Premium tax
amortization period in years",}, \
-{DB_PmTxAmortIntRate,DB_Topic_DacAndPremiumTax,"PmTxAmortIntRate","Premium tax
amortization annual effective interest rate",}, \
+{DB_PremTaxAmortPeriod,DB_Topic_DacAndPremiumTax,"PremTaxAmortPeriod","Premium
tax amortization period in years",}, \
+{DB_PremTaxAmortIntRate,DB_Topic_DacAndPremiumTax,"PremTaxAmortIntRate","Premium
tax amortization annual effective interest rate",}, \
{DB_PremTaxRate,DB_Topic_DacAndPremiumTax,"PremTaxRate","Scalar premium tax
rate paid by insurance company--distinct from premium load due to premium
tax",}, \
{DB_PremTaxState,DB_Topic_DacAndPremiumTax,"PremTaxState","State that
determines premium tax rate: 0=insured state, 1=corporation state",}, \
{DB_PremTaxTable,DB_Topic_DacAndPremiumTax,"PremTaxTable","[not yet
implemented--use PremTaxLoad instead]",}, \
{DB_Topic_SurrenderCharges,DB_FIRST,"Surrender charges","Surrender-charge
rates and parameters",}, \
-{DB_SurrChgAVMult,DB_Topic_SurrenderCharges,"SurrChgAVMult","Multiple of
account value for formulaic surrender charges",}, \
-{DB_SurrChgAVDurFactor,DB_Topic_SurrenderCharges,"SurrChgAVDurFactor","Durational
factor applied to multiple-of-account-value surrender charge",}, \
-{DB_SurrChgSAMult,DB_Topic_SurrenderCharges,"SurrChgSAMult","Multiple of
initial spec amt for formulaic surrender charges",}, \
-{DB_SurrChgSADurFactor,DB_Topic_SurrenderCharges,"SurrChgSADurFactor","Durational
factor applied to multiple-of-specified-amount surrender charge",}, \
+{DB_SurrChgAcctValMult,DB_Topic_SurrenderCharges,"SurrChgAcctValMult","Multiple
of account value for formulaic surrender charges",}, \
+{DB_SurrChgAcctValSlope,DB_Topic_SurrenderCharges,"SurrChgAcctValSlope","Durational
factor applied to multiple-of-account-value surrender charge",}, \
+{DB_SurrChgSpecAmtMult,DB_Topic_SurrenderCharges,"SurrChgSpecAmtMult","Multiple
of initial spec amt for formulaic surrender charges",}, \
+{DB_SurrChgSpecAmtSlope,DB_Topic_SurrenderCharges,"SurrChgSpecAmtSlope","Durational
factor applied to multiple-of-specified-amount surrender charge",}, \
{DB_SurrChgPremMult,DB_Topic_SurrenderCharges,"SurrChgPremMult","Multiple of
paid premium for formulaic surrender charges [not yet implemented]",}, \
{DB_SurrChgOnIncr,DB_Topic_SurrenderCharges,"SurrChgOnIncr","Specified-amount
increases engender a new surrender layer: 0=no, 1=yes",}, \
{DB_SurrChgOnDecr,DB_Topic_SurrenderCharges,"SurrChgOnDecr","Specified-amount
decreases engender a new surrender layer: 0=no, 1=yes [not yet implemented]",},
\
{DB_Has1035ExchCharge,DB_Topic_SurrenderCharges,"Has1035ExchCharge","Surrender
charge or market-value adjustment on 1035 exchange: 0=no, 1=yes",}, \
-{DB_NonforfQTable,DB_Topic_SurrenderCharges,"NonforfQTable","Nonforfeiture
annual mortality rate (index in mortality table database) [not yet
implemented]",}, \
-{DB_COINonforfIsGuar,DB_Topic_SurrenderCharges,"COINonforfIsGuar","Use
guaranteed cost of insurance rates as nonforfeiture basis [not yet
implemented]",}, \
+{DB_SnflQTable,DB_Topic_SurrenderCharges,"SnflQTable","Nonforfeiture annual
mortality rate (index in mortality table database) [not yet implemented]",}, \
+{DB_CoiSnflIsGuar,DB_Topic_SurrenderCharges,"CoiSnflIsGuar","Use guaranteed
cost of insurance rates as nonforfeiture basis [not yet implemented]",}, \
{DB_SurrChgByFormula,DB_Topic_SurrenderCharges,"SurrChgByFormula","Surrender
charge calculation method: 0=table, 1=formula [not yet implemented]",}, \
{DB_SurrChgPeriod,DB_Topic_SurrenderCharges,"SurrChgPeriod","Number of years
formulaic surrender charges apply [not yet implemented]",}, \
{DB_SurrChgZeroDur,DB_Topic_SurrenderCharges,"SurrChgZeroDur","Year at end of
which formulaic surrender charges are set to zero [not yet implemented]",}, \
-{DB_SurrChgNLPMult,DB_Topic_SurrenderCharges,"SurrChgNLPMult","Net level
premium multiplier for formulaic surrender charges [not yet implemented]",}, \
-{DB_SurrChgNLPMax,DB_Topic_SurrenderCharges,"SurrChgNLPMax","Maximum net level
premium for formulaic surrender charges [not yet implemented]",}, \
-{DB_SurrChgEAMax,DB_Topic_SurrenderCharges,"SurrChgEAMax","Maximum expense
allowance for formulaic surrender charges [not yet implemented]",}, \
-{DB_SurrChgIsMly,DB_Topic_SurrenderCharges,"SurrChgIsMly","Surrender charge
amortization: 0=annual, 1=monthly [not yet implemented]",}, \
+{DB_SurrChgNlpMult,DB_Topic_SurrenderCharges,"SurrChgNlpMult","Net level
premium multiplier for formulaic surrender charges [not yet implemented]",}, \
+{DB_SurrChgNlpMax,DB_Topic_SurrenderCharges,"SurrChgNlpMax","Maximum net level
premium for formulaic surrender charges [not yet implemented]",}, \
+{DB_SurrChgEaMax,DB_Topic_SurrenderCharges,"SurrChgEaMax","Maximum expense
allowance for formulaic surrender charges [not yet implemented]",}, \
+{DB_SurrChgAmort,DB_Topic_SurrenderCharges,"SurrChgAmort","Surrender charge
amortization: 0=annual, 1=monthly [not yet implemented]",}, \
{DB_Topic_DeathBenefits,DB_FIRST,"Death benefits","Death benefit options and
limits",}, \
-{DB_AllowSAIncr,DB_Topic_DeathBenefits,"AllowSAIncr","Allow increases in
specified amount: 0=no, 1=yes",}, \
+{DB_AllowSpecAmtIncr,DB_Topic_DeathBenefits,"AllowSpecAmtIncr","Allow
increases in specified amount: 0=no, 1=yes",}, \
{DB_MinSpecAmtIncr,DB_Topic_DeathBenefits,"MinSpecAmtIncr","Minimum
specified-amount increase [not yet implemented]",}, \
-{DB_EnforceNAARLimit,DB_Topic_DeathBenefits,"EnforceNAARLimit","Enforce input
limit on net amount at risk: 0=no, 1=yes [not yet implemented]",}, \
+{DB_EnforceNaarLimit,DB_Topic_DeathBenefits,"EnforceNaarLimit","Enforce input
limit on net amount at risk: 0=no, 1=yes [not yet implemented]",}, \
{DB_MinSpecAmt,DB_Topic_DeathBenefits,"MinSpecAmt","Minimum specified amount
[interaction with similar entities not yet documented]",}, \
{DB_MinIssSpecAmt,DB_Topic_DeathBenefits,"MinIssSpecAmt","Minimum specified
amount allowed at issue",}, \
{DB_MinRenlSpecAmt,DB_Topic_DeathBenefits,"MinRenlSpecAmt","Minimum specified
amount after issue for base policy including any term rider",}, \
{DB_MinRenlBaseSpecAmt,DB_Topic_DeathBenefits,"MinRenlBaseSpecAmt","Minimum
specified amount after issue for base policy only, ignoring any term rider",}, \
{DB_MaxIssSpecAmt,DB_Topic_DeathBenefits,"MaxIssSpecAmt","Maximum specified
amount allowed at issue",}, \
{DB_MaxRenlSpecAmt,DB_Topic_DeathBenefits,"MaxRenlSpecAmt","Maximum specified
amount after issue for base policy only, ignoring any term rider",}, \
-{DB_AllowDBO1,DB_Topic_DeathBenefits,"AllowDBO1","Allow level death benefit
option",}, \
-{DB_AllowDBO2,DB_Topic_DeathBenefits,"AllowDBO2","Allow increasing death
benefit option",}, \
-{DB_AllowDBO3,DB_Topic_DeathBenefits,"AllowDBO3","Allow return of premium
death benefit option",}, \
-{DB_AllowChangeToDBO2,DB_Topic_DeathBenefits,"AllowChangeToDBO2","Allow change
to increasing death benefit option: 0=no, 1=yes",}, \
-{DB_OptChgCanIncrSA,DB_Topic_DeathBenefits,"OptChgCanIncrSA","Option changes
can increase specified amount to preserve net amount at risk",}, \
-{DB_OptChgCanDecrSA,DB_Topic_DeathBenefits,"OptChgCanDecrSA","Option changes
can decrease specified amount to preserve net amount at risk",}, \
-{DB_AllowExtEndt,DB_Topic_DeathBenefits,"AllowExtEndt","Allow coverage beyond
maturity [not yet implemented]",}, \
+{DB_AllowDbo1,DB_Topic_DeathBenefits,"AllowDbo1","Allow level death benefit
option",}, \
+{DB_AllowDbo2,DB_Topic_DeathBenefits,"AllowDbo2","Allow increasing death
benefit option",}, \
+{DB_AllowDbo3,DB_Topic_DeathBenefits,"AllowDbo3","Allow return of premium
death benefit option",}, \
+{DB_AllowChangeToDbo2,DB_Topic_DeathBenefits,"AllowChangeToDbo2","Allow change
to increasing death benefit option: 0=no, 1=yes",}, \
+{DB_DboChgCanIncrSpecAmt,DB_Topic_DeathBenefits,"DboChgCanIncrSpecAmt","Option
changes can increase specified amount to preserve net amount at risk",}, \
+{DB_DboChgCanDecrSpecAmt,DB_Topic_DeathBenefits,"DboChgCanDecrSpecAmt","Option
changes can decrease specified amount to preserve net amount at risk",}, \
+{DB_AllowExtEndt,DB_Topic_DeathBenefits,"AllowExtEndt","Allow coverage beyond
normal maturity ('extended endowment') [not yet implemented]",}, \
{DB_Topic_Riders,DB_FIRST,"Riders","Riders and other additional benefits",}, \
{DB_AllowTerm,DB_Topic_Riders,"AllowTerm","Allow term rider: 0=no, 1=yes",}, \
{DB_GuarTermTable,DB_Topic_Riders,"GuarTermTable","Term rider guaranteed
mortality charge table (index in mortality table database)",}, \
@@ -188,48 +188,48 @@
{DB_TermMaxIssAge,DB_Topic_Riders,"TermMaxIssAge","Term rider maximum issue
age",}, \
{DB_TermForcedConvAge,DB_Topic_Riders,"TermForcedConvAge","Age at which term
rider converts to base policy with no positive election required",}, \
{DB_MaxTermProportion,DB_Topic_Riders,"MaxTermProportion","Term rider as
maximum proportion of total coverage",}, \
-{DB_TermCOIRate,DB_Topic_Riders,"TermCOIRate","[not yet implemented--use
external table instead]",}, \
+{DB_TermCoiRate,DB_Topic_Riders,"TermCoiRate","[not yet implemented--use
external table instead]",}, \
{DB_TermPremRate,DB_Topic_Riders,"TermPremRate","[not yet implemented--use
external table instead]",}, \
-{DB_AllowWP,DB_Topic_Riders,"AllowWP","Allow waiver benefit: 0=no, 1=yes",}, \
-{DB_WPTable,DB_Topic_Riders,"WPTable","Waiver benefit charge (index in
mortality table database)",}, \
-{DB_WPMinIssAge,DB_Topic_Riders,"WPMinIssAge","Waiver benefit minimum issue
age",}, \
-{DB_WPMaxIssAge,DB_Topic_Riders,"WPMaxIssAge","Waiver benefit maximum issue
age",}, \
-{DB_WPMax,DB_Topic_Riders,"WPMax","Maximum specified amount to which waiver
benefit can apply",}, \
-{DB_WPCOIRate,DB_Topic_Riders,"WPCOIRate","[not yet implemented--use external
table instead]",}, \
-{DB_WPPremRate,DB_Topic_Riders,"WPPremRate","[not yet implemented--use
external table instead]",}, \
-{DB_WPChargeMethod,DB_Topic_Riders,"WPChargeMethod","Waiver benefit charge is
multiple of: 0=monthly deductions, 1=NAAR",}, \
-{DB_AllowADD,DB_Topic_Riders,"AllowADD","Allow accidental death benefit: 0=no,
1=yes",}, \
-{DB_ADDTable,DB_Topic_Riders,"ADDTable","Accidental death benefit charge
(index in mortality table database)",}, \
-{DB_ADDMinIssAge,DB_Topic_Riders,"ADDMinIssAge","Accidental death benefit
minimum issue age",}, \
-{DB_ADDMaxIssAge,DB_Topic_Riders,"ADDMaxIssAge","Accidental death benefit
maximum issue age",}, \
-{DB_ADDLimit,DB_Topic_Riders,"ADDLimit","Maximum specified amount to which
accidental death benefit can apply",}, \
-{DB_ADDCOIRate,DB_Topic_Riders,"ADDCOIRate","[not yet implemented--use
external table instead]",}, \
-{DB_ADDPremRate,DB_Topic_Riders,"ADDPremRate","[not yet implemented--use
external table instead]",}, \
-{DB_AllowSpouse,DB_Topic_Riders,"AllowSpouse","Allow spouse rider: 0=no,
1=yes",}, \
+{DB_AllowWp,DB_Topic_Riders,"AllowWp","Allow waiver benefit: 0=no, 1=yes",}, \
+{DB_WpTable,DB_Topic_Riders,"WpTable","Waiver benefit charge (index in
mortality table database)",}, \
+{DB_WpMinIssAge,DB_Topic_Riders,"WpMinIssAge","Waiver benefit minimum issue
age",}, \
+{DB_WpMaxIssAge,DB_Topic_Riders,"WpMaxIssAge","Waiver benefit maximum issue
age",}, \
+{DB_WpMax,DB_Topic_Riders,"WpMax","Maximum specified amount to which waiver
benefit can apply",}, \
+{DB_WpCoiRate,DB_Topic_Riders,"WpCoiRate","[not yet implemented--use external
table instead]",}, \
+{DB_WpPremRate,DB_Topic_Riders,"WpPremRate","[not yet implemented--use
external table instead]",}, \
+{DB_WpChargeMethod,DB_Topic_Riders,"WpChargeMethod","Waiver benefit charge is
multiple of: 0=monthly deductions, 1=NAAR",}, \
+{DB_AllowAdb,DB_Topic_Riders,"AllowAdb","Allow accidental death benefit: 0=no,
1=yes",}, \
+{DB_AdbTable,DB_Topic_Riders,"AdbTable","Accidental death benefit charge
(index in mortality table database)",}, \
+{DB_AdbMinIssAge,DB_Topic_Riders,"AdbMinIssAge","Accidental death benefit
minimum issue age",}, \
+{DB_AdbMaxIssAge,DB_Topic_Riders,"AdbMaxIssAge","Accidental death benefit
maximum issue age",}, \
+{DB_AdbLimit,DB_Topic_Riders,"AdbLimit","Maximum specified amount to which
accidental death benefit can apply",}, \
+{DB_AdbCoiRate,DB_Topic_Riders,"AdbCoiRate","[not yet implemented--use
external table instead]",}, \
+{DB_AdbPremRate,DB_Topic_Riders,"AdbPremRate","[not yet implemented--use
external table instead]",}, \
+{DB_AllowSpouseRider,DB_Topic_Riders,"AllowSpouseRider","Allow spouse rider:
0=no, 1=yes",}, \
{DB_SpouseRiderGuarTable,DB_Topic_Riders,"SpouseRiderGuarTable","Spouse rider
guaranteed charge table (index in mortality table database)",}, \
{DB_SpouseRiderTable,DB_Topic_Riders,"SpouseRiderTable","Spouse rider current
charge table (index in mortality table database)",}, \
-{DB_AllowChild,DB_Topic_Riders,"AllowChild","Allow child rider: 0=no,
1=yes",}, \
+{DB_AllowChildRider,DB_Topic_Riders,"AllowChildRider","Allow child rider:
0=no, 1=yes",}, \
{DB_ChildRiderTable,DB_Topic_Riders,"ChildRiderTable","Child rider charge
table (index in mortality table database)",}, \
{DB_Topic_Withdrawals,DB_FIRST,"Withdrawals","Withdrawal fees, options, and
restrictions; effect on specified amount",}, \
-{DB_AllowWD,DB_Topic_Withdrawals,"AllowWD","Allow withdrawals: 0=no, 1=yes",},
\
-{DB_WDFee,DB_Topic_Withdrawals,"WDFee","Maximum fee per withdrawal as flat
dollar amount",}, \
-{DB_WDFeeRate,DB_Topic_Withdrawals,"WDFeeRate","Maximum fee per withdrawal as
percent of net withdrawal",}, \
-{DB_FreeWDProportion,DB_Topic_Withdrawals,"FreeWDProportion","Yearly free
partial surrender as a proportion of account value",}, \
-{DB_MinWD,DB_Topic_Withdrawals,"MinWD","Minimum withdrawal amount",}, \
-{DB_MaxWDAVMult,DB_Topic_Withdrawals,"MaxWDAVMult","Maximum withdrawal as
proportion of account value, e.g. 1=100%",}, \
-{DB_MaxWDDed,DB_Topic_Withdrawals,"MaxWDDed","Monthiversary deductions
reflected in maximum withdrawal: 0=12 times most recent, 1=to next anniversary,
2=to next modal premium due date, 3=18 times most recent",}, \
-{DB_WDCanDecrSADBO1,DB_Topic_Withdrawals,"WDCanDecrSADBO1","Withdrawals
decrease specified amount for level death benefit option",}, \
-{DB_WDCanDecrSADBO2,DB_Topic_Withdrawals,"WDCanDecrSADBO2","Withdrawals
decrease specified amount for increasing death benefit option",}, \
-{DB_WDCanDecrSADBO3,DB_Topic_Withdrawals,"WDCanDecrSADBO3","Withdrawals
decrease specified amount for return of premium death benefit option",}, \
-{DB_FirstWDYear,DB_Topic_Withdrawals,"FirstWDYear","Number of years
withdrawals not allowed [not supported yet; should be months instead]",}, \
+{DB_AllowWd,DB_Topic_Withdrawals,"AllowWd","Allow withdrawals: 0=no, 1=yes",},
\
+{DB_WdFee,DB_Topic_Withdrawals,"WdFee","Maximum fee per withdrawal as flat
dollar amount",}, \
+{DB_WdFeeRate,DB_Topic_Withdrawals,"WdFeeRate","Maximum fee per withdrawal as
percent of net withdrawal",}, \
+{DB_FreeWdProportion,DB_Topic_Withdrawals,"FreeWdProportion","Yearly free
partial surrender as a proportion of account value",}, \
+{DB_MinWd,DB_Topic_Withdrawals,"MinWd","Minimum withdrawal amount",}, \
+{DB_MaxWdAcctValMult,DB_Topic_Withdrawals,"MaxWdAcctValMult","Maximum
withdrawal as proportion of account value, e.g. 1=100%",}, \
+{DB_MaxWdDed,DB_Topic_Withdrawals,"MaxWdDed","Monthiversary deductions
reflected in maximum withdrawal: 0=12 times most recent, 1=to next anniversary,
2=to next modal premium due date, 3=18 times most recent",}, \
+{DB_WdCanDecrSpecAmtDbo1,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo1","Withdrawals
decrease specified amount for level death benefit option",}, \
+{DB_WdCanDecrSpecAmtDbo2,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo2","Withdrawals
decrease specified amount for increasing death benefit option",}, \
+{DB_WdCanDecrSpecAmtDbo3,DB_Topic_Withdrawals,"WdCanDecrSpecAmtDbo3","Withdrawals
decrease specified amount for return of premium death benefit option",}, \
+{DB_FirstWdYear,DB_Topic_Withdrawals,"FirstWdYear","Number of years
withdrawals not allowed [not supported yet; should be months instead]",}, \
{DB_Topic_Loans,DB_FIRST,"Loans","Loan rates, spreads, options, and
restrictions",}, \
{DB_AllowLoan,DB_Topic_Loans,"AllowLoan","Allow loans: 0=no, 1=yes",}, \
{DB_AllowPrefLoan,DB_Topic_Loans,"AllowPrefLoan","Preferred loans permitted:
0=no, 1=yes [preferred loans not yet supported]",}, \
{DB_AllowFixedLoan,DB_Topic_Loans,"AllowFixedLoan","Fixed-rate loans
permitted: 0=no, 1=yes",}, \
-{DB_AllowVLR,DB_Topic_Loans,"AllowVLR","Variable-rate loans permitted: 0=no,
1=yes",}, \
+{DB_AllowVlr,DB_Topic_Loans,"AllowVlr","Variable-rate loans permitted: 0=no,
1=yes",}, \
{DB_FixedLoanRate,DB_Topic_Loans,"FixedLoanRate","Fixed loan rate, e.g. .06 =
6%",}, \
-{DB_MaxVLRRate,DB_Topic_Loans,"MaxVLRRate","Maximum variable loan rate [not
yet implemented]",}, \
-{DB_MaxLoanAVMult,DB_Topic_Loans,"MaxLoanAVMult","Maximum loan as proportion
of account value, e.g. 1=100%",}, \
+{DB_MaxVlrRate,DB_Topic_Loans,"MaxVlrRate","Maximum variable loan rate [not
yet implemented]",}, \
+{DB_MaxLoanAcctValMult,DB_Topic_Loans,"MaxLoanAcctValMult","Maximum loan as
proportion of account value, e.g. 1=100%",}, \
{DB_MaxLoanDed,DB_Topic_Loans,"MaxLoanDed","Monthiversary deductions reflected
in maximum loan: 0=12 times most recent, 1=to next anniversary, 2=to next modal
premium due date, 3=18 times most recent",}, \
{DB_GuarPrefLoanSpread,DB_Topic_Loans,"GuarPrefLoanSpread","Guaranteed
interest spread for preferred loans [preferred loans not yet supported]",}, \
{DB_GuarRegLoanSpread,DB_Topic_Loans,"GuarRegLoanSpread","Guaranteed interest
spread for regular loans",}, \
@@ -241,14 +241,14 @@
{DB_MinPremIntSpread,DB_Topic_Premiums,"MinPremIntSpread","Interest spread
from general-account rate used to capitalize monthly deductions for minimum
premium calculation",}, \
{DB_TgtPremType,DB_Topic_Premiums,"TgtPremType","Target premium: 0=based on
monthly deductions, 1=7702A seven-pay premium, 2=read from table",}, \
{DB_TgtPremTable,DB_Topic_Premiums,"TgtPremTable","Target premium table (index
in mortality table database)",}, \
-{DB_TgtPmFixedAtIssue,DB_Topic_Premiums,"TgtPmFixedAtIssue","Target premium
set forever at issue: 0=no, 1=yes",}, \
-{DB_TgtPmIgnoreSubstd,DB_Topic_Premiums,"TgtPmIgnoreSubstd","Target premium
ignores substandard rating: 0=no, 1=yes",}, \
+{DB_TgtPremFixedAtIssue,DB_Topic_Premiums,"TgtPremFixedAtIssue","Target
premium set forever at issue: 0=no, 1=yes",}, \
+{DB_TgtPremIgnoreSubstd,DB_Topic_Premiums,"TgtPremIgnoreSubstd","Target
premium ignores substandard rating: 0=no, 1=yes",}, \
{DB_MinPmt,DB_Topic_Premiums,"MinPmt","Minimum initial payment",}, \
{DB_Topic_SecondaryGuarantees,DB_FIRST,"Secondary
guarantees","Secondary-guarantee options and parameters",}, \
{DB_NoLapseMinDur,DB_Topic_SecondaryGuarantees,"NoLapseMinDur","Minimum number
of years no-lapse guarantee remains in effect if premium requirement
satisfied",}, \
{DB_NoLapseMinAge,DB_Topic_SecondaryGuarantees,"NoLapseMinAge","Minimum age to
which no-lapse guarantee remains in effect if premium requirement satisfied",},
\
{DB_NoLapseUnratedOnly,DB_Topic_SecondaryGuarantees,"NoLapseUnratedOnly","No-lapse
guarantee available only to unrated lives: 0=no, 1=yes",}, \
-{DB_NoLapseOpt1Only,DB_Topic_SecondaryGuarantees,"NoLapseOpt1Only","No-lapse
guarantee available only with level death benefit option: 0=no, 1=yes",}, \
+{DB_NoLapseDbo1Only,DB_Topic_SecondaryGuarantees,"NoLapseDbo1Only","No-lapse
guarantee available only with level death benefit option: 0=no, 1=yes",}, \
{DB_NoLapseAlwaysActive,DB_Topic_SecondaryGuarantees,"NoLapseAlwaysActive","No-lapse
guarantee requirements are always met by contract or issue rules: 0=no,
1=yes",}, \
{DB_AllowHoneymoon,DB_Topic_SecondaryGuarantees,"AllowHoneymoon","Honeymoon
allowed: 0=no, 1=yes",}, \
{DB_Topic_Allocations,DB_FIRST,"Allocations","Allocations between general and
separate account",}, \
@@ -272,20 +272,20 @@
{DB_Topic_ExperienceRating,DB_FIRST,"Experience rating","Experience-rating
parameters",}, \
{DB_AllowExpRating,DB_Topic_ExperienceRating,"AllowExpRating","Allow
experience rating: 0=no, 1=yes",}, \
{DB_ExpRatStdDevMult,DB_Topic_ExperienceRating,"ExpRatStdDevMult","Experience
rating reserve as multiple of standard deviation of expected claims net of
account value released on death",}, \
-{DB_ExpRatIBNRMult,DB_Topic_ExperienceRating,"ExpRatIBNRMult","Experience
rating IBNR reserve as number of months of net cost of insurance charges",}, \
-{DB_ExpRatCOIRetention,DB_Topic_ExperienceRating,"ExpRatCOIRetention","Experience
rating retention as proportion of net cost of insurance charges",}, \
-{DB_ExpRatRiskCOIMult,DB_Topic_ExperienceRating,"ExpRatRiskCOIMult","Maximum
risk charge as a multiple of annual cost of insurance charges",}, \
+{DB_ExpRatIbnrMult,DB_Topic_ExperienceRating,"ExpRatIbnrMult","Experience
rating IBNR as number of months of net cost of insurance charges",}, \
+{DB_ExpRatCoiRetention,DB_Topic_ExperienceRating,"ExpRatCoiRetention","Experience
rating retention as proportion of net cost of insurance charges",}, \
+{DB_ExpRatRiskCoiMult,DB_Topic_ExperienceRating,"ExpRatRiskCoiMult","Maximum
risk charge as a multiple of annual cost of insurance charges",}, \
{DB_ExpRatAmortPeriod,DB_Topic_ExperienceRating,"ExpRatAmortPeriod","Experience
rating amortization period",}, \
{DB_Topic_Miscellanea,DB_FIRST,"Miscellanea","Parameters that don't fit tidily
into other categories",}, \
{DB_LedgerType,DB_Topic_Miscellanea,"LedgerType","Ledger type: 0=illustration
reg, 1=NASD, 2=prospectus illustration, 3=group private placement, 4=offshore
private placement, 5=private placement subject to illustration reg,
6=individual private placement, 7=variable annuity",}, \
{DB_AgeLastOrNearest,DB_Topic_Miscellanea,"AgeLastOrNearest","Age calculated
as of last or nearest birthday: 0=ALB, 1=ANB (ties --> older), 2=ANB (ties -->
younger)",}, \
{DB_MaxIllusAge,DB_Topic_Miscellanea,"MaxIllusAge","Highest attained age
illustrated [not yet implemented]",}, \
-{DB_EndtAge,DB_Topic_Miscellanea,"EndtAge","Maturity age",}, \
+{DB_MaturityAge,DB_Topic_Miscellanea,"MaturityAge","Normal maturity age",}, \
{DB_LapseIgnoresSurrChg,DB_Topic_Miscellanea,"LapseIgnoresSurrChg","Ignore
tabular surrender charge for lapse processing",}, \
{DB_DefaultProcessOrder,DB_Topic_Miscellanea,"DefaultProcessOrder","Default
processing order: 0=life by life, 1=month by month [not yet implemented]",}, \
{DB_NominallyPar,DB_Topic_Miscellanea,"NominallyPar","Nominally participating,
but dividends expected to be zero",}, \
{DB_TableYTable,DB_Topic_Miscellanea,"TableYTable","New York table Y (index in
mortality table database)",}, \
-{DB_83GamTable,DB_Topic_Miscellanea,"83GamTable","1983 Group Annuitant
Mortality table (index in mortality table database)",}, \
+{DB_Gam83Table,DB_Topic_Miscellanea,"Gam83Table","1983 Group Annuitant
Mortality table (index in mortality table database)",}, \
{DB_Topic_Weights,DB_FIRST,"Weights","Weights for profit analysis cells [not
yet implemented]",}, \
{DB_WeightClass,DB_Topic_Weights,"WeightClass","Weight by underwriting class
[not yet implemented]",}, \
{DB_WeightGender,DB_Topic_Weights,"WeightGender","Weight by gender [not yet
implemented]",}, \
@@ -297,14 +297,14 @@
{DB_FullExpPol,DB_Topic_Expenses,"FullExpPol","Full expense per policy [not
yet implemented]",}, \
{DB_FullExpPrem,DB_Topic_Expenses,"FullExpPrem","Full expense per $1 of
premium [not yet implemented]",}, \
{DB_FullExpDumpin,DB_Topic_Expenses,"FullExpDumpin","Full expense per $1 of
dumpin [not yet implemented]",}, \
-{DB_FullExpPerK,DB_Topic_Expenses,"FullExpPerK","Full expense per $1 of
specified amount [not yet implemented]",}, \
+{DB_FullExpSpecAmt,DB_Topic_Expenses,"FullExpSpecAmt","Full expense per $1 of
specified amount [not yet implemented]",}, \
{DB_VarExpPol,DB_Topic_Expenses,"VarExpPol","Variable expense per policy [not
yet implemented]",}, \
{DB_VarExpPrem,DB_Topic_Expenses,"VarExpPrem","Variable expense per $1 of
premium [not yet implemented]",}, \
{DB_VarExpDumpin,DB_Topic_Expenses,"VarExpDumpin","Variable expense per $1 of
dumpin [not yet implemented]",}, \
-{DB_VarExpPerK,DB_Topic_Expenses,"VarExpPerK","Variable expense per $1 of
specified amount [not yet implemented]",}, \
-{DB_ExpPerKLimit,DB_Topic_Expenses,"ExpPerKLimit","Maximum specified amount to
which expense per $1 of specified amount applies [not yet implemented]",}, \
+{DB_VarExpSpecAmt,DB_Topic_Expenses,"VarExpSpecAmt","Variable expense per $1
of specified amount [not yet implemented]",}, \
+{DB_ExpSpecAmtLimit,DB_Topic_Expenses,"ExpSpecAmtLimit","Maximum specified
amount to which expense per $1 of specified amount applies [not yet
implemented]",}, \
{DB_MedicalProportion,DB_Topic_Expenses,"MedicalProportion","Proportion
requiring medical or paramedical underwriting [not yet implemented]",}, \
-{DB_UWTestCost,DB_Topic_Expenses,"UWTestCost","Expense per policy issue for
underwriting tests [not yet implemented]",}, \
+{DB_UwTestCost,DB_Topic_Expenses,"UwTestCost","Expense per policy issue for
underwriting tests [not yet implemented]",}, \
{DB_Topic_Reserves,DB_FIRST,"Reserves","Reserves [not yet implemented]",}, \
{DB_VxBasicQTable,DB_Topic_Reserves,"VxBasicQTable","Basic reserve annual
mortality rate (index in mortality table database) [not yet implemented]",}, \
{DB_VxDeficQTable,DB_Topic_Reserves,"VxDeficQTable","Deficiency reserve annual
mortality rate (index in mortality table database) [not yet implemented]",}, \
@@ -314,14 +314,14 @@
{DB_StatVxQ,DB_Topic_Reserves,"StatVxQ","[not used]",}, \
{DB_TaxVxQ,DB_Topic_Reserves,"TaxVxQ","[not used]",}, \
{DB_DefVxQ,DB_Topic_Reserves,"DefVxQ","[not used]",}, \
-{DB_NonforfQ,DB_Topic_Reserves,"NonforfQ","[not used]",}, \
+{DB_SnflQ,DB_Topic_Reserves,"SnflQ","[not used]",}, \
{DB_Topic_OtherAssumptions,DB_FIRST,"Other assumptions","Other assumptions
[not yet implemented]",}, \
{DB_LapseRate,DB_Topic_OtherAssumptions,"LapseRate","Lapse rate [not yet
implemented]",}, \
-{DB_ReqSurpNAAR,DB_Topic_OtherAssumptions,"ReqSurpNAAR","Required surplus
proportion of net amount at risk [not yet implemented]",}, \
+{DB_ReqSurpNaar,DB_Topic_OtherAssumptions,"ReqSurpNaar","Required surplus
proportion of net amount at risk [not yet implemented]",}, \
{DB_ReqSurpVx,DB_Topic_OtherAssumptions,"ReqSurpVx","Required surplus
proportion of statutory reserve [not yet implemented]",}, \
-{DB_LICFitRate,DB_Topic_OtherAssumptions,"LICFitRate","Life insurance company
federal income tax rate [not yet implemented]",}, \
+{DB_LicFitRate,DB_Topic_OtherAssumptions,"LicFitRate","Life insurance company
federal income tax rate [not yet implemented]",}, \
{DB_LicDacTaxRate,DB_Topic_OtherAssumptions,"LicDacTaxRate","Life insurance
company DAC tax rate [not yet implemented]",}, \
-{DB_GDBVxMethod,DB_Topic_OtherAssumptions,"GDBVxMethod","Guaranteed death
benefit reserve method [not yet implemented]",}, \
+{DB_GdbVxMethod,DB_Topic_OtherAssumptions,"GdbVxMethod","Guaranteed death
benefit reserve method [not yet implemented]",}, \
{DB_PrimaryHurdle,DB_Topic_OtherAssumptions,"PrimaryHurdle","Hurdle rate [not
yet implemented]",}, \
{DB_SecondaryHurdle,DB_Topic_OtherAssumptions,"SecondaryHurdle","Secondary
hurdle rate (TSA XL, Part I, page 61) [not yet implemented]",}, \
Modified: lmi/trunk/dbvalue.hpp
===================================================================
--- lmi/trunk/dbvalue.hpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/dbvalue.hpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -137,7 +137,7 @@
std::vector<int> const& maximum_database_dimensions();
/*
-Some data are scalar by nature--for example, maturity age (DB_EndtAge).
+Some data are scalar by nature--for example, DB_MaturityAge.
Someday we might add a flag here to express that constraint; until then,
it's enforced passim by using a scalar-only Query() function.
Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/ihs_acctval.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -694,7 +694,7 @@
ItLapsed = false;
VariantValues().LapseMonth = 11;
VariantValues().LapseYear = BasicValues::GetLength();
-// TODO ?? Length should be Database_->Query(DB_EndtAge);
+// TODO ?? Length should be Database_->Query(DB_MaturityAge);
InvariantValues().IsMec = false;
InvariantValues().MecMonth = 11;
@@ -729,9 +729,9 @@
MlyDed = 0.0;
CumulativeSalesLoad = 0.0; // INFORCE !! Add to inforce input.
- CoiRetentionRate =
Database_->Query(DB_ExpRatCOIRetention);
+ CoiRetentionRate =
Database_->Query(DB_ExpRatCoiRetention);
ExperienceRatingAmortizationYears = Database_->Query(DB_ExpRatAmortPeriod);
- IbnrAsMonthsOfMortalityCharges = Database_->Query(DB_ExpRatIBNRMult);
+ IbnrAsMonthsOfMortalityCharges = Database_->Query(DB_ExpRatIbnrMult);
Dumpin = Outlay_->dumpin();
External1035Amount = Outlay_->external_1035_amount();
@@ -964,7 +964,7 @@
TermSpecAmt = InvariantValues().TermSpecAmt[Year];
int target_year = Year;
- if(Database_->Query(DB_TgtPmFixedAtIssue))
+ if(Database_->Query(DB_TgtPremFixedAtIssue))
{
target_year = 0;
}
@@ -985,7 +985,7 @@
//
// Motivation for GetTgtPrem(): encapsulate calculations that need to
// return the exact target premium, respecting all arcana such as
-// 'DB_TgtPmFixedAtIssue'.
+// 'DB_TgtPremFixedAtIssue'.
//
// Defect in its implementation: specamt is passed as an argument, and
// it's easy to get that wrong, as it is here. Real encapsulation
@@ -1036,7 +1036,7 @@
}
// TODO ?? It should be something like this:
-// rate = delta_specamt * TempDatabase.Query(DB_SurrChgSAMult);
+// rate = delta_specamt * TempDatabase.Query(DB_SurrChgSpecAmtMult);
// but for the moment we resort to this kludge:
double z = delta_specamt * MortalityRates_->TargetPremiumRates()[year];
Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/ihs_avstrtgy.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -210,7 +210,7 @@
// InitialTargetPremium
// AnnualTargetPrem
// be used instead, at least in the
-// if(Database_->Query(DB_TgtPmFixedAtIssue))
+// if(Database_->Query(DB_TgtPremFixedAtIssue))
// case?
return GetModalTgtPrem
(Year
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/ihs_basicval.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -217,8 +217,8 @@
HOPEFULLY(RetAge <= 100);
HOPEFULLY(yare_input_.RetireesCanEnroll || IssueAge <= RetAge);
- // The database class constrains endowment age to be scalar.
- EndtAge = static_cast<int>(Database_->Query(DB_EndtAge));
+ // The database class constrains maturity age to be scalar.
+ EndtAge = static_cast<int>(Database_->Query(DB_MaturityAge));
Length = EndtAge - IssueAge;
LedgerType_ =
@@ -298,8 +298,8 @@
StateOfJurisdiction_ = Database_->GetStateOfJurisdiction();
- // The database class constrains endowment age to be scalar.
- EndtAge = static_cast<int>(Database_->Query(DB_EndtAge));
+ // The database class constrains maturity age to be scalar.
+ EndtAge = static_cast<int>(Database_->Query(DB_MaturityAge));
Length = EndtAge - IssueAge;
LedgerType_ =
@@ -481,8 +481,8 @@
<< configurable_settings::instance().spreadsheet_file_extension()
;
std::ofstream os(oss.str().c_str(), ios_out_trunc_binary());
- int const minimum_age =
static_cast<int>(Database_->Query(DB_MinIssAge));
- int const maturity_age = static_cast<int>(Database_->Query(DB_EndtAge
));
+ int const minimum_age =
static_cast<int>(Database_->Query(DB_MinIssAge ));
+ int const maturity_age =
static_cast<int>(Database_->Query(DB_MaturityAge));
if(minimum_age != yare_input_.IssueAge)
{
warning()
@@ -607,7 +607,7 @@
,i_upper_12_over_12_from_i<double>()
);
- Database_->Query(Mly7702ig, DB_NAARDiscount);
+ Database_->Query(Mly7702ig, DB_NaarDiscount);
// TODO ?? We should avoid reading the rate file again; but
// the GPT server doesn't initialize a MortalityRates object
@@ -681,7 +681,7 @@
,mcenum_mode a_mode
) const
{
- if(Database_->Query(DB_TgtPmFixedAtIssue))
+ if(Database_->Query(DB_TgtPremFixedAtIssue))
{
if(0 == a_year)
{
@@ -730,42 +730,42 @@
MinRenlBaseFace = Database_->Query(DB_MinRenlBaseSpecAmt );
MinRenlFace = Database_->Query(DB_MinRenlSpecAmt );
- NoLapseOpt1Only = Database_->Query(DB_NoLapseOpt1Only );
+ NoLapseOpt1Only = Database_->Query(DB_NoLapseDbo1Only );
NoLapseUnratedOnly = Database_->Query(DB_NoLapseUnratedOnly );
- OptChgCanIncrSA = Database_->Query(DB_OptChgCanIncrSA );
- OptChgCanDecrSA = Database_->Query(DB_OptChgCanDecrSA );
- WDCanDecrSADBO1 = Database_->Query(DB_WDCanDecrSADBO1 );
- WDCanDecrSADBO2 = Database_->Query(DB_WDCanDecrSADBO2 );
- WDCanDecrSADBO3 = Database_->Query(DB_WDCanDecrSADBO3 );
+ OptChgCanIncrSA = Database_->Query(DB_DboChgCanIncrSpecAmt );
+ OptChgCanDecrSA = Database_->Query(DB_DboChgCanDecrSpecAmt );
+ WDCanDecrSADBO1 = Database_->Query(DB_WdCanDecrSpecAmtDbo1 );
+ WDCanDecrSADBO2 = Database_->Query(DB_WdCanDecrSpecAmtDbo2 );
+ WDCanDecrSADBO3 = Database_->Query(DB_WdCanDecrSpecAmtDbo3 );
MaxIncrAge = static_cast<int>(Database_->Query(DB_MaxIncrAge));
- WaivePmTxInt1035 = Database_->Query(DB_WaivePmTxInt1035 );
+ WaivePmTxInt1035 = Database_->Query(DB_WaivePremTaxInt1035 );
AllowTerm = Database_->Query(DB_AllowTerm );
- ExpPerKLimit = Database_->Query(DB_ExpPerKLimit );
- MaxWDDed_ =
static_cast<mcenum_anticipated_deduction>(static_cast<int>(Database_->Query(DB_MaxWDDed)));
- MaxWDAVMult = Database_->Query(DB_MaxWDAVMult );
+ ExpPerKLimit = Database_->Query(DB_ExpSpecAmtLimit );
+ MaxWDDed_ =
static_cast<mcenum_anticipated_deduction>(static_cast<int>(Database_->Query(DB_MaxWdDed)));
+ MaxWDAVMult = Database_->Query(DB_MaxWdAcctValMult );
MaxLoanDed_ =
static_cast<mcenum_anticipated_deduction>(static_cast<int>(Database_->Query(DB_MaxLoanDed)));
- MaxLoanAVMult = Database_->Query(DB_MaxLoanAVMult );
+ MaxLoanAVMult = Database_->Query(DB_MaxLoanAcctValMult );
NoLapseMinDur = static_cast<int>(Database_->Query(DB_NoLapseMinDur));
NoLapseMinAge = static_cast<int>(Database_->Query(DB_NoLapseMinAge));
MinSpecAmt = Database_->Query(DB_MinSpecAmt );
- AdbLimit = Database_->Query(DB_ADDLimit );
- WpLimit = Database_->Query(DB_WPMax );
+ AdbLimit = Database_->Query(DB_AdbLimit );
+ WpLimit = Database_->Query(DB_WpMax );
SpecAmtLoadLimit = Database_->Query(DB_SpecAmtLoadLimit );
- MinWD = Database_->Query(DB_MinWD );
- WDFee = Database_->Query(DB_WDFee );
- WDFeeRate = Database_->Query(DB_WDFeeRate );
- AllowChangeToDBO2 = Database_->Query(DB_AllowChangeToDBO2 );
- AllowSAIncr = Database_->Query(DB_AllowSAIncr );
+ MinWD = Database_->Query(DB_MinWd );
+ WDFee = Database_->Query(DB_WdFee );
+ WDFeeRate = Database_->Query(DB_WdFeeRate );
+ AllowChangeToDBO2 = Database_->Query(DB_AllowChangeToDbo2 );
+ AllowSAIncr = Database_->Query(DB_AllowSpecAmtIncr );
NoLapseAlwaysActive = Database_->Query(DB_NoLapseAlwaysActive );
- WaiverChargeMethod =
static_cast<oenum_waiver_charge_method>(static_cast<int>(Database_->Query(DB_WPChargeMethod)));
+ WaiverChargeMethod =
static_cast<oenum_waiver_charge_method>(static_cast<int>(Database_->Query(DB_WpChargeMethod)));
LapseIgnoresSurrChg = Database_->Query(DB_LapseIgnoresSurrChg );
SurrChgOnIncr = Database_->Query(DB_SurrChgOnIncr );
SurrChgOnDecr = Database_->Query(DB_SurrChgOnDecr );
HOPEFULLY(!SurrChgOnDecr); // Surrchg change on decrease not supported.
- Database_->Query(FreeWDProportion, DB_FreeWDProportion);
+ Database_->Query(FreeWDProportion, DB_FreeWdProportion);
- Database_->Query(DBDiscountRate, DB_NAARDiscount);
+ Database_->Query(DBDiscountRate, DB_NaarDiscount);
LMI_ASSERT(!contains(DBDiscountRate, -1.0));
// This would be more natural:
// assign(DBDiscountRate, 1.0 / (1.0 + DBDiscountRate));
@@ -779,10 +779,10 @@
FirstYearPremiumRetaliationLimit = Database_->Query(DB_PremTaxRetalLimit);
- MandEIsDynamic = Database_->Query(DB_DynamicMandE );
- SepAcctLoadIsDynamic= Database_->Query(DB_DynamicSepAcctLoad );
+ MandEIsDynamic = Database_->Query(DB_DynamicMandE );
+ SepAcctLoadIsDynamic= Database_->Query(DB_DynamicSepAcctLoad );
- UseUnusualCOIBanding= Database_->Query(DB_UnusualCOIBanding );
+ UseUnusualCOIBanding= Database_->Query(DB_UnusualCoiBanding );
// 'Unusual' COI banding accommodates a particular idiosyncratic
// product which has no term rider and doesn't permit experience
@@ -824,7 +824,7 @@
DefnLifeIns_ = yare_input_.DefinitionOfLifeInsurance;
DefnMaterialChange_ = yare_input_.DefinitionOfMaterialChange;
- Equiv7702DBO3 =
static_cast<mcenum_dbopt_7702>(static_cast<int>(Database_->Query(DB_Equiv7702DBO3)));
+ Equiv7702DBO3 =
static_cast<mcenum_dbopt_7702>(static_cast<int>(Database_->Query(DB_Equiv7702Dbo3)));
MaxNAAR = yare_input_.MaximumNaar;
Database_->Query(MinPremIntSpread_, DB_MinPremIntSpread);
@@ -1159,7 +1159,7 @@
{
return round_max_premium()
(
- ( Database_->Query(DB_TgtPremPolFee)
+ ( Database_->Query(DB_TgtPremMonthlyPolFee)
+ a_specamt
* epsilon_plus_one
* MortalityRates_->TargetPremiumRates()[0]
@@ -1505,7 +1505,7 @@
double wp_rate = 0.0;
if(yare_input_.WaiverOfPremiumBenefit)
{
- // For simplicity, ignore Database_->Query(DB_WPMax)
+ // For simplicity, ignore Database_->Query(DB_WpMax)
wp_rate = MortalityRates_->WpRates()[0];
if(0.0 != 1.0 + wp_rate)
{
@@ -1524,13 +1524,13 @@
// DEFECT Is this correct now?
if(yare_input_.WaiverOfPremiumBenefit && 0.0 != 1.0 + wp_rate)
{
- // For simplicity, ignore Database_->Query(DB_WPMax)
+ // For simplicity, ignore Database_->Query(DB_WpMax)
z /= (1.0 + wp_rate);
}
if(yare_input_.AccidentalDeathBenefit)
{
- // DEFECT For simplicity, ignore Database_->Query(DB_ADDMax)
+ // DEFECT For simplicity, ignore Database_->Query(DB_AdbLimit)
z -= MortalityRates_->AdbRates()[0];
}
// DEFECT Other riders should be considered here.
@@ -1561,8 +1561,8 @@
{
if(UseUnusualCOIBanding && mce_gen_guar != rate_basis)
{
- double band_0_limit = Database_->Query(DB_CurrCOITable0Limit);
- double band_1_limit = Database_->Query(DB_CurrCOITable1Limit);
+ double band_0_limit = Database_->Query(DB_CurrCoiTable0Limit);
+ double band_1_limit = Database_->Query(DB_CurrCoiTable1Limit);
LMI_ASSERT(0.0 <= band_0_limit);
LMI_ASSERT(band_0_limit <= band_1_limit);
if(band_0_limit <= a_specamt && a_specamt < band_1_limit)
@@ -1639,7 +1639,7 @@
(static_cast<int>(Database_->Query(DB_CoiInforceReentry))
);
- if(DB_CurrCOITable == TableID && e_reenter_never != method)
+ if(DB_CurrCoiTable == TableID && e_reenter_never != method)
{
return actuarial_table_rates_elaborated
(TableFile
@@ -2019,7 +2019,7 @@
{
return GetTable
(ProductData_->datum("CurrCOIFilename")
- ,DB_CurrCOITable
+ ,DB_CurrCoiTable
,true
,CanBlend
,CanBlend
@@ -2028,13 +2028,13 @@
std::vector<double> BasicValues::GetCurrCOIRates1() const
{
if
- ( Database_->Query(DB_CurrCOITable0Limit)
+ ( Database_->Query(DB_CurrCoiTable0Limit)
< std::numeric_limits<double>::max()
)
{
return GetTable
(ProductData_->datum("CurrCOIFilename")
- ,DB_CurrCOITable1
+ ,DB_CurrCoiTable1
,true
,CanBlend
,CanBlend
@@ -2048,13 +2048,13 @@
std::vector<double> BasicValues::GetCurrCOIRates2() const
{
if
- ( Database_->Query(DB_CurrCOITable1Limit)
+ ( Database_->Query(DB_CurrCoiTable1Limit)
< std::numeric_limits<double>::max()
)
{
return GetTable
(ProductData_->datum("CurrCOIFilename")
- ,DB_CurrCOITable2
+ ,DB_CurrCoiTable2
,true
,CanBlend
,CanBlend
@@ -2069,14 +2069,14 @@
{
return GetTable
(ProductData_->datum("GuarCOIFilename")
- ,DB_GuarCOITable
+ ,DB_GuarCoiTable
);
}
std::vector<double> BasicValues::GetSmokerBlendedGuarCOIRates() const
{
return GetTable
(ProductData_->datum("GuarCOIFilename")
- ,DB_GuarCOITable
+ ,DB_GuarCoiTable
,true
,CanBlend
,CanBlend
@@ -2086,16 +2086,16 @@
{
return GetTable
(ProductData_->datum("WPFilename")
- ,DB_WPTable
- ,Database_->Query(DB_AllowWP)
+ ,DB_WpTable
+ ,Database_->Query(DB_AllowWp)
);
}
std::vector<double> BasicValues::GetAdbRates() const
{
return GetTable
(ProductData_->datum("ADDFilename")
- ,DB_ADDTable
- ,Database_->Query(DB_AllowADD)
+ ,DB_AdbTable
+ ,Database_->Query(DB_AllowAdb)
);
}
std::vector<double> BasicValues::GetChildRiderRates() const
@@ -2103,12 +2103,12 @@
return GetTable
(ProductData_->datum("ChildRiderFilename")
,DB_ChildRiderTable
- ,Database_->Query(DB_AllowChild)
+ ,Database_->Query(DB_AllowChildRider)
);
}
std::vector<double> BasicValues::GetCurrentSpouseRiderRates() const
{
- if(!Database_->Query(DB_AllowSpouse))
+ if(!Database_->Query(DB_AllowSpouseRider))
{
return std::vector<double>(GetLength());
}
@@ -2124,7 +2124,7 @@
}
std::vector<double> BasicValues::GetGuaranteedSpouseRiderRates() const
{
- if(!Database_->Query(DB_AllowSpouse))
+ if(!Database_->Query(DB_AllowSpouseRider))
{
return std::vector<double>(GetLength());
}
@@ -2169,7 +2169,7 @@
{
return GetTable
(ProductData_->datum("TAMRA7PayFilename")
- ,DB_TAMRA7PayTable
+ ,DB_SevenPayTable
);
}
std::vector<double> BasicValues::GetTgtPremRates() const
@@ -2184,14 +2184,14 @@
{
return GetTable
(ProductData_->datum("IRC7702Filename")
- ,DB_IRC7702QTable
+ ,DB_Irc7702QTable
);
}
std::vector<double> BasicValues::Get83GamRates() const
{
return GetTable
(ProductData_->datum("Gam83Filename")
- ,DB_83GamTable
+ ,DB_Gam83Table
,true
,CannotBlend
,CanBlend
@@ -2199,14 +2199,14 @@
}
std::vector<double> BasicValues::GetSubstdTblMultTable() const
{
- if(0 == Database_->Query(DB_SubstdTblMultTable))
+ if(0 == Database_->Query(DB_SubstdTableMultTable))
{
return std::vector<double>(GetLength(), 1.0);
}
return GetTable
(ProductData_->datum("SubstdTblMultFilename")
- ,DB_SubstdTblMultTable
+ ,DB_SubstdTableMultTable
);
}
std::vector<double> BasicValues::GetCurrSpecAmtLoadTable() const
Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/input_harmonization.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -98,7 +98,7 @@
)
);
- GleanedMaturityAge_ = static_cast<int>(database_->Query(DB_EndtAge));
+ GleanedMaturityAge_ = static_cast<int>(database_->Query(DB_MaturityAge));
GleanedLedgerType_ =
static_cast<mcenum_ledger_type>
@@ -128,12 +128,12 @@
bool sepacct_only = allow_sep_acct && !allow_gen_acct;
bool genacct_only = allow_gen_acct && !allow_sep_acct;
- bool wd_allowed = database_->Query(DB_AllowWD);
+ bool wd_allowed = database_->Query(DB_AllowWd);
bool loan_allowed = database_->Query(DB_AllowLoan);
bool pref_loan_allowed = loan_allowed &&
database_->Query(DB_AllowPrefLoan);
- DefinitionOfLifeInsurance.allow(mce_gpt, database_->Query(DB_AllowGPT));
- DefinitionOfLifeInsurance.allow(mce_cvat, database_->Query(DB_AllowCVAT));
+ DefinitionOfLifeInsurance.allow(mce_gpt, database_->Query(DB_AllowGpt));
+ DefinitionOfLifeInsurance.allow(mce_cvat, database_->Query(DB_AllowCvat));
DefinitionOfLifeInsurance.allow(mce_noncompliant,
database_->Query(DB_AllowNo7702));
DefinitionOfMaterialChange.enable(mce_noncompliant !=
DefinitionOfLifeInsurance);
@@ -177,11 +177,11 @@
// TODO ?? There should be flags in the database to allow or
// forbid paramedical and nonmedical underwriting; arbitrarily,
// until they are added, those options are always inhibited.
- GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUW));
+ GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUw));
GroupUnderwritingType.allow(mce_paramedical, false);
GroupUnderwritingType.allow(mce_nonmedical, false);
- GroupUnderwritingType.allow(mce_simplified_issue,
database_->Query(DB_AllowSimpUW));
- GroupUnderwritingType.allow(mce_guaranteed_issue,
database_->Query(DB_AllowGuarUW));
+ GroupUnderwritingType.allow(mce_simplified_issue,
database_->Query(DB_AllowSimpUw));
+ GroupUnderwritingType.allow(mce_guaranteed_issue,
database_->Query(DB_AllowGuarUw));
bool part_mort_used = mce_yes == UsePartialMortality;
@@ -270,9 +270,8 @@
DateOfRetirement.enable(mce_yes == DeprecatedUseDOR);
// DATABASE !! Maximum illustrated age should be distinguished
- // from maturity age (which shouldn't be called 'EndtAge' because
- // the contract needn't endow).
- int max_age = static_cast<int>(database_->Query(DB_EndtAge));
+ // from maturity age.
+ int max_age = static_cast<int>(database_->Query(DB_MaturityAge));
InforceAsOfDate.minimum_and_maximum
(EffectiveDate.value()
,add_years_and_months
@@ -472,7 +471,7 @@
bool inhibit_sequence = specamt_solve || specamt_from_term_proportion;
SpecifiedAmount.enable(!inhibit_sequence);
- bool never_retire = database_->Query(DB_EndtAge) <= RetirementAge.value();
+ bool never_retire = database_->Query(DB_MaturityAge) <=
RetirementAge.value();
/*
// TODO ?? WX PORT !! Figure out how to handle the next line:
if(!is_specamt_simply_representable)
@@ -528,10 +527,10 @@
DeathBenefitOptionFromRetirement.allow(mce_option1,
is_dbopt_simply_representable);
DeathBenefitOptionFromRetirement.allow(mce_option2,
is_dbopt_simply_representable);
- DeathBenefitOptionFromRetirement.allow(mce_rop ,
is_dbopt_simply_representable && database_->Query(DB_AllowDBO3));
+ DeathBenefitOptionFromRetirement.allow(mce_rop ,
is_dbopt_simply_representable && database_->Query(DB_AllowDbo3));
DeathBenefitOptionFromIssue .allow(mce_option1,
is_dbopt_simply_representable && !never_retire);
- DeathBenefitOptionFromIssue .allow(mce_option2,
is_dbopt_simply_representable && !never_retire &&
(database_->Query(DB_AllowChangeToDBO2) || mce_option2 ==
DeathBenefitOptionFromRetirement));
- DeathBenefitOptionFromIssue .allow(mce_rop ,
is_dbopt_simply_representable && !never_retire &&
database_->Query(DB_AllowDBO3));
+ DeathBenefitOptionFromIssue .allow(mce_option2,
is_dbopt_simply_representable && !never_retire &&
(database_->Query(DB_AllowChangeToDbo2) || mce_option2 ==
DeathBenefitOptionFromRetirement));
+ DeathBenefitOptionFromIssue .allow(mce_rop ,
is_dbopt_simply_representable && !never_retire &&
database_->Query(DB_AllowDbo3));
/*
// TODO ?? WX PORT !! Figure out how to do this properly.
@@ -650,7 +649,7 @@
// TODO ?? VLR not yet implemented.
bool allow_vlr =
( loan_allowed
- && ( database_->Query(DB_AllowVLR)
+ && ( database_->Query(DB_AllowVlr)
|| anything_goes
)
);
@@ -660,7 +659,7 @@
UseAverageOfAllFunds.enable(!genacct_only);
bool enable_custom_fund =
!genacct_only
- && ( database_->Query(DB_AllowCustomFund)
+ && ( database_->Query(DB_AllowImfOverride)
|| home_office_only
)
;
@@ -786,16 +785,16 @@
TermAdjustmentMethod.allow(mce_adjust_term, enable_term);
TermAdjustmentMethod.allow(mce_adjust_both, enable_term);
- WaiverOfPremiumBenefit.enable( database_->Query(DB_AllowWP));
- WaiverOfPremiumBenefit.allow(mce_yes, database_->Query(DB_AllowWP));
- AccidentalDeathBenefit.enable( database_->Query(DB_AllowADD));
- AccidentalDeathBenefit.allow(mce_yes, database_->Query(DB_AllowADD));
+ WaiverOfPremiumBenefit.enable( database_->Query(DB_AllowWp));
+ WaiverOfPremiumBenefit.allow(mce_yes, database_->Query(DB_AllowWp));
+ AccidentalDeathBenefit.enable( database_->Query(DB_AllowAdb));
+ AccidentalDeathBenefit.allow(mce_yes, database_->Query(DB_AllowAdb));
- ChildRider .enable( database_->Query(DB_AllowChild));
- ChildRider .allow(mce_yes, database_->Query(DB_AllowChild));
+ ChildRider .enable( database_->Query(DB_AllowChildRider));
+ ChildRider .allow(mce_yes, database_->Query(DB_AllowChildRider));
ChildRiderAmount .enable(mce_yes == ChildRider);
- SpouseRider .enable( database_->Query(DB_AllowSpouse));
- SpouseRider .allow(mce_yes, database_->Query(DB_AllowSpouse));
+ SpouseRider .enable( database_->Query(DB_AllowSpouseRider));
+ SpouseRider .allow(mce_yes, database_->Query(DB_AllowSpouseRider));
SpouseRiderAmount.enable(mce_yes == SpouseRider);
SpouseIssueAge .enable(mce_yes == SpouseRider);
#if 0
@@ -1268,7 +1267,7 @@
case enumerator_fromret:
{
if(IssueAge < RetirementAge)
-// TODO ?? RetirementAge < database_->Query(DB_EndtAge)
+// TODO ?? RetirementAge < database_->Query(DB_MaturityAge)
{
s += "0, retirement";
s += "; ";
@@ -1278,7 +1277,7 @@
case enumerator_fromage:
{
if(IssueAge < local_rep->WDBegTime)
-// TODO ?? local_rep->WDBegTime < database_->Query(DB_EndtAge)
+// TODO ?? local_rep->WDBegTime < database_->Query(DB_MaturityAge)
{
s += "0, @" + value_cast<std::string>(local_rep->WDBegTime);
s += "; ";
@@ -1289,7 +1288,7 @@
{
if(0 < local_rep->WDBegTime)
// TODO ?? ( IssueAge + local_rep->WDBegTime
-// TODO ?? < database_->Query(DB_EndtAge)
+// TODO ?? < database_->Query(DB_MaturityAge)
// TODO ?? )
{
s += "0, " + value_cast<std::string>(local_rep->WDBegTime);
@@ -1322,7 +1321,7 @@
{
case enumerator_toret:
{
- if(RetirementAge < database_->Query(DB_EndtAge))
+ if(RetirementAge < database_->Query(DB_MaturityAge))
{
s += ", retirement";
s += "; 0";
@@ -1331,7 +1330,7 @@
break;
case enumerator_toage:
{
- if(local_rep->WDEndTime < database_->Query(DB_EndtAge))
+ if(local_rep->WDEndTime < database_->Query(DB_MaturityAge))
{
s += ", @" + value_cast<std::string>(local_rep->WDEndTime);
s += "; 0";
@@ -1342,7 +1341,7 @@
{
if
( IssueAge + local_rep->WDEndTime
- < database_->Query(DB_EndtAge)
+ < database_->Query(DB_MaturityAge)
)
{
s += ", " + value_cast<std::string>(local_rep->WDEndTime);
Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/input_realization.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -603,7 +603,7 @@
}
if
- ( !database_->Query(DB_AllowChangeToDBO2)
+ ( !database_->Query(DB_AllowChangeToDbo2)
&& !nonstd::is_sorted
(DeathBenefitOptionRealized_.begin()
,DeathBenefitOptionRealized_.end()
@@ -621,7 +621,7 @@
}
if
- ( !database_->Query(DB_AllowDBO3)
+ ( !database_->Query(DB_AllowDbo3)
&& contains(DeathBenefitOptionRealized_, mce_dbopt("ROP"))
)
{
@@ -890,7 +890,7 @@
return s;
}
- if(!database_->Query(DB_AllowWD))
+ if(!database_->Query(DB_AllowWd))
{
if(!each_equal(WithdrawalRealized_.begin(), WithdrawalRealized_.end(),
0.0))
{
@@ -899,7 +899,7 @@
}
else
{
- double lowest_allowed_withdrawal = database_->Query(DB_MinWD);
+ double lowest_allowed_withdrawal = database_->Query(DB_MinWd);
for
(std::vector<tnr_unrestricted_double>::iterator i =
WithdrawalRealized_.begin()
;i < WithdrawalRealized_.end()
Modified: lmi/trunk/input_test.cpp
===================================================================
--- lmi/trunk/input_test.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/input_test.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -146,16 +146,16 @@
std::cout
<< "\n Database speed tests..."
<< "\n initialize() : " <<
TimeAnAliquot(boost::bind(&product_database::initialize, &db))
- << "\n Query(vector) : " <<
TimeAnAliquot(boost::bind(&product_database::Query, &db, v,
DB_EndtAge))
- << "\n Query(scalar) : " <<
TimeAnAliquot(boost::bind(&product_database::Query, &db, DB_EndtAge))
- << "\n entity_from_key() : " <<
TimeAnAliquot(boost::bind(&product_database::entity_from_key, &db, DB_EndtAge))
+ << "\n Query(vector) : " <<
TimeAnAliquot(boost::bind(&product_database::Query, &db, v,
DB_MaturityAge))
+ << "\n Query(scalar) : " <<
TimeAnAliquot(boost::bind(&product_database::Query, &db,
DB_MaturityAge))
+ << "\n entity_from_key() : " <<
TimeAnAliquot(boost::bind(&product_database::entity_from_key, &db,
DB_MaturityAge))
<< '\n'
;
- database_entity const maturity = db.entity_from_key(DB_EndtAge);
+ database_entity const maturity = db.entity_from_key(DB_MaturityAge);
// Maturity age must not vary by duration.
- DBDictionary::instance().dictionary_[DB_EndtAge] = database_entity
+ DBDictionary::instance().dictionary_[DB_MaturityAge] = database_entity
(DB_StatVxQ
,e_number_of_axes
,dims_stat
@@ -166,12 +166,12 @@
,std::runtime_error
,"Assertion '1 == v.extent()' failed."
);
- DBDictionary::instance().dictionary_[DB_EndtAge] = maturity;
+ DBDictionary::instance().dictionary_[DB_MaturityAge] = maturity;
DBDictionary::instance().dictionary_[1 + DB_LAST] = maturity;
- DBDictionary::instance().dictionary_.erase(DB_EndtAge);
+ DBDictionary::instance().dictionary_.erase(DB_MaturityAge);
BOOST_TEST_THROW
- (db.entity_from_key(DB_EndtAge)
+ (db.entity_from_key(DB_MaturityAge)
,std::runtime_error
,"map_lookup: key '258' not found."
);
Modified: lmi/trunk/interest_rates.cpp
===================================================================
--- lmi/trunk/interest_rates.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/interest_rates.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -296,13 +296,13 @@
// almost certainly quoted as an APR. It is assumed that the
// interest bonus is not guaranteed.
std::vector<double> general_account_interest_bonus;
- v.Database_->Query(general_account_interest_bonus, DB_GAIntBonus);
+ v.Database_->Query(general_account_interest_bonus, DB_GenAcctIntBonus);
// ET !! GenAcctGrossRate_ += general_account_interest_bonus;
// ...and this might be further simplified by implementing e.g.
// std::vector<double> product_database::QueryVector(int k) const;
// and replacing 'general_account_interest_bonus' with a
// temporary:
- // GenAcctGrossRate_ += v.Database_->QueryVector(DB_GAIntBonus);
+ // GenAcctGrossRate_ += v.Database_->QueryVector(DB_GenAcctIntBonus);
std::transform
(GenAcctGrossRate_[mce_gen_curr].begin()
,GenAcctGrossRate_[mce_gen_curr].end()
@@ -360,7 +360,7 @@
if(v.yare_input_.AmortizePremiumLoad)
{
- v.Database_->Query(AmortLoad_, DB_AmortPmLdFundCharge);
+ v.Database_->Query(AmortLoad_, DB_LoadAmortFundCharge);
}
// TODO ?? This was once initialized with 'DB_MgmtFeeFundCharge',
Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/ledger_invariant.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -581,7 +581,7 @@
SpouseIssueAge = b->yare_input_.SpouseIssueAge;
HasHoneymoon = b->yare_input_.HoneymoonEndorsement;
- AllowDbo3 = b->Database_->Query(DB_AllowDBO3);
+ AllowDbo3 = b->Database_->Query(DB_AllowDbo3);
PostHoneymoonSpread = b->yare_input_.PostHoneymoonSpread;
// The antediluvian branch has a null ProductData_ object.
@@ -785,7 +785,7 @@
// it seems that output forms assume that the DAC tax premium load
// represents the entire DAC tax charge, so they're incorrect if
// the DAC tax fund charge isn't zero.
- LMI_ASSERT(0.0 == b->Database_->Query(DB_DACTaxFundCharge));
+ LMI_ASSERT(0.0 == b->Database_->Query(DB_DacTaxFundCharge));
InitAnnLoanDueRate = b->InterestRates_->RegLnDueRate
(mce_gen_curr
Modified: lmi/trunk/loads.cpp
===================================================================
--- lmi/trunk/loads.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/loads.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -58,8 +58,8 @@
,V.yare_input_.AmortizePremiumLoad
,V.LowestPremiumTaxLoad()
,V.Database_->Query(DB_PremTaxRate)
- ,V.Database_->Query(DB_PmTxAmortIntRate)
- ,V.Database_->Query(DB_PmTxAmortPeriod)
+ ,V.Database_->Query(DB_PremTaxAmortIntRate)
+ ,V.Database_->Query(DB_PremTaxAmortPeriod)
,V.Database_->Query(DB_AssetChargeType)
,V.IsSubjectToIllustrationReg()
,V.round_interest_rate()
@@ -123,23 +123,23 @@
void Loads::Initialize(product_database const& database)
{
- database.Query(refundable_sales_load_proportion_, DB_PremRefund );
- database.Query(premium_tax_load_ , DB_PremTaxLoad );
- database.Query(dac_tax_load_ , DB_DACTaxPremLoad);
+ database.Query(refundable_sales_load_proportion_ , DB_LoadRfdProportion
);
+ database.Query(premium_tax_load_ , DB_PremTaxLoad
);
+ database.Query(dac_tax_load_ , DB_DacTaxPremLoad
);
- database.Query(monthly_policy_fee_ [mce_gen_guar], DB_GuarPolFee
);
- database.Query(annual_policy_fee_ [mce_gen_guar], DB_GuarIssueFee
);
+ database.Query(monthly_policy_fee_ [mce_gen_guar], DB_GuarMonthlyPolFee
);
+ database.Query(annual_policy_fee_ [mce_gen_guar], DB_GuarAnnualPolFee
);
database.Query(specified_amount_load_[mce_gen_guar], DB_GuarSpecAmtLoad
);
- database.Query(separate_account_load_[mce_gen_guar],
DB_GuarAcctValLoadAMD);
+ database.Query(separate_account_load_[mce_gen_guar], DB_GuarAcctValLoad
);
database.Query(target_premium_load_ [mce_gen_guar], DB_GuarPremLoadTgt
);
database.Query(excess_premium_load_ [mce_gen_guar], DB_GuarPremLoadExc
);
database.Query(target_sales_load_ [mce_gen_guar],
DB_GuarPremLoadTgtRfd);
database.Query(excess_sales_load_ [mce_gen_guar],
DB_GuarPremLoadExcRfd);
- database.Query(monthly_policy_fee_ [mce_gen_curr], DB_CurrPolFee
);
- database.Query(annual_policy_fee_ [mce_gen_curr], DB_CurrIssueFee
);
+ database.Query(monthly_policy_fee_ [mce_gen_curr], DB_CurrMonthlyPolFee
);
+ database.Query(annual_policy_fee_ [mce_gen_curr], DB_CurrAnnualPolFee
);
database.Query(specified_amount_load_[mce_gen_curr], DB_CurrSpecAmtLoad
);
- database.Query(separate_account_load_[mce_gen_curr],
DB_CurrAcctValLoadAMD);
+ database.Query(separate_account_load_[mce_gen_curr], DB_CurrAcctValLoad
);
database.Query(target_premium_load_ [mce_gen_curr], DB_CurrPremLoadTgt
);
database.Query(excess_premium_load_ [mce_gen_curr], DB_CurrPremLoadExc
);
database.Query(target_sales_load_ [mce_gen_curr],
DB_CurrPremLoadTgtRfd);
@@ -348,15 +348,15 @@
excess_premium_load_ .resize(mc_n_gen_bases);
specified_amount_load_.resize(mc_n_gen_bases);
- database.Query(monthly_policy_fee_ [mce_gen_guar], DB_GuarPolFee );
- database.Query(target_premium_load_ [mce_gen_guar], DB_GuarPremLoadTgt);
- database.Query(excess_premium_load_ [mce_gen_guar], DB_GuarPremLoadExc);
- database.Query(specified_amount_load_[mce_gen_guar], DB_GuarSpecAmtLoad);
+ database.Query(monthly_policy_fee_ [mce_gen_guar], DB_GuarMonthlyPolFee);
+ database.Query(target_premium_load_ [mce_gen_guar], DB_GuarPremLoadTgt );
+ database.Query(excess_premium_load_ [mce_gen_guar], DB_GuarPremLoadExc );
+ database.Query(specified_amount_load_[mce_gen_guar], DB_GuarSpecAmtLoad );
- database.Query(monthly_policy_fee_ [mce_gen_curr], DB_CurrPolFee );
- database.Query(target_premium_load_ [mce_gen_curr], DB_CurrPremLoadTgt);
- database.Query(excess_premium_load_ [mce_gen_curr], DB_CurrPremLoadExc);
- database.Query(specified_amount_load_[mce_gen_curr], DB_CurrSpecAmtLoad);
+ database.Query(monthly_policy_fee_ [mce_gen_curr], DB_CurrMonthlyPolFee);
+ database.Query(target_premium_load_ [mce_gen_curr], DB_CurrPremLoadTgt );
+ database.Query(excess_premium_load_ [mce_gen_curr], DB_CurrPremLoadExc );
+ database.Query(specified_amount_load_[mce_gen_curr], DB_CurrSpecAmtLoad );
// This ctor ignores tabular specified-amount loads.
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/mec_input.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -246,7 +246,7 @@
)
);
- GleanedMaturityAge_ = static_cast<int>(database_->Query(DB_EndtAge));
+ GleanedMaturityAge_ = static_cast<int>(database_->Query(DB_MaturityAge));
}
datum_base const* mec_input::DoBaseDatumPointer
@@ -309,8 +309,8 @@
{
bool anything_goes = global_settings::instance().ash_nazg();
- DefinitionOfLifeInsurance.allow(mce_gpt , database_->Query(DB_AllowGPT ));
- DefinitionOfLifeInsurance.allow(mce_cvat, database_->Query(DB_AllowCVAT));
+ DefinitionOfLifeInsurance.allow(mce_gpt , database_->Query(DB_AllowGpt ));
+ DefinitionOfLifeInsurance.allow(mce_cvat, database_->Query(DB_AllowCvat));
DefinitionOfLifeInsurance.allow(mce_noncompliant, false);
DefinitionOfMaterialChange.enable(mce_noncompliant !=
DefinitionOfLifeInsurance);
@@ -345,11 +345,11 @@
// DATABASE !! There should be flags in the database to allow or
// forbid paramedical and nonmedical underwriting; arbitrarily,
// until they are added, those options are always inhibited.
- GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUW));
+ GroupUnderwritingType.allow(mce_medical, database_->Query(DB_AllowFullUw));
GroupUnderwritingType.allow(mce_paramedical, false);
GroupUnderwritingType.allow(mce_nonmedical, false);
- GroupUnderwritingType.allow(mce_simplified_issue,
database_->Query(DB_AllowSimpUW));
- GroupUnderwritingType.allow(mce_guaranteed_issue,
database_->Query(DB_AllowGuarUW));
+ GroupUnderwritingType.allow(mce_simplified_issue,
database_->Query(DB_AllowSimpUw));
+ GroupUnderwritingType.allow(mce_guaranteed_issue,
database_->Query(DB_AllowGuarUw));
IssueAge .enable(mce_no == DeprecatedUseDOB);
DateOfBirth .enable(mce_yes == DeprecatedUseDOB);
@@ -383,7 +383,7 @@
,maximum_birthdate(IssueAge.minimum(), EffectiveDate.value(), use_anb)
);
- int max_age = static_cast<int>(database_->Query(DB_EndtAge));
+ int max_age = static_cast<int>(database_->Query(DB_MaturityAge));
InforceAsOfDate.minimum_and_maximum
(EffectiveDate.value()
,add_years_and_months
Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/mec_server.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -159,14 +159,14 @@
std::vector<double> const tabular_7Px = actuarial_table_rates
(AddDataDir(product_filenames.datum("TAMRA7PayFilename"))
- ,static_cast<long int>(database.Query(DB_TAMRA7PayTable))
+ ,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"))
- ,static_cast<long int>(database.Query(DB_IRC7702QTable))
+ ,static_cast<long int>(database.Query(DB_Irc7702QTable))
,input.issue_age()
,input.years_to_maturity()
);
@@ -194,7 +194,7 @@
);
std::vector<double> Mly7702ig;
- database.Query(Mly7702ig, DB_NAARDiscount);
+ database.Query(Mly7702ig, DB_NaarDiscount);
LMI_ASSERT(!contains(Mly7702ig, -1.0));
std::vector<double> DBDiscountRate(input.years_to_maturity());
assign(DBDiscountRate, 1.0 / (1.0 + Mly7702ig));
@@ -265,7 +265,7 @@
double AnnualTargetPrem = 1000000000.0; // No higher premium is
anticipated.
int const target_year =
- database.Query(DB_TgtPmFixedAtIssue)
+ database.Query(DB_TgtPremFixedAtIssue)
? 0
: input.inforce_year()
;
@@ -277,7 +277,7 @@
{
// When 7Px is calculated from first principles, presumably
// the target premium should be the same as for oe_modal_table
- // with a 7Px table and a DB_TgtPremPolFee of zero.
+ // with a 7Px table and a DB_TgtPremMonthlyPolFee of zero.
AnnualTargetPrem = round_max_premium
( InforceTargetSpecifiedAmount
* epsilon_plus_one
@@ -287,7 +287,7 @@
else if(oe_modal_table == target_premium_type)
{
AnnualTargetPrem = round_max_premium
- ( database.Query(DB_TgtPremPolFee)
+ ( database.Query(DB_TgtPremMonthlyPolFee)
+ InforceTargetSpecifiedAmount
* epsilon_plus_one
* TargetPremiumRates[target_year]
@@ -318,7 +318,7 @@
database.Query(excess_sales_load , DB_CurrPremLoadExcRfd);
database.Query(target_premium_load, DB_CurrPremLoadTgt);
database.Query(excess_premium_load, DB_CurrPremLoadExc);
- database.Query(dac_tax_load , DB_DACTaxPremLoad);
+ database.Query(dac_tax_load , DB_DacTaxPremLoad);
double const LoadTarget = target_sales_load[InforceYear] +
target_premium_load[InforceYear] + dac_tax_load[InforceYear] + premium_tax_load;
double const LoadExcess = excess_sales_load[InforceYear] +
excess_premium_load[InforceYear] + dac_tax_load[InforceYear] + premium_tax_load;
Modified: lmi/trunk/mortality_rates.cpp
===================================================================
--- lmi/trunk/mortality_rates.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/mortality_rates.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -51,14 +51,14 @@
MonthlyCurrentCoiRatesBand0_ = actuarial_table_rates
(CurrentTableFile()
- ,static_cast<long int>(basic_values.Database_->Query(DB_CurrCOITable))
+ ,static_cast<long int>(basic_values.Database_->Query(DB_CurrCoiTable))
,issue_age
,length
);
MonthlyGuaranteedCoiRates_ = actuarial_table_rates
(GuaranteedTableFile()
- ,static_cast<long int>(basic_values.Database_->Query(DB_GuarCOITable))
+ ,static_cast<long int>(basic_values.Database_->Query(DB_GuarCoiTable))
,issue_age
,length
);
@@ -94,14 +94,14 @@
AdbRates_ = actuarial_table_rates
(CurrentTableFile()
- ,static_cast<long int>(basic_values.Database_->Query(DB_ADDTable))
+ ,static_cast<long int>(basic_values.Database_->Query(DB_AdbTable))
,issue_age
,length
);
WpRates_ = actuarial_table_rates
(CurrentTableFile()
- ,static_cast<long int>(basic_values.Database_->Query(DB_WPTable))
+ ,static_cast<long int>(basic_values.Database_->Query(DB_WpTable))
,issue_age
,length
);
Modified: lmi/trunk/mortality_rates_fetch.cpp
===================================================================
--- lmi/trunk/mortality_rates_fetch.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/mortality_rates_fetch.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -49,15 +49,15 @@
// Some of these data members seem useless for now, but they will
// become useful when mortality-table access is moved hither from
// class BasicValues.
- AllowAdb_ = basic_values.Database_->Query(DB_AllowADD );
- AllowChild_ = basic_values.Database_->Query(DB_AllowChild );
+ AllowAdb_ = basic_values.Database_->Query(DB_AllowAdb );
+ AllowChild_ = basic_values.Database_->Query(DB_AllowChildRider );
AllowFlatExtras_ = basic_values.Database_->Query(DB_AllowFlatExtras );
- AllowSpouse_ = basic_values.Database_->Query(DB_AllowSpouse );
+ AllowSpouse_ = basic_values.Database_->Query(DB_AllowSpouseRider );
AllowSubstdTable_ = basic_values.Database_->Query(DB_AllowSubstdTable );
AllowTerm_ = basic_values.Database_->Query(DB_AllowTerm );
- AllowWp_ = basic_values.Database_->Query(DB_AllowWP );
- CCoiIsAnnual_ = basic_values.Database_->Query(DB_CCoiIsAnnual );
- GCoiIsAnnual_ = basic_values.Database_->Query(DB_GCoiIsAnnual );
+ AllowWp_ = basic_values.Database_->Query(DB_AllowWp );
+ CCoiIsAnnual_ = basic_values.Database_->Query(DB_CurrCoiIsAnnual );
+ GCoiIsAnnual_ = basic_values.Database_->Query(DB_GuarCoiIsAnnual );
IsTgtPremTabular_ =
oe_modal_table == basic_values.Database_->Query(DB_TgtPremType)
;
@@ -67,9 +67,9 @@
max_coi_rate = 1.0 / max_coi_rate;
MaxMonthlyCoiRate_ = max_coi_rate;
- basic_values.Database_->Query(GCoiMultiplier_, DB_GCOIMultiplier);
- basic_values.Database_->Query(CCoiMultiplier_, DB_CCOIMultiplier);
- basic_values.Database_->Query(SubstdTblMult_ , DB_SubstdTblMult );
+ basic_values.Database_->Query(GCoiMultiplier_, DB_GuarCoiMultiplier);
+ basic_values.Database_->Query(CCoiMultiplier_, DB_CurrCoiMultiplier);
+ basic_values.Database_->Query(SubstdTblMult_ , DB_SubstdTableMult );
CountryCoiMultiplier_ = basic_values.yare_input_.CountryCoiMultiplier;
IsPolicyRated_ = is_policy_rated(basic_values.yare_input_);
Modified: lmi/trunk/my_db.cpp
===================================================================
--- lmi/trunk/my_db.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/my_db.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -50,7 +50,7 @@
// Sample policy form.
{
InitDB();
- Add(database_entity(DB_GuarPolFee, 10.00));
+ Add(database_entity(DB_GuarMonthlyPolFee, 10.00));
// etc.
// Not necessary for 'sample' product only, because it's built in.
// WriteDB(AddDataDir("sample.database"));
Modified: lmi/trunk/surrchg_rates.cpp
===================================================================
--- lmi/trunk/surrchg_rates.cpp 2010-06-04 16:20:27 UTC (rev 4972)
+++ lmi/trunk/surrchg_rates.cpp 2010-06-04 20:21:36 UTC (rev 4973)
@@ -40,10 +40,10 @@
//============================================================================
void SurrChgRates::Initialize(product_database const& database)
{
- database.Query(RatePerDollarOfPremium_ , DB_SurrChgPremMult );
- database.Query(RatePerDollarOfAcctval_ , DB_SurrChgAVMult );
- database.Query(RatePerDollarOfSpecamt_ , DB_SurrChgSAMult );
- database.Query(AcctvalRateDurationalFactor_, DB_SurrChgAVDurFactor);
- database.Query(SpecamtRateDurationalFactor_, DB_SurrChgSADurFactor);
+ database.Query(RatePerDollarOfPremium_ , DB_SurrChgPremMult );
+ database.Query(RatePerDollarOfAcctval_ , DB_SurrChgAcctValMult );
+ database.Query(RatePerDollarOfSpecamt_ , DB_SurrChgSpecAmtMult );
+ database.Query(AcctvalRateDurationalFactor_, DB_SurrChgAcctValSlope);
+ database.Query(SpecamtRateDurationalFactor_, DB_SurrChgSpecAmtSlope);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [4973] Rename numerous database entities to improve concinnity,
Greg Chicares <=