[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5350] Reorder inforce inputs: e.g., GLP naturally precede
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5350] Reorder inforce inputs: e.g., GLP naturally precedes cumulative GLP |
|
Date: |
Wed, 11 Jan 2012 08:17:26 +0000 |
Revision: 5350
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5350
Author: chicares
Date: 2012-01-11 08:17:26 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Reorder inforce inputs: e.g., GLP naturally precedes cumulative GLP
Modified Paths:
--------------
lmi/trunk/ihs_irc7702.cpp
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_harmonization.cpp
lmi/trunk/skin.xrc
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/ihs_irc7702.cpp
===================================================================
--- lmi/trunk/ihs_irc7702.cpp 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/ihs_irc7702.cpp 2012-01-11 08:17:26 UTC (rev 5350)
@@ -183,14 +183,14 @@
PriorSpecAmt = a_PresentSpecAmt;
// TODO ?? Assert that this is <= least-bft arg?
LeastBftAmtEver = a_PresentSpecAmt;
- CumGLP = 0.0;
- GptLimit = 0.0;
- CumPmts = 0.0;
+ PriorDBOpt = PresentDBOpt;
PresentGLP = 0.0;
PriorGLP = 0.0;
+ CumGLP = 0.0;
PresentGSP = 0.0;
PriorGSP = 0.0;
- PriorDBOpt = PresentDBOpt;
+ GptLimit = 0.0;
+ CumPmts = 0.0;
}
else
{
@@ -199,15 +199,15 @@
LeastBftAmtEver = a_LeastBftAmtEver;
LMI_ASSERT(LeastBftAmtEver <= PriorBftAmt);
LMI_ASSERT(LeastBftAmtEver <= PresentBftAmt);
+// PriorDBOpt = PresentDBOpt; // TODO ??
// TODO ?? Think more about inforce.
- CumGLP = InforceCumGLP; // TODO ?? Don't need as member?
- GptLimit = 0.0; // TODO ??
- CumPmts = 0.0; // TODO ??
PresentGLP = 0.0; // TODO ??
PriorGLP = 0.0;
+ CumGLP = InforceCumGLP; // TODO ?? Don't need as member?
PresentGSP = 0.0;
PriorGSP = a_InforceGSP; // TODO ?? Don't need as member?
-// PriorDBOpt = PresentDBOpt; // TODO ??
+ GptLimit = 0.0; // TODO ??
+ CumPmts = 0.0; // TODO ??
// to handle inforce, we need to know:
// the quantity A in A+B-C (i.e. both GSP and GLP)
// CumGLP
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/input.cpp 2012-01-11 08:17:26 UTC (rev 5350)
@@ -154,8 +154,8 @@
// ,PolicyNumber ("")
// ,InforceAsOfDate ("")
// ,InforceTaxBasis ("")
+// ,InforceGlp ("")
// ,InforceCumulativeGlp ("")
-// ,InforceGlp ("")
// ,InforceGsp ("")
// ,InforceSevenPayPremium ("")
// ,InforceIsMec ("")
@@ -459,8 +459,8 @@
ascribe("PolicyNumber" , &Input::PolicyNumber
);
ascribe("InforceAsOfDate" , &Input::InforceAsOfDate
);
ascribe("InforceTaxBasis" , &Input::InforceTaxBasis
);
+ ascribe("InforceGlp" , &Input::InforceGlp
);
ascribe("InforceCumulativeGlp" ,
&Input::InforceCumulativeGlp );
- ascribe("InforceGlp" , &Input::InforceGlp
);
ascribe("InforceGsp" , &Input::InforceGsp
);
ascribe("InforceSevenPayPremium" ,
&Input::InforceSevenPayPremium );
ascribe("InforceIsMec" , &Input::InforceIsMec
);
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/input.hpp 2012-01-11 08:17:26 UTC (rev 5350)
@@ -348,8 +348,8 @@
datum_string PolicyNumber ;
tnr_date InforceAsOfDate ;
tnr_nonnegative_double InforceTaxBasis ;
+ tnr_nonnegative_double InforceGlp ;
tnr_nonnegative_double InforceCumulativeGlp ;
- tnr_nonnegative_double InforceGlp ;
tnr_nonnegative_double InforceGsp ;
tnr_nonnegative_double InforceSevenPayPremium ;
mce_yes_or_no InforceIsMec ;
Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/input_harmonization.cpp 2012-01-11 08:17:26 UTC (rev 5350)
@@ -289,8 +289,8 @@
,std::max(InforceAsOfDate.value(), InforceAsOfDate.minimum())
);
+ InforceGlp .enable(mce_gpt == DefinitionOfLifeInsurance);
InforceCumulativeGlp.enable(mce_gpt == DefinitionOfLifeInsurance);
- InforceGlp .enable(mce_gpt == DefinitionOfLifeInsurance);
InforceGsp .enable(mce_gpt == DefinitionOfLifeInsurance);
bool non_mec = mce_no == InforceIsMec;
Modified: lmi/trunk/skin.xrc
===================================================================
--- lmi/trunk/skin.xrc 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/skin.xrc 2012-01-11 08:17:26 UTC (rev 5350)
@@ -1582,13 +1582,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Cumulative GLP</label>
+ <label>GLP</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxTextCtrl"
name="InforceCumulativeGlp">
- <help>Cumulative guideline level
premium since issue (not yet implemented)</help>
+ <object class="wxTextCtrl"
name="InforceGlp">
+ <help>Inforce guideline level premium
(not yet implemented)</help>
<size>80,-1</size>
<value>0</value>
</object>
@@ -1597,13 +1597,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
<object class="wxStaticText">
- <label>GLP</label>
+ <label>Cumulative GLP</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxTextCtrl"
name="InforceGlp">
- <help>Inforce guideline level premium
(not yet implemented)</help>
+ <object class="wxTextCtrl"
name="InforceCumulativeGlp">
+ <help>Cumulative guideline level
premium since issue (not yet implemented)</help>
<size>80,-1</size>
<value>0</value>
</object>
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2012-01-08 09:11:27 UTC (rev 5349)
+++ lmi/trunk/yare_input.hpp 2012-01-11 08:17:26 UTC (rev 5350)
@@ -178,8 +178,8 @@
// std::string PolicyNumber ;
// calendar_date InforceAsOfDate ;
double InforceTaxBasis ;
+// double InforceGlp ;
// double InforceCumulativeGlp ;
-// double InforceGlp ;
// double InforceGsp ;
// double InforceSevenPayPremium ;
bool InforceIsMec ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5350] Reorder inforce inputs: e.g., GLP naturally precedes cumulative GLP,
Greg Chicares <=