[lmi-commits] [5605] Resolve a marked defect

[Greg Chicares]

Revision: 5605
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5605
Author:   chicares
Date:     2012-11-18 12:52:18 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Resolve a marked defect

Modified Paths:
--------------
    lmi/trunk/dbdict.cpp
    lmi/trunk/ihs_avstrtgy.cpp

Modified: lmi/trunk/dbdict.cpp
===================================================================
--- lmi/trunk/dbdict.cpp        2012-11-17 04:07:18 UTC (rev 5604)
+++ lmi/trunk/dbdict.cpp        2012-11-18 12:52:18 UTC (rev 5605)
@@ -807,11 +807,8 @@
     Add(database_entity(DB_LedgerType          , mce_ill_reg));
     Add(database_entity(DB_AllowExpRating      , false));
 
-    // These rates are US 65-70 male ALB. NY Table Y is more often
-    // encountered in the group-carveout market, but it's not included
-    // in the SOA's databases; for default initialization, a widely-
-    // available table is preferred.
-    Add(database_entity(DB_GroupProxyRateTable , 358));
+    // 1960 CSG (which does not distinguish gender).
+    Add(database_entity(DB_GroupProxyRateTable , 305));
 
     double T83Gam[3] = {825, 826, 826,};
     Add

Modified: lmi/trunk/ihs_avstrtgy.cpp
===================================================================
--- lmi/trunk/ihs_avstrtgy.cpp  2012-11-17 04:07:18 UTC (rev 5604)
+++ lmi/trunk/ihs_avstrtgy.cpp  2012-11-18 12:52:18 UTC (rev 5605)
@@ -224,16 +224,11 @@
             }
         case mce_pmt_table:
             {
-// TODO ?? This assumes that the group term proxy rates given by
-// GroupProxyRates() are monthly. They should instead be annual, so that
-// any other qx table can be substituted--for example, an experience
-// table from the SOA database, as DBDictionary::WriteSampleDBFile()
-// specifies.
             return
                   ActualSpecAmt
                 * MortalityRates_->GroupProxyRates()[Year]
-                * (12.0 / a_CurrentMode)
                 * a_TblMult
+                / a_CurrentMode
                 ;
             }
         default: