[lmi-commits] [6554] Add required dumpin and various other data to group roster

[Greg Chicares]

Revision: 6554
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6554
Author:   chicares
Date:     2016-05-04 10:50:16 +0000 (Wed, 04 May 2016)
Log Message:
-----------
Add required dumpin and various other data to group roster

Modified Paths:
--------------
    lmi/trunk/ihs_acctval.cpp
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/ledger_invariant.hpp
    lmi/trunk/ledger_text_formats.cpp
    lmi/trunk/ledger_xml_io.cpp

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2016-05-03 22:46:40 UTC (rev 6553)
+++ lmi/trunk/ihs_acctval.cpp   2016-05-04 10:50:16 UTC (rev 6554)
@@ -1042,8 +1042,10 @@
 
     if(0 == Year)
         {
-        InvariantValues().InitTgtPrem = AnnualTargetPrem;
-        InvariantValues().InitMinPrem = MinInitPrem();
+        // 'InitMinDumpin' and 'InitMinPrem' depend on 'InitTgtPrem'.
+        InvariantValues().InitTgtPrem   = AnnualTargetPrem;
+        InvariantValues().InitMinDumpin = MinInitDumpin();
+        InvariantValues().InitMinPrem   = MinInitPrem();
         }
 
     // Calculate special initial premiums for premium-quote PDF only.

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2016-05-03 22:46:40 UTC (rev 6553)
+++ lmi/trunk/ledger_invariant.cpp      2016-05-04 10:50:16 UTC (rev 6554)
@@ -139,6 +139,7 @@
     ScalableScalars ["InitGLP"               ] = &InitGLP                ;
     ScalableScalars ["InitTgtPrem"           ] = &InitTgtPrem            ;
     ScalableScalars ["InitMinPrem"           ] = &InitMinPrem            ;
+    ScalableScalars ["InitMinDumpin"         ] = &InitMinDumpin          ;
     ScalableScalars ["InitModalPrem00"       ] = &InitModalPrem00        ;
     ScalableScalars ["InitModalPrem01"       ] = &InitModalPrem01        ;
     ScalableScalars ["InitModalPrem10"       ] = &InitModalPrem10        ;
@@ -611,6 +612,7 @@
 //  InitSevenPayPrem        =
 //  InitTgtPrem             =
 //  InitMinPrem             =
+//  InitMinDumpin           =
     InitModalPrem00         = 0.0;
     InitModalPrem01         = 0.0;
     InitModalPrem10         = 0.0;

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2016-05-03 22:46:40 UTC (rev 6553)
+++ lmi/trunk/ledger_invariant.hpp      2016-05-04 10:50:16 UTC (rev 6554)
@@ -152,6 +152,7 @@
     double          InitGLP;
     double          InitTgtPrem;
     double          InitMinPrem;
+    double          InitMinDumpin;
     double          InitModalPrem00;
     double          InitModalPrem01;
     double          InitModalPrem10;

Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp   2016-05-03 22:46:40 UTC (rev 6553)
+++ lmi/trunk/ledger_text_formats.cpp   2016-05-04 10:50:16 UTC (rev 6554)
@@ -730,8 +730,10 @@
         ,"SpecifiedAmount"
         ,"SupplSpecAmt"
         ,"ModalMinimumPremium"
+        ,"InitMinDumpin"
         ,"EeModalMinimumPremium"
         ,"ErModalMinimumPremium"
+        ,"EeMode"
         ,"ErMode"
         ,"CorpName"
         ,"EffDate"
@@ -750,6 +752,7 @@
         ,"TermRider"
         ,"ChildRider"
         ,"SpouseRider"
+        ,"SpouseRiderAmount"
         };
 
     std::vector<std::string> const sheaders
@@ -810,8 +813,10 @@
         << Invar.value_str("SpecAmt"              ,d) << '\t'
         << Invar.value_str("TermSpecAmt"          ,d) << '\t'
         << Invar.value_str("ModalMinimumPremium"  ,d) << '\t'
+        << Invar.value_str("InitMinDumpin"          ) << '\t'
         << Invar.value_str("EeModalMinimumPremium",d) << '\t'
         << Invar.value_str("ErModalMinimumPremium",d) << '\t'
+        << Invar.EeMode                           [d] << '\t'
         << Invar.ErMode                           [d] << '\t'
         << Invar.value_str("CorpName"               ) << '\t'
         << "'" << Invar.EffDate                       << "'\t"
@@ -830,6 +835,7 @@
         << Invar.value_str("HasTerm"                ) << '\t'
         << Invar.value_str("HasChildRider"          ) << '\t'
         << Invar.value_str("HasSpouseRider"         ) << '\t'
+        << Invar.value_str("SpouseRiderAmount"      ) << '\t'
         << '\n'
         ;
 

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2016-05-03 22:46:40 UTC (rev 6553)
+++ lmi/trunk/ledger_xml_io.cpp 2016-05-04 10:50:16 UTC (rev 6554)
@@ -363,6 +363,7 @@
     format_map["InitSevenPayPrem"                  ] = f2;
     format_map["InitTgtPrem"                       ] = f2;
     format_map["InitMinPrem"                       ] = f2;
+    format_map["InitMinDumpin"                     ] = f2;
 // >
 // F1: zero decimals, commas
 // > Format as a number with thousand separators and no decimal places 
(#,###,###)