[lmi-commits] [lmi] valyuta/007 2cbd2ea4 3/7: Change several more ledger fields to cents

[Greg Chicares]

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

    Change several more ledger fields to cents
    
    Changed '*Pmt' fields.
---
 accountvalue.cpp        |  4 ++--
 custom_io_0.cpp         |  4 ++--
 custom_io_1.cpp         |  4 ++--
 ihs_acctval.cpp         | 16 ++++++++--------
 ledger_evaluator.cpp    | 10 +++++-----
 ledger_text_formats.cpp | 12 ++++++------
 main_cli.cpp            |  2 +-
 7 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/accountvalue.cpp b/accountvalue.cpp
index 9cfbef99..7f11d48b 100644
--- a/accountvalue.cpp
+++ b/accountvalue.cpp
@@ -348,9 +348,9 @@ void AccountValue::DoYear
     VariantValues().EOYDeathBft[Year] = centize(deathbft);
 
     // IHS !! Change one of these names, which differ only in the terminal 's'.
-    InvariantValues().GrossPmt[Year] += 
dblize(std::accumulate(GrossPmts.begin(), GrossPmts.end(), C0));
+    InvariantValues().GrossPmt[Year] += 
centize(std::accumulate(GrossPmts.begin(), GrossPmts.end(), C0));
     InvariantValues().Outlay[Year] =
-            InvariantValues().GrossPmt   [Year] * 100.0
+            InvariantValues().GrossPmt   [Year]
         -   InvariantValues().NetWD      [Year]
         -   InvariantValues().NewCashLoan[Year]
         ;
diff --git a/custom_io_0.cpp b/custom_io_0.cpp
index 525ea896..2c795fdf 100644
--- a/custom_io_0.cpp
+++ b/custom_io_0.cpp
@@ -532,9 +532,9 @@ void custom_io_0_write(Ledger const& ledger_values, 
std::string const& filename)
 // but this order was accepted; perhaps both were always zero
 // in actual practice.
             << ',' << 0                                  // 'MinPrem' always 
zero.
-            << ',' << prem_load            [j]
+            << ',' << prem_load            [j] / 100.0
             << ',' << surr_chg             [j]
-            << ',' << Invar.GrossPmt       [j]
+            << ',' << Invar.GrossPmt       [j] / 100.0
             << ',' << Curr_.AnnGAIntRate   [j] * 10000.0 // 'IntRate' in bp.
             << '\n'
             ;
diff --git a/custom_io_1.cpp b/custom_io_1.cpp
index 067f2252..54adee82 100644
--- a/custom_io_1.cpp
+++ b/custom_io_1.cpp
@@ -402,10 +402,10 @@ void custom_io_1_write(Ledger const& ledger_values, 
std::string const& filename)
             << ',' << Curr_.NetIntCredited [j] / 100.0
             << ',' << Curr_.COICharge      [j] / 100.0
             << ',' << Curr_.SpecAmtLoad    [j] / 100.0   // 'MiscFees' = spec 
amt load.
-            << ',' << prem_load            [j]
+            << ',' << prem_load            [j] / 100.0
             << ',' << 0                                  // 'MinPrem' always 
zero.
             << ',' << surr_chg             [j]
-            << ',' << Invar.GrossPmt       [j]
+            << ',' << Invar.GrossPmt       [j] / 100.0
             << '\n'
             ;
         }
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 0a4638cd..29eced0b 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1305,7 +1305,7 @@ void AccountValue::FinalizeYear()
             );
         }
 
-    VariantValues().NetPmt[Year] = dblize(std::accumulate
+    VariantValues().NetPmt[Year] = centize(std::accumulate
         (NetPmts.begin()
         ,NetPmts.end()
         ,-YearsTotalGptForceout
@@ -1329,20 +1329,20 @@ void AccountValue::FinalizeYear()
         // Forceouts should be a distinct component, passed separately
         // to ledger values. Probably we should treat 1035 exchanges
         // and NAAR 'forceouts' the same way.
-        InvariantValues().GrossPmt  [Year]  -= dblize(YearsTotalGptForceout);
-        InvariantValues().EeGrossPmt[Year]  -= dblize(YearsTotalGptForceout);
+        InvariantValues().GrossPmt  [Year]  -= centize(YearsTotalGptForceout);
+        InvariantValues().EeGrossPmt[Year]  -= centize(YearsTotalGptForceout);
 
         for(int j = 0; j < 12; ++j)
             {
             assert_pmts_add_up(__FILE__, __LINE__, j);
-            InvariantValues().GrossPmt  [Year]  += dblize(GrossPmts  [j]);
-            InvariantValues().EeGrossPmt[Year]  += dblize(EeGrossPmts[j]);
-            InvariantValues().ErGrossPmt[Year]  += dblize(ErGrossPmts[j]);
+            InvariantValues().GrossPmt  [Year]  += centize(GrossPmts  [j]);
+            InvariantValues().EeGrossPmt[Year]  += centize(EeGrossPmts[j]);
+            InvariantValues().ErGrossPmt[Year]  += centize(ErGrossPmts[j]);
             }
         if(0 == Year)
             {
             // CURRENCY !! KLUDGE 100.0
-            InvariantValues().InitPrem = InvariantValues().GrossPmt[Year] * 
100.0;
+            InvariantValues().InitPrem = InvariantValues().GrossPmt[Year];
             }
         LMI_ASSERT
             (materially_equal
@@ -1352,7 +1352,7 @@ void AccountValue::FinalizeYear()
                 )
             );
         InvariantValues().Outlay[Year] =
-                InvariantValues().GrossPmt   [Year] * 100.0
+                InvariantValues().GrossPmt   [Year]
             -   InvariantValues().NetWD      [Year]
             -   InvariantValues().NewCashLoan[Year]
             ;
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index eb7fcd13..5ba21630 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -632,17 +632,17 @@ format_map_t static_formats()
     ,{"Dcv"                             , f1}
     ,{"DeathProceedsPaid"               , f1}
     ,{"EOYDeathBft"                     , f5}
-    ,{"EeGrossPmt"                      , f1}
+    ,{"EeGrossPmt"                      , f5}
     ,{"EeModalMinimumPremium"           , f5}
 //  ,{"EeMode"                          , f1} // Not numeric.
-    ,{"ErGrossPmt"                      , f1}
+    ,{"ErGrossPmt"                      , f5}
     ,{"ErModalMinimumPremium"           , f5}
 //  ,{"ErMode"                          , f1} // Not numeric.
     ,{"ExpenseCharges"                  , f1}
     ,{"FundNumbers"                     , f1}
     ,{"GptForceout"                     , f5}
     ,{"GrossIntCredited"                , f5}
-    ,{"GrossPmt"                        , f1}
+    ,{"GrossPmt"                        , f5}
     ,{"Loads"                           , f1}
     ,{"LoanInt"                         , f1}
     ,{"LoanIntAccrued"                  , f5}
@@ -650,7 +650,7 @@ format_map_t static_formats()
     ,{"NaarForceout"                    , f1}
     ,{"NetClaims"                       , f1}
     ,{"NetIntCredited"                  , f5}
-    ,{"NetPmt"                          , f1}
+    ,{"NetPmt"                          , f5}
     ,{"NetWD"                           , f5}
     ,{"NewCashLoan"                     , f5}
     ,{"Outlay"                          , f5}
@@ -767,7 +767,7 @@ ledger_evaluator Ledger::make_evaluator() const
     vectors   ["PremiumLoad"] = &PremiumLoad;
     title_map ["PremiumLoad"] = "Premium\nLoad";
     mask_map  ["PremiumLoad"] = "999,999,999";
-    format_map["PremiumLoad"] = f1;
+    format_map["PremiumLoad"] = f5;
 
     vectors   ["MiscCharges"] = &MiscCharges;
     title_map ["MiscCharges"] = "Miscellaneous\nCharges";
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 0035c4e0..1e4da5b2 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -79,8 +79,8 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["AnnGAIntRate_Current"       ] = ledger_metadata(2, 
oe_format_percentage, "Curr Ann Gen Acct Int Rate"            ); // "General 
Account Crediting Rate"
         m["AnnSAIntRate_Current"       ] = ledger_metadata(2, 
oe_format_percentage, "Curr Ann Sep Acct Int Rate"            ); // "Separate 
Account Net Rate"
         m["Outlay"                     ] = ledger_metadata(0, 
oe_cents_as_dollars , "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["EeGrossPmt"                 ] = ledger_metadata(0, 
oe_cents_as_dollars , "EE Gross Payment"                      ); // "Employee 
Gross Payment"
+        m["ErGrossPmt"                 ] = ledger_metadata(0, 
oe_cents_as_dollars , "ER Gross Payment"                      ); // "Employer 
Gross Payment"
         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"              );
@@ -108,7 +108,7 @@ std::map<std::string,ledger_metadata> const& 
ledger_metadata_map()
         m["IrrDb_Current"              ] = ledger_metadata(2, 
oe_format_percentage, "Curr IRR on DB"                        ); // "Current 
Death Benefit IRR"
         m["IrrDb_Guaranteed"           ] = ledger_metadata(2, 
oe_format_percentage, "Guar IRR on DB"                        ); // "Guaranteed 
Death Benefit IRR"
         m["NetClaims_Current"          ] = ledger_metadata(0, oe_format_normal 
   , "Curr Net Claims"                       ); // "Experience Rating Current 
Net Claims"
-        m["GrossPmt"                   ] = ledger_metadata(0, oe_format_normal 
   , "Premium Outlay"                        ); // "Total Payment"
+        m["GrossPmt"                   ] = ledger_metadata(0, 
oe_cents_as_dollars , "Premium Outlay"                        ); // "Total 
Payment"
         m["LoanIntAccrued_Current"     ] = ledger_metadata(0, oe_format_normal 
   , "Curr Loan Int Accrued"                 ); // "Current Accrued Loan 
Interest"
         m["NetDeathBenefit"            ] = ledger_metadata(0, oe_format_normal 
   , "Net Death Benefit"                     ); // "Current Net Death Benefit"
         m["DeathProceedsPaid_Current"  ] = ledger_metadata(0, oe_format_normal 
   , "Curr Death Proceeds Paid"              ); // "Current Death Proceeds Paid"
@@ -562,14 +562,14 @@ void PrintCellTabDelimited
             os << Invar.DBOpt[j]                          << '\t';
             }
 
-        os << Invar.value_str("EeGrossPmt"            ,j) << '\t';
-        os << Invar.value_str("ErGrossPmt"            ,j) << '\t';
+        os << Invar.value_str("EeGrossPmt"            ,j, 100.0) << '\t';
+        os << Invar.value_str("ErGrossPmt"            ,j, 100.0) << '\t';
         os << Invar.value_str("NetWD"                 ,j, 100.0) << '\t'; // 
TODO ?? It's *gross* WD.
         os << Invar.value_str("NewCashLoan"           ,j, 100.0) << '\t';
         os << Curr_.value_str("TotalLoanBalance"      ,j, 100.0) << '\t';
         os << Invar.value_str("Outlay"                ,j, 100.0) << '\t';
 
-        os << Curr_.value_str("NetPmt"                ,j) << '\t';
+        os << Curr_.value_str("NetPmt"                ,j, 100.0) << '\t';
 
         os << Curr_.value_str("PremTaxLoad"           ,j) << '\t';
         os << Curr_.value_str("DacTaxLoad"            ,j) << '\t';
diff --git a/main_cli.cpp b/main_cli.cpp
index 2f924ee1..d14e301a 100644
--- a/main_cli.cpp
+++ b/main_cli.cpp
@@ -125,7 +125,7 @@ void self_test()
     naic_solve_ee_prem["SolveType"] = "Employee premium";
     expected_value = 10673.51;
     z("CLI_selftest", naic_solve_ee_prem);
-    observed_value = 
z.principal_ledger()->GetLedgerInvariant().EeGrossPmt.front();
+    observed_value = 
z.principal_ledger()->GetLedgerInvariant().EeGrossPmt.front() / 100.0;
     if(!antediluvian && .005 < std::fabs(expected_value - observed_value))
         {
         warning()