[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5658] Permute to bring 7702 items together
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5658] Permute to bring 7702 items together |
|
Date: |
Thu, 10 Jan 2013 23:52:38 +0000 |
Revision: 5658
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5658
Author: chicares
Date: 2013-01-10 23:52:38 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Permute to bring 7702 items together
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 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/basic_values.hpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -181,6 +181,7 @@
round_to<double> const& round_interest_credit () const {return
round_interest_credit_ ;}
round_to<double> const& round_withdrawal () const {return
round_withdrawal_ ;}
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_surrender_charge () const {return
round_surrender_charge_ ;}
round_to<double> const& round_irr () const {return
round_irr_ ;}
@@ -188,7 +189,6 @@
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_interest_rate_7702() const {return
round_interest_rate_7702_;}
protected:
double GetModalMinPrem
@@ -414,6 +414,7 @@
round_to<double> round_interest_credit_ ;
round_to<double> round_withdrawal_ ;
round_to<double> round_loan_ ;
+ round_to<double> round_interest_rate_7702_;
round_to<double> round_corridor_factor_ ;
round_to<double> round_surrender_charge_ ;
round_to<double> round_irr_ ;
@@ -421,7 +422,6 @@
round_to<double> round_max_specamt_ ;
round_to<double> round_min_premium_ ;
round_to<double> round_max_premium_ ;
- round_to<double> round_interest_rate_7702_;
};
inline int BasicValues::GetLength() const
Modified: lmi/trunk/basicvalues.cpp
===================================================================
--- lmi/trunk/basicvalues.cpp 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/basicvalues.cpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -70,6 +70,7 @@
,round_interest_credit_ (2, r_to_nearest)
,round_withdrawal_ (2, r_to_nearest)
,round_loan_ (2, r_to_nearest)
+ ,round_interest_rate_7702_(0, r_not_at_all)
,round_corridor_factor_ (2, r_to_nearest)
,round_surrender_charge_ (2, r_to_nearest)
,round_irr_ (5, r_downward )
@@ -77,7 +78,6 @@
,round_max_specamt_ (0, r_downward )
,round_min_premium_ (2, r_upward )
,round_max_premium_ (2, r_downward )
- ,round_interest_rate_7702_(0, r_not_at_all)
{
Init();
}
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/ihs_basicval.cpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -874,6 +874,7 @@
set_rounding_rule(round_interest_credit_ ,
RoundingRules_->datum("RoundIntCredit" ));
set_rounding_rule(round_withdrawal_ ,
RoundingRules_->datum("RoundWithdrawal" ));
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_surrender_charge_ ,
RoundingRules_->datum("RoundSurrCharge" ));
set_rounding_rule(round_irr_ ,
RoundingRules_->datum("RoundIrr" ));
@@ -881,7 +882,6 @@
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_interest_rate_7702_,
RoundingRules_->datum("RoundIntRate7702"));
}
/// Establish maximum survivorship duration.
Modified: lmi/trunk/rounding_document.cpp
===================================================================
--- lmi/trunk/rounding_document.cpp 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/rounding_document.cpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -55,6 +55,7 @@
values_["interest_credit" ] = &rounding_rules_.round_interest_credit_;
values_["withdrawal" ] = &rounding_rules_.round_withdrawal_;
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_["surrender_charge" ] = &rounding_rules_.round_surrender_charge_;
values_["irr" ] = &rounding_rules_.round_irr_;
@@ -62,7 +63,6 @@
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_["interest_rate_7702"] = &rounding_rules_.round_interest_rate_7702_;
}
RoundingDocument::~RoundingDocument()
Modified: lmi/trunk/rounding_rules.cpp
===================================================================
--- lmi/trunk/rounding_rules.cpp 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/rounding_rules.cpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -158,6 +158,7 @@
,round_interest_credit_ (2, r_to_nearest, "")
,round_withdrawal_ (2, r_to_nearest, "")
,round_loan_ (2, r_to_nearest, "")
+ ,round_interest_rate_7702_(0, r_not_at_all, "")
,round_corridor_factor_ (2, r_to_nearest, "")
,round_surrender_charge_ (2, r_to_nearest, "")
,round_irr_ (5, r_downward , "")
@@ -165,7 +166,6 @@
,round_max_specamt_ (0, r_downward , "")
,round_min_premium_ (2, r_upward , "")
,round_max_premium_ (2, r_downward , "")
- ,round_interest_rate_7702_(0, r_not_at_all, "")
{
ascribe_members();
}
@@ -197,11 +197,11 @@
load(filename);
+ LMI_ASSERT(r_not_at_all == round_interest_rate_7702_.style() || r_upward
== round_interest_rate_7702_.style());
LMI_ASSERT(r_not_at_all == round_min_specamt_ .style() || r_upward
== round_min_specamt_ .style());
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_interest_rate_7702_.style() || r_upward
== round_interest_rate_7702_.style());
}
rounding_rules::~rounding_rules()
@@ -230,6 +230,7 @@
ascribe("RoundIntCredit" , &rounding_rules::round_interest_credit_ );
ascribe("RoundWithdrawal" , &rounding_rules::round_withdrawal_ );
ascribe("RoundLoan" , &rounding_rules::round_loan_ );
+ ascribe("RoundIntRate7702", &rounding_rules::round_interest_rate_7702_);
ascribe("RoundCorrFactor" , &rounding_rules::round_corridor_factor_ );
ascribe("RoundSurrCharge" , &rounding_rules::round_surrender_charge_ );
ascribe("RoundIrr" , &rounding_rules::round_irr_ );
@@ -237,7 +238,6 @@
ascribe("RoundMaxSpecamt" , &rounding_rules::round_max_specamt_ );
ascribe("RoundMinPrem" , &rounding_rules::round_min_premium_ );
ascribe("RoundMaxPrem" , &rounding_rules::round_max_premium_ );
- ascribe("RoundIntRate7702", &rounding_rules::round_interest_rate_7702_);
}
/// Backward-compatibility serial number of this class's xml version.
Modified: lmi/trunk/rounding_rules.hpp
===================================================================
--- lmi/trunk/rounding_rules.hpp 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/rounding_rules.hpp 2013-01-10 23:52:38 UTC (rev 5658)
@@ -145,6 +145,7 @@
rounding_parameters round_interest_credit_ ;
rounding_parameters round_withdrawal_ ;
rounding_parameters round_loan_ ;
+ rounding_parameters round_interest_rate_7702_;
rounding_parameters round_corridor_factor_ ;
rounding_parameters round_surrender_charge_ ;
rounding_parameters round_irr_ ;
@@ -152,7 +153,6 @@
rounding_parameters round_max_specamt_ ;
rounding_parameters round_min_premium_ ;
rounding_parameters round_max_premium_ ;
- rounding_parameters round_interest_rate_7702_;
};
void LMI_SO load(rounding_rules &, fs::path const&);
Modified: lmi/trunk/rounding_view.xrc
===================================================================
--- lmi/trunk/rounding_view.xrc 2013-01-10 19:39:31 UTC (rev 5657)
+++ lmi/trunk/rounding_view.xrc 2013-01-10 23:52:38 UTC (rev 5658)
@@ -170,6 +170,18 @@
<size>-1,-1</size>
</object>
</object>
+ <object class="sizeritem">
+
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
+ <label>Loan</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <flag>wxALIGN_LEFT</flag>
+ <object class="RoundingButtons"
name="loan">
+ <size>-1,-1</size>
+ </object>
+ </object>
</object>
</object>
</object>
@@ -189,12 +201,12 @@
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
- <label>Loan</label>
+ <label>7702 interest rate</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT</flag>
- <object class="RoundingButtons"
name="loan">
+ <object class="RoundingButtons"
name="interest_rate_7702">
<size>-1,-1</size>
</object>
</object>
@@ -282,18 +294,6 @@
<size>-1,-1</size>
</object>
</object>
- <object class="sizeritem">
-
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
- <object class="wxStaticText">
- <label>7702 interest rate</label>
- </object>
- </object>
- <object class="sizeritem">
- <flag>wxALIGN_LEFT</flag>
- <object class="RoundingButtons"
name="interest_rate_7702">
- <size>-1,-1</size>
- </object>
- </object>
</object>
</object>
</object>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5658] Permute to bring 7702 items together,
Greg Chicares <=