[lmi-commits] [lmi] valyuta/007 2d26a146 08/10: Change several more ledger fields to cents

[Greg Chicares]

branch: valyuta/007
commit 2d26a146b37cbd13b241c6a927a71ca557e0141c
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Change several more ledger fields to cents
    
    Chose '*ModalMinimumPremium' for this proof of concept because their
    values are never read back from the ledger object to class AccountValue
    (like 'BaseDeathBft' in an earlier commit), but they're formatted in a
    broad variety of ways.
---
 group_quote_pdf_gen_wx.cpp |  6 +++---
 ihs_acctval.cpp            | 10 +++++-----
 ledger_evaluator.cpp       |  6 +++---
 ledger_text_formats.cpp    | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index ddc32445..85dbfe1f 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -553,7 +553,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const& 
ledger)
                 break;
             case e_col_basic_premium:
                 {
-                double const z = invar.ErModalMinimumPremium.at(year);
+                double const z = invar.ErModalMinimumPremium.at(year) / 100.0;
                 rd.output_values[i] = '$' + ledger_format(z, f2);
                 if(is_composite)
                     {
@@ -573,7 +573,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const& 
ledger)
                 break;
             case e_col_additional_premium:
                 {
-                double const z = invar.EeModalMinimumPremium.at(year);
+                double const z = invar.EeModalMinimumPremium.at(year) / 100.0;
                 rd.output_values[i] = '$' + ledger_format(z, f2);
                 if(is_composite)
                     {
@@ -593,7 +593,7 @@ void group_quote_pdf_generator_wx::add_ledger(Ledger const& 
ledger)
                 break;
             case e_col_total_premium:
                 {
-                double const z = invar.ModalMinimumPremium.at(year);
+                double const z = invar.ModalMinimumPremium.at(year) / 100.0;
                 rd.output_values[i] = '$' + ledger_format(z, f2);
                 if(is_composite)
                     {
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 79c562e6..3b964569 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1049,8 +1049,8 @@ void AccountValue::set_modal_min_premium()
             ,Outlay_->er_premium_modes()[Year]
             ,base_specamt(Year)
             );
-        InvariantValues().ModalMinimumPremium[Year]   = dblize(z);
-        InvariantValues().ErModalMinimumPremium[Year] = dblize(z);
+        InvariantValues().ModalMinimumPremium[Year]   = centize(z);
+        InvariantValues().ErModalMinimumPremium[Year] = centize(z);
         }
     else
         {
@@ -1060,9 +1060,9 @@ void AccountValue::set_modal_min_premium()
             ,base_specamt(Year)
             ,term_specamt(Year)
             );
-        InvariantValues().EeModalMinimumPremium[Year] = dblize(z.first);
-        InvariantValues().ErModalMinimumPremium[Year] = dblize(z.second);
-        InvariantValues().ModalMinimumPremium[Year] = dblize(z.first + 
z.second);
+        InvariantValues().EeModalMinimumPremium[Year] = centize(z.first);
+        InvariantValues().ErModalMinimumPremium[Year] = centize(z.second);
+        InvariantValues().ModalMinimumPremium[Year] = centize(z.first + 
z.second);
         }
 }
 
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 7a874704..32029691 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -632,10 +632,10 @@ format_map_t static_formats()
     ,{"DeathProceedsPaid"               , f1}
     ,{"EOYDeathBft"                     , f1}
     ,{"EeGrossPmt"                      , f1}
-    ,{"EeModalMinimumPremium"           , f1}
+    ,{"EeModalMinimumPremium"           , f5}
 //  ,{"EeMode"                          , f1} // Not numeric.
     ,{"ErGrossPmt"                      , f1}
-    ,{"ErModalMinimumPremium"           , f1}
+    ,{"ErModalMinimumPremium"           , f5}
 //  ,{"ErMode"                          , f1} // Not numeric.
     ,{"ExpenseCharges"                  , f1}
     ,{"FundNumbers"                     , f1}
@@ -645,7 +645,7 @@ format_map_t static_formats()
     ,{"Loads"                           , f1}
     ,{"LoanInt"                         , f1}
     ,{"LoanIntAccrued"                  , f1}
-    ,{"ModalMinimumPremium"             , f1}
+    ,{"ModalMinimumPremium"             , f5}
     ,{"NaarForceout"                    , f1}
     ,{"NetClaims"                       , f1}
     ,{"NetIntCredited"                  , f1}
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index faff097b..3764dc4d 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -81,9 +81,9 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["Outlay"                     ] = ledger_metadata(0, oe_format_normal 
   , "Net Outlay"                            );
         m["EeGrossPmt"                 ] = ledger_metadata(0, oe_format_normal 
   , "EE Gross Payment"                      ); // "Employee Gross Payment"
         m["ErGrossPmt"                 ] = ledger_metadata(0, oe_format_normal 
   , "ER Gross Payment"                      ); // "Employer Gross Payment"
-        m["ModalMinimumPremium"        ] = ledger_metadata(0, oe_format_normal 
   , "Modal Minimum Premium"                 );
-        m["EeModalMinimumPremium"      ] = ledger_metadata(0, oe_format_normal 
   , "EE Modal Minimum Premium"              );
-        m["ErModalMinimumPremium"      ] = ledger_metadata(0, oe_format_normal 
   , "ER Modal Minimum Premium"              );
+        m["ModalMinimumPremium"        ] = ledger_metadata(0, 
oe_cents_as_dollars , "Modal Minimum Premium"                 );
+        m["EeModalMinimumPremium"      ] = ledger_metadata(0, 
oe_cents_as_dollars , "EE Modal Minimum Premium"              );
+        m["ErModalMinimumPremium"      ] = ledger_metadata(0, 
oe_cents_as_dollars , "ER Modal Minimum Premium"              );
         m["NetWD"                      ] = ledger_metadata(0, oe_format_normal 
   , "Withdrawal"                            );
         m["NewCashLoan"                ] = ledger_metadata(0, oe_format_normal 
   , "Annual Loan"                           ); // "New Cash Loan"
         m["TotalLoanBalance_Current"   ] = ledger_metadata(0, oe_format_normal 
   , "Curr Total Loan Balance"               ); // "Current Total Loan Balance"
@@ -746,9 +746,9 @@ void PrintRosterTabDelimited
         << Invar.value_str("SpecAmt"              ,d) << '\t'
         << Invar.value_str("TermSpecAmt"          ,d) << '\t'
         << Invar.value_str("InitTgtPrem"            ) << '\t'
-        << Invar.value_str("ModalMinimumPremium"  ,d) << '\t'
-        << Invar.value_str("EeModalMinimumPremium",d) << '\t'
-        << Invar.value_str("ErModalMinimumPremium",d) << '\t'
+        << Invar.value_str("ModalMinimumPremium"  ,d, 100.0) << '\t'
+        << Invar.value_str("EeModalMinimumPremium",d, 100.0) << '\t'
+        << Invar.value_str("ErModalMinimumPremium",d, 100.0) << '\t'
         << Invar.value_str("ListBillPremium"        ) << '\t'
         << Invar.value_str("EeListBillPremium"      ) << '\t'
         << Invar.value_str("ErListBillPremium"      ) << '\t'