[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5532] Rearrange data members
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5532] Rearrange data members |
|
Date: |
Fri, 03 Aug 2012 00:51:27 +0000 |
Revision: 5532
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5532
Author: chicares
Date: 2012-08-03 00:51:26 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Rearrange data members
Modified Paths:
--------------
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/mec_input.cpp
lmi/trunk/mec_input.hpp
lmi/trunk/yare_input.cpp
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/input.cpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -79,8 +79,6 @@
,OverrideExperienceReserveRate ("Yes")
,ExperienceReserveRate ("0.02")
,ExperienceRatingInitialKFactor ("1")
-// ,InforceNetExperienceReserve ("")
-// ,InforceYtdNetCoiCharge ("")
// ,WithdrawToBasisThenLoan ("")
// ,UseAverageOfAllFunds ("")
// ,OverrideFundManagementFee ("")
@@ -128,6 +126,9 @@
,IncludeInComposite ("Yes")
// ,Comments ("")
// ,AmortizePremiumLoad ("")
+// ,PolicyNumber ("")
+// ,Franchise ("")
+// ,InforceAsOfDate ("")
// ,InforceYear ("")
// ,InforceMonth ("")
// ,InforceGeneralAccountValue ("")
@@ -138,6 +139,23 @@
// ,InforcePreferredLoanBalance ("")
// ,InforceCumulativeNoLapsePremium ("")
// ,InforceCumulativePayments ("")
+// ,InforceHoneymoonValue ("")
+// ,InforceNetExperienceReserve ("")
+// ,InforceYtdNetCoiCharge ("")
+// ,InforceTaxBasis ("")
+// ,InforceGlp ("")
+// ,InforceCumulativeGlp ("")
+// ,InforceGsp ("")
+// ,InforceIsMec ("")
+// ,InforceSevenPayPremium ("")
+// ,LastMaterialChangeDate ("")
+// ,InforceContractYear ("")
+// ,InforceContractMonth ("")
+// ,InforceAvBeforeLastMc ("")
+// ,InforceDcv ("")
+// ,InforceLeastDeathBenefit ("")
+ ,PremiumHistory ("0")
+ ,SpecamtHistory ("0")
,Country ("US")
// ,OverrideCoiMultiplier ("")
,CountryCoiMultiplier ("1")
@@ -150,21 +168,6 @@
// ,SpouseRider ("")
// ,SpouseRiderAmount ("")
,SpouseIssueAge ("45")
-// ,Franchise ("")
-// ,PolicyNumber ("")
-// ,InforceAsOfDate ("")
-// ,InforceTaxBasis ("")
-// ,InforceGlp ("")
-// ,InforceCumulativeGlp ("")
-// ,InforceGsp ("")
-// ,InforceSevenPayPremium ("")
-// ,InforceIsMec ("")
-// ,LastMaterialChangeDate ("")
-// ,InforceDcv ("")
-// ,InforceAvBeforeLastMc ("")
-// ,InforceContractYear ("")
-// ,InforceContractMonth ("")
-// ,InforceLeastDeathBenefit ("")
,StateOfJurisdiction ("CT")
,PremiumTaxState ("CT")
,SalarySpecifiedAmountFactor ("1")
@@ -172,7 +175,6 @@
,SalarySpecifiedAmountOffset ("50000")
// ,HoneymoonEndorsement ("")
// ,PostHoneymoonSpread ("")
-// ,InforceHoneymoonValue ("")
,ExtraMonthlyCustodialFee ("0")
,ExtraCompensationOnAssets ("0")
,ExtraCompensationOnPremium ("0")
@@ -194,8 +196,6 @@
,FlatExtra ("0")
// ,PolicyLevelFlatExtra ("")
,HoneymoonValueSpread ("0")
- ,PremiumHistory ("0")
- ,SpecamtHistory ("0")
,FundAllocations ("0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0")
,CashValueEnhancementRate ("0")
// ,CreateSupplementalReport ("")
@@ -327,8 +327,6 @@
ascribe("OverrideExperienceReserveRate" ,
&Input::OverrideExperienceReserveRate );
ascribe("ExperienceReserveRate" ,
&Input::ExperienceReserveRate );
ascribe("ExperienceRatingInitialKFactor" ,
&Input::ExperienceRatingInitialKFactor );
- ascribe("InforceNetExperienceReserve" ,
&Input::InforceNetExperienceReserve );
- ascribe("InforceYtdNetCoiCharge" ,
&Input::InforceYtdNetCoiCharge );
ascribe("WithdrawToBasisThenLoan" ,
&Input::WithdrawToBasisThenLoan );
ascribe("UseAverageOfAllFunds" ,
&Input::UseAverageOfAllFunds );
ascribe("OverrideFundManagementFee" ,
&Input::OverrideFundManagementFee );
@@ -376,6 +374,9 @@
ascribe("IncludeInComposite" ,
&Input::IncludeInComposite );
ascribe("Comments" , &Input::Comments
);
ascribe("AmortizePremiumLoad" ,
&Input::AmortizePremiumLoad );
+ ascribe("PolicyNumber" , &Input::PolicyNumber
);
+ ascribe("Franchise" , &Input::Franchise
);
+ ascribe("InforceAsOfDate" , &Input::InforceAsOfDate
);
ascribe("InforceYear" , &Input::InforceYear
);
ascribe("InforceMonth" , &Input::InforceMonth
);
ascribe("InforceGeneralAccountValue" ,
&Input::InforceGeneralAccountValue );
@@ -386,6 +387,23 @@
ascribe("InforcePreferredLoanBalance" ,
&Input::InforcePreferredLoanBalance );
ascribe("InforceCumulativeNoLapsePremium" ,
&Input::InforceCumulativeNoLapsePremium );
ascribe("InforceCumulativePayments" ,
&Input::InforceCumulativePayments );
+ ascribe("InforceHoneymoonValue" ,
&Input::InforceHoneymoonValue );
+ ascribe("InforceNetExperienceReserve" ,
&Input::InforceNetExperienceReserve );
+ ascribe("InforceYtdNetCoiCharge" ,
&Input::InforceYtdNetCoiCharge );
+ ascribe("InforceTaxBasis" , &Input::InforceTaxBasis
);
+ ascribe("InforceGlp" , &Input::InforceGlp
);
+ ascribe("InforceCumulativeGlp" ,
&Input::InforceCumulativeGlp );
+ ascribe("InforceGsp" , &Input::InforceGsp
);
+ ascribe("InforceIsMec" , &Input::InforceIsMec
);
+ ascribe("InforceSevenPayPremium" ,
&Input::InforceSevenPayPremium );
+ ascribe("LastMaterialChangeDate" ,
&Input::LastMaterialChangeDate );
+ ascribe("InforceContractYear" ,
&Input::InforceContractYear );
+ ascribe("InforceContractMonth" ,
&Input::InforceContractMonth );
+ ascribe("InforceAvBeforeLastMc" ,
&Input::InforceAvBeforeLastMc );
+ ascribe("InforceDcv" , &Input::InforceDcv
);
+ ascribe("InforceLeastDeathBenefit" ,
&Input::InforceLeastDeathBenefit );
+ ascribe("PremiumHistory" , &Input::PremiumHistory
);
+ ascribe("SpecamtHistory" , &Input::SpecamtHistory
);
ascribe("Country" , &Input::Country
);
ascribe("OverrideCoiMultiplier" ,
&Input::OverrideCoiMultiplier );
ascribe("CountryCoiMultiplier" ,
&Input::CountryCoiMultiplier );
@@ -398,21 +416,6 @@
ascribe("SpouseRider" , &Input::SpouseRider
);
ascribe("SpouseRiderAmount" ,
&Input::SpouseRiderAmount );
ascribe("SpouseIssueAge" , &Input::SpouseIssueAge
);
- ascribe("Franchise" , &Input::Franchise
);
- ascribe("PolicyNumber" , &Input::PolicyNumber
);
- ascribe("InforceAsOfDate" , &Input::InforceAsOfDate
);
- ascribe("InforceTaxBasis" , &Input::InforceTaxBasis
);
- ascribe("InforceGlp" , &Input::InforceGlp
);
- ascribe("InforceCumulativeGlp" ,
&Input::InforceCumulativeGlp );
- ascribe("InforceGsp" , &Input::InforceGsp
);
- ascribe("InforceSevenPayPremium" ,
&Input::InforceSevenPayPremium );
- ascribe("InforceIsMec" , &Input::InforceIsMec
);
- ascribe("LastMaterialChangeDate" ,
&Input::LastMaterialChangeDate );
- ascribe("InforceDcv" , &Input::InforceDcv
);
- ascribe("InforceAvBeforeLastMc" ,
&Input::InforceAvBeforeLastMc );
- ascribe("InforceContractYear" ,
&Input::InforceContractYear );
- ascribe("InforceContractMonth" ,
&Input::InforceContractMonth );
- ascribe("InforceLeastDeathBenefit" ,
&Input::InforceLeastDeathBenefit );
ascribe("StateOfJurisdiction" ,
&Input::StateOfJurisdiction );
ascribe("PremiumTaxState" , &Input::PremiumTaxState
);
ascribe("SalarySpecifiedAmountFactor" ,
&Input::SalarySpecifiedAmountFactor );
@@ -420,7 +423,6 @@
ascribe("SalarySpecifiedAmountOffset" ,
&Input::SalarySpecifiedAmountOffset );
ascribe("HoneymoonEndorsement" ,
&Input::HoneymoonEndorsement );
ascribe("PostHoneymoonSpread" ,
&Input::PostHoneymoonSpread );
- ascribe("InforceHoneymoonValue" ,
&Input::InforceHoneymoonValue );
ascribe("ExtraMonthlyCustodialFee" ,
&Input::ExtraMonthlyCustodialFee );
ascribe("ExtraCompensationOnAssets" ,
&Input::ExtraCompensationOnAssets );
ascribe("ExtraCompensationOnPremium" ,
&Input::ExtraCompensationOnPremium );
@@ -442,8 +444,6 @@
ascribe("FlatExtra" , &Input::FlatExtra
);
// ascribe("PolicyLevelFlatExtra" ,
&Input::PolicyLevelFlatExtra ); // INPUT !! Not yet
implemented.
ascribe("HoneymoonValueSpread" ,
&Input::HoneymoonValueSpread );
- ascribe("PremiumHistory" , &Input::PremiumHistory
);
- ascribe("SpecamtHistory" , &Input::SpecamtHistory
);
ascribe("FundAllocations" , &Input::FundAllocations
);
ascribe("CashValueEnhancementRate" ,
&Input::CashValueEnhancementRate );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/input.hpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -271,8 +271,6 @@
mce_yes_or_no OverrideExperienceReserveRate ;
tnr_proportion ExperienceReserveRate ;
tnr_nonnegative_double ExperienceRatingInitialKFactor ;
- tnr_unrestricted_double InforceNetExperienceReserve ;
- tnr_nonnegative_double InforceYtdNetCoiCharge ;
mce_yes_or_no WithdrawToBasisThenLoan ;
mce_yes_or_no UseAverageOfAllFunds ;
mce_yes_or_no OverrideFundManagementFee ;
@@ -320,6 +318,9 @@
mce_yes_or_no IncludeInComposite ;
datum_string Comments ;
mce_yes_or_no AmortizePremiumLoad ;
+ datum_string PolicyNumber ;
+ datum_string Franchise ;
+ tnr_date InforceAsOfDate ;
tnr_duration InforceYear ;
tnr_month InforceMonth ;
tnr_nonnegative_double InforceGeneralAccountValue ;
@@ -330,6 +331,23 @@
tnr_nonnegative_double InforcePreferredLoanBalance ;
tnr_nonnegative_double InforceCumulativeNoLapsePremium ;
tnr_nonnegative_double InforceCumulativePayments ;
+ tnr_nonnegative_double InforceHoneymoonValue ;
+ tnr_unrestricted_double InforceNetExperienceReserve ;
+ tnr_nonnegative_double InforceYtdNetCoiCharge ;
+ tnr_nonnegative_double InforceTaxBasis ;
+ tnr_nonnegative_double InforceGlp ;
+ tnr_nonnegative_double InforceCumulativeGlp ;
+ tnr_nonnegative_double InforceGsp ;
+ mce_yes_or_no InforceIsMec ;
+ tnr_nonnegative_double InforceSevenPayPremium ;
+ tnr_date LastMaterialChangeDate ;
+ tnr_duration InforceContractYear ;
+ tnr_month InforceContractMonth ;
+ tnr_nonnegative_double InforceAvBeforeLastMc ;
+ tnr_nonnegative_double InforceDcv ;
+ tnr_nonnegative_double InforceLeastDeathBenefit ;
+ numeric_sequence PremiumHistory ;
+ numeric_sequence SpecamtHistory ;
mce_country Country ;
mce_yes_or_no OverrideCoiMultiplier ;
tnr_nonnegative_double CountryCoiMultiplier ;
@@ -342,21 +360,6 @@
mce_yes_or_no SpouseRider ;
tnr_nonnegative_double SpouseRiderAmount ;
tnr_age SpouseIssueAge ;
- datum_string Franchise ;
- datum_string PolicyNumber ;
- tnr_date InforceAsOfDate ;
- tnr_nonnegative_double InforceTaxBasis ;
- tnr_nonnegative_double InforceGlp ;
- tnr_nonnegative_double InforceCumulativeGlp ;
- tnr_nonnegative_double InforceGsp ;
- tnr_nonnegative_double InforceSevenPayPremium ;
- mce_yes_or_no InforceIsMec ;
- tnr_date LastMaterialChangeDate ;
- tnr_nonnegative_double InforceDcv ;
- tnr_nonnegative_double InforceAvBeforeLastMc ;
- tnr_duration InforceContractYear ;
- tnr_month InforceContractMonth ;
- tnr_nonnegative_double InforceLeastDeathBenefit ;
mce_state StateOfJurisdiction ;
mce_state PremiumTaxState ;
tnr_nonnegative_double SalarySpecifiedAmountFactor ;
@@ -364,7 +367,6 @@
tnr_nonnegative_double SalarySpecifiedAmountOffset ;
mce_yes_or_no HoneymoonEndorsement ;
tnr_proportion PostHoneymoonSpread ;
- tnr_nonnegative_double InforceHoneymoonValue ;
numeric_sequence ExtraMonthlyCustodialFee ;
numeric_sequence ExtraCompensationOnAssets ;
numeric_sequence ExtraCompensationOnPremium ;
@@ -386,8 +388,6 @@
numeric_sequence FlatExtra ;
numeric_sequence PolicyLevelFlatExtra ;
numeric_sequence HoneymoonValueSpread ;
- numeric_sequence PremiumHistory ;
- numeric_sequence SpecamtHistory ;
numeric_sequence FundAllocations ; // INPUT !!
http://savannah.nongnu.org/support/?104481
numeric_sequence CashValueEnhancementRate ;
mce_yes_or_no CreateSupplementalReport ;
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/mec_input.cpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -93,23 +93,23 @@
,DefinitionOfMaterialChange ("Unnecessary premium")
// ,GroupUnderwritingType ("")
// ,Comments ("")
+// ,InforceAsOfDate ("")
// ,InforceYear ("")
// ,InforceMonth ("")
,InforceTargetSpecifiedAmount ("1000000")
// ,InforceAccountValue ("")
-// ,InforceAsOfDate ("")
// ,InforceIsMec ("")
// ,LastMaterialChangeDate ("")
-// ,InforceDcv ("")
-// ,InforceAvBeforeLastMc ("")
// ,InforceContractYear ("")
// ,InforceContractMonth ("")
+// ,InforceAvBeforeLastMc ("")
+// ,InforceDcv ("")
,InforceLeastDeathBenefit ("1000000")
+ ,PaymentHistory ("0")
+ ,BenefitHistory ("1000000")
,StateOfJurisdiction ("CT")
,PremiumTaxState ("CT")
,FlatExtra ("0")
- ,PaymentHistory ("0")
- ,BenefitHistory ("1000000")
// ,UseDOB ("")
,Payment ("0")
,BenefitAmount ("1000000")
@@ -172,23 +172,23 @@
ascribe("DefinitionOfMaterialChange" ,
&mec_input::DefinitionOfMaterialChange );
ascribe("GroupUnderwritingType" ,
&mec_input::GroupUnderwritingType );
ascribe("Comments" , &mec_input::Comments
);
+ ascribe("InforceAsOfDate" ,
&mec_input::InforceAsOfDate );
ascribe("InforceYear" , &mec_input::InforceYear
);
ascribe("InforceMonth" , &mec_input::InforceMonth
);
ascribe("InforceTargetSpecifiedAmount" ,
&mec_input::InforceTargetSpecifiedAmount );
ascribe("InforceAccountValue" ,
&mec_input::InforceAccountValue );
- ascribe("InforceAsOfDate" ,
&mec_input::InforceAsOfDate );
ascribe("InforceIsMec" , &mec_input::InforceIsMec
);
ascribe("LastMaterialChangeDate" ,
&mec_input::LastMaterialChangeDate );
- ascribe("InforceDcv" , &mec_input::InforceDcv
);
- ascribe("InforceAvBeforeLastMc" ,
&mec_input::InforceAvBeforeLastMc );
ascribe("InforceContractYear" ,
&mec_input::InforceContractYear );
ascribe("InforceContractMonth" ,
&mec_input::InforceContractMonth );
+ ascribe("InforceAvBeforeLastMc" ,
&mec_input::InforceAvBeforeLastMc );
+ ascribe("InforceDcv" , &mec_input::InforceDcv
);
ascribe("InforceLeastDeathBenefit" ,
&mec_input::InforceLeastDeathBenefit );
+ ascribe("PaymentHistory" ,
&mec_input::PaymentHistory );
+ ascribe("BenefitHistory" ,
&mec_input::BenefitHistory );
ascribe("StateOfJurisdiction" ,
&mec_input::StateOfJurisdiction );
ascribe("PremiumTaxState" ,
&mec_input::PremiumTaxState );
ascribe("FlatExtra" , &mec_input::FlatExtra
);
- ascribe("PaymentHistory" ,
&mec_input::PaymentHistory );
- ascribe("BenefitHistory" ,
&mec_input::BenefitHistory );
ascribe("UseDOB" , &mec_input::UseDOB
);
ascribe("Payment" , &mec_input::Payment
);
ascribe("BenefitAmount" ,
&mec_input::BenefitAmount );
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/mec_input.hpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -163,23 +163,23 @@
mce_defn_material_change DefinitionOfMaterialChange ;
mce_uw_basis GroupUnderwritingType ;
datum_string Comments ;
+ tnr_date InforceAsOfDate ;
tnr_duration InforceYear ;
tnr_month InforceMonth ;
tnr_nonnegative_double InforceTargetSpecifiedAmount ;
tnr_nonnegative_double InforceAccountValue ;
- tnr_date InforceAsOfDate ;
mce_yes_or_no InforceIsMec ;
tnr_date LastMaterialChangeDate ;
- tnr_nonnegative_double InforceDcv ;
- tnr_nonnegative_double InforceAvBeforeLastMc ;
tnr_duration InforceContractYear ;
tnr_month InforceContractMonth ;
+ tnr_nonnegative_double InforceAvBeforeLastMc ;
+ tnr_nonnegative_double InforceDcv ;
tnr_nonnegative_double InforceLeastDeathBenefit ;
+ numeric_sequence PaymentHistory ;
+ numeric_sequence BenefitHistory ;
mce_state StateOfJurisdiction ;
mce_state PremiumTaxState ;
numeric_sequence FlatExtra ;
- numeric_sequence PaymentHistory ;
- numeric_sequence BenefitHistory ;
mce_yes_or_no UseDOB ;
tnr_nonnegative_double Payment ;
tnr_nonnegative_double BenefitAmount ;
Modified: lmi/trunk/yare_input.cpp
===================================================================
--- lmi/trunk/yare_input.cpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/yare_input.cpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -75,8 +75,6 @@
OverrideExperienceReserveRate = z.OverrideExperienceReserveRate
.value();
ExperienceReserveRate = z.ExperienceReserveRate
.value();
ExperienceRatingInitialKFactor = z.ExperienceRatingInitialKFactor
.value();
- InforceNetExperienceReserve = z.InforceNetExperienceReserve
.value();
- InforceYtdNetCoiCharge = z.InforceYtdNetCoiCharge
.value();
WithdrawToBasisThenLoan = z.WithdrawToBasisThenLoan
.value();
UseAverageOfAllFunds = z.UseAverageOfAllFunds
.value();
OverrideFundManagementFee = z.OverrideFundManagementFee
.value();
@@ -112,6 +110,23 @@
InforcePreferredLoanBalance = z.InforcePreferredLoanBalance
.value();
InforceCumulativeNoLapsePremium =
z.InforceCumulativeNoLapsePremium.value();
InforceCumulativePayments = z.InforceCumulativePayments
.value();
+ InforceHoneymoonValue = z.InforceHoneymoonValue
.value();
+ InforceNetExperienceReserve = z.InforceNetExperienceReserve
.value();
+ InforceYtdNetCoiCharge = z.InforceYtdNetCoiCharge
.value();
+ InforceTaxBasis = z.InforceTaxBasis
.value();
+ InforceGlp = z.InforceGlp
.value();
+ InforceCumulativeGlp = z.InforceCumulativeGlp
.value();
+ InforceGsp = z.InforceGsp
.value();
+ InforceIsMec = z.InforceIsMec
.value();
+ InforceSevenPayPremium = z.InforceSevenPayPremium
.value();
+ LastMaterialChangeDate = z.LastMaterialChangeDate
.value();
+ InforceContractYear = z.InforceContractYear
.value();
+ InforceContractMonth = z.InforceContractMonth
.value();
+ InforceAvBeforeLastMc = z.InforceAvBeforeLastMc
.value();
+ InforceDcv = z.InforceDcv
.value();
+ InforceLeastDeathBenefit = z.InforceLeastDeathBenefit
.value();
+ PremiumHistory = convert_vector_type<double
>(z.PremiumHistoryRealized_ );
+ SpecamtHistory = convert_vector_type<double
>(z.SpecamtHistoryRealized_ );
CountryCoiMultiplier = z.CountryCoiMultiplier
.value();
SurviveToType = z.SurviveToType
.value();
SurviveToYear = z.SurviveToYear
.value();
@@ -122,18 +137,6 @@
SpouseRider = z.SpouseRider
.value();
SpouseRiderAmount = z.SpouseRiderAmount
.value();
SpouseIssueAge = z.SpouseIssueAge
.value();
- InforceTaxBasis = z.InforceTaxBasis
.value();
- InforceGlp = z.InforceGlp
.value();
- InforceCumulativeGlp = z.InforceCumulativeGlp
.value();
- InforceGsp = z.InforceGsp
.value();
- InforceSevenPayPremium = z.InforceSevenPayPremium
.value();
- InforceIsMec = z.InforceIsMec
.value();
- LastMaterialChangeDate = z.LastMaterialChangeDate
.value();
- InforceDcv = z.InforceDcv
.value();
- InforceAvBeforeLastMc = z.InforceAvBeforeLastMc
.value();
- InforceContractYear = z.InforceContractYear
.value();
- InforceContractMonth = z.InforceContractMonth
.value();
- InforceLeastDeathBenefit = z.InforceLeastDeathBenefit
.value();
StateOfJurisdiction = z.StateOfJurisdiction
.value();
PremiumTaxState = z.PremiumTaxState
.value();
SalarySpecifiedAmountFactor = z.SalarySpecifiedAmountFactor
.value();
@@ -141,7 +144,6 @@
SalarySpecifiedAmountOffset = z.SalarySpecifiedAmountOffset
.value();
HoneymoonEndorsement = z.HoneymoonEndorsement
.value();
PostHoneymoonSpread = z.PostHoneymoonSpread
.value();
- InforceHoneymoonValue = z.InforceHoneymoonValue
.value();
ExtraMonthlyCustodialFee = convert_vector_type<double
>(z.ExtraMonthlyCustodialFeeRealized_ );
ExtraCompensationOnAssets = convert_vector_type<double
>(z.ExtraCompensationOnAssetsRealized_ );
ExtraCompensationOnPremium = convert_vector_type<double
>(z.ExtraCompensationOnPremiumRealized_ );
@@ -162,8 +164,6 @@
Withdrawal = convert_vector_type<double
>(z.WithdrawalRealized_ );
FlatExtra = convert_vector_type<double
>(z.FlatExtraRealized_ );
HoneymoonValueSpread = convert_vector_type<double
>(z.HoneymoonValueSpreadRealized_ );
- PremiumHistory = convert_vector_type<double
>(z.PremiumHistoryRealized_ );
- SpecamtHistory = convert_vector_type<double
>(z.SpecamtHistoryRealized_ );
FundAllocations = convert_vector_type<double
>(z.FundAllocationsRealized_ ); // INPUT !! Not yet implemented.
CashValueEnhancementRate = convert_vector_type<double
>(z.CashValueEnhancementRateRealized_ );
SpecifiedAmountStrategy = convert_vector_type<mcenum_sa_strategy
>(z.SpecifiedAmountStrategyRealized_ );
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2012-08-02 22:02:34 UTC (rev 5531)
+++ lmi/trunk/yare_input.hpp 2012-08-03 00:51:26 UTC (rev 5532)
@@ -103,8 +103,6 @@
bool OverrideExperienceReserveRate ;
double ExperienceReserveRate ;
double ExperienceRatingInitialKFactor ;
- double InforceNetExperienceReserve ;
- double InforceYtdNetCoiCharge ;
bool WithdrawToBasisThenLoan ;
bool UseAverageOfAllFunds ;
bool OverrideFundManagementFee ;
@@ -152,6 +150,9 @@
bool IncludeInComposite ;
std::string Comments ;
bool AmortizePremiumLoad ;
+// std::string PolicyNumber ;
+// std::string Franchise ;
+// calendar_date InforceAsOfDate ;
int InforceYear ;
int InforceMonth ;
double InforceGeneralAccountValue ;
@@ -162,6 +163,24 @@
double InforcePreferredLoanBalance ;
double InforceCumulativeNoLapsePremium ;
double InforceCumulativePayments ;
+ double InforceHoneymoonValue ;
+ double InforceNetExperienceReserve ;
+ double InforceYtdNetCoiCharge ;
+ double InforceTaxBasis ;
+ double InforceGlp ;
+ double InforceCumulativeGlp ;
+ double InforceGsp ;
+// INPUT !! Also need inforce 7702 premiums paid.
+ bool InforceIsMec ;
+ double InforceSevenPayPremium ;
+ calendar_date LastMaterialChangeDate ;
+ int InforceContractYear ;
+ int InforceContractMonth ;
+ double InforceAvBeforeLastMc ;
+ double InforceDcv ;
+ double InforceLeastDeathBenefit ;
+ std::vector<double> PremiumHistory ;
+ std::vector<double> SpecamtHistory ;
// mcenum_country Country ;
// bool OverrideCoiMultiplier ;
double CountryCoiMultiplier ;
@@ -174,22 +193,6 @@
bool SpouseRider ;
double SpouseRiderAmount ;
int SpouseIssueAge ;
-// std::string Franchise ;
-// std::string PolicyNumber ;
-// calendar_date InforceAsOfDate ;
- double InforceTaxBasis ;
- double InforceGlp ;
- double InforceCumulativeGlp ;
- double InforceGsp ;
-// INPUT !! Also need inforce 7702 premiums paid.
- double InforceSevenPayPremium ;
- bool InforceIsMec ;
- calendar_date LastMaterialChangeDate ;
- double InforceDcv ;
- double InforceAvBeforeLastMc ;
- int InforceContractYear ;
- int InforceContractMonth ;
- double InforceLeastDeathBenefit ;
mcenum_state StateOfJurisdiction ;
mcenum_state PremiumTaxState ;
double SalarySpecifiedAmountFactor ;
@@ -197,7 +200,6 @@
double SalarySpecifiedAmountOffset ;
bool HoneymoonEndorsement ;
double PostHoneymoonSpread ;
- double InforceHoneymoonValue ;
std::vector<double> ExtraMonthlyCustodialFee ;
std::vector<double> ExtraCompensationOnAssets ;
std::vector<double> ExtraCompensationOnPremium ;
@@ -219,8 +221,6 @@
std::vector<double> FlatExtra ;
// std::vector<double> PolicyLevelFlatExtra ;
std::vector<double> HoneymoonValueSpread ;
- std::vector<double> PremiumHistory ;
- std::vector<double> SpecamtHistory ;
std::vector<double> FundAllocations ;
std::vector<double> CashValueEnhancementRate ;
//
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5532] Rearrange data members,
Greg Chicares <=