[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5072] Remove undesirable input members
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5072] Remove undesirable input members |
|
Date: |
Tue, 27 Jul 2010 10:52:47 +0000 |
Revision: 5072
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5072
Author: chicares
Date: 2010-07-27 10:52:47 +0000 (Tue, 27 Jul 2010)
Log Message:
-----------
Remove undesirable input members
Modified Paths:
--------------
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_harmonization.cpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/sample.cns
lmi/trunk/sample.ill
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/input.cpp 2010-07-27 10:52:47 UTC (rev 5072)
@@ -51,7 +51,6 @@
// ,TermRiderProportion ("")
// ,TermRiderUseProportion ("")
// ,DateOfBirth ("")
-// ,DateOfRetirement ("")
// ,SubstandardTable ("")
// ,ProductName ("")
// ,Dumpin ("")
@@ -146,7 +145,6 @@
,SurviveToYear ("100")
,SurviveToAge ("99")
,MaximumNaar ("10000000")
-// ,UseOffshoreCorridorFactor ("")
// ,ChildRider ("")
// ,ChildRiderAmount ("")
// ,SpouseRider ("")
@@ -178,10 +176,8 @@
,ExtraMonthlyCustodialFee ("0")
,ExtraCompensationOnAssets ("0")
,ExtraCompensationOnPremium ("0")
- ,OffshoreCorridorFactor ("1")
,PartialMortalityMultiplier ("1")
,CurrentCoiMultiplier ("1")
- ,CurrentCoiGrading ("0")
// ,CorporationTaxBracket ("")
// ,TaxBracket ("")
,ProjectedSalary ("100000")
@@ -219,7 +215,6 @@
,DeprecatedSolveFromWhich ("Issue")
,DeprecatedSolveToWhich ("Retirement")
// ,DeprecatedUseDOB ("")
-// ,DeprecatedUseDOR ("")
// ,EffectiveDateToday ("")
// ,DeathBenefitOptionFromRetirement ("")
// ,DeathBenefitOptionFromIssue ("")
@@ -351,7 +346,6 @@
ascribe("TermRiderProportion" ,
&Input::TermRiderProportion );
ascribe("TermRiderUseProportion" ,
&Input::TermRiderUseProportion );
ascribe("DateOfBirth" , &Input::DateOfBirth
);
- ascribe("DateOfRetirement" , &Input::DateOfRetirement
);
ascribe("SubstandardTable" , &Input::SubstandardTable
);
ascribe("ProductName" , &Input::ProductName
);
ascribe("Dumpin" , &Input::Dumpin
);
@@ -446,7 +440,6 @@
ascribe("SurviveToYear" , &Input::SurviveToYear
);
ascribe("SurviveToAge" , &Input::SurviveToAge
);
ascribe("MaximumNaar" , &Input::MaximumNaar
);
- ascribe("UseOffshoreCorridorFactor" ,
&Input::UseOffshoreCorridorFactor );
ascribe("ChildRider" , &Input::ChildRider
);
ascribe("ChildRiderAmount" , &Input::ChildRiderAmount
);
ascribe("SpouseRider" , &Input::SpouseRider
);
@@ -478,10 +471,8 @@
ascribe("ExtraMonthlyCustodialFee" ,
&Input::ExtraMonthlyCustodialFee );
ascribe("ExtraCompensationOnAssets" ,
&Input::ExtraCompensationOnAssets );
ascribe("ExtraCompensationOnPremium" ,
&Input::ExtraCompensationOnPremium );
- ascribe("OffshoreCorridorFactor" ,
&Input::OffshoreCorridorFactor );
ascribe("PartialMortalityMultiplier" ,
&Input::PartialMortalityMultiplier );
ascribe("CurrentCoiMultiplier" ,
&Input::CurrentCoiMultiplier );
- ascribe("CurrentCoiGrading" ,
&Input::CurrentCoiGrading );
ascribe("CorporationTaxBracket" ,
&Input::CorporationTaxBracket );
ascribe("TaxBracket" , &Input::TaxBracket
);
ascribe("ProjectedSalary" , &Input::ProjectedSalary
);
@@ -521,7 +512,6 @@
ascribe("DeprecatedSolveFromWhich" ,
&Input::DeprecatedSolveFromWhich );
ascribe("DeprecatedSolveToWhich" ,
&Input::DeprecatedSolveToWhich );
ascribe("DeprecatedUseDOB" , &Input::DeprecatedUseDOB
);
- ascribe("DeprecatedUseDOR" , &Input::DeprecatedUseDOR
);
ascribe("EffectiveDateToday" ,
&Input::EffectiveDateToday );
ascribe("DeathBenefitOptionFromRetirement" ,
&Input::DeathBenefitOptionFromRetirement );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/input.hpp 2010-07-27 10:52:47 UTC (rev 5072)
@@ -258,7 +258,6 @@
tnr_proportion TermRiderProportion ;
mce_yes_or_no TermRiderUseProportion ;
tnr_date DateOfBirth ;
- tnr_date DateOfRetirement ; // TODO ??
Expunge this everywhere.
mce_table_rating SubstandardTable ;
ce_product_name ProductName ;
tnr_nonnegative_double Dumpin ;
@@ -353,7 +352,6 @@
tnr_duration SurviveToYear ;
tnr_age SurviveToAge ;
tnr_nonnegative_double MaximumNaar ;
- tnr_corridor_factor UseOffshoreCorridorFactor ; // INPUT !!
Obsolete, and apparently wrong type.
mce_yes_or_no ChildRider ;
tnr_nonnegative_double ChildRiderAmount ;
mce_yes_or_no SpouseRider ;
@@ -385,10 +383,8 @@
datum_sequence ExtraMonthlyCustodialFee ;
datum_sequence ExtraCompensationOnAssets ;
datum_sequence ExtraCompensationOnPremium ;
- datum_sequence OffshoreCorridorFactor ; // INPUT !!
Obsolete.
datum_sequence PartialMortalityMultiplier ;
datum_sequence CurrentCoiMultiplier ;
- datum_sequence CurrentCoiGrading ; // TODO ??
Obsolete: expunge.
datum_sequence CorporationTaxBracket ;
datum_sequence TaxBracket ;
datum_sequence ProjectedSalary ;
@@ -426,7 +422,6 @@
mce_from_point DeprecatedSolveFromWhich ;
mce_to_point DeprecatedSolveToWhich ;
mce_yes_or_no DeprecatedUseDOB ;
- mce_yes_or_no DeprecatedUseDOR ;
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 09:45:40 UTC (rev 5071)
+++ lmi/trunk/input_harmonization.cpp 2010-07-27 10:52:47 UTC (rev 5072)
@@ -170,7 +170,6 @@
AmortizePremiumLoad.enable(database_->Query(DB_AllowAmortPremLoad));
ExtraCompensationOnAssets
.enable(database_->Query(DB_AllowExtraAssetComp));
ExtraCompensationOnPremium.enable(database_->Query(DB_AllowExtraPremComp));
- OffshoreCorridorFactor.enable(mce_noncompliant ==
DefinitionOfLifeInsurance);
RetireesCanEnroll.enable(database_->Query(DB_AllowRetirees));
@@ -188,7 +187,6 @@
PartialMortalityTable .enable(part_mort_used);
PartialMortalityMultiplier.enable(part_mort_used);
- CurrentCoiGrading .enable(part_mort_used && home_office_only);
CashValueEnhancementRate .enable(home_office_only);
SurviveToType .allow(mce_no_survival_limit ,
part_mort_used);
@@ -255,6 +253,7 @@
(static_cast<int>(database_->Query(DB_MinIssAge))
,static_cast<int>(database_->Query(DB_MaxIssAge))
);
+// RetirementAge.minimum_and_maximum(...
#endif // 0
EffectiveDate.minimum
@@ -270,9 +269,6 @@
,maximum_birthdate(IssueAge.minimum(), EffectiveDate.value(), use_anb)
);
- RetirementAge .enable(mce_no == DeprecatedUseDOR);
- DateOfRetirement.enable(mce_yes == DeprecatedUseDOR);
-
// DATABASE !! Maximum illustrated age should be distinguished
// from maturity age.
int max_age = static_cast<int>(database_->Query(DB_MaturityAge));
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/input_xml_io.cpp 2010-07-27 10:52:47 UTC (rev 5072)
@@ -110,6 +110,8 @@
,"CorporationPremiumTableNumber" // Never implemented.
,"CorporationTaxpayerId" // Would violate privacy.
,"CurrentCoiGrading" // Withdrawn.
+ ,"DateOfRetirement" // Withdrawn.
+ ,"DeprecatedUseDOR" // Withdrawn.
,"FilingApprovalState" // Alias for 'StateOfJurisdiction'.
,"FirstName" // Single name instead.
,"InforceDcvDeathBenefit" // Misbegotten.
@@ -118,12 +120,14 @@
,"LastName" // Single name instead.
,"MiddleName" // Single name instead.
,"NetMortalityChargeHistory" // Renamed before implementation.
+ ,"OffshoreCorridorFactor" // Withdrawn.
,"PartialMortalityTable" // Never implemented.
,"PayLoanInterestInCash" // Never implemented.
,"PolicyDate" // Never implemented.
,"PolicyLevelFlatExtra" // Never implemented; poor name.
,"SocialSecurityNumber" // Withdrawn: would violate privacy.
,"TermProportion" // 'TermRiderProportion' instead.
+ ,"UseOffshoreCorridorFactor" // Withdrawn.
,"YearsOfZeroDeaths" // Withdrawn.
};
static std::vector<std::string> const v(a, a + lmi_array_size(a));
Modified: lmi/trunk/sample.cns
===================================================================
--- lmi/trunk/sample.cns 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/sample.cns 2010-07-27 10:52:47 UTC (rev 5072)
@@ -31,10 +31,8 @@
<Country>US</Country>
<CountryCoiMultiplier>1</CountryCoiMultiplier>
<CreateSupplementalReport>No</CreateSupplementalReport>
- <CurrentCoiGrading>0</CurrentCoiGrading>
<CurrentCoiMultiplier>1</CurrentCoiMultiplier>
<DateOfBirth>2437604</DateOfBirth>
- <DateOfRetirement>2461345</DateOfRetirement>
<DeathBenefitOption>a</DeathBenefitOption>
<DeathBenefitOptionFromIssue>A</DeathBenefitOptionFromIssue>
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
@@ -44,7 +42,6 @@
<DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
<DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
<DeprecatedUseDOB>No</DeprecatedUseDOB>
- <DeprecatedUseDOR>No</DeprecatedUseDOR>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -122,7 +119,6 @@
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
<NumberOfIdenticalLives>1</NumberOfIdenticalLives>
- <OffshoreCorridorFactor>1</OffshoreCorridorFactor>
<OverrideCoiMultiplier>No</OverrideCoiMultiplier>
<OverrideExperienceReserveRate>Yes</OverrideExperienceReserveRate>
<OverrideFundManagementFee>No</OverrideFundManagementFee>
@@ -192,7 +188,6 @@
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
<UseExperienceRating>No</UseExperienceRating>
- <UseOffshoreCorridorFactor>1</UseOffshoreCorridorFactor>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
<WithdrawToBasisThenLoan>No</WithdrawToBasisThenLoan>
@@ -238,10 +233,8 @@
<Country>US</Country>
<CountryCoiMultiplier>1</CountryCoiMultiplier>
<CreateSupplementalReport>No</CreateSupplementalReport>
- <CurrentCoiGrading>0</CurrentCoiGrading>
<CurrentCoiMultiplier>1</CurrentCoiMultiplier>
<DateOfBirth>2437604</DateOfBirth>
- <DateOfRetirement>2461345</DateOfRetirement>
<DeathBenefitOption>a</DeathBenefitOption>
<DeathBenefitOptionFromIssue>A</DeathBenefitOptionFromIssue>
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
@@ -251,7 +244,6 @@
<DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
<DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
<DeprecatedUseDOB>No</DeprecatedUseDOB>
- <DeprecatedUseDOR>No</DeprecatedUseDOR>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -329,7 +321,6 @@
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
<NumberOfIdenticalLives>1</NumberOfIdenticalLives>
- <OffshoreCorridorFactor>1</OffshoreCorridorFactor>
<OverrideCoiMultiplier>No</OverrideCoiMultiplier>
<OverrideExperienceReserveRate>Yes</OverrideExperienceReserveRate>
<OverrideFundManagementFee>No</OverrideFundManagementFee>
@@ -399,7 +390,6 @@
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
<UseExperienceRating>No</UseExperienceRating>
- <UseOffshoreCorridorFactor>1</UseOffshoreCorridorFactor>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
<WithdrawToBasisThenLoan>No</WithdrawToBasisThenLoan>
@@ -445,10 +435,8 @@
<Country>US</Country>
<CountryCoiMultiplier>1</CountryCoiMultiplier>
<CreateSupplementalReport>No</CreateSupplementalReport>
- <CurrentCoiGrading>0</CurrentCoiGrading>
<CurrentCoiMultiplier>1</CurrentCoiMultiplier>
<DateOfBirth>2437604</DateOfBirth>
- <DateOfRetirement>2461345</DateOfRetirement>
<DeathBenefitOption>a</DeathBenefitOption>
<DeathBenefitOptionFromIssue>A</DeathBenefitOptionFromIssue>
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
@@ -458,7 +446,6 @@
<DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
<DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
<DeprecatedUseDOB>No</DeprecatedUseDOB>
- <DeprecatedUseDOR>No</DeprecatedUseDOR>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -536,7 +523,6 @@
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
<NumberOfIdenticalLives>1</NumberOfIdenticalLives>
- <OffshoreCorridorFactor>1</OffshoreCorridorFactor>
<OverrideCoiMultiplier>No</OverrideCoiMultiplier>
<OverrideExperienceReserveRate>Yes</OverrideExperienceReserveRate>
<OverrideFundManagementFee>No</OverrideFundManagementFee>
@@ -606,7 +592,6 @@
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
<UseExperienceRating>No</UseExperienceRating>
- <UseOffshoreCorridorFactor>1</UseOffshoreCorridorFactor>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
<WithdrawToBasisThenLoan>No</WithdrawToBasisThenLoan>
Modified: lmi/trunk/sample.ill
===================================================================
--- lmi/trunk/sample.ill 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/sample.ill 2010-07-27 10:52:47 UTC (rev 5072)
@@ -31,10 +31,8 @@
<Country>US</Country>
<CountryCoiMultiplier>1</CountryCoiMultiplier>
<CreateSupplementalReport>No</CreateSupplementalReport>
- <CurrentCoiGrading>0</CurrentCoiGrading>
<CurrentCoiMultiplier>1</CurrentCoiMultiplier>
<DateOfBirth>2437604</DateOfBirth>
- <DateOfRetirement>2461345</DateOfRetirement>
<DeathBenefitOption>a</DeathBenefitOption>
<DeathBenefitOptionFromIssue>A</DeathBenefitOptionFromIssue>
<DeathBenefitOptionFromRetirement>A</DeathBenefitOptionFromRetirement>
@@ -44,7 +42,6 @@
<DeprecatedSolveTgtAtWhich>Maturity</DeprecatedSolveTgtAtWhich>
<DeprecatedSolveToWhich>Retirement</DeprecatedSolveToWhich>
<DeprecatedUseDOB>No</DeprecatedUseDOB>
- <DeprecatedUseDOR>No</DeprecatedUseDOR>
<Dumpin>0</Dumpin>
<EffectiveDate>2454040</EffectiveDate>
<EffectiveDateToday>No</EffectiveDateToday>
@@ -122,7 +119,6 @@
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
<NumberOfIdenticalLives>1</NumberOfIdenticalLives>
- <OffshoreCorridorFactor>1</OffshoreCorridorFactor>
<OverrideCoiMultiplier>No</OverrideCoiMultiplier>
<OverrideExperienceReserveRate>Yes</OverrideExperienceReserveRate>
<OverrideFundManagementFee>No</OverrideFundManagementFee>
@@ -192,7 +188,6 @@
<UseAverageOfAllFunds>No</UseAverageOfAllFunds>
<UseCurrentDeclaredRate>No</UseCurrentDeclaredRate>
<UseExperienceRating>No</UseExperienceRating>
- <UseOffshoreCorridorFactor>1</UseOffshoreCorridorFactor>
<UsePartialMortality>No</UsePartialMortality>
<WaiverOfPremiumBenefit>No</WaiverOfPremiumBenefit>
<WithdrawToBasisThenLoan>No</WithdrawToBasisThenLoan>
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2010-07-27 09:45:40 UTC (rev 5071)
+++ lmi/trunk/yare_input.hpp 2010-07-27 10:52:47 UTC (rev 5072)
@@ -76,7 +76,6 @@
// double TermRiderProportion ;
// bool TermRiderUseProportion ;
// calendar_date DateOfBirth ;
-// calendar_date DateOfRetirement ;
mcenum_table_rating SubstandardTable ;
std::string ProductName ;
double Dumpin ;
@@ -171,7 +170,6 @@
int SurviveToYear ;
int SurviveToAge ;
double MaximumNaar ;
-// tnr_corridor_factor UseOffshoreCorridorFactor ;
bool ChildRider ;
double ChildRiderAmount ;
bool SpouseRider ;
@@ -203,10 +201,8 @@
std::vector<double> ExtraMonthlyCustodialFee ;
std::vector<double> ExtraCompensationOnAssets ;
std::vector<double> ExtraCompensationOnPremium ;
-// std::vector<double> OffshoreCorridorFactor ;
std::vector<double> PartialMortalityMultiplier ;
std::vector<double> CurrentCoiMultiplier ;
-// std::vector<double> CurrentCoiGrading ;
std::vector<double> CorporationTaxBracket ;
std::vector<double> TaxBracket ;
std::vector<double> ProjectedSalary ;
@@ -246,7 +242,6 @@
// mcenum_from_point DeprecatedSolveFromWhich ;
// mcenum_to_point DeprecatedSolveToWhich ;
// bool DeprecatedUseDOB ;
-// bool DeprecatedUseDOR ;
// bool EffectiveDateToday ;
// mcenum_dbopt DeathBenefitOptionFromRetirement;
// mcenum_dbopt DeathBenefitOptionFromIssue ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5072] Remove undesirable input members,
Greg Chicares <=