[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 8580716: Rename vector& "query" function
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 8580716: Rename vector& "query" function |
|
Date: |
Tue, 6 Nov 2018 16:05:14 -0500 (EST) |
branch: master
commit 85807167bf2367f6fd30137bc79b282617729537
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename vector& "query" function
Renamed this function from Query() to query_into() because it writes its
result into a reference argument rather than returning it. Transposed
its arguments so that the e_database_key comes first, as explained in
the immediately preceding commit.
---
custom_io_0.cpp | 2 +-
database.cpp | 10 ++++-----
database.hpp | 8 +++----
gpt_server.cpp | 14 ++++++------
ihs_basicval.cpp | 24 ++++++++++----------
input_harmonization.cpp | 2 +-
input_realization.cpp | 2 +-
input_test.cpp | 20 ++++++++---------
interest_rates.cpp | 26 +++++++++++-----------
ledger_invariant_init.cpp | 2 +-
loads.cpp | 56 +++++++++++++++++++++++------------------------
loads_test.cpp | 2 +-
mec_server.cpp | 14 ++++++------
mortality_rates_fetch.cpp | 6 ++---
14 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/custom_io_0.cpp b/custom_io_0.cpp
index 5c87221..de0f660 100644
--- a/custom_io_0.cpp
+++ b/custom_io_0.cpp
@@ -409,7 +409,7 @@ bool custom_io_0_read(Input& z, std::string const& filename)
;
std::vector<double> declared_rate;
- database.Query(declared_rate, DB_MaxGenAcctRate);
+ database.query_into(DB_MaxGenAcctRate, declared_rate);
z["GeneralAccountRate"] = adjust_interest_rates
(first_year_general_account_rate
,renewal_year_general_account_rate
diff --git a/database.cpp b/database.cpp
index 3cbf87a..2f3375d 100644
--- a/database.cpp
+++ b/database.cpp
@@ -93,9 +93,9 @@ database_index product_database::index() const
/// Query database; write result into vector argument.
-void product_database::Query
- (std::vector<double>& dst
- ,e_database_key k
+void product_database::query_into
+ (e_database_key k
+ ,std::vector<double>& dst
,database_index const& i
) const
{
@@ -117,9 +117,9 @@ void product_database::Query
/// Query database, using default index; write result into vector argument.
-void product_database::Query(std::vector<double>& dst, e_database_key k) const
+void product_database::query_into(e_database_key k, std::vector<double>& dst)
const
{
- return Query(dst, k, index_);
+ return query_into(k, dst, index_);
}
/// Query database; return a scalar.
diff --git a/database.hpp b/database.hpp
index b5ec9d8..28a946a 100644
--- a/database.hpp
+++ b/database.hpp
@@ -66,12 +66,12 @@ class LMI_SO product_database final
int length() const;
database_index index() const;
- void Query
- (std::vector<double>&
- ,e_database_key
+ void query_into
+ (e_database_key
+ ,std::vector<double>&
,database_index const&
) const;
- void Query(std::vector<double>&, e_database_key) const;
+ void query_into(e_database_key, std::vector<double>&) const;
double Query(e_database_key, database_index const&) const;
double Query(e_database_key) const;
diff --git a/gpt_server.cpp b/gpt_server.cpp
index 1f050df..7baf932 100644
--- a/gpt_server.cpp
+++ b/gpt_server.cpp
@@ -192,7 +192,7 @@ gpt_state test_one_days_gpt_transactions
assign(Mly7702qc, apply_binary(coi_rate_from_q<double>(), Mly7702qc,
max_coi_rate));
std::vector<double> guar_int;
- database.Query(guar_int, DB_GuarInt);
+ database.query_into(DB_GuarInt, guar_int);
std::vector<double> const spread
(input.years_to_maturity()
@@ -210,7 +210,7 @@ gpt_state test_one_days_gpt_transactions
);
std::vector<double> Mly7702ig;
- database.Query(Mly7702ig, DB_NaarDiscount);
+ database.query_into(DB_NaarDiscount, Mly7702ig);
LMI_ASSERT(!contains(Mly7702ig, -1.0));
std::vector<double> DBDiscountRate(input.years_to_maturity());
assign(DBDiscountRate, 1.0 / (1.0 + Mly7702ig));
@@ -329,11 +329,11 @@ gpt_state test_one_days_gpt_transactions
std::vector<double> excess_premium_load;
std::vector<double> dac_tax_load ;
- database.Query(target_sales_load , DB_CurrPremLoadTgtRfd);
- 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_into(DB_CurrPremLoadTgtRfd, target_sales_load );
+ database.query_into(DB_CurrPremLoadExcRfd, excess_sales_load );
+ database.query_into(DB_CurrPremLoadTgt , target_premium_load);
+ database.query_into(DB_CurrPremLoadExc , excess_premium_load);
+ database.query_into(DB_DacTaxPremLoad , dac_tax_load );
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;
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index 3bebd6e..3da3c57 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -456,7 +456,7 @@ void BasicValues::Init7702()
// GPT calculations in the 7702 class.
std::vector<double> guar_int;
- database().Query(guar_int, DB_GuarInt);
+ database().query_into(DB_GuarInt, guar_int);
// TAXATION !! Rework this. The intention is to make the 7702 interest
// rate no less, at any duration, than the guaranteed loan rate--here,
// the fixed rate charged on loans, minus the guaranteed loan spread
@@ -467,9 +467,9 @@ void BasicValues::Init7702()
case mce_fixed_loan_rate:
{
std::vector<double> gross_loan_rate;
- database().Query(gross_loan_rate, DB_FixedLoanRate);
+ database().query_into(DB_FixedLoanRate , gross_loan_rate);
std::vector<double> guar_loan_spread;
- database().Query(guar_loan_spread, DB_GuarRegLoanSpread);
+ database().query_into(DB_GuarRegLoanSpread, guar_loan_spread);
// ET !! std::vector<double> guar_loan_rate = gross_loan_rate -
guar_loan_spread;
std::vector<double> guar_loan_rate(Length);
std::transform
@@ -519,7 +519,7 @@ void BasicValues::Init7702()
)
);
- database().Query(Mly7702ig, DB_NaarDiscount);
+ database().query_into(DB_NaarDiscount, Mly7702ig);
// TODO ?? We should avoid reading the rate file again; but
// the GPT server doesn't initialize a MortalityRates object
@@ -655,17 +655,17 @@ void BasicValues::SetPermanentInvariants()
AllowChangeToDBO2 = database().Query(DB_AllowChangeToDbo2 );
AllowSAIncr = database().Query(DB_AllowSpecAmtIncr );
NoLapseAlwaysActive = database().Query(DB_NoLapseAlwaysActive );
- database().query_into(DB_WpChargeMethod, WaiverChargeMethod);
- database().Query(CashValueEnhMult, DB_CashValueEnhMult);
+ database().query_into(DB_WpChargeMethod , WaiverChargeMethod);
+ database().query_into(DB_CashValueEnhMult, CashValueEnhMult );
LapseIgnoresSurrChg = database().Query(DB_LapseIgnoresSurrChg );
SurrChgOnIncr = database().Query(DB_SurrChgOnIncr );
SurrChgOnDecr = database().Query(DB_SurrChgOnDecr );
LMI_ASSERT(!SurrChgOnIncr); // Surrchg change on increase not supported.
LMI_ASSERT(!SurrChgOnDecr); // Surrchg change on decrease not supported.
- database().Query(FreeWDProportion, DB_FreeWdProportion);
+ database().query_into(DB_FreeWdProportion, FreeWDProportion);
- database().Query(DBDiscountRate, DB_NaarDiscount);
+ 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);
CalculateComp = database().Query(DB_CalculateComp );
- database().Query(AssetComp , DB_AssetComp);
- database().Query(CompTarget, DB_CompTarget);
- database().Query(CompExcess, DB_CompExcess);
+ database().query_into(DB_AssetComp , AssetComp );
+ database().query_into(DB_CompTarget, CompTarget);
+ database().query_into(DB_CompExcess, CompExcess);
MandEIsDynamic = database().Query(DB_DynamicMandE );
SepAcctLoadIsDynamic= database().Query(DB_DynamicSepAcctLoad );
@@ -765,7 +765,7 @@ void BasicValues::SetPermanentInvariants()
TermIsDbFor7702A = 1.0 == database().Query(DB_TermIsQABOrDb7702A);
MaxNAAR = yare_input_.MaximumNaar;
- database().Query(MinPremIntSpread_, DB_MinPremIntSpread);
+ database().query_into(DB_MinPremIntSpread, MinPremIntSpread_);
}
namespace
diff --git a/input_harmonization.cpp b/input_harmonization.cpp
index a3ed03a..319f2ef 100644
--- a/input_harmonization.cpp
+++ b/input_harmonization.cpp
@@ -44,7 +44,7 @@ namespace
std::string current_credited_rate(product_database const& database)
{
std::vector<double> z;
- database.Query(z, DB_MaxGenAcctRate);
+ database.query_into(DB_MaxGenAcctRate, z);
return canonicalized_input_sequence(z);
}
} // Unnamed namespace.
diff --git a/input_realization.cpp b/input_realization.cpp
index d10f82e..6abf00f 100644
--- a/input_realization.cpp
+++ b/input_realization.cpp
@@ -665,7 +665,7 @@ std::string Input::RealizeGeneralAccountRate()
double guar_int = database_->Query(DB_GuarInt);
std::vector<double> general_account_max_rate;
- database_->Query(general_account_max_rate, DB_MaxGenAcctRate);
+ database_->query_into(DB_MaxGenAcctRate, general_account_max_rate);
if(global_settings::instance().ash_nazg())
{
diff --git a/input_test.cpp b/input_test.cpp
index a6fa16e..413c94f 100644
--- a/input_test.cpp
+++ b/input_test.cpp
@@ -115,7 +115,7 @@ void input_test::test_product_database()
,dims_stat
,stat
);
- db.Query(v, DB_StatVxQ);
+ db.query_into(DB_StatVxQ, v);
w.assign(stat, stat + 10);
w.insert(w.end(), db.length() - w.size(), w.back());
BOOST_TEST(v == w);
@@ -140,7 +140,7 @@ void input_test::test_product_database()
,dims_tax
,tax
);
- db.Query(v, DB_TaxVxQ);
+ db.query_into(DB_TaxVxQ, v);
w.assign(tax, tax + db.length());
BOOST_TEST(v == w);
@@ -167,7 +167,7 @@ void input_test::test_product_database()
);
auto f0 = [&db] {db.initialize("sample");};
- auto f1 = [&db, &v] {db.Query(v, DB_MaturityAge);};
+ auto f1 = [&db, &v] {db.query_into(DB_MaturityAge, v);};
auto f2 = [&db] {db.Query(DB_MaturityAge);};
auto f3 = [&db] {db.query<oenum_alb_or_anb>(DB_AgeLastOrNearest);};
auto f4 = [&db, &a] {db.query_into(DB_AgeLastOrNearest, a);};
@@ -175,7 +175,7 @@ void input_test::test_product_database()
std::cout
<< "\n Database speed tests..."
<< "\n initialize() : " << TimeAnAliquot(f0)
- << "\n Query(vector) : " << TimeAnAliquot(f1)
+ << "\n query_into(vector): " << TimeAnAliquot(f1)
<< "\n Query(scalar) : " << TimeAnAliquot(f2)
<< "\n query<T>(scalar) : " << TimeAnAliquot(f3)
<< "\n query_into(scalar): " << TimeAnAliquot(f4)
@@ -208,11 +208,11 @@ void input_test::test_product_database()
,dims_snflq
,tax
);
- db.Query(v, DB_SnflQ);
+ db.query_into(DB_SnflQ, v);
BOOST_TEST_EQUAL(55, db.length());
BOOST_TEST_EQUAL(55, v.size());
database_index index = db.index().issue_age(29);
- db.Query(v, DB_SnflQ, index);
+ db.query_into(DB_SnflQ, v, index);
BOOST_TEST_EQUAL(55, db.length());
BOOST_TEST_EQUAL(71, v.size());
@@ -229,7 +229,7 @@ void input_test::test_product_database()
);
index.issue_age(99);
- db.Query(v, DB_SnflQ, index);
+ db.query_into(DB_SnflQ, v, index);
BOOST_TEST_EQUAL( 1, v.size());
// Force the product to mature at 98.
@@ -237,17 +237,17 @@ void input_test::test_product_database()
index.issue_age(98);
db.Query(DB_MaturityAge, index); // Accepted because maturity age is
scalar.
BOOST_TEST_THROW
- (db.Query(v, DB_SnflQ, index)
+ (db.query_into(DB_SnflQ, v, index)
,std::runtime_error
,"Assertion '0 < local_length && local_length <= methuselah' failed."
);
index.issue_age(97);
- db.Query(v, DB_SnflQ, index);
+ db.query_into(DB_SnflQ, v, index);
BOOST_TEST_EQUAL( 1, v.size());
index.issue_age(0);
- db.Query(v, DB_SnflQ, index);
+ db.query_into(DB_SnflQ, v, index);
BOOST_TEST_EQUAL(98, v.size());
}
diff --git a/interest_rates.cpp b/interest_rates.cpp
index 53d723e..fd3e69a 100644
--- a/interest_rates.cpp
+++ b/interest_rates.cpp
@@ -275,7 +275,7 @@ void InterestRates::Initialize(BasicValues const& v)
{
// Retrieve general-account data from class BasicValues.
- v.database().Query(GenAcctGrossRate_[mce_gen_guar], DB_GuarInt);
+ v.database().query_into(DB_GuarInt, GenAcctGrossRate_[mce_gen_guar]);
std::copy
(v.yare_input_.GeneralAccountRate.begin()
@@ -293,7 +293,7 @@ void InterestRates::Initialize(BasicValues const& v)
// 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_GenAcctIntBonus);
+ v.database().query_into(DB_GenAcctIntBonus,
general_account_interest_bonus);
// 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;
@@ -308,7 +308,7 @@ void InterestRates::Initialize(BasicValues const& v)
,std::plus<double>()
);
- v.database().Query(GenAcctSpread_, DB_CurrIntSpread);
+ v.database().query_into(DB_CurrIntSpread, GenAcctSpread_);
// Retrieve separate-account data from class BasicValues.
@@ -321,10 +321,10 @@ void InterestRates::Initialize(BasicValues const& v)
// the input class has an inappropriate size.
SepAcctGrossRate_[mce_sep_full].resize(Length_);
- v.database().Query(MAndERate_[mce_gen_guar], DB_GuarMandE );
- v.database().Query(MAndERate_[mce_gen_curr], DB_CurrMandE );
+ v.database().query_into(DB_GuarMandE , MAndERate_[mce_gen_guar]);
+ v.database().query_into(DB_CurrMandE , MAndERate_[mce_gen_curr]);
- v.database().Query(Stabilizer_, DB_StableValFundCharge);
+ v.database().query_into(DB_StableValFundCharge, Stabilizer_ );
// Deduct miscellaneous fund charges and input extra asset comp in
// the same way as M&E, iff database entity DB_AssetChargeType has
@@ -354,7 +354,7 @@ void InterestRates::Initialize(BasicValues const& v)
if(v.yare_input_.AmortizePremiumLoad)
{
- v.database().Query(AmortLoad_, DB_LoadAmortFundCharge);
+ v.database().query_into(DB_LoadAmortFundCharge, AmortLoad_);
}
// TODO ?? This was once initialized with 'DB_MgmtFeeFundCharge',
@@ -371,7 +371,7 @@ void InterestRates::Initialize(BasicValues const& v)
{
case mce_fixed_loan_rate:
{
- v.database().Query(PublishedLoanRate_, DB_FixedLoanRate);
+ v.database().query_into(DB_FixedLoanRate, PublishedLoanRate_);
}
break;
case mce_variable_loan_rate:
@@ -385,12 +385,12 @@ void InterestRates::Initialize(BasicValues const& v)
}
}
- v.database().Query(PrefLoanRateDecr_, DB_PrefLoanRateDecr);
+ v.database().query_into(DB_PrefLoanRateDecr , PrefLoanRateDecr_
);
- v.database().Query(RegLoanSpread_[mce_gen_guar], DB_GuarRegLoanSpread);
- v.database().Query(RegLoanSpread_[mce_gen_curr], DB_CurrRegLoanSpread);
- v.database().Query(PrfLoanSpread_[mce_gen_guar], DB_GuarPrefLoanSpread);
- v.database().Query(PrfLoanSpread_[mce_gen_curr], DB_CurrPrefLoanSpread);
+ v.database().query_into(DB_GuarRegLoanSpread ,
RegLoanSpread_[mce_gen_guar]);
+ v.database().query_into(DB_CurrRegLoanSpread ,
RegLoanSpread_[mce_gen_curr]);
+ v.database().query_into(DB_GuarPrefLoanSpread,
PrfLoanSpread_[mce_gen_guar]);
+ v.database().query_into(DB_CurrPrefLoanSpread,
PrfLoanSpread_[mce_gen_curr]);
if(NeedHoneymoonRates_)
{
diff --git a/ledger_invariant_init.cpp b/ledger_invariant_init.cpp
index 63c177c..f97f16a 100644
--- a/ledger_invariant_init.cpp
+++ b/ledger_invariant_init.cpp
@@ -131,7 +131,7 @@ void LedgerInvariant::Init(BasicValues const* b)
RefundableSalesLoad = b->Loads_->refundable_sales_load_proportion();
std::vector<double> coimult;
- b->database().Query(coimult, DB_CurrCoiMultiplier);
+ b->database().query_into(DB_CurrCoiMultiplier, coimult);
CurrentCoiMultiplier =
coimult [b->yare_input_.InforceYear]
* b->yare_input_.CurrentCoiMultiplier[b->yare_input_.InforceYear]
diff --git a/loads.cpp b/loads.cpp
index 77e0d96..3766f13 100644
--- a/loads.cpp
+++ b/loads.cpp
@@ -115,26 +115,26 @@ void Loads::Allocate(int length)
void Loads::Initialize(product_database const& database)
{
- database.Query(refundable_sales_load_proportion_ , DB_LoadRfdProportion
);
- database.Query(dac_tax_load_ , DB_DacTaxPremLoad
);
-
- 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_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_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_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);
- database.Query(excess_sales_load_ [mce_gen_curr],
DB_CurrPremLoadExcRfd);
+ database.query_into(DB_LoadRfdProportion ,
refundable_sales_load_proportion_ );
+ database.query_into(DB_DacTaxPremLoad , dac_tax_load_
);
+
+ database.query_into(DB_GuarMonthlyPolFee , monthly_policy_fee_
[mce_gen_guar]);
+ database.query_into(DB_GuarAnnualPolFee , annual_policy_fee_
[mce_gen_guar]);
+ database.query_into(DB_GuarSpecAmtLoad ,
specified_amount_load_[mce_gen_guar]);
+ database.query_into(DB_GuarAcctValLoad ,
separate_account_load_[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadTgt , target_premium_load_
[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadExc , excess_premium_load_
[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadTgtRfd, target_sales_load_
[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadExcRfd, excess_sales_load_
[mce_gen_guar]);
+
+ database.query_into(DB_CurrMonthlyPolFee , monthly_policy_fee_
[mce_gen_curr]);
+ database.query_into(DB_CurrAnnualPolFee , annual_policy_fee_
[mce_gen_curr]);
+ database.query_into(DB_CurrSpecAmtLoad ,
specified_amount_load_[mce_gen_curr]);
+ database.query_into(DB_CurrAcctValLoad ,
separate_account_load_[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadTgt , target_premium_load_
[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadExc , excess_premium_load_
[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadTgtRfd, target_sales_load_
[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadExcRfd, excess_sales_load_
[mce_gen_curr]);
}
/// Transform raw input and database data into directly-useful rates.
@@ -342,15 +342,15 @@ Loads::Loads(product_database const& database, bool
NeedMidpointRates)
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_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_into(DB_GuarMonthlyPolFee, monthly_policy_fee_
[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadTgt , target_premium_load_
[mce_gen_guar]);
+ database.query_into(DB_GuarPremLoadExc , excess_premium_load_
[mce_gen_guar]);
+ database.query_into(DB_GuarSpecAmtLoad ,
specified_amount_load_[mce_gen_guar]);
- 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 );
+ database.query_into(DB_CurrMonthlyPolFee, monthly_policy_fee_
[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadTgt , target_premium_load_
[mce_gen_curr]);
+ database.query_into(DB_CurrPremLoadExc , excess_premium_load_
[mce_gen_curr]);
+ database.query_into(DB_CurrSpecAmtLoad ,
specified_amount_load_[mce_gen_curr]);
// This ctor ignores tabular specified-amount loads.
diff --git a/loads_test.cpp b/loads_test.cpp
index 492688c..7e975c9 100644
--- a/loads_test.cpp
+++ b/loads_test.cpp
@@ -50,7 +50,7 @@ std::vector<double> BasicValues::GetGuarSpecAmtLoadTable()
const {return dummy_v
#include "database.hpp"
product_database::product_database(int length) :length_(length) {}
int product_database::length() const {return length_;}
-void product_database::Query(std::vector<double>& v, e_database_key) const
{v.resize(length_);}
+void product_database::query_into(e_database_key, std::vector<double>& v)
const {v.resize(length_);}
double product_database::Query(e_database_key) const {return 0.0;}
#include "premium_tax.hpp"
diff --git a/mec_server.cpp b/mec_server.cpp
index 261f8b3..4facd5a 100644
--- a/mec_server.cpp
+++ b/mec_server.cpp
@@ -175,7 +175,7 @@ mec_state test_one_days_7702A_transactions
assign(Mly7702qc, apply_binary(coi_rate_from_q<double>(), Mly7702qc,
max_coi_rate));
std::vector<double> guar_int;
- database.Query(guar_int, DB_GuarInt);
+ database.query_into(DB_GuarInt, guar_int);
std::vector<double> const spread
(input.years_to_maturity()
@@ -193,7 +193,7 @@ mec_state test_one_days_7702A_transactions
);
std::vector<double> Mly7702ig;
- database.Query(Mly7702ig, DB_NaarDiscount);
+ database.query_into(DB_NaarDiscount, Mly7702ig);
LMI_ASSERT(!contains(Mly7702ig, -1.0));
std::vector<double> DBDiscountRate(input.years_to_maturity());
assign(DBDiscountRate, 1.0 / (1.0 + Mly7702ig));
@@ -312,11 +312,11 @@ mec_state test_one_days_7702A_transactions
std::vector<double> excess_premium_load;
std::vector<double> dac_tax_load ;
- database.Query(target_sales_load , DB_CurrPremLoadTgtRfd);
- 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_into(DB_CurrPremLoadTgtRfd, target_sales_load );
+ database.query_into(DB_CurrPremLoadExcRfd, excess_sales_load );
+ database.query_into(DB_CurrPremLoadTgt , target_premium_load);
+ database.query_into(DB_CurrPremLoadExc , excess_premium_load);
+ database.query_into(DB_DacTaxPremLoad , dac_tax_load );
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;
diff --git a/mortality_rates_fetch.cpp b/mortality_rates_fetch.cpp
index 68727a9..87d56d3 100644
--- a/mortality_rates_fetch.cpp
+++ b/mortality_rates_fetch.cpp
@@ -62,9 +62,9 @@ void MortalityRates::fetch_parameters(BasicValues const&
basic_values)
max_coi_rate = 1.0 / max_coi_rate;
MaxMonthlyCoiRate_ = max_coi_rate;
- basic_values.database().Query(GCoiMultiplier_, DB_GuarCoiMultiplier);
- basic_values.database().Query(CCoiMultiplier_, DB_CurrCoiMultiplier);
- basic_values.database().Query(SubstdTblMult_ , DB_SubstdTableMult );
+ basic_values.database().query_into(DB_GuarCoiMultiplier, GCoiMultiplier_);
+ basic_values.database().query_into(DB_CurrCoiMultiplier, CCoiMultiplier_);
+ basic_values.database().query_into(DB_SubstdTableMult , SubstdTblMult_ );
CountryCoiMultiplier_ = basic_values.yare_input_.CountryCoiMultiplier;
IsPolicyRated_ = is_policy_rated(basic_values.yare_input_);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [lmi] master 8580716: Rename vector& "query" function,
Greg Chicares <=