[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [6195] Add several ledger columns
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [6195] Add several ledger columns |
|
Date: |
Thu, 28 May 2015 17:15:59 +0000 |
Revision: 6195
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6195
Author: chicares
Date: 2015-05-28 17:15:57 +0000 (Thu, 28 May 2015)
Log Message:
-----------
Add several ledger columns
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/ledger.cpp
lmi/trunk/ledger_text_formats.cpp
lmi/trunk/ledger_xml_io.cpp
lmi/trunk/mc_enum_types.cpp
lmi/trunk/mc_enum_types.xpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/ChangeLog 2015-05-28 17:15:57 UTC (rev 6195)
@@ -36245,3 +36245,29 @@
Fix XRC assertion failures. See:
http://lists.nongnu.org/archive/html/lmi/2015-05/msg00009.html
+20150527T1643Z <address@hidden> [512]
+
+ account_value.hpp
+ basic_values.hpp
+ dbdict.cpp
+ dbdict.hpp
+ dbnames.hpp
+ dbnames.xpp
+ ihs_acctval.cpp
+ ihs_basicval.cpp
+Add new database entities.
+
+20150528T1714Z <address@hidden> [511]
+
+ ihs_acctval.cpp
+Remove a defect marker that is now invalid.
+
+20150528T1715Z <address@hidden> [511]
+
+ ledger.cpp
+ ledger_text_formats.cpp
+ ledger_xml_io.cpp
+ mc_enum_types.cpp
+ mc_enum_types.xpp
+Add several ledger columns.
+
Modified: lmi/trunk/ledger.cpp
===================================================================
--- lmi/trunk/ledger.cpp 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/ledger.cpp 2015-05-28 17:15:57 UTC (rev 6195)
@@ -529,6 +529,8 @@
: "IrrDb_Guaranteed" == compound_name ? invar.IrrDbGuarInput
: "NetDeathBenefit" == compound_name ? net_death_benefit
: "PolicyYear" == compound_name ? policy_year
+ : "SupplSpecAmt" == compound_name ? invar.TermSpecAmt
+ : "SupplDeathBft" == base_name ? *map_lookup(z.all_vectors(),
"TermPurchased")
: *map_lookup(z.all_vectors(), base_name)
;
}
Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/ledger_text_formats.cpp 2015-05-28 17:15:57 UTC (rev 6195)
@@ -80,6 +80,7 @@
m["InforceLives" ] = ledger_metadata(4, oe_format_normal
, "BOY Lives Inforce" ); // "Inforce Lives BOY"
m["SpecAmt" ] = ledger_metadata(0, oe_format_normal
, "Specified Amount" ); // "Base Specified Amount"
m["TermSpecAmt" ] = ledger_metadata(0, oe_format_normal
, "Term Specified Amount" );
+ m["SupplSpecAmt" ] = ledger_metadata(0, oe_format_normal
, "Suppl Specified Amount" ); // "Supplemental Specified
Amount"
m["CorridorFactor" ] = ledger_metadata(0,
oe_format_percentage, "Corridor Factor" );
m["AnnGAIntRate_Current" ] = ledger_metadata(2,
oe_format_percentage, "Curr Ann Gen Acct Int Rate" ); // "General
Account Crediting Rate"
m["AnnSAIntRate_Current" ] = ledger_metadata(2,
oe_format_percentage, "Curr Ann Sep Acct Int Rate" ); // "Separate
Account Net Rate"
@@ -87,6 +88,8 @@
m["EeGrossPmt" ] = ledger_metadata(0, oe_format_normal
, "EE Gross Payment" ); // "Employee Gross Payment"
m["ErGrossPmt" ] = ledger_metadata(0, oe_format_normal
, "ER Gross Payment" ); // "Employer Gross Payment"
m["ModalMinimumPremium" ] = ledger_metadata(0, oe_format_normal
, "Modal Minimum Premium" );
+ m["EeModalMinimumPremium" ] = ledger_metadata(0, oe_format_normal
, "EE Modal Minimum Premium" );
+ m["ErModalMinimumPremium" ] = ledger_metadata(0, oe_format_normal
, "ER Modal Minimum Premium" );
m["NetWD" ] = ledger_metadata(0, oe_format_normal
, "Withdrawal" );
m["NewCashLoan" ] = ledger_metadata(0, oe_format_normal
, "Annual Loan" ); // "New Cash Loan"
m["TotalLoanBalance_Current" ] = ledger_metadata(0, oe_format_normal
, "Curr Total Loan Balance" ); // "Current Total Loan Balance"
@@ -101,6 +104,8 @@
m["BaseDeathBft_Guaranteed" ] = ledger_metadata(0, oe_format_normal
, "Guar Base Death Benefit" ); // "Guaranteed Base Death
Benefit"
m["TermPurchased_Current" ] = ledger_metadata(0, oe_format_normal
, "Curr Term Amt Purchased" ); // "Current Term Purchased"
m["TermPurchased_Guaranteed" ] = ledger_metadata(0, oe_format_normal
, "Guar Term Amt Purchased" ); // "Guaranteed Term Purchased"
+ m["SupplDeathBft_Current" ] = ledger_metadata(0, oe_format_normal
, "Curr Suppl Death Benefit" ); // "Current Supplemental Death
Benefit"
+ m["SupplDeathBft_Guaranteed" ] = ledger_metadata(0, oe_format_normal
, "Guar Suppl Death Benefit" ); // "Guaranteed Supplemental
Death Benefit"
m["COICharge_Current" ] = ledger_metadata(0, oe_format_normal
, "Curr COI Charge" ); // "Current Mortality Charge"
m["COICharge_Guaranteed" ] = ledger_metadata(0, oe_format_normal
, "Guar COI Charge" ); // "Guaranteed Mortality Charge"
m["RiderCharges_Current" ] = ledger_metadata(0, oe_format_normal
, "Curr Rider Charges" ); // "Current Rider Charges"
@@ -717,8 +722,12 @@
,"CurrentAge"
,"UWClass"
,"Smoker"
+ ,"Salary"
,"SpecifiedAmount"
+ ,"SupplSpecAmt"
,"ModalMinimumPremium"
+ ,"EeModalMinimumPremium"
+ ,"ErModalMinimumPremium"
,"ErMode"
,"CorpName"
,"EffDate"
@@ -793,8 +802,12 @@
<< Invar.Age + Invar.InforceYear << '\t'
<< Invar.value_str("UWClass" ) << '\t'
<< Invar.value_str("Smoker" ) << '\t'
+ << Invar.value_str("Salary" ,d) << '\t'
<< Invar.value_str("SpecAmt" ,d) << '\t'
+ << Invar.value_str("TermSpecAmt" ,d) << '\t'
<< Invar.value_str("ModalMinimumPremium" ,d) << '\t'
+ << Invar.value_str("EeModalMinimumPremium",d) << '\t'
+ << Invar.value_str("ErModalMinimumPremium",d) << '\t'
<< Invar.ErMode [d] << '\t'
<< Invar.value_str("CorpName" ) << '\t'
<< "'" << Invar.EffDate << "'\t"
Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/ledger_xml_io.cpp 2015-05-28 17:15:57 UTC (rev 6195)
@@ -240,10 +240,12 @@
title_map["EOYDeathBft_Current" ] = " _____________ Curr EOY
Death Benefit";
title_map["EOYDeathBft_Guaranteed" ] = " _____________ Guar EOY
Death Benefit";
title_map["EeGrossPmt" ] = " _____________ ______ EE
Gross Payment";
+ title_map["EeModalMinimumPremium" ] = "EE Modal Minimum Premium";
title_map["EeMode" ] = "EE Payment Mode";
// TODO ?? This can't be a mode. I don't know how it differs from 'EeGrossPmt'
above.
title_map["EePmt" ] = "EE Payment Mode";
title_map["ErGrossPmt" ] = " _____________ ______ ER
Gross Payment";
+ title_map["ErModalMinimumPremium" ] = "ER Modal Minimum Premium";
title_map["ErMode" ] = "ER Payment Mode";
// TODO ?? This can't be a mode. I don't know how it differs from 'ErGrossPmt'
above.
title_map["ErPmt" ] = "ER Payment Mode";
@@ -531,10 +533,12 @@
format_map["DacTaxRsv" ] = f1;
format_map["DeathProceedsPaid" ] = f1;
format_map["EeGrossPmt" ] = f1;
+ format_map["EeModalMinimumPremium" ] = f1;
// format_map["EeMode" ] = f1; // Not numeric.
format_map["EePmt" ] = f1;
format_map["EOYDeathBft" ] = f1;
format_map["ErGrossPmt" ] = f1;
+ format_map["ErModalMinimumPremium" ] = f1;
// format_map["ErMode" ] = f1; // Not numeric.
format_map["ErPmt" ] = f1;
format_map["ExpenseCharges" ] = f1;
@@ -644,7 +648,9 @@
// however, code changes are required, and this is as appropriate
// a place as any to make them.
- LedgerVariant const& Curr_ = GetCurrFull();
+ LedgerInvariant const& Invar = GetLedgerInvariant();
+ LedgerVariant const& Curr_ = GetCurrFull();
+ LedgerVariant const& Guar_ = GetGuarFull();
// ET !! Easier to write as
// std::vector<double> NetDeathBenefit =
@@ -657,11 +663,24 @@
,NetDeathBenefit.begin()
,std::minus<double>()
);
-
- vectors ["NetDeathBenefit"] = &NetDeathBenefit ;
+ vectors ["NetDeathBenefit"] = &NetDeathBenefit;
title_map ["NetDeathBenefit"] = " _____________ __Net __Death Benefit";
format_map["NetDeathBenefit"] = f1;
+ std::vector<double> SupplDeathBft_Current (Curr_.TermPurchased);
+ std::vector<double> SupplDeathBft_Guaranteed(Guar_.TermPurchased);
+ vectors ["SupplDeathBft_Current" ] = &SupplDeathBft_Current;
+ vectors ["SupplDeathBft_Guaranteed"] = &SupplDeathBft_Guaranteed;
+ title_map ["SupplDeathBft_Current" ] = " _____________ Curr Suppl Death
Benefit";
+ title_map ["SupplDeathBft_Guaranteed"] = " _____________ Guar Suppl Death
Benefit";
+ format_map["SupplDeathBft_Current" ] = f1;
+ format_map["SupplDeathBft_Guaranteed"] = f1;
+
+ std::vector<double> SupplSpecAmt(Invar.TermSpecAmt);
+ vectors ["SupplSpecAmt" ] = &SupplSpecAmt;
+ title_map ["SupplSpecAmt" ] = " _____________ Suppl Specified
Amount";
+ format_map["SupplSpecAmt" ] = f1;
+
// [End of derived columns.]
double Composite = GetIsComposite();
Modified: lmi/trunk/mc_enum_types.cpp
===================================================================
--- lmi/trunk/mc_enum_types.cpp 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/mc_enum_types.cpp 2015-05-28 17:15:57 UTC (rev 6195)
@@ -159,7 +159,7 @@
MC_DEFINE(premium_table,1)
MC_DEFINE(from_point,4)
MC_DEFINE(to_point,4)
-MC_DEFINE(report_column,58)
+MC_DEFINE(report_column,63)
MC_DEFINE(suppl_illus_type,3)
#undef MC_DEFINE
Modified: lmi/trunk/mc_enum_types.xpp
===================================================================
--- lmi/trunk/mc_enum_types.xpp 2015-05-28 17:14:22 UTC (rev 6194)
+++ lmi/trunk/mc_enum_types.xpp 2015-05-28 17:15:57 UTC (rev 6195)
@@ -556,6 +556,7 @@
,mce_inforce_lives_boy \
,mce_specified_amount \
,mce_term_specified_amount \
+ ,mce_supplemental_specified_amount \
,mce_corridor_factor \
,mce_general_account_crediting_rate \
,mce_separate_account_net_rate \
@@ -563,6 +564,8 @@
,mce_employee_gross_payment \
,mce_employer_gross_payment \
,mce_modal_minimum_premium \
+ ,mce_employee_modal_minimum_premium \
+ ,mce_employer_modal_minimum_premium \
,mce_withdrawal \
,mce_new_cash_loan \
,mce_current_total_loan_balance \
@@ -577,6 +580,8 @@
,mce_guaranteed_base_death_benefit \
,mce_current_term_purchased \
,mce_guaranteed_term_purchased \
+ ,mce_current_supplemental_death_benefit \
+ ,mce_guaranteed_supplemental_death_benefit \
,mce_current_mortality_charge \
,mce_guaranteed_mortality_charge \
,mce_current_rider_charges \
@@ -616,6 +621,7 @@
,"InforceLives" \
,"SpecAmt" \
,"TermSpecAmt" \
+ ,"SupplSpecAmt" \
,"CorridorFactor" \
,"AnnGAIntRate_Current" \
,"AnnSAIntRate_Current" \
@@ -623,6 +629,8 @@
,"EeGrossPmt" \
,"ErGrossPmt" \
,"ModalMinimumPremium" \
+ ,"EeModalMinimumPremium" \
+ ,"ErModalMinimumPremium" \
,"NetWD" \
,"NewCashLoan" \
,"TotalLoanBalance_Current" \
@@ -637,6 +645,8 @@
,"BaseDeathBft_Guaranteed" \
,"TermPurchased_Current" \
,"TermPurchased_Guaranteed" \
+ ,"SupplDeathBft_Current" \
+ ,"SupplDeathBft_Guaranteed" \
,"COICharge_Current" \
,"COICharge_Guaranteed" \
,"RiderCharges_Current" \
@@ -678,6 +688,7 @@
,"Inforce Lives BOY" \
,"Base Specified Amount" \
,"Term Specified Amount" \
+ ,"Supplemental Specified Amount" \
,"Corridor Factor" \
,"General Account Crediting Rate" \
,"Separate Account Net Rate" \
@@ -685,6 +696,8 @@
,"Employee Gross Payment" \
,"Employer Gross Payment" \
,"Modal Minimum Premium" \
+ ,"Employee Modal Minimum Premium" \
+ ,"Employer Modal Minimum Premium" \
,"Withdrawal" \
,"New Cash Loan" \
,"Current Total Loan Balance" \
@@ -699,6 +712,8 @@
,"Guaranteed Base Death Benefit" \
,"Current Term Purchased" \
,"Guaranteed Term Purchased" \
+ ,"Current Supplemental Death Benefit" \
+ ,"Guaranteed Supplemental Death Benefit" \
,"Current Mortality Charge" \
,"Guaranteed Mortality Charge" \
,"Current Rider Charges" \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [6195] Add several ledger columns,
Greg Chicares <=