[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5e009d6 3/8: Adjust whitespace to improve ver
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 5e009d6 3/8: Adjust whitespace to improve vertical alignment |
|
Date: |
Wed, 7 Nov 2018 17:11:10 -0500 (EST) |
branch: master
commit 5e009d6827e9b204b9bb611b49379cd59e7d25e7
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Adjust whitespace to improve vertical alignment
---
dbdict.cpp | 152 +++++++++++++++++++++++++++----------------------------
ihs_basicval.cpp | 38 +++++++-------
2 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/dbdict.cpp b/dbdict.cpp
index da3a503..99d16d8 100644
--- a/dbdict.cpp
+++ b/dbdict.cpp
@@ -513,12 +513,12 @@ void DBDictionary::InitDB()
}
// It would be dangerous to set these to zero.
- Add(database_entity(DB_MinInputCoiMult , 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_MaxWdGenAcctValMult , 1.0));
- Add(database_entity(DB_MaxWdSepAcctValMult , 1.0));
+ Add(database_entity(DB_MinInputCoiMult , 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_MaxWdGenAcctValMult , 1.0));
+ Add(database_entity(DB_MaxWdSepAcctValMult , 1.0));
// This is determined by law and regulation, and should be the
// same for all life-insurance products.
@@ -533,13 +533,13 @@ void DBDictionary::InitDB()
);
// These are the same as class date_trammel's nominal limits.
- Add(database_entity(DB_CoiResetMinDate ,
gregorian_epoch().julian_day_number()));
- Add(database_entity(DB_CoiResetMaxDate , last_yyyy_date
().julian_day_number()));
+ Add(database_entity(DB_CoiResetMinDate ,
gregorian_epoch().julian_day_number()));
+ Add(database_entity(DB_CoiResetMaxDate , last_yyyy_date
().julian_day_number()));
// Usually the maximum is a reciprocal, e.g., 1/11 or 1/12; for
// greatest precision, store the reciprocal of that reciprocal,
// e.g., 11 or 12.
- Add(database_entity(DB_MaxMonthlyCoiRate , 12.0));
+ Add(database_entity(DB_MaxMonthlyCoiRate , 12.0));
// This must not be zero in TX, which specifically requires a
// "guaranteed" rate of not more than fifteen percent--see:
@@ -554,27 +554,27 @@ void DBDictionary::InitDB()
max_vlr[mce_s_TX] = 0.15;
Add(database_entity(DB_MaxVlrRate, max_vlr_dimensions, max_vlr));
- Add(database_entity(DB_FirstPrefLoanYear , 100));
+ Add(database_entity(DB_FirstPrefLoanYear , 100));
- Add(database_entity(DB_GuarIntSpread , dbl_inf));
+ Add(database_entity(DB_GuarIntSpread , dbl_inf));
- Add(database_entity(DB_CurrCoiTable0Limit , dbl_inf));
- Add(database_entity(DB_CurrCoiTable1 , 999));
- Add(database_entity(DB_CurrCoiTable1Limit , dbl_inf));
- Add(database_entity(DB_CurrCoiTable2 , 999));
+ Add(database_entity(DB_CurrCoiTable0Limit , dbl_inf));
+ Add(database_entity(DB_CurrCoiTable1 , 999));
+ Add(database_entity(DB_CurrCoiTable1Limit , dbl_inf));
+ Add(database_entity(DB_CurrCoiTable2 , 999));
- Add(database_entity(DB_SpecAmtLoadLimit , dbl_inf));
- Add(database_entity(DB_DynSepAcctLoadLimit , dbl_inf));
- Add(database_entity(DB_PremTaxRetalLimit , dbl_inf));
- Add(database_entity(DB_WpLimit , dbl_inf));
- Add(database_entity(DB_AdbLimit , dbl_inf));
- Add(database_entity(DB_ExpSpecAmtLimit , dbl_inf));
+ Add(database_entity(DB_SpecAmtLoadLimit , dbl_inf));
+ Add(database_entity(DB_DynSepAcctLoadLimit , dbl_inf));
+ Add(database_entity(DB_PremTaxRetalLimit , dbl_inf));
+ Add(database_entity(DB_WpLimit , dbl_inf));
+ Add(database_entity(DB_AdbLimit , dbl_inf));
+ Add(database_entity(DB_ExpSpecAmtLimit , dbl_inf));
// These are the same as the nominal limits of the associated
// members of class Input.
- Add(database_entity(DB_SpouseRiderMaxAmt , bignum));
- Add(database_entity(DB_SpouseRiderMaxIssAge, 99));
- Add(database_entity(DB_ChildRiderMaxAmt , bignum));
+ Add(database_entity(DB_SpouseRiderMaxAmt , bignum));
+ Add(database_entity(DB_SpouseRiderMaxIssAge , 99));
+ Add(database_entity(DB_ChildRiderMaxAmt , bignum));
}
void DBDictionary::write_database_files()
@@ -995,34 +995,34 @@ void DBDictionary::InitAntediluvian()
// These are the same as class date_trammel's nominal limits.
// They mustn't be zero.
- Add(database_entity(DB_CoiResetMinDate ,
gregorian_epoch().julian_day_number()));
- Add(database_entity(DB_CoiResetMaxDate , last_yyyy_date
().julian_day_number()));
+ Add(database_entity(DB_CoiResetMinDate ,
gregorian_epoch().julian_day_number()));
+ Add(database_entity(DB_CoiResetMaxDate , last_yyyy_date
().julian_day_number()));
- Add(database_entity(DB_GuarInt, 0.03));
+ Add(database_entity(DB_GuarInt , 0.03));
- Add(database_entity(DB_FixedLoanRate, 0.06));
+ Add(database_entity(DB_FixedLoanRate , 0.06));
- Add(database_entity(DB_GuarRegLoanSpread, 0.0));
- Add(database_entity(DB_CurrRegLoanSpread, 0.0));
- Add(database_entity(DB_GuarPrefLoanSpread, 0.0));
- Add(database_entity(DB_CurrPrefLoanSpread, 0.0));
+ Add(database_entity(DB_GuarRegLoanSpread , 0.0));
+ Add(database_entity(DB_CurrRegLoanSpread , 0.0));
+ Add(database_entity(DB_GuarPrefLoanSpread , 0.0));
+ Add(database_entity(DB_CurrPrefLoanSpread , 0.0));
- Add(database_entity(DB_AllowPreferredClass, true));
+ Add(database_entity(DB_AllowPreferredClass , true));
// premium loads
- 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_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_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_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
@@ -1040,38 +1040,38 @@ void DBDictionary::InitAntediluvian()
};
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_AdbTable, 9));
- Add(database_entity(DB_MaturityAge, 100));
- Add(database_entity(DB_AgeLastOrNearest,
oe_age_nearest_birthday_ties_older));
- Add(database_entity(DB_MinSpecAmt, 10000.0));
-
- Add(database_entity(DB_AllowGenAcct, true));
- Add(database_entity(DB_MaxGenAcctRate, 0.12));
- Add(database_entity(DB_MaxSepAcctRate, 0.12));
-
- Add(database_entity(DB_AllowLoan, true));
- Add(database_entity(DB_AllowWd, true));
- Add(database_entity(DB_AllowFlatExtras, true));
- Add(database_entity(DB_AllowChangeToDbo2, true));
- Add(database_entity(DB_AllowDbo3, true));
-
- Add(database_entity(DB_LedgerType, mce_ill_reg));
-
- Add(database_entity(DB_NoLapseAlwaysActive, 0.0));
- Add(database_entity(DB_NoLapseMinDur, 0.0));
- Add(database_entity(DB_NoLapseMinAge, 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, false));
- Add(database_entity(DB_AllowAdb, false));
- Add(database_entity(DB_AllowSpouseRider, false));
- Add(database_entity(DB_AllowChildRider, false));
-
- Add(database_entity(DB_ExpRatAmortPeriod, 4.0));
+ Add(database_entity(DB_CorridorTable , 7));
+ Add(database_entity(DB_WpTable , 8));
+ Add(database_entity(DB_AdbTable , 9));
+ Add(database_entity(DB_MaturityAge , 100));
+ Add(database_entity(DB_AgeLastOrNearest ,
oe_age_nearest_birthday_ties_older));
+ Add(database_entity(DB_MinSpecAmt , 10000.0));
+
+ Add(database_entity(DB_AllowGenAcct , true));
+ Add(database_entity(DB_MaxGenAcctRate , 0.12));
+ Add(database_entity(DB_MaxSepAcctRate , 0.12));
+
+ Add(database_entity(DB_AllowLoan , true));
+ Add(database_entity(DB_AllowWd , true));
+ Add(database_entity(DB_AllowFlatExtras , true));
+ Add(database_entity(DB_AllowChangeToDbo2 , true));
+ Add(database_entity(DB_AllowDbo3 , true));
+
+ Add(database_entity(DB_LedgerType , mce_ill_reg));
+
+ Add(database_entity(DB_NoLapseAlwaysActive , 0.0));
+ Add(database_entity(DB_NoLapseMinDur , 0.0));
+ Add(database_entity(DB_NoLapseMinAge , 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 , false));
+ Add(database_entity(DB_AllowAdb , false));
+ Add(database_entity(DB_AllowSpouseRider , false));
+ Add(database_entity(DB_AllowChildRider , false));
+
+ Add(database_entity(DB_ExpRatAmortPeriod , 4.0));
}
/// Print databases to file in an alternative text format.
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index e842099..82be30e 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -617,14 +617,14 @@ void BasicValues::SetPermanentInvariants()
database().query_into(DB_WdCanDecrSpecAmtDbo1 , WDCanDecrSADBO1);
database().query_into(DB_WdCanDecrSpecAmtDbo2 , WDCanDecrSADBO2);
database().query_into(DB_WdCanDecrSpecAmtDbo3 , WDCanDecrSADBO3);
- database().query_into(DB_MaxIncrAge , MaxIncrAge);
+ database().query_into(DB_MaxIncrAge , MaxIncrAge);
database().query_into(DB_WaivePremTaxInt1035 , WaivePmTxInt1035);
database().query_into(DB_TermIsNotRider , TermIsNotRider);
- database().query_into(DB_TermForcedConvAge, TermForcedConvAge);
- database().query_into(DB_TermForcedConvDur, TermForcedConvDur);
+ database().query_into(DB_TermForcedConvAge , TermForcedConvAge);
+ database().query_into(DB_TermForcedConvDur , TermForcedConvDur);
database().query_into(DB_ExpSpecAmtLimit , ExpPerKLimit);
- database().query_into(DB_MinPremType, MinPremType);
- database().query_into(DB_TgtPremType, TgtPremType);
+ database().query_into(DB_MinPremType , MinPremType);
+ database().query_into(DB_TgtPremType , TgtPremType);
database().query_into(DB_TgtPremFixedAtIssue , TgtPremFixedAtIssue);
database().query_into(DB_TgtPremMonthlyPolFee , TgtPremMonthlyPolFee);
// Assertion: see comments on GetModalPremTgtFromTable().
@@ -636,16 +636,16 @@ void BasicValues::SetPermanentInvariants()
database().query_into(DB_CurrCoiTable1Limit , CurrCoiTable1Limit);
LMI_ASSERT(0.0 <= CurrCoiTable0Limit);
LMI_ASSERT(CurrCoiTable0Limit <= CurrCoiTable1Limit);
- database().query_into(DB_CoiInforceReentry, CoiInforceReentry);
- database().query_into(DB_MaxWdDed , MaxWDDed_ );
+ database().query_into(DB_CoiInforceReentry , CoiInforceReentry);
+ database().query_into(DB_MaxWdDed , MaxWDDed_);
database().query_into(DB_MaxWdGenAcctValMult , MaxWdGenAcctValMult);
database().query_into(DB_MaxWdSepAcctValMult , MaxWdSepAcctValMult);
- database().query_into(DB_AllowPrefLoan , AllowPrefLoan);
- database().query_into(DB_MaxLoanDed , MaxLoanDed_);
+ database().query_into(DB_AllowPrefLoan , AllowPrefLoan);
+ database().query_into(DB_MaxLoanDed , MaxLoanDed_);
database().query_into(DB_MaxLoanAcctValMult , MaxLoanAVMult);
- database().query_into(DB_FirstPrefLoanYear, FirstPrefLoanYear);
- database().query_into(DB_NoLapseMinDur , NoLapseMinDur);
- database().query_into(DB_NoLapseMinAge , NoLapseMinAge);
+ database().query_into(DB_FirstPrefLoanYear , FirstPrefLoanYear);
+ database().query_into(DB_NoLapseMinDur , NoLapseMinDur);
+ database().query_into(DB_NoLapseMinAge , NoLapseMinAge);
database().query_into(DB_AdbLimit , AdbLimit);
database().query_into(DB_WpLimit , WpLimit);
database().query_into(DB_SpecAmtLoadLimit , SpecAmtLoadLimit);
@@ -655,17 +655,17 @@ void BasicValues::SetPermanentInvariants()
database().query_into(DB_AllowChangeToDbo2 , AllowChangeToDBO2);
database().query_into(DB_AllowSpecAmtIncr , AllowSAIncr);
database().query_into(DB_NoLapseAlwaysActive , NoLapseAlwaysActive);
- database().query_into(DB_WpChargeMethod , WaiverChargeMethod);
- database().query_into(DB_CashValueEnhMult, CashValueEnhMult );
+ database().query_into(DB_WpChargeMethod , WaiverChargeMethod);
+ database().query_into(DB_CashValueEnhMult , CashValueEnhMult);
database().query_into(DB_LapseIgnoresSurrChg , LapseIgnoresSurrChg);
database().query_into(DB_SurrChgOnIncr , SurrChgOnIncr);
database().query_into(DB_SurrChgOnDecr , SurrChgOnDecr);
LMI_ASSERT(!SurrChgOnIncr); // Surrchg change on increase not supported.
LMI_ASSERT(!SurrChgOnDecr); // Surrchg change on decrease not supported.
- database().query_into(DB_FreeWdProportion, FreeWDProportion);
+ database().query_into(DB_FreeWdProportion , FreeWDProportion);
- database().query_into(DB_NaarDiscount, DBDiscountRate);
+ database().query_into(DB_NaarDiscount , DBDiscountRate);
LMI_ASSERT(!contains(DBDiscountRate, -1.0));
// This would be more natural:
// assign(DBDiscountRate, 1.0 / (1.0 + DBDiscountRate));
@@ -674,9 +674,9 @@ void BasicValues::SetPermanentInvariants()
assign(DBDiscountRate, 1.0 / DBDiscountRate);
database().query_into(DB_CalculateComp , CalculateComp);
- database().query_into(DB_AssetComp , AssetComp );
- database().query_into(DB_CompTarget, CompTarget);
- database().query_into(DB_CompExcess, CompExcess);
+ database().query_into(DB_AssetComp , AssetComp);
+ database().query_into(DB_CompTarget , CompTarget);
+ database().query_into(DB_CompExcess , CompExcess);
database().query_into(DB_DynamicMandE , MandEIsDynamic);
database().query_into(DB_DynamicSepAcctLoad , SepAcctLoadIsDynamic);
- [lmi-commits] [lmi] master updated (259f97c -> 6c72fcf), Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master 284339d 1/8: Document boolean database entities more uniformly, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master e4a6ba2 6/8: Use query<bool> with database entities that are inherently boolean, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master 39f76e4 4/8: Make a deliberate mistake more obvious in a unit test, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master f066478 7/8: Use query<T> with database entities that are inherently enumerative, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master 6c72fcf 8/8: Use query<double> with database entities that are inherently floating, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master 5e009d6 3/8: Adjust whitespace to improve vertical alignment,
Greg Chicares <=
- [lmi-commits] [lmi] master 28105c5 5/8: Use query<int> with database entities that are inherently int, Greg Chicares, 2018/11/07
- [lmi-commits] [lmi] master 9490b4c 2/8: Avoid using floating-point constants for boolean values, Greg Chicares, 2018/11/07