[lmi-commits] [lmi] valyuta/007 7535505d 09/10: Change several more ledger fields to cents

[Greg Chicares]

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

    Change several more ledger fields to cents
    
    Changed the other fields that are used in 'custom_io_*' but never read
    back from the ledger object into class AccountValue (though one's value
    is read in Ledger::make_evaluator():
      MiscCharges[j] = curr.SpecAmtLoad[j] + curr.PolicyFee[j];
    and is therefore adjusted there).
---
 custom_io_0.cpp         | 4 ++--
 custom_io_1.cpp         | 6 +++---
 ihs_acctval.cpp         | 6 +++---
 ledger_evaluator.cpp    | 8 ++++----
 ledger_text_formats.cpp | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/custom_io_0.cpp b/custom_io_0.cpp
index 35192899..9f287d11 100644
--- a/custom_io_0.cpp
+++ b/custom_io_0.cpp
@@ -526,8 +526,8 @@ void custom_io_0_write(Ledger const& ledger_values, 
std::string const& filename)
             <<        Curr_.AcctVal        [j]
             << ',' << Curr_.CSVNet         [j]
             << ',' << Curr_.EOYDeathBft    [j]
-            << ',' << Curr_.NetIntCredited [j]
-            << ',' << Curr_.COICharge      [j]
+            << ',' << Curr_.NetIntCredited [j] / 100.0
+            << ',' << Curr_.COICharge      [j] / 100.0
 // Column headers suggest that 'Load' should precede 'MinPrem',
 // but this order was accepted; perhaps both were always zero
 // in actual practice.
diff --git a/custom_io_1.cpp b/custom_io_1.cpp
index 8ee6a3aa..65aefdf4 100644
--- a/custom_io_1.cpp
+++ b/custom_io_1.cpp
@@ -399,9 +399,9 @@ void custom_io_1_write(Ledger const& ledger_values, 
std::string const& filename)
             << std::setprecision(4)
             << ',' << Curr_.AnnGAIntRate   [j] * 10000.0 // 'IntRate' in bp.
             << std::setprecision(2)
-            << ',' << Curr_.NetIntCredited [j]
-            << ',' << Curr_.COICharge      [j]
-            << ',' << Curr_.SpecAmtLoad    [j]           // 'MiscFees' = spec 
amt load.
+            << ',' << Curr_.NetIntCredited [j] / 100.0
+            << ',' << Curr_.COICharge      [j] / 100.0
+            << ',' << Curr_.SpecAmtLoad    [j] / 100.0   // 'MiscFees' = spec 
amt load.
             << ',' << prem_load            [j]
             << ',' << 0                                  // 'MinPrem' always 
zero.
             << ',' << surr_chg             [j]
diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 3b964569..bb30266d 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -1252,18 +1252,18 @@ void AccountValue::FinalizeYear()
 
     // Monthly deduction detail
 
-    VariantValues().COICharge         [Year] = dblize(YearsTotalCoiCharge)    ;
+    VariantValues().COICharge         [Year] = centize(YearsTotalCoiCharge)   ;
     VariantValues().RiderCharges      [Year] = dblize(YearsTotalRiderCharges) ;
     VariantValues().AVRelOnDeath      [Year] = YearsAVRelOnDeath              ;
     VariantValues().ClaimsPaid        [Year] = YearsGrossClaims               ;
     VariantValues().DeathProceedsPaid [Year] = YearsDeathProceeds             ;
     VariantValues().NetClaims         [Year] = YearsNetClaims                 ;
-    VariantValues().NetIntCredited    [Year] = 
dblize(YearsTotalNetIntCredited);
+    VariantValues().NetIntCredited    [Year] = 
centize(YearsTotalNetIntCredited);
     VariantValues().GrossIntCredited  [Year] = 
dblize(YearsTotalGrossIntCredited);
     VariantValues().LoanIntAccrued    [Year] = 
dblize(YearsTotalLoanIntAccrued);
     VariantValues().PolicyFee         [Year] = dblize(YearsTotalPolicyFee)    ;
     VariantValues().DacTaxLoad        [Year] = YearsTotalDacTaxLoad           ;
-    VariantValues().SpecAmtLoad       [Year] = dblize(YearsTotalSpecAmtLoad)  ;
+    VariantValues().SpecAmtLoad       [Year] = centize(YearsTotalSpecAmtLoad) ;
     VariantValues().PremTaxLoad       [Year] = PremiumTax_->ytd_load()        ;
 
     currency notional_sep_acct_charge =
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 32029691..91c04466 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -621,7 +621,7 @@ format_map_t static_formats()
     ,{"AvgDeathBft"                     , f1}
     ,{"BOYAssets"                       , f1}
     ,{"BaseDeathBft"                    , f5}
-    ,{"COICharge"                       , f1}
+    ,{"COICharge"                       , f5}
     ,{"CSVNet"                          , f1}
     ,{"CV7702"                          , f1}
     ,{"ClaimsPaid"                      , f1}
@@ -648,7 +648,7 @@ format_map_t static_formats()
     ,{"ModalMinimumPremium"             , f5}
     ,{"NaarForceout"                    , f1}
     ,{"NetClaims"                       , f1}
-    ,{"NetIntCredited"                  , f1}
+    ,{"NetIntCredited"                  , f5}
     ,{"NetPmt"                          , f1}
     ,{"NetWD"                           , f1}
     ,{"NewCashLoan"                     , f1}
@@ -661,7 +661,7 @@ format_map_t static_formats()
     ,{"Salary"                          , f1}
     ,{"SepAcctCharges"                  , f1}
     ,{"SpecAmt"                         , f1}
-    ,{"SpecAmtLoad"                     , f1}
+    ,{"SpecAmtLoad"                     , f5}
     ,{"SpouseRiderAmount"               , f1}
     ,{"SurrChg"                         , f1}
     ,{"TermPurchased"                   , f1}
@@ -758,7 +758,7 @@ ledger_evaluator Ledger::make_evaluator() const
     for(int j = 0; j < max_duration; ++j)
         {
         PremiumLoad[j] = invar.GrossPmt[j] - curr.NetPmt[j];
-        MiscCharges[j] = curr.SpecAmtLoad[j] + curr.PolicyFee[j];
+        MiscCharges[j] = curr.SpecAmtLoad[j] / 100.0 + curr.PolicyFee[j];
         }
 
     vectors   ["PremiumLoad"] = &PremiumLoad;
diff --git a/ledger_text_formats.cpp b/ledger_text_formats.cpp
index 3764dc4d..80d88eb7 100644
--- a/ledger_text_formats.cpp
+++ b/ledger_text_formats.cpp
@@ -574,9 +574,9 @@ void PrintCellTabDelimited
         os << Curr_.value_str("PremTaxLoad"           ,j) << '\t';
         os << Curr_.value_str("DacTaxLoad"            ,j) << '\t';
         os << Curr_.value_str("PolicyFee"             ,j) << '\t';
-        os << Curr_.value_str("SpecAmtLoad"           ,j) << '\t';
+        os << Curr_.value_str("SpecAmtLoad"           ,j, 100.0) << '\t';
         os << Invar.value_str("AnnualFlatExtra"       ,j) << '\t';
-        os << Curr_.value_str("COICharge"             ,j) << '\t';
+        os << Curr_.value_str("COICharge"             ,j, 100.0) << '\t';
         os << Curr_.value_str("RiderCharges"          ,j) << '\t';
         os << "0\t"; // obsolete
         os << Curr_.value_str("SepAcctCharges"        ,j) << '\t';
@@ -584,7 +584,7 @@ void PrintCellTabDelimited
         os << Curr_.value_str("AnnSAIntRate"          ,j) << '\t';
         os << Curr_.value_str("AnnGAIntRate"          ,j) << '\t';
         os << Curr_.value_str("GrossIntCredited"      ,j) << '\t';
-        os << Curr_.value_str("NetIntCredited"        ,j) << '\t';
+        os << Curr_.value_str("NetIntCredited"        ,j, 100.0) << '\t';
 
         os << Guar_.value_str("AcctVal"               ,j) << '\t';
         os << Guar_.value_str("CSVNet"                ,j) << '\t';