[lmi-commits] [5308] Set IMF to average if separate account offered but unused

[Greg Chicares]

Revision: 5308
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5308
Author:   chicares
Date:     2011-11-12 10:53:15 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Set IMF to average if separate account offered but unused

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-10-28 12:11:16 UTC (rev 5307)
+++ lmi/trunk/ChangeLog 2011-11-12 10:53:15 UTC (rev 5308)
@@ -28630,3 +28630,17 @@
   ihs_basicval.cpp
 Fix defect introduced 20080714T1122Z: misleading indentation.
 
+20111028T1211Z <address@hidden> [607]
+
+  census_document.cpp
+  census_document.hpp
+  census_view.cpp
+  census_view.hpp
+Revert 20111026T1342Z reversion of wxDVC census manager.
+
+20111112T1053Z <address@hidden> [607]
+
+  ihs_basicval.cpp
+Set IMF to average if separate account offered but unused. Formerly,
+it was zero in this case; the arithmetic mean is more reasonable.
+

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2011-10-28 12:11:16 UTC (rev 5307)
+++ lmi/trunk/ihs_basicval.cpp  2011-11-12 10:53:15 UTC (rev 5308)
@@ -364,8 +364,12 @@
         // disregard "custom" funds--that is, set their weights to
         // zero. Custom funds are those whose name begins with "Custom".
         // Reason: "average" means average of the normally-available
-        // funds only.
-        if(yare_input_.UseAverageOfAllFunds)
+        // funds only. Use the average not only if explicitly chosen
+        // in input, but also if all payments are allocated to the
+        // general account: in the latter case, some separate-account
+        // fee or rate may nonetheless be wanted on output, and the
+        // arithmetic mean is more reasonable than zero.
+        if(yare_input_.UseAverageOfAllFunds || 0.0 == 
premium_allocation_to_sepacct(yare_input_))
             {
             char const s[] = "Custom";
             std::size_t n = std::strlen(s);