[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5078] Rectify names
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5078] Rectify names |
|
Date: |
Tue, 27 Jul 2010 23:57:30 +0000 |
Revision: 5078
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5078
Author: chicares
Date: 2010-07-27 23:57:29 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Rectify names
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_harmonization.cpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/main_cgi.cpp
lmi/trunk/main_cli.cpp
lmi/trunk/mec.xrc
lmi/trunk/mec_input.cpp
lmi/trunk/mec_input.hpp
lmi/trunk/mec_server.cpp
lmi/trunk/sample.cns
lmi/trunk/sample.ill
lmi/trunk/skin.xrc
lmi/trunk/skin_coli_boli.xrc
lmi/trunk/skin_group_carveout.xrc
lmi/trunk/skin_group_carveout2.xrc
lmi/trunk/skin_reg_d.xrc
lmi/trunk/skin_single_premium.xrc
lmi/trunk/skin_variable_annuity.xrc
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/ChangeLog 2010-07-27 23:57:29 UTC (rev 5078)
@@ -26587,3 +26587,63 @@
tn_range_types.hpp
Merge two identical types. Rationale: vide supra at 20100726T2148Z.
+20100727T1052Z <address@hidden> [667]
+
+ input.cpp
+ input.hpp
+ input_harmonization.cpp
+ input_xml_io.cpp
+ sample.cns
+ sample.ill
+ yare_input.hpp
+Remove undesirable input members.
+
+20100727T1332Z <address@hidden> [666]
+
+ input_realization.cpp
+Remove a duplicative defect marker.
+
+20100727T1333Z <address@hidden> [662]
+
+ input_harmonization.cpp
+Remove duplicative defect markers.
+
+20100727T1338Z <address@hidden> [661]
+
+ input_harmonization.cpp
+Remove a marker for a defect already resolved.
+
+20100727T1341Z <address@hidden> [659]
+
+ input_harmonization.cpp
+Remove duplicative defect markers.
+
+20100727T2356Z <address@hidden> [659]
+
+ xml_serializable.tpp
+Extend redintegrative value-translation to obsolete elements.
+
+20100727T2357Z <address@hidden> [659]
+
+ input.cpp
+ input.hpp
+ input_harmonization.cpp
+ input_xml_io.cpp
+ main_cgi.cpp
+ main_cli.cpp
+ mec.xrc
+ mec_input.cpp
+ mec_input.hpp
+ mec_server.cpp
+ sample.cns
+ sample.ill
+ skin.xrc
+ skin_coli_boli.xrc
+ skin_group_carveout.xrc
+ skin_group_carveout2.xrc
+ skin_reg_d.xrc
+ skin_single_premium.xrc
+ skin_variable_annuity.xrc
+ yare_input.hpp
+Rectify names.
+
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/input.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -211,10 +211,10 @@
// ,SupplementalReportColumn09 ("")
// ,SupplementalReportColumn10 ("")
// ,SupplementalReportColumn11 ("")
- ,DeprecatedSolveTgtAtWhich ("Maturity")
- ,DeprecatedSolveFromWhich ("Issue")
- ,DeprecatedSolveToWhich ("Retirement")
-// ,DeprecatedUseDOB ("")
+ ,SolveTgtAtWhich ("Maturity")
+ ,SolveFromWhich ("Issue")
+ ,SolveToWhich ("Retirement")
+// ,UseDOB ("")
// ,EffectiveDateToday ("")
// ,DeathBenefitOptionFromRetirement ("")
// ,DeathBenefitOptionFromIssue ("")
@@ -508,10 +508,10 @@
ascribe("SupplementalReportColumn10" ,
&Input::SupplementalReportColumn10 );
ascribe("SupplementalReportColumn11" ,
&Input::SupplementalReportColumn11 );
- ascribe("DeprecatedSolveTgtAtWhich" ,
&Input::DeprecatedSolveTgtAtWhich );
- ascribe("DeprecatedSolveFromWhich" ,
&Input::DeprecatedSolveFromWhich );
- ascribe("DeprecatedSolveToWhich" ,
&Input::DeprecatedSolveToWhich );
- ascribe("DeprecatedUseDOB" , &Input::DeprecatedUseDOB
);
+ ascribe("SolveTgtAtWhich" , &Input::SolveTgtAtWhich
);
+ ascribe("SolveFromWhich" , &Input::SolveFromWhich
);
+ ascribe("SolveToWhich" , &Input::SolveToWhich
);
+ ascribe("UseDOB" , &Input::UseDOB
);
ascribe("EffectiveDateToday" ,
&Input::EffectiveDateToday );
ascribe("DeathBenefitOptionFromRetirement" ,
&Input::DeathBenefitOptionFromRetirement );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/input.hpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -418,10 +418,10 @@
mce_report_column SupplementalReportColumn09 ;
mce_report_column SupplementalReportColumn10 ;
mce_report_column SupplementalReportColumn11 ;
- mce_to_point DeprecatedSolveTgtAtWhich ;
- mce_from_point DeprecatedSolveFromWhich ;
- mce_to_point DeprecatedSolveToWhich ;
- mce_yes_or_no DeprecatedUseDOB ;
+ mce_to_point SolveTgtAtWhich ;
+ mce_from_point SolveFromWhich ;
+ mce_to_point SolveToWhich ;
+ mce_yes_or_no UseDOB ;
mce_yes_or_no EffectiveDateToday ;
mce_dbopt DeathBenefitOptionFromRetirement;
mce_dbopt DeathBenefitOptionFromIssue ;
Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/input_harmonization.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -232,8 +232,8 @@
EffectiveDate.enable(mce_no == EffectiveDateToday);
- IssueAge .enable(mce_no == DeprecatedUseDOB);
- DateOfBirth .enable(mce_yes == DeprecatedUseDOB);
+ IssueAge .enable(mce_no == UseDOB);
+ DateOfBirth .enable(mce_yes == UseDOB);
// The ranges of both EffectiveDate and IssueAge are treated as
// independent, to prevent one's value from affecting the other's
@@ -852,27 +852,27 @@
bool actually_solving = solves_allowed && mce_solve_none != SolveType;
- DeprecatedSolveFromWhich .allow(mce_from_issue , actually_solving);
- DeprecatedSolveFromWhich .allow(mce_from_year , actually_solving);
- DeprecatedSolveFromWhich .allow(mce_from_age , actually_solving);
- DeprecatedSolveFromWhich .allow(mce_from_retirement, actually_solving);
- DeprecatedSolveFromWhich .enable(actually_solving);
+ SolveFromWhich .allow(mce_from_issue , actually_solving);
+ SolveFromWhich .allow(mce_from_year , actually_solving);
+ SolveFromWhich .allow(mce_from_age , actually_solving);
+ SolveFromWhich .allow(mce_from_retirement, actually_solving);
+ SolveFromWhich .enable(actually_solving);
- DeprecatedSolveToWhich .allow(mce_to_retirement , actually_solving);
- DeprecatedSolveToWhich .allow(mce_to_year , actually_solving);
- DeprecatedSolveToWhich .allow(mce_to_age , actually_solving);
- DeprecatedSolveToWhich .allow(mce_to_maturity , actually_solving);
- DeprecatedSolveToWhich .enable(actually_solving);
+ SolveToWhich .allow(mce_to_retirement , actually_solving);
+ SolveToWhich .allow(mce_to_year , actually_solving);
+ SolveToWhich .allow(mce_to_age , actually_solving);
+ SolveToWhich .allow(mce_to_maturity , actually_solving);
+ SolveToWhich .enable(actually_solving);
- DeprecatedSolveTgtAtWhich .allow(mce_to_retirement , actually_solving);
- DeprecatedSolveTgtAtWhich .allow(mce_to_year , actually_solving);
- DeprecatedSolveTgtAtWhich .allow(mce_to_age , actually_solving);
- DeprecatedSolveTgtAtWhich .allow(mce_to_maturity , actually_solving);
- DeprecatedSolveTgtAtWhich .enable(actually_solving &&
mce_solve_for_non_mec != SolveTarget);
+ SolveTgtAtWhich .allow(mce_to_retirement , actually_solving);
+ SolveTgtAtWhich .allow(mce_to_year , actually_solving);
+ SolveTgtAtWhich .allow(mce_to_age , actually_solving);
+ SolveTgtAtWhich .allow(mce_to_maturity , actually_solving);
+ SolveTgtAtWhich .enable(actually_solving && mce_solve_for_non_mec !=
SolveTarget);
- SolveBeginYear .enable(actually_solving && mce_from_year ==
DeprecatedSolveFromWhich);
- SolveEndYear .enable(actually_solving && mce_to_year ==
DeprecatedSolveToWhich);
- SolveTargetYear.enable(actually_solving && mce_to_year ==
DeprecatedSolveTgtAtWhich && mce_solve_for_non_mec != SolveTarget);
+ SolveBeginYear .enable(actually_solving && mce_from_year ==
SolveFromWhich);
+ SolveEndYear .enable(actually_solving && mce_to_year == SolveToWhich);
+ SolveTargetYear.enable(actually_solving && mce_to_year ==
SolveTgtAtWhich && mce_solve_for_non_mec != SolveTarget);
SolveTargetYear.minimum(1);
// INPUT !! The minimum 'SolveEndYear' and 'SolveTargetYear' set
@@ -886,9 +886,9 @@
// INPUT !! Temporarily, existing -'Time' names are used where
// -'Age' names would be clearer.
- SolveBeginTime .enable(actually_solving && mce_from_age ==
DeprecatedSolveFromWhich);
- SolveEndTime .enable(actually_solving && mce_to_age ==
DeprecatedSolveToWhich);
- SolveTargetTime.enable(actually_solving && mce_to_age ==
DeprecatedSolveTgtAtWhich && mce_solve_for_non_mec != SolveTarget);
+ SolveBeginTime .enable(actually_solving && mce_from_age == SolveFromWhich);
+ SolveEndTime .enable(actually_solving && mce_to_age == SolveToWhich);
+ SolveTargetTime.enable(actually_solving && mce_to_age == SolveTgtAtWhich
&& mce_solve_for_non_mec != SolveTarget);
#if 0 // http://lists.nongnu.org/archive/html/lmi/2008-08/msg00036.html
SolveBeginTime .minimum_and_maximum(issue_age() ,
maturity_age());
@@ -1049,7 +1049,7 @@
,EffectiveDate.value()
,use_anb
);
- if(mce_no == DeprecatedUseDOB)
+ if(mce_no == UseDOB)
{
// If no DOB is supplied, assume a birthday occurs on the
// issue date--as good an assumption as any, and the simplest.
@@ -1088,7 +1088,7 @@
void Input::SetSolveDurations()
{
- switch(DeprecatedSolveTgtAtWhich.value())
+ switch(SolveTgtAtWhich.value())
{
case mce_to_year:
{
@@ -1114,14 +1114,14 @@
{
fatal_error()
<< "Case '"
- << DeprecatedSolveTgtAtWhich.value()
+ << SolveTgtAtWhich.value()
<< "' not found."
<< LMI_FLUSH
;
}
}
- switch(DeprecatedSolveFromWhich.value())
+ switch(SolveFromWhich.value())
{
case mce_from_year:
{
@@ -1147,14 +1147,14 @@
{
fatal_error()
<< "Case '"
- << DeprecatedSolveFromWhich.value()
+ << SolveFromWhich.value()
<< "' not found."
<< LMI_FLUSH
;
}
}
- switch(DeprecatedSolveToWhich.value())
+ switch(SolveToWhich.value())
{
case mce_to_year:
{
@@ -1180,7 +1180,7 @@
{
fatal_error()
<< "Case '"
- << DeprecatedSolveToWhich.value()
+ << SolveToWhich.value()
<< "' not found."
<< LMI_FLUSH
;
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/input_xml_io.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -111,6 +111,10 @@
,"CorporationTaxpayerId" // Would violate privacy.
,"CurrentCoiGrading" // Withdrawn.
,"DateOfRetirement" // Withdrawn.
+ ,"DeprecatedSolveFromWhich" // Renamed (without 'Deprecated'-).
+ ,"DeprecatedSolveTgtAtWhich" // Renamed (without 'Deprecated'-).
+ ,"DeprecatedSolveToWhich" // Renamed (without 'Deprecated'-).
+ ,"DeprecatedUseDOB" // Renamed (without 'Deprecated'-).
,"DeprecatedUseDOR" // Withdrawn.
,"FilingApprovalState" // Alias for 'StateOfJurisdiction'.
,"FirstName" // Single name instead.
@@ -459,6 +463,18 @@
PremiumTaxState = state;
}
}
+
+ if(file_version < 6)
+ {
+ LMI_ASSERT(contains(residuary_names, "SolveFromWhich"));
+ LMI_ASSERT(contains(residuary_names, "SolveTgtAtWhich"));
+ LMI_ASSERT(contains(residuary_names, "SolveToWhich"));
+ LMI_ASSERT(contains(residuary_names, "UseDOB"));
+ SolveFromWhich = map_lookup(detritus_map, "DeprecatedSolveFromWhich");
+ SolveTgtAtWhich = map_lookup(detritus_map,
"DeprecatedSolveTgtAtWhich");
+ SolveToWhich = map_lookup(detritus_map, "DeprecatedSolveToWhich");
+ UseDOB = map_lookup(detritus_map, "DeprecatedUseDOB");
+ }
}
void Input::redintegrate_ad_terminum()
Modified: lmi/trunk/main_cgi.cpp
===================================================================
--- lmi/trunk/main_cgi.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/main_cgi.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -487,8 +487,8 @@
input["UnderwritingClass"] = "Preferred";
input["WaiverOfPremiumBenefit"] = "No";
input["AccidentalDeathBenefit"] = "No";
- input["DeprecatedSolveTgtAtWhich"] = "Year";
- input["DeprecatedSolveToWhich"] = "Year";
+ input["SolveTgtAtWhich"] = "Year";
+ input["SolveToWhich"] = "Year";
input["UseCurrentDeclaredRate"] = "No";
input["ProductName"] = GetValue(data, "ProductName" );
Modified: lmi/trunk/main_cli.cpp
===================================================================
--- lmi/trunk/main_cli.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/main_cli.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -159,7 +159,7 @@
;
}
- IP["DeprecatedSolveToWhich"] = "Maturity";
+ IP["SolveToWhich"] = "Maturity";
IP["SolveType"] = "Specified amount";
expected_value = 1879139.14;
Modified: lmi/trunk/mec.xrc
===================================================================
--- lmi/trunk/mec.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/mec.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -327,7 +327,7 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxCheckBox"
name="DeprecatedUseDOB">
+ <object class="wxCheckBox" name="UseDOB">
<help>Calculate issue age based on
date of birth and effective date, automatically reflecting changes in effective
date</help>
<!--
It's unusual to place a checkbox's "label" on the left, as is simulated
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/mec_input.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -36,6 +36,7 @@
#include "dbnames.hpp"
#include "global_settings.hpp"
#include "input_seq_helpers.hpp"
+#include "map_lookup.hpp"
#include "miscellany.hpp" // lmi_array_size()
#include <algorithm> // std::max()
@@ -109,7 +110,7 @@
,FlatExtra ("0")
,PaymentHistory ("0")
,BenefitHistory ("1000000")
-// ,DeprecatedUseDOB ("")
+// ,UseDOB ("")
,Payment ("0")
,BenefitAmount ("1000000")
{
@@ -202,7 +203,7 @@
ascribe("FlatExtra" , &mec_input::FlatExtra
);
ascribe("PaymentHistory" ,
&mec_input::PaymentHistory );
ascribe("BenefitHistory" ,
&mec_input::BenefitHistory );
- ascribe("DeprecatedUseDOB" ,
&mec_input::DeprecatedUseDOB );
+ ascribe("UseDOB" , &mec_input::UseDOB
);
ascribe("Payment" , &mec_input::Payment
);
ascribe("BenefitAmount" ,
&mec_input::BenefitAmount );
}
@@ -354,8 +355,8 @@
GroupUnderwritingType.allow(mce_simplified_issue,
database_->Query(DB_AllowSimpUw));
GroupUnderwritingType.allow(mce_guaranteed_issue,
database_->Query(DB_AllowGuarUw));
- IssueAge .enable(mce_no == DeprecatedUseDOB);
- DateOfBirth .enable(mce_yes == DeprecatedUseDOB);
+ IssueAge .enable(mce_no == UseDOB);
+ DateOfBirth .enable(mce_yes == UseDOB);
// The ranges of both EffectiveDate and IssueAge are treated as
// independent, to prevent one's value from affecting the other's
@@ -506,7 +507,7 @@
,EffectiveDate.value()
,use_anb
);
- if(mce_no == DeprecatedUseDOB)
+ if(mce_no == UseDOB)
{
// If no DOB is supplied, assume a birthday occurs on the
// issue date--as good an assumption as any, and the simplest.
@@ -626,8 +627,9 @@
bool mec_input::is_detritus(std::string const& s) const
{
static std::string const a[] =
- {"EffectiveDateToday"
- ,"InforceSevenPayPremium"
+ {"DeprecatedUseDOB" // Renamed (without 'Deprecated'-).
+ ,"EffectiveDateToday" // Withdrawn.
+ ,"InforceSevenPayPremium" // Withdrawn.
};
static std::vector<std::string> const v(a, a + lmi_array_size(a));
return contains(v, s);
@@ -649,7 +651,7 @@
void mec_input::redintegrate_ex_post
(int file_version
- ,std::map<std::string, std::string> const& // detritus_map
+ ,std::map<std::string, std::string> const& detritus_map
,std::list<std::string> const& residuary_names
)
{
@@ -662,6 +664,8 @@
{
LMI_ASSERT(contains(residuary_names, "PremiumTaxState"));
PremiumTaxState = StateOfJurisdiction;
+ LMI_ASSERT(contains(residuary_names, "UseDOB"));
+ UseDOB = map_lookup(detritus_map, "DeprecatedUseDOB");
}
}
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/mec_input.hpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -58,7 +58,7 @@
/// InforceContractYear
/// InforceYear
/// are dependent, but useful. These:
-/// DeprecatedUseDOB
+/// UseDOB
/// IssueAge
/// are superfluous, but convenient. These:
/// InforceContractMonth
@@ -181,7 +181,7 @@
datum_sequence FlatExtra ;
datum_sequence PaymentHistory ;
datum_sequence BenefitHistory ;
- mce_yes_or_no DeprecatedUseDOB ;
+ mce_yes_or_no UseDOB ;
tnr_nonnegative_double Payment ;
tnr_nonnegative_double BenefitAmount ;
Modified: lmi/trunk/mec_server.cpp
===================================================================
--- lmi/trunk/mec_server.cpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/mec_server.cpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -104,7 +104,7 @@
// std::string FlatExtra =
exact_cast<datum_sequence >(input["FlatExtra"
])->value();
// std::string PaymentHistory =
exact_cast<datum_sequence >(input["PaymentHistory"
])->value();
// std::string BenefitHistory =
exact_cast<datum_sequence >(input["BenefitHistory"
])->value();
-// bool DeprecatedUseDOB =
exact_cast<mce_yes_or_no >(input["DeprecatedUseDOB"
])->value();
+// bool UseDOB =
exact_cast<mce_yes_or_no >(input["UseDOB"
])->value();
double Payment =
exact_cast<tnr_nonnegative_double >(input["Payment"
])->value();
double BenefitAmount =
exact_cast<tnr_nonnegative_double >(input["BenefitAmount"
])->value();
Modified: lmi/trunk/sample.cns
===================================================================
--- lmi/trunk/sample.cns 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/sample.cns 2010-07-27 23:57:29 UTC (rev 5078)
@@ -38,10 +38,6 @@
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
<DefinitionOfLifeInsurance>CVAT</DefinitionOfLifeInsurance>
<DefinitionOfMaterialChange>Earlier of increase or unnecessary
premium</DefinitionOfMaterialChange>
- <DeprecatedSolveFromWhich>Issue</DeprecatedSolveFromWhich>
- <DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
- <DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
- <DeprecatedUseDOB>No</DeprecatedUseDOB>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -145,11 +141,14 @@
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+ <SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
<SolveTargetCashSurrenderValue>0</SolveTargetCashSurrenderValue>
<SolveTargetTime>100</SolveTargetTime>
<SolveTargetYear>55</SolveTargetYear>
+ <SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
+ <SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
<SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
@@ -187,6 +186,7 @@
<UnderwritingClass>Standard</UnderwritingClass>
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
+ <UseDOB>No</UseDOB>
<UseExperienceRating>No</UseExperienceRating>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
@@ -240,10 +240,6 @@
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
<DefinitionOfLifeInsurance>CVAT</DefinitionOfLifeInsurance>
<DefinitionOfMaterialChange>Earlier of increase or unnecessary
premium</DefinitionOfMaterialChange>
- <DeprecatedSolveFromWhich>Issue</DeprecatedSolveFromWhich>
- <DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
- <DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
- <DeprecatedUseDOB>No</DeprecatedUseDOB>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -347,11 +343,14 @@
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+ <SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
<SolveTargetCashSurrenderValue>0</SolveTargetCashSurrenderValue>
<SolveTargetTime>100</SolveTargetTime>
<SolveTargetYear>55</SolveTargetYear>
+ <SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
+ <SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
<SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
@@ -389,6 +388,7 @@
<UnderwritingClass>Standard</UnderwritingClass>
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
+ <UseDOB>No</UseDOB>
<UseExperienceRating>No</UseExperienceRating>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
@@ -442,10 +442,6 @@
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
<DefinitionOfLifeInsurance>CVAT</DefinitionOfLifeInsurance>
<DefinitionOfMaterialChange>Earlier of increase or unnecessary
premium</DefinitionOfMaterialChange>
- <DeprecatedSolveFromWhich>Issue</DeprecatedSolveFromWhich>
- <DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
- <DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
- <DeprecatedUseDOB>No</DeprecatedUseDOB>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -549,11 +545,14 @@
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+ <SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
<SolveTargetCashSurrenderValue>0</SolveTargetCashSurrenderValue>
<SolveTargetTime>100</SolveTargetTime>
<SolveTargetYear>55</SolveTargetYear>
+ <SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
+ <SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
<SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
@@ -591,6 +590,7 @@
<UnderwritingClass>Standard</UnderwritingClass>
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
+ <UseDOB>No</UseDOB>
<UseExperienceRating>No</UseExperienceRating>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
Modified: lmi/trunk/sample.ill
===================================================================
--- lmi/trunk/sample.ill 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/sample.ill 2010-07-27 23:57:29 UTC (rev 5078)
@@ -38,10 +38,6 @@
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
<DefinitionOfLifeInsurance>CVAT</DefinitionOfLifeInsurance>
<DefinitionOfMaterialChange>Earlier of increase or unnecessary
premium</DefinitionOfMaterialChange>
- <DeprecatedSolveFromWhich>Issue</DeprecatedSolveFromWhich>
- <DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
- <DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
- <DeprecatedUseDOB>No</DeprecatedUseDOB>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -145,11 +141,14 @@
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+ <SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
<SolveTargetCashSurrenderValue>0</SolveTargetCashSurrenderValue>
<SolveTargetTime>100</SolveTargetTime>
<SolveTargetYear>55</SolveTargetYear>
+ <SolveTgtAtWhich>Maturity</SolveTgtAtWhich>
+ <SolveToWhich>Retirement</SolveToWhich>
<SolveType>No solve</SolveType>
<SpecamtHistory>0</SpecamtHistory>
<SpecifiedAmount>1000000</SpecifiedAmount>
@@ -187,6 +186,7 @@
<UnderwritingClass>Standard</UnderwritingClass>
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
+ <UseDOB>No</UseDOB>
<UseExperienceRating>No</UseExperienceRating>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
Modified: lmi/trunk/skin.xrc
===================================================================
--- lmi/trunk/skin.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -1076,7 +1076,7 @@
<growablerows>0,1,2,3</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
- <object class="wxCheckBox" name="DeprecatedUseDOB">
+ <object class="wxCheckBox" name="UseDOB">
<help>Calculate issue age based on date of
birth and effective date, automatically reflecting changes in effective
date</help>
<label>Birthdate overrides issue age </label>
</object>
@@ -1858,7 +1858,7 @@
<cols>1</cols>
<object class="sizeritem">
<flag>wxALIGN_CENTER|wxALL</flag>
- <object class="wxRadioBox"
name="DeprecatedSolveFromWhich">
+ <object class="wxRadioBox"
name="SolveFromWhich">
<help>Beginning of solve
period (inclusive)</help>
<style>wxRA_SPECIFY_COLS</style>
<label>From</label>
@@ -1918,7 +1918,7 @@
<cols>1</cols>
<object class="sizeritem">
<flag>wxALIGN_CENTER|wxALL</flag>
- <object class="wxRadioBox"
name="DeprecatedSolveToWhich">
+ <object class="wxRadioBox"
name="SolveToWhich">
<help>End of solve period
(exclusive)</help>
<style>wxRA_SPECIFY_COLS</style>
<label>To</label>
@@ -1978,7 +1978,7 @@
<cols>1</cols>
<object class="sizeritem">
<flag>wxALIGN_CENTER|wxALL</flag>
- <object class="wxRadioBox"
name="DeprecatedSolveTgtAtWhich">
+ <object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to
be achieved</help>
<style>wxRA_SPECIFY_COLS</style>
<label>At</label>
Modified: lmi/trunk/skin_coli_boli.xrc
===================================================================
--- lmi/trunk/skin_coli_boli.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_coli_boli.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -890,7 +890,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxBOTTOM</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedUseDOB">
+ <object class="wxRadioBox" name="UseDOB">
<help>Calculate issue age based on
date of birth and effective date, automatically reflecting changes in effective
date</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Use date</label>
@@ -1821,7 +1821,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveFromWhich">
+ <object class="wxRadioBox" name="SolveFromWhich">
<help>Beginning of solve period
(inclusive)</help>
<label>From</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1900,7 +1900,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveToWhich">
+ <object class="wxRadioBox" name="SolveToWhich">
<help>End of solve period (exclusive)</help>
<label>To</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -2036,7 +2036,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
- <object class="wxRadioBox"
name="DeprecatedSolveTgtAtWhich">
+ <object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to be
achieved</help>
<label>At</label>
<style>wxRA_SPECIFY_COLS</style>
Modified: lmi/trunk/skin_group_carveout.xrc
===================================================================
--- lmi/trunk/skin_group_carveout.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_group_carveout.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -326,7 +326,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxRadioBox"
name="DeprecatedUseDOB">
+ <object class="wxRadioBox"
name="UseDOB">
<help>Calculate issue age
based on date of birth and effective date, automatically reflecting changes in
effective date</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Use date</label>
@@ -903,7 +903,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveFromWhich">
+ <object class="wxRadioBox" name="SolveFromWhich">
<help>Beginning of solve period
(inclusive)</help>
<label>From</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -981,7 +981,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveToWhich">
+ <object class="wxRadioBox" name="SolveToWhich">
<help>End of solve period (exclusive)</help>
<label>To</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1119,7 +1119,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveTgtAtWhich">
+ <object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to
be achieved</help>
<label>At</label>
<style>wxRA_SPECIFY_COLS</style>
Modified: lmi/trunk/skin_group_carveout2.xrc
===================================================================
--- lmi/trunk/skin_group_carveout2.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_group_carveout2.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -307,7 +307,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxRadioBox"
name="DeprecatedUseDOB">
+ <object class="wxRadioBox"
name="UseDOB">
<help>Calculate issue age
based on date of birth and effective date, automatically reflecting changes in
effective date</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Use date</label>
@@ -455,7 +455,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveFromWhich">
+ <object class="wxRadioBox" name="SolveFromWhich">
<help>Beginning of solve period
(inclusive)</help>
<label>From</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -533,7 +533,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveToWhich">
+ <object class="wxRadioBox" name="SolveToWhich">
<help>End of solve period (exclusive)</help>
<label>To</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -671,7 +671,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveTgtAtWhich">
+ <object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to
be achieved</help>
<label>At</label>
<style>wxRA_SPECIFY_COLS</style>
Modified: lmi/trunk/skin_reg_d.xrc
===================================================================
--- lmi/trunk/skin_reg_d.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_reg_d.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -117,7 +117,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxBOTTOM</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedUseDOB">
+ <object class="wxRadioBox" name="UseDOB">
<help>Calculate issue age based on
date of birth and effective date, automatically reflecting changes in effective
date</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Use date</label>
@@ -1152,7 +1152,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveFromWhich">
+ <object class="wxRadioBox" name="SolveFromWhich">
<help>Beginning of solve period
(inclusive)</help>
<label>From</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1230,7 +1230,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveToWhich">
+ <object class="wxRadioBox" name="SolveToWhich">
<help>End of solve period (exclusive)</help>
<label>To</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1368,7 +1368,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox"
name="DeprecatedSolveTgtAtWhich">
+ <object class="wxRadioBox"
name="SolveTgtAtWhich">
<help>When solve target is to
be achieved</help>
<label>At</label>
<style>wxRA_SPECIFY_COLS</style>
Modified: lmi/trunk/skin_single_premium.xrc
===================================================================
--- lmi/trunk/skin_single_premium.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_single_premium.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -752,7 +752,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxRadioBox"
name="DeprecatedUseDOB">
+ <object class="wxRadioBox"
name="UseDOB">
<help>Calculate issue age
based on date of birth and effective date, automatically reflecting changes in
effective date</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Use date</label>
Modified: lmi/trunk/skin_variable_annuity.xrc
===================================================================
--- lmi/trunk/skin_variable_annuity.xrc 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/skin_variable_annuity.xrc 2010-07-27 23:57:29 UTC (rev 5078)
@@ -164,7 +164,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxCheckBox" name="DeprecatedUseDOB">
+ <object class="wxCheckBox" name="UseDOB">
<help>Calculate issue age based on date of
birth and effective date, automatically reflecting changes in effective
date</help>
<label>Birthdate overrides issue age </label>
</object>
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2010-07-27 23:56:32 UTC (rev 5077)
+++ lmi/trunk/yare_input.hpp 2010-07-27 23:57:29 UTC (rev 5078)
@@ -238,10 +238,10 @@
// mcenum_report_column SupplementalReportColumn10 ;
// mcenum_report_column SupplementalReportColumn11 ;
//
-// mcenum_to_point DeprecatedSolveTgtAtWhich ;
-// mcenum_from_point DeprecatedSolveFromWhich ;
-// mcenum_to_point DeprecatedSolveToWhich ;
-// bool DeprecatedUseDOB ;
+// mcenum_to_point SolveTgtAtWhich ;
+// mcenum_from_point SolveFromWhich ;
+// mcenum_to_point SolveToWhich ;
+// bool UseDOB ;
// bool EffectiveDateToday ;
// mcenum_dbopt DeathBenefitOptionFromRetirement;
// mcenum_dbopt DeathBenefitOptionFromIssue ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5078] Rectify names,
Greg Chicares <=