[lmi-commits] [5542] Initialize cumulative 7702 'premiums paid' from new input field

[Greg Chicares]

Revision: 5542
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5542
Author:   chicares
Date:     2012-08-11 10:13:40 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Initialize cumulative 7702 'premiums paid' from new input field

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

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2012-08-09 22:29:29 UTC (rev 5541)
+++ lmi/trunk/ihs_basicval.cpp  2012-08-11 10:13:40 UTC (rev 5542)
@@ -661,7 +661,7 @@
             ,yare_input_.InforceGlp
             ,yare_input_.InforceCumulativeGlp
             ,yare_input_.InforceGsp
-            ,yare_input_.InforceCumulativeNoLapsePayments // TAXATION !! INPUT 
!! Wrong--this is not 7702 "premiums paid".
+            ,yare_input_.InforceCumulativeGptPremiumsPaid
             )
         );
 }

Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp  2012-08-09 22:29:29 UTC (rev 5541)
+++ lmi/trunk/input_xml_io.cpp  2012-08-11 10:13:40 UTC (rev 5542)
@@ -519,6 +519,15 @@
             SolveExpenseGeneralAccountBasis = map_lookup(detritus_map, 
"SolveBasis");
             }
         }
+
+    if(file_version < 7)
+        {
+        // Prior to version 7, 'InforceCumulativePayments' was used
+        // for no-lapse, GPT, and ROP, so set them all equal here for
+        // backward compatibility.
+        InforceCumulativeGptPremiumsPaid = 
InforceCumulativeNoLapsePayments.value();
+        InforceCumulativeRopPayments     = 
InforceCumulativeNoLapsePayments.value();
+        }
 }
 
 void Input::redintegrate_ad_terminum()