[lmi-commits] [6414] Add a rounding rule for minimum initial premium

[Greg Chicares]

Revision: 6414
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6414
Author:   chicares
Date:     2015-11-16 04:16:38 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
Add a rounding rule for minimum initial premium

Modified Paths:
--------------
    lmi/trunk/basic_values.hpp
    lmi/trunk/basicvalues.cpp
    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  2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/basic_values.hpp  2015-11-16 04:16:38 UTC (rev 6414)
@@ -193,6 +193,7 @@
     round_to<double> const& round_max_specamt       () const {return 
round_max_specamt_       ;}
     round_to<double> const& round_min_premium       () const {return 
round_min_premium_       ;}
     round_to<double> const& round_max_premium       () const {return 
round_max_premium_       ;}
+    round_to<double> const& round_min_init_premium  () const {return 
round_min_init_premium_  ;}
 
   protected:
     double GetModalMinPrem
@@ -460,6 +461,7 @@
     round_to<double> round_max_specamt_       ;
     round_to<double> round_min_premium_       ;
     round_to<double> round_max_premium_       ;
+    round_to<double> round_min_init_premium_  ;
 };
 
 inline int BasicValues::GetLength() const

Modified: lmi/trunk/basicvalues.cpp
===================================================================
--- lmi/trunk/basicvalues.cpp   2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/basicvalues.cpp   2015-11-16 04:16:38 UTC (rev 6414)
@@ -77,6 +77,7 @@
     ,round_max_specamt_       (0, r_downward  )
     ,round_min_premium_       (2, r_upward    )
     ,round_max_premium_       (2, r_downward  )
+    ,round_min_init_premium_  (2, r_upward    )
 {
     Init();
 }

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/ihs_basicval.cpp  2015-11-16 04:16:38 UTC (rev 6414)
@@ -834,6 +834,7 @@
     set_rounding_rule(round_max_specamt_       , 
RoundingRules_->datum("RoundMaxSpecamt"  ));
     set_rounding_rule(round_min_premium_       , 
RoundingRules_->datum("RoundMinPrem"     ));
     set_rounding_rule(round_max_premium_       , 
RoundingRules_->datum("RoundMaxPrem"     ));
+    set_rounding_rule(round_min_init_premium_  , 
RoundingRules_->datum("RoundMinInitPrem" ));
 }
 
 /// Establish maximum survivorship duration.

Modified: lmi/trunk/rounding_document.cpp
===================================================================
--- lmi/trunk/rounding_document.cpp     2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/rounding_document.cpp     2015-11-16 04:16:38 UTC (rev 6414)
@@ -27,7 +27,7 @@
 // a GUI class, is required in a document implementation?
 
 #include "rounding_view.hpp"
-#include "rounding_view_editor.hpp" // class RoundingButtons
+#include "rounding_view_editor.hpp"     // class RoundingButtons
 #include "view_ex.tpp"
 
 // EVGENIY !! Doesn't it seem strange that this wx header appears
@@ -65,6 +65,7 @@
     values_["max_specamt"       ] = &rounding_rules_.round_max_specamt_       ;
     values_["min_premium"       ] = &rounding_rules_.round_min_premium_       ;
     values_["max_premium"       ] = &rounding_rules_.round_max_premium_       ;
+    values_["min_init_premium"  ] = &rounding_rules_.round_min_init_premium_  ;
 }
 
 RoundingDocument::~RoundingDocument()

Modified: lmi/trunk/rounding_rules.cpp
===================================================================
--- lmi/trunk/rounding_rules.cpp        2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/rounding_rules.cpp        2015-11-16 04:16:38 UTC (rev 6414)
@@ -168,6 +168,7 @@
     ,round_max_specamt_       (0, r_downward  , "")
     ,round_min_premium_       (2, r_upward    , "")
     ,round_max_premium_       (2, r_downward  , "")
+    ,round_min_init_premium_  (2, r_upward    , "")
 {
     ascribe_members();
 }
@@ -204,6 +205,7 @@
     LMI_ASSERT(r_not_at_all == round_max_specamt_       .style() || r_downward 
== round_max_specamt_       .style());
     LMI_ASSERT(r_not_at_all == round_min_premium_       .style() || r_upward   
== round_min_premium_       .style());
     LMI_ASSERT(r_not_at_all == round_max_premium_       .style() || r_downward 
== round_max_premium_       .style());
+    LMI_ASSERT(r_not_at_all == round_min_init_premium_  .style() || r_upward   
== round_min_init_premium_  .style());
 }
 
 rounding_rules::~rounding_rules()
@@ -242,6 +244,7 @@
     ascribe("RoundMaxSpecamt"  , &rounding_rules::round_max_specamt_       );
     ascribe("RoundMinPrem"     , &rounding_rules::round_min_premium_       );
     ascribe("RoundMaxPrem"     , &rounding_rules::round_max_premium_       );
+    ascribe("RoundMinInitPrem" , &rounding_rules::round_min_init_premium_  );
 }
 
 /// Backward-compatibility serial number of this class's xml version.

Modified: lmi/trunk/rounding_rules.hpp
===================================================================
--- lmi/trunk/rounding_rules.hpp        2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/rounding_rules.hpp        2015-11-16 04:16:38 UTC (rev 6414)
@@ -155,6 +155,7 @@
     rounding_parameters round_max_specamt_       ;
     rounding_parameters round_min_premium_       ;
     rounding_parameters round_max_premium_       ;
+    rounding_parameters round_min_init_premium_  ;
 };
 
 void LMI_SO load(rounding_rules      &, fs::path const&);

Modified: lmi/trunk/rounding_view.xrc
===================================================================
--- lmi/trunk/rounding_view.xrc 2015-11-16 03:50:24 UTC (rev 6413)
+++ lmi/trunk/rounding_view.xrc 2015-11-16 04:16:38 UTC (rev 6414)
@@ -318,6 +318,18 @@
                                         <size>-1,-1</size>
                                     </object>
                                 </object>
+                                <object class="sizeritem">
+                                    
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
+                                    <object class="wxStaticText">
+                                        <label>Minimum initial premium</label>
+                                    </object>
+                                </object>
+                                <object class="sizeritem">
+                                    <flag>wxALIGN_LEFT</flag>
+                                    <object class="RoundingButtons" 
name="min_init_premium">
+                                        <size>-1,-1</size>
+                                    </object>
+                                </object>
                             </object>
                         </object>
                     </object>