[lmi-commits] [lmi] valyuta/002 9cf4517 46/65: c()

[Greg Chicares]

branch: valyuta/002
commit 9cf4517923749322eba38ec1aa403c7bec239d8a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    c()
---
 outlay.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/outlay.cpp b/outlay.cpp
index c5fe894..df33a11 100644
--- a/outlay.cpp
+++ b/outlay.cpp
@@ -37,9 +37,9 @@ modal_outlay::modal_outlay
     :round_gross_premium_  {round_gross_premium}
     ,round_withdrawal_     {round_withdrawal   }
     ,round_loan_           {round_loan         }
-    ,dumpin_               {round_gross_premium_(  yi.Dumpin)                  
  }
-    ,external_1035_amount_ {round_gross_premium_(  
yi.External1035ExchangeAmount)}
-    ,internal_1035_amount_ {round_gross_premium_(  
yi.Internal1035ExchangeAmount)}
+    ,dumpin_               {round_gross_premium_.c(yi.Dumpin)                  
  }
+    ,external_1035_amount_ 
{round_gross_premium_.c(yi.External1035ExchangeAmount)}
+    ,internal_1035_amount_ 
{round_gross_premium_.c(yi.Internal1035ExchangeAmount)}
     ,ee_modal_premiums_    {round_gross_premium_.c(yi.Payment)                 
  }
     ,ee_premium_modes_     {                       yi.PaymentMode              
  }
     ,er_modal_premiums_    {round_gross_premium_.c(yi.CorporationPayment)      
  }
@@ -51,30 +51,30 @@ modal_outlay::modal_outlay
 
 void modal_outlay::set_external_1035_amount(currency z)
 {
-    external_1035_amount_ = round_gross_premium_(z);
+    external_1035_amount_ = round_gross_premium_.c(z);
 }
 
 void modal_outlay::set_internal_1035_amount(currency z)
 {
-    internal_1035_amount_ = round_gross_premium_(z);
+    internal_1035_amount_ = round_gross_premium_.c(z);
 }
 
 void modal_outlay::set_ee_modal_premiums(currency z, int from_year, int 
to_year)
 {
-    z = round_gross_premium_(z);
+    z = round_gross_premium_.c(z); // already rounded?
     std::fill_n(ee_modal_premiums_.begin() + from_year, to_year - from_year, 
z);
 }
 
 void modal_outlay::set_er_modal_premiums(currency z, int from_year, int 
to_year)
 {
-    z = round_gross_premium_(z);
+    z = round_gross_premium_.c(z); // already rounded?
     std::fill_n(er_modal_premiums_.begin() + from_year, to_year - from_year, 
z);
 }
 
 void modal_outlay::set_er_modal_premiums(std::vector<currency> const& z)
 {
     LMI_ASSERT(z.size() == er_modal_premiums_.size());
-//  er_modal_premiums_ = round_gross_premium_(z);
+//  er_modal_premiums_ = round_gross_premium_.c(z);
     // Temporarily disregard rounding, which remains necessary: the
     // new value is currency, so it's rounded to cents somehow, but
     // premiums could be rounded differently--say, up to dollars.
@@ -83,12 +83,12 @@ void 
modal_outlay::set_er_modal_premiums(std::vector<currency> const& z)
 
 void modal_outlay::set_withdrawals(currency z, int from_year, int to_year)
 {
-    z = round_withdrawal_(z);
+    z = round_withdrawal_.c(z);
     std::fill_n(withdrawals_.begin() + from_year, to_year - from_year, z);
 }
 
 void modal_outlay::set_new_cash_loans(currency z, int from_year, int to_year)
 {
-    z = round_loan_(z);
+    z = round_loan_.c(z);
     std::fill_n(new_cash_loans_.begin() + from_year, to_year - from_year, z);
 }