[lmi-commits] [6562] Rename required dumpin, which is now modal

[chicares]

Revision: 6562
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6562
Author:   chicares
Date:     2016-05-07 13:54:31 +0000 (Sat, 07 May 2016)
Log Message:
-----------
Rename required dumpin, which is now modal

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/group_quote_pdf_gen_wx.cpp
    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/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ChangeLog 2016-05-07 13:54:31 UTC (rev 6562)
@@ -38984,3 +38984,18 @@
   group_quote_pdf_gen_wx.cpp
 Deduce plan type.
 
+20160507T1148Z <address@hidden> [451]
+
+  ihs_acctval.cpp
+Modalize required dumpin.
+
+20160507T1354Z <address@hidden> [451]
+
+  group_quote_pdf_gen_wx.cpp
+  ihs_acctval.cpp
+  ledger_invariant.cpp
+  ledger_invariant.hpp
+  ledger_text_formats.cpp
+  ledger_xml_io.cpp
+Rename required dumpin, which is now modal.
+

Modified: lmi/trunk/group_quote_pdf_gen_wx.cpp
===================================================================
--- lmi/trunk/group_quote_pdf_gen_wx.cpp        2016-05-07 11:48:29 UTC (rev 
6561)
+++ lmi/trunk/group_quote_pdf_gen_wx.cpp        2016-05-07 13:54:31 UTC (rev 
6562)
@@ -776,7 +776,7 @@
                 break;
             case e_col_additional_premium:
                 {
-                double const z = invar.EeModalMinimumPremium.at(year) + 
invar.InitMinDumpin;
+                double const z = invar.EeModalMinimumPremium.at(year) + 
invar.ModalMinimumDumpin;
                 rd.values[col] = '$' + ledger_format(z, f2);
                 if(is_composite)
                     {
@@ -796,7 +796,7 @@
                 break;
             case e_col_total_premium:
                 {
-                double const z = invar.ModalMinimumPremium.at(year) + 
invar.InitMinDumpin;
+                double const z = invar.ModalMinimumPremium.at(year) + 
invar.ModalMinimumDumpin;
                 rd.values[col] = '$' + ledger_format(z, f2);
                 if(is_composite)
                     {

Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp   2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ihs_acctval.cpp   2016-05-07 13:54:31 UTC (rev 6562)
@@ -1043,10 +1043,10 @@
     if(0 == Year)
         {
         mcenum_mode const er_mode = InvariantValues().ErMode[0].value();
-        // 'InitMinDumpin' and 'InitMinPrem' depend on 'InitTgtPrem'.
-        InvariantValues().InitTgtPrem   = AnnualTargetPrem;
-        InvariantValues().InitMinDumpin = MinInitDumpin() / er_mode;
-        InvariantValues().InitMinPrem   = MinInitPrem();
+        // 'ModalMinimumDumpin' and 'InitMinPrem' depend on 'InitTgtPrem'.
+        InvariantValues().InitTgtPrem        = AnnualTargetPrem;
+        InvariantValues().ModalMinimumDumpin = MinInitDumpin() / er_mode;
+        InvariantValues().InitMinPrem        = MinInitPrem();
         }
 
     SurrChgSpecAmt = InvariantValues().SpecAmt[0];

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ledger_invariant.cpp      2016-05-07 13:54:31 UTC (rev 6562)
@@ -139,7 +139,7 @@
     ScalableScalars ["InitGLP"               ] = &InitGLP                ;
     ScalableScalars ["InitTgtPrem"           ] = &InitTgtPrem            ;
     ScalableScalars ["InitMinPrem"           ] = &InitMinPrem            ;
-    ScalableScalars ["InitMinDumpin"         ] = &InitMinDumpin          ;
+    ScalableScalars ["ModalMinimumDumpin"    ] = &ModalMinimumDumpin     ;
     ScalableScalars ["Dumpin"                ] = &Dumpin                 ;
     ScalableScalars ["External1035Amount"    ] = &External1035Amount     ;
     ScalableScalars ["Internal1035Amount"    ] = &Internal1035Amount     ;
@@ -625,7 +625,7 @@
 //  InitSevenPayPrem        =
 //  InitTgtPrem             =
 //  InitMinPrem             =
-//  InitMinDumpin           =
+//  ModalMinimumDumpin      =
 
     MaleProportion          = b->yare_input_.MaleProportion;
     NonsmokerProportion     = b->yare_input_.NonsmokerProportion;

Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp      2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ledger_invariant.hpp      2016-05-07 13:54:31 UTC (rev 6562)
@@ -152,7 +152,7 @@
     double          InitGLP;
     double          InitTgtPrem;
     double          InitMinPrem;
-    double          InitMinDumpin;
+    double          ModalMinimumDumpin;
     double          Dumpin;
     double          External1035Amount;
     double          Internal1035Amount;

Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp   2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ledger_text_formats.cpp   2016-05-07 13:54:31 UTC (rev 6562)
@@ -730,7 +730,7 @@
         ,"SpecifiedAmount"
         ,"SupplSpecAmt"
         ,"ModalMinimumPremium"
-        ,"InitMinDumpin"
+        ,"ModalMinimumDumpin"
         ,"EeModalMinimumPremium"
         ,"ErModalMinimumPremium"
         ,"EeMode"
@@ -813,7 +813,7 @@
         << 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("ModalMinimumDumpin"     ) << '\t'
         << Invar.value_str("EeModalMinimumPremium",d) << '\t'
         << Invar.value_str("ErModalMinimumPremium",d) << '\t'
         << Invar.EeMode                           [d] << '\t'

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2016-05-07 11:48:29 UTC (rev 6561)
+++ lmi/trunk/ledger_xml_io.cpp 2016-05-07 13:54:31 UTC (rev 6562)
@@ -359,7 +359,7 @@
     format_map["InitSevenPayPrem"                  ] = f2;
     format_map["InitTgtPrem"                       ] = f2;
     format_map["InitMinPrem"                       ] = f2;
-    format_map["InitMinDumpin"                     ] = f2;
+    format_map["ModalMinimumDumpin"                ] = f2;
 // >
 // F1: zero decimals, commas
 // > Format as a number with thousand separators and no decimal places 
(#,###,###)