[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 19b1e67 1/2: Add a rounding rule for rider ch
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 19b1e67 1/2: Add a rounding rule for rider charges |
|
Date: |
Tue, 25 Aug 2020 12:15:49 -0400 (EDT) |
branch: master
commit 19b1e6719f370f4b537c651b9035cdfd3afdf3ad
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Add a rounding rule for rider charges
---
basic_values.hpp | 2 ++
basicvalues.cpp | 1 +
ihs_basicval.cpp | 1 +
rounding_document.cpp | 1 +
rounding_rules.cpp | 2 ++
rounding_rules.hpp | 1 +
rounding_view.xrc | 12 ++++++++++++
7 files changed, 20 insertions(+)
diff --git a/basic_values.hpp b/basic_values.hpp
index 1afa805..1501151 100644
--- a/basic_values.hpp
+++ b/basic_values.hpp
@@ -174,6 +174,7 @@ class LMI_SO BasicValues
round_to<double> const& round_naar () const {return
round_naar_ ;}
round_to<double> const& round_coi_rate () const {return
round_coi_rate_ ;}
round_to<double> const& round_coi_charge () const {return
round_coi_charge_ ;}
+ round_to<double> const& round_rider_charges () const {return
round_rider_charges_ ;}
round_to<double> const& round_gross_premium () const {return
round_gross_premium_ ;}
round_to<double> const& round_net_premium () const {return
round_net_premium_ ;}
round_to<double> const& round_interest_rate () const {return
round_interest_rate_ ;}
@@ -441,6 +442,7 @@ class LMI_SO BasicValues
round_to<double> round_naar_ ;
round_to<double> round_coi_rate_ ;
round_to<double> round_coi_charge_ ;
+ round_to<double> round_rider_charges_ ;
round_to<double> round_gross_premium_ ;
round_to<double> round_net_premium_ ;
round_to<double> round_interest_rate_ ;
diff --git a/basicvalues.cpp b/basicvalues.cpp
index 9eddf08..ed8022a 100644
--- a/basicvalues.cpp
+++ b/basicvalues.cpp
@@ -65,6 +65,7 @@ BasicValues::BasicValues(Input const& input)
,round_naar_ {2, r_to_nearest}
,round_coi_rate_ {8, r_downward }
,round_coi_charge_ {2, r_to_nearest}
+ ,round_rider_charges_ {2, r_to_nearest}
,round_gross_premium_ {2, r_to_nearest}
,round_net_premium_ {2, r_to_nearest}
,round_interest_rate_ {0, r_not_at_all}
diff --git a/ihs_basicval.cpp b/ihs_basicval.cpp
index d71385c..592cd35 100644
--- a/ihs_basicval.cpp
+++ b/ihs_basicval.cpp
@@ -780,6 +780,7 @@ void BasicValues::SetRoundingFunctors()
set_rounding_rule(round_naar_ ,
RoundingRules_->datum("RoundNaar" ));
set_rounding_rule(round_coi_rate_ ,
RoundingRules_->datum("RoundCoiRate" ));
set_rounding_rule(round_coi_charge_ ,
RoundingRules_->datum("RoundCoiCharge" ));
+ set_rounding_rule(round_rider_charges_ ,
RoundingRules_->datum("RoundRiderCharges"));
set_rounding_rule(round_gross_premium_ ,
RoundingRules_->datum("RoundGrossPrem" ));
set_rounding_rule(round_net_premium_ ,
RoundingRules_->datum("RoundNetPrem" ));
set_rounding_rule(round_interest_rate_ ,
RoundingRules_->datum("RoundIntRate" ));
diff --git a/rounding_document.cpp b/rounding_document.cpp
index d91b3de..7400b25 100644
--- a/rounding_document.cpp
+++ b/rounding_document.cpp
@@ -42,6 +42,7 @@ RoundingDocument::RoundingDocument()
values_["round_naar" ] = &rounding_rules_.round_naar_
;
values_["round_coi_rate" ] = &rounding_rules_.round_coi_rate_
;
values_["round_coi_charge" ] = &rounding_rules_.round_coi_charge_
;
+ values_["round_rider_charges" ] =
&rounding_rules_.round_rider_charges_ ;
values_["round_gross_premium" ] =
&rounding_rules_.round_gross_premium_ ;
values_["round_net_premium" ] = &rounding_rules_.round_net_premium_
;
values_["round_interest_rate" ] =
&rounding_rules_.round_interest_rate_ ;
diff --git a/rounding_rules.cpp b/rounding_rules.cpp
index f8111cd..f868ec7 100644
--- a/rounding_rules.cpp
+++ b/rounding_rules.cpp
@@ -136,6 +136,7 @@ rounding_rules::rounding_rules()
,round_naar_ (2, r_to_nearest, "")
,round_coi_rate_ (8, r_downward , "")
,round_coi_charge_ (2, r_to_nearest, "")
+ ,round_rider_charges_ (2, r_to_nearest, "")
,round_gross_premium_ (2, r_to_nearest, "")
,round_net_premium_ (2, r_to_nearest, "")
,round_interest_rate_ (0, r_not_at_all, "")
@@ -207,6 +208,7 @@ void rounding_rules::ascribe_members()
ascribe("RoundNaar" , &rounding_rules::round_naar_ );
ascribe("RoundCoiRate" , &rounding_rules::round_coi_rate_ );
ascribe("RoundCoiCharge" , &rounding_rules::round_coi_charge_ );
+ ascribe("RoundRiderCharges", &rounding_rules::round_rider_charges_ );
ascribe("RoundGrossPrem" , &rounding_rules::round_gross_premium_ );
ascribe("RoundNetPrem" , &rounding_rules::round_net_premium_ );
ascribe("RoundIntRate" , &rounding_rules::round_interest_rate_ );
diff --git a/rounding_rules.hpp b/rounding_rules.hpp
index 05240bc..1a402b2 100644
--- a/rounding_rules.hpp
+++ b/rounding_rules.hpp
@@ -135,6 +135,7 @@ class LMI_SO rounding_rules final
rounding_parameters round_naar_ ;
rounding_parameters round_coi_rate_ ;
rounding_parameters round_coi_charge_ ;
+ rounding_parameters round_rider_charges_ ;
rounding_parameters round_gross_premium_ ;
rounding_parameters round_net_premium_ ;
rounding_parameters round_interest_rate_ ;
diff --git a/rounding_view.xrc b/rounding_view.xrc
index 04b761e..1d6c4c9 100644
--- a/rounding_view.xrc
+++ b/rounding_view.xrc
@@ -111,6 +111,18 @@
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
+ <label>Rider charges</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_LEFT</flag>
+ <object class="RoundingButtons"
name="round_rider_charges">
+ <size>-1,-1</size>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
<label>Gross premium</label>
</object>
</object>