[lmi-commits] [lmi] valyuta/004 4613e4d 3/6: Don't round what's already properly rounded

[Greg Chicares]

branch: valyuta/004
commit 4613e4de85ea0b79d51fb21cf5c58caa7c227b42
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Don't round what's already properly rounded
---
 ihs_acctval.cpp | 12 ++++++------
 ihs_avmly.cpp   |  8 ++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ihs_acctval.cpp b/ihs_acctval.cpp
index 9db5a85..8340c6e 100644
--- a/ihs_acctval.cpp
+++ b/ihs_acctval.cpp
@@ -559,12 +559,12 @@ void AccountValue::SetInitialValues()
 
     DB7702A               = C0;  // TODO ?? TAXATION !! This seems silly.
 
-    AVRegLn               = round_minutiae().c(InforceAVRegLn);
-    AVPrfLn               = round_minutiae().c(InforceAVPrfLn);
-    RegLnBal              = round_minutiae().c(InforceRegLnBal);
-    PrfLnBal              = round_minutiae().c(InforcePrfLnBal);
-    AVGenAcct             = round_minutiae().c(InforceAVGenAcct);
-    AVSepAcct             = round_minutiae().c(InforceAVSepAcct);
+    AVRegLn               = InforceAVRegLn;
+    AVPrfLn               = InforceAVPrfLn;
+    RegLnBal              = InforceRegLnBal;
+    PrfLnBal              = InforcePrfLnBal;
+    AVGenAcct             = InforceAVGenAcct;
+    AVSepAcct             = InforceAVSepAcct;
 
     // WX PORT !! When fund selection is finally ported from ihs,
     // this workaround should not be needed; until then, it sidesteps
diff --git a/ihs_avmly.cpp b/ihs_avmly.cpp
index 8585522..f2eb2ff 100644
--- a/ihs_avmly.cpp
+++ b/ihs_avmly.cpp
@@ -776,7 +776,6 @@ void AccountValue::ChangeSpecAmtBy(currency delta)
                     - ActualSpecAmt
                     ;
                 }
-            TermSpecAmt = round_specamt().c(TermSpecAmt); // already rounded?
             }
         }
     else
@@ -786,7 +785,7 @@ void AccountValue::ChangeSpecAmtBy(currency delta)
 
     // If specamt would be reduced below the minimum (e.g., by a large
     // withdrawal), then force it to the minimum.
-    ActualSpecAmt = round_specamt().c // already rounded?
+    ActualSpecAmt =
         (std::max
             (ActualSpecAmt
             ,minimum_specified_amount(0 == Year && 0 == Month, TermRiderActive)
@@ -828,7 +827,6 @@ void AccountValue::ChangeSupplAmtBy(currency delta)
         (TermSpecAmt
         ,C0 // No minimum other than zero is defined.
         );
-    TermSpecAmt = round_specamt().c(TermSpecAmt); // already rounded?
     // At least for now, there is no effect on surrender charges.
 
     // Carry the new supplemental amount forward into all future years.
@@ -1713,7 +1711,6 @@ void AccountValue::TxSetDeathBft()
         (DBIgnoringCorr
         ,round_death_benefit().c(YearsCorridorFactor * std::max(C0, 
cash_value_for_corridor))
         );
-    DBReflectingCorr = round_death_benefit().c(DBReflectingCorr); // already 
rounded?
     LMI_ASSERT(C0 <= DBReflectingCorr);
     // This overrides the value assigned above. There's more than one
     // way to interpret 7702A "death benefit"; this is just one.
@@ -1761,7 +1758,6 @@ void AccountValue::TxSetTermAmt()
         }
 
     TermDB = std::max(C0, TermSpecAmt + DBIgnoringCorr - DBReflectingCorr);
-    TermDB = round_death_benefit().c(TermDB); // already rounded?
 }
 
 /// Terminate the term rider, optionally converting it to base.
@@ -2409,7 +2405,7 @@ void AccountValue::TxTakeWD()
 
     if(Solving || mce_run_gen_curr_sep_full == RunBasis_)
         {
-        NetWD = round_withdrawal().c(std::min(RequestedWD, MaxWD));
+        NetWD = std::min(RequestedWD, MaxWD);
         OverridingWD[Year] = NetWD;
         }
     else