[lmi-commits] [5709] Use product of all COI multipliers in ledger

[Greg Chicares]

Revision: 5709
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5709
Author:   chicares
Date:     2013-04-21 01:47:47 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Use product of all COI multipliers in ledger

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ledger_invariant.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2013-04-19 16:58:14 UTC (rev 5708)
+++ lmi/trunk/ChangeLog 2013-04-21 01:47:47 UTC (rev 5709)
@@ -32172,3 +32172,9 @@
   ihs_basicval.cpp
 Use highest tiered AK and SD premium tax for pay-as-you-go premium.
 
+20130421T0147Z <address@hidden> [542]
+
+  ledger_invariant.cpp
+Use product of all COI multipliers in ledger. Retain the old name for
+the nonce to avoid affecting every regression test.
+

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2013-04-19 16:58:14 UTC (rev 5708)
+++ lmi/trunk/ledger_invariant.cpp      2013-04-21 01:47:47 UTC (rev 5709)
@@ -457,7 +457,14 @@
     TotalIMF             = b->InterestRates_->InvestmentManagementFee();
     RefundableSalesLoad  = b->Loads_->refundable_sales_load_proportion();
 
-    CountryCOIMultiplier = b->yare_input_.CountryCoiMultiplier;
+    std::vector<double> coimult;
+    b->Database_->Query(coimult, DB_CurrCoiMultiplier);
+    // This will soon be renamed:
+    CountryCOIMultiplier =
+          coimult                            [b->yare_input_.InforceYear]
+        * b->yare_input_.CurrentCoiMultiplier[b->yare_input_.InforceYear]
+        * b->yare_input_.CountryCoiMultiplier
+        ;
 
     CountryIso3166Abbrev = (*b->Input_)["Country"].str();
     Comments             = b->yare_input_.Comments;