[lmi-commits] [5661] Add rounding rules for 7702 and 7702A premium rates

[Greg Chicares]

Revision: 5661
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5661
Author:   chicares
Date:     2013-01-11 12:07:12 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
Add rounding rules for 7702 and 7702A premium rates

Modified Paths:
--------------
    lmi/trunk/basic_values.hpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/rounding_document.cpp
    lmi/trunk/rounding_rules.cpp
    lmi/trunk/rounding_rules.hpp
    lmi/trunk/rounding_view.xrc

Modified: lmi/trunk/basic_values.hpp
===================================================================
--- lmi/trunk/basic_values.hpp  2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/basic_values.hpp  2013-01-11 12:07:12 UTC (rev 5661)
@@ -183,6 +183,8 @@
     round_to<double> const& round_loan              () const {return 
round_loan_              ;}
     round_to<double> const& round_interest_rate_7702() const {return 
round_interest_rate_7702_;}
     round_to<double> const& round_corridor_factor   () const {return 
round_corridor_factor_   ;}
+    round_to<double> const& round_nsp_rate_7702     () const {return 
round_nsp_rate_7702_     ;}
+    round_to<double> const& round_seven_pay_rate    () const {return 
round_seven_pay_rate_    ;}
     round_to<double> const& round_surrender_charge  () const {return 
round_surrender_charge_  ;}
     round_to<double> const& round_irr               () const {return 
round_irr_               ;}
     round_to<double> const& round_min_specamt       () const {return 
round_min_specamt_       ;}
@@ -416,6 +418,8 @@
     round_to<double> round_loan_              ;
     round_to<double> round_interest_rate_7702_;
     round_to<double> round_corridor_factor_   ;
+    round_to<double> round_nsp_rate_7702_     ;
+    round_to<double> round_seven_pay_rate_    ;
     round_to<double> round_surrender_charge_  ;
     round_to<double> round_irr_               ;
     round_to<double> round_min_specamt_       ;

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/ihs_basicval.cpp  2013-01-11 12:07:12 UTC (rev 5661)
@@ -876,6 +876,8 @@
     set_rounding_rule(round_loan_              , 
RoundingRules_->datum("RoundLoan"        ));
     set_rounding_rule(round_interest_rate_7702_, 
RoundingRules_->datum("RoundIntRate7702" ));
     set_rounding_rule(round_corridor_factor_   , 
RoundingRules_->datum("RoundCorrFactor"  ));
+    set_rounding_rule(round_nsp_rate_7702_     , 
RoundingRules_->datum("RoundNspRate7702" ));
+    set_rounding_rule(round_seven_pay_rate_    , 
RoundingRules_->datum("RoundSevenPayRate"));
     set_rounding_rule(round_surrender_charge_  , 
RoundingRules_->datum("RoundSurrCharge"  ));
     set_rounding_rule(round_irr_               , 
RoundingRules_->datum("RoundIrr"         ));
     set_rounding_rule(round_min_specamt_       , 
RoundingRules_->datum("RoundMinSpecamt"  ));

Modified: lmi/trunk/rounding_document.cpp
===================================================================
--- lmi/trunk/rounding_document.cpp     2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/rounding_document.cpp     2013-01-11 12:07:12 UTC (rev 5661)
@@ -57,6 +57,8 @@
     values_["loan"              ] = &rounding_rules_.round_loan_              ;
     values_["interest_rate_7702"] = &rounding_rules_.round_interest_rate_7702_;
     values_["corridor_factor"   ] = &rounding_rules_.round_corridor_factor_   ;
+    values_["nsp_rate_7702"     ] = &rounding_rules_.round_nsp_rate_7702_     ;
+    values_["seven_pay_rate"    ] = &rounding_rules_.round_seven_pay_rate_    ;
     values_["surrender_charge"  ] = &rounding_rules_.round_surrender_charge_  ;
     values_["irr"               ] = &rounding_rules_.round_irr_               ;
     values_["min_specamt"       ] = &rounding_rules_.round_min_specamt_       ;

Modified: lmi/trunk/rounding_rules.cpp
===================================================================
--- lmi/trunk/rounding_rules.cpp        2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/rounding_rules.cpp        2013-01-11 12:07:12 UTC (rev 5661)
@@ -160,6 +160,8 @@
     ,round_loan_              (2, r_to_nearest, "")
     ,round_interest_rate_7702_(0, r_not_at_all, "")
     ,round_corridor_factor_   (2, r_to_nearest, "")
+    ,round_nsp_rate_7702_     (6, r_downward  , "")
+    ,round_seven_pay_rate_    (6, r_downward  , "")
     ,round_surrender_charge_  (2, r_to_nearest, "")
     ,round_irr_               (5, r_downward  , "")
     ,round_min_specamt_       (0, r_upward    , "")
@@ -232,6 +234,8 @@
     ascribe("RoundLoan"        , &rounding_rules::round_loan_              );
     ascribe("RoundIntRate7702" , &rounding_rules::round_interest_rate_7702_);
     ascribe("RoundCorrFactor"  , &rounding_rules::round_corridor_factor_   );
+    ascribe("RoundNspRate7702" , &rounding_rules::round_nsp_rate_7702_     );
+    ascribe("RoundSevenPayRate", &rounding_rules::round_seven_pay_rate_    );
     ascribe("RoundSurrCharge"  , &rounding_rules::round_surrender_charge_  );
     ascribe("RoundIrr"         , &rounding_rules::round_irr_               );
     ascribe("RoundMinSpecamt"  , &rounding_rules::round_min_specamt_       );

Modified: lmi/trunk/rounding_rules.hpp
===================================================================
--- lmi/trunk/rounding_rules.hpp        2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/rounding_rules.hpp        2013-01-11 12:07:12 UTC (rev 5661)
@@ -147,6 +147,8 @@
     rounding_parameters round_loan_              ;
     rounding_parameters round_interest_rate_7702_;
     rounding_parameters round_corridor_factor_   ;
+    rounding_parameters round_nsp_rate_7702_     ;
+    rounding_parameters round_seven_pay_rate_    ;
     rounding_parameters round_surrender_charge_  ;
     rounding_parameters round_irr_               ;
     rounding_parameters round_min_specamt_       ;

Modified: lmi/trunk/rounding_view.xrc
===================================================================
--- lmi/trunk/rounding_view.xrc 2013-01-11 11:23:16 UTC (rev 5660)
+++ lmi/trunk/rounding_view.xrc 2013-01-11 12:07:12 UTC (rev 5661)
@@ -225,6 +225,30 @@
                                 <object class="sizeritem">
                                     
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
                                     <object class="wxStaticText">
+                                        <label>7702 NSP rate</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_LEFT</flag>
+                                    <object class="RoundingButtons" 
name="nsp_rate_7702">
+                                        <size>-1,-1</size>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText">
+                                        <label>Seven-pay rate</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_LEFT</flag>
+                                    <object class="RoundingButtons" 
name="seven_pay_rate">
+                                        <size>-1,-1</size>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText">
                                         <label>Surrender charge</label>
                                     </object>
                                 </object>