[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5538] Rename various input fields
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [5538] Rename various input fields |
|
Date: |
Wed, 08 Aug 2012 21:30:26 +0000 |
Revision: 5538
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5538
Author: chicares
Date: 2012-08-08 21:30:25 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Rename various input fields
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/accountvalue.cpp
lmi/trunk/cell.rnc
lmi/trunk/cell.xsd
lmi/trunk/custom_io_0.cpp
lmi/trunk/fo_common.xsl
lmi/trunk/ihs_acctval.cpp
lmi/trunk/ihs_avmly.cpp
lmi/trunk/ihs_basicval.cpp
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/input_harmonization.cpp
lmi/trunk/input_realization.cpp
lmi/trunk/input_xml_io.cpp
lmi/trunk/ledger_invariant.cpp
lmi/trunk/ledger_invariant.hpp
lmi/trunk/ledger_text_formats.cpp
lmi/trunk/main_cgi.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/solve.cpp
lmi/trunk/yare_input.cpp
lmi/trunk/yare_input.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ChangeLog 2012-08-08 21:30:25 UTC (rev 5538)
@@ -30523,3 +30523,47 @@
yare_input.hpp
Add more inforce data members.
+20120805T0936Z <address@hidden> [571]
+
+ input.cpp
+ input.hpp
+Remove vestiges of a disused member.
+
+20120806T1059Z <address@hidden> [571]
+
+ input_harmonization.cpp
+Enable recently-added inforce controls only when they're relevant.
+
+20120808T2130Z <address@hidden> [570]
+
+ accountvalue.cpp
+ cell.rnc
+ cell.xsd
+ custom_io_0.cpp
+ fo_common.xsl
+ ihs_acctval.cpp
+ ihs_avmly.cpp
+ ihs_basicval.cpp
+ input.cpp
+ input.hpp
+ input_harmonization.cpp
+ input_realization.cpp
+ input_xml_io.cpp
+ ledger_invariant.cpp
+ ledger_invariant.hpp
+ ledger_text_formats.cpp
+ main_cgi.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
+ solve.cpp
+ yare_input.cpp
+ yare_input.hpp
+Rename various input fields.
+
Modified: lmi/trunk/accountvalue.cpp
===================================================================
--- lmi/trunk/accountvalue.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/accountvalue.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -161,7 +161,7 @@
{
// TODO ?? Isn't this unreachable?
throw std::logic_error("This line had seemed to be unreachable.");
-// LMI_ASSERT(TheBasis corresponds to yare_input_.SolveBasis);
+// LMI_ASSERT(TheBasis corresponds to
yare_input_.SolveExpenseGeneralAccountBasis);
// z = Solve();
}
else
@@ -186,7 +186,7 @@
mcenum_run_basis run_basis;
set_run_basis_from_cloven_bases
(run_basis
- ,yare_input_.SolveBasis
+ ,yare_input_.SolveExpenseGeneralAccountBasis
,mce_sep_full
);
Modified: lmi/trunk/cell.rnc
===================================================================
--- lmi/trunk/cell.rnc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/cell.rnc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -25,7 +25,7 @@
# inclusion from other schemata.
cell_element = element cell
- {attribute version {"6"}
+ {attribute version {"7"}
,## Accidental death benefit: elected or not.
element AccidentalDeathBenefit {yes_or_no}
@@ -63,6 +63,9 @@
element City {text}
,## Free-form comments.
element Comments {text}
+ ,## Contract number: a unique identifier, which, although usually
+ ## called a "number", is often not purely numeric.
+ element ContractNumber {text}
,## Corporation's address: number and street.
element CorporationAddress {text}
,## Corporation's address: city.
@@ -117,10 +120,10 @@
element ExperienceReserveRate {proportion_double}
,## Amount of 1035 exchange from a different insurer.
element External1035ExchangeAmount {nonnegative_double}
- ,## Tax basis of 1035 exchange from a different insurer.
- element External1035ExchangeBasis {xsd:double}
,## MEC status of 1035 exchange from a different insurer.
element External1035ExchangeFromMec {yes_or_no}
+ ,## Tax basis of 1035 exchange from a different insurer.
+ element External1035ExchangeTaxBasis {xsd:double}
,## Extra charge on separate-account assets. The motivation is to
## let end users add a negotiated asset trailer without changing
## the product database, but the field may be used for any extra
@@ -136,8 +139,6 @@
element ExtraMonthlyCustodialFee {numeric_sequence}
,## Annual flat extra per thousand of specified amount.
element FlatExtra {numeric_sequence}
- ,## Agency or brokerage code.
- element Franchise {text}
,## As yet unused: cf. 'fund_input_method'.
element FundAllocations {numeric_sequence}
,## Fund-allocation override: cf. 'fund_input_method'.
@@ -174,6 +175,10 @@
element IndividualPaymentToAlternative {to_point}
,## [obsolete]
element IndividualPaymentToDuration {duration_int}
+ ,## 7702A "amounts paid" for each "contract year" since beginning
+ ## of most recent seven-pay period; zero if not in a seven-pay
+ ## period.
+ element Inforce7702AAmountsPaidHistory {numeric_sequence}
,## Inforce annual target premium.
element InforceAnnualTargetPremium {nonnegative_double}
,## Date as of which inforce values are provided. This is taken to
@@ -193,15 +198,15 @@
element InforceCumulativeGlp {xsd:double}
,## Inforce cumulative 7702(f)(1) 'premiums paid'.
element InforceCumulativeGptPremiumsPaid {xsd:double}
+ ,## Inforce cumulative payments for no-lapse guarantee: sum of all
+ ## gross premiums, including dump-ins and 1035 exchange proceeds,
+ ## minus rider charges, withdrawals, and premiums refunded or
+ ## forced out.
+ element InforceCumulativeNoLapsePayments {nonnegative_double}
,## Inforce cumulative no-lapse premium, for contracts that offer
## a no-lapse guarantee as long as a cumulative minimum premium
## is paid.
element InforceCumulativeNoLapsePremium {nonnegative_double}
- ,## Inforce cumulative payments for no-lapse guarantee: sum of all
- ## gross premiums, including dump-ins and 1035 exchange proceeds,
- ## minus rider charges, withdrawals, and premiums refunded or
- ## forced out.
- element InforceCumulativePayments {nonnegative_double}
,## Inforce cumulative payments for return of premium death
## benefit option: sum of all gross premiums, including dump-ins
## and 1035 exchange proceeds, minus withdrawals and premiums
@@ -270,10 +275,10 @@
## from external 1035 because an internal exchange may not be
## subject to premium tax.
element Internal1035ExchangeAmount {nonnegative_double}
- ,## Tax basis of 1035 exchange from the same insurer.
- element Internal1035ExchangeBasis {xsd:double}
,## MEC status of 1035 exchange from the same insurer.
element Internal1035ExchangeFromMec {yes_or_no}
+ ,## Tax basis of 1035 exchange from the same insurer.
+ element Internal1035ExchangeTaxBasis {xsd:double}
,## Insurance age on effective date.
element IssueAge {age_int}
,## Most recent group-underwriting date, for group contracts that
@@ -302,6 +307,8 @@
element LoanToDuration {duration_int}
,## Proportion of males when rates are custom-blended by gender.
element MaleProportion {proportion_double}
+ ,## Group master contract number.
+ element MasterContractNumber {text}
,## Maximum net amount at risk, as constrained by reinsurance.
## Some contracts in the high-net-worth market force money out to
## prevent corridor death benefit from exceeding available
@@ -328,17 +335,10 @@
element Payment {payment_sequence}
,## Insured's premium mode.
element PaymentMode {mode_sequence}
- ,## Policy number: a unique identifier, which, despite its
- ## commonly-used name, is often not purely numeric.
- element PolicyNumber {text}
,## Interest decrement applied to crediting rate after the
## honeymoon expires--designed to recover the cost of providing
## the honeymoon.
element PostHoneymoonSpread {proportion_double}
- ,## 7702A "amounts paid" for each "contract year" since beginning
- ## of most recent seven-pay period; zero if not in a seven-pay
- ## period.
- element PremiumHistory {numeric_sequence}
,## State to which premium tax is paid.
element PremiumTaxState {state}
,## Product (plan): enumerators depend on run-time context.
@@ -367,9 +367,6 @@
element SeparateAccountRateType {sep_acct_rate_type}
,## Insured's smoking or tobacco use.
element Smoking {smoking}
- ,## Expense and general-account basis for a solve: lmi permits
- ## solves on guaranteed and midpoint bases as well as current.
- element SolveBasis {gen_basis}
,## Age at which a solve begins (inclusive).
element SolveBeginTime {duration_int}
,## Policy year in which a solve begins (inclusive).
@@ -378,6 +375,9 @@
element SolveEndTime {duration_int}
,## Policy year at which a solve ends (exclusive).
element SolveEndYear {duration_int}
+ ,## Expense and general-account basis for a solve: lmi permits
+ ## solves on guaranteed and midpoint bases as well as current.
+ element SolveExpenseGeneralAccountBasis {gen_basis}
,## Point at which a solve begins.
element SolveFromWhich {from_point}
,## Separate-account basis for a solve: lmi permits solves on
Modified: lmi/trunk/cell.xsd
===================================================================
--- lmi/trunk/cell.xsd 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/cell.xsd 2012-08-08 21:30:25 UTC (rev 5538)
@@ -54,6 +54,7 @@
<xs:element ref="ChildRiderAmount"/>
<xs:element ref="City"/>
<xs:element ref="Comments"/>
+ <xs:element ref="ContractNumber"/>
<xs:element ref="CorporationAddress"/>
<xs:element ref="CorporationCity"/>
<xs:element ref="CorporationName"/>
@@ -80,13 +81,12 @@
<xs:element ref="ExperienceRatingInitialKFactor"/>
<xs:element ref="ExperienceReserveRate"/>
<xs:element ref="External1035ExchangeAmount"/>
- <xs:element ref="External1035ExchangeBasis"/>
<xs:element ref="External1035ExchangeFromMec"/>
+ <xs:element ref="External1035ExchangeTaxBasis"/>
<xs:element ref="ExtraCompensationOnAssets"/>
<xs:element ref="ExtraCompensationOnPremium"/>
<xs:element ref="ExtraMonthlyCustodialFee"/>
<xs:element ref="FlatExtra"/>
- <xs:element ref="Franchise"/>
<xs:element ref="FundAllocations"/>
<xs:element ref="FundChoiceType"/>
<xs:element ref="Gender"/>
@@ -102,6 +102,7 @@
<xs:element ref="IndividualPaymentToAge"/>
<xs:element ref="IndividualPaymentToAlternative"/>
<xs:element ref="IndividualPaymentToDuration"/>
+ <xs:element ref="Inforce7702AAmountsPaidHistory"/>
<xs:element ref="InforceAnnualTargetPremium"/>
<xs:element ref="InforceAsOfDate"/>
<xs:element ref="InforceAvBeforeLastMc"/>
@@ -109,8 +110,8 @@
<xs:element ref="InforceContractYear"/>
<xs:element ref="InforceCumulativeGlp"/>
<xs:element ref="InforceCumulativeGptPremiumsPaid"/>
+ <xs:element ref="InforceCumulativeNoLapsePayments"/>
<xs:element ref="InforceCumulativeNoLapsePremium"/>
- <xs:element ref="InforceCumulativePayments"/>
<xs:element ref="InforceCumulativeRopPayments"/>
<xs:element ref="InforceCumulativeSalesLoad"/>
<xs:element ref="InforceDataSource"/>
@@ -141,8 +142,8 @@
<xs:element ref="InsuredName"/>
<xs:element ref="InsuredPremiumTableFactor"/>
<xs:element ref="Internal1035ExchangeAmount"/>
- <xs:element ref="Internal1035ExchangeBasis"/>
<xs:element ref="Internal1035ExchangeFromMec"/>
+ <xs:element ref="Internal1035ExchangeTaxBasis"/>
<xs:element ref="IssueAge"/>
<xs:element ref="LastCoiReentryDate"/>
<xs:element ref="LastMaterialChangeDate"/>
@@ -156,6 +157,7 @@
<xs:element ref="LoanToAlternative"/>
<xs:element ref="LoanToDuration"/>
<xs:element ref="MaleProportion"/>
+ <xs:element ref="MasterContractNumber"/>
<xs:element ref="MaximumNaar"/>
<xs:element ref="NewLoan"/>
<xs:element ref="NonsmokerProportion"/>
@@ -166,9 +168,7 @@
<xs:element ref="PartialMortalityMultiplier"/>
<xs:element ref="Payment"/>
<xs:element ref="PaymentMode"/>
- <xs:element ref="PolicyNumber"/>
<xs:element ref="PostHoneymoonSpread"/>
- <xs:element ref="PremiumHistory"/>
<xs:element ref="PremiumTaxState"/>
<xs:element ref="ProductName"/>
<xs:element ref="ProjectedSalary"/>
@@ -181,11 +181,11 @@
<xs:element ref="SeparateAccountRate"/>
<xs:element ref="SeparateAccountRateType"/>
<xs:element ref="Smoking"/>
- <xs:element ref="SolveBasis"/>
<xs:element ref="SolveBeginTime"/>
<xs:element ref="SolveBeginYear"/>
<xs:element ref="SolveEndTime"/>
<xs:element ref="SolveEndYear"/>
+ <xs:element ref="SolveExpenseGeneralAccountBasis"/>
<xs:element ref="SolveFromWhich"/>
<xs:element ref="SolveSeparateAccountBasis"/>
<xs:element ref="SolveTarget"/>
@@ -249,7 +249,7 @@
<xs:attribute name="version" use="required">
<xs:simpleType>
<xs:restriction base="xs:token">
- <xs:enumeration value="6"/>
+ <xs:enumeration value="7"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
@@ -345,6 +345,12 @@
<xs:documentation>Free-form comments.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="ContractNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Contract number: a unique identifier, which, although
usually
+called a "number", is often not purely numeric.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="CorporationAddress" type="xs:string">
<xs:annotation>
<xs:documentation>Corporation's address: number and
street.</xs:documentation>
@@ -477,14 +483,14 @@
<xs:documentation>Amount of 1035 exchange from a different
insurer.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="External1035ExchangeBasis" type="xs:double">
+ <xs:element name="External1035ExchangeFromMec" type="yes_or_no">
<xs:annotation>
- <xs:documentation>Tax basis of 1035 exchange from a different
insurer.</xs:documentation>
+ <xs:documentation>MEC status of 1035 exchange from a different
insurer.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="External1035ExchangeFromMec" type="yes_or_no">
+ <xs:element name="External1035ExchangeTaxBasis" type="xs:double">
<xs:annotation>
- <xs:documentation>MEC status of 1035 exchange from a different
insurer.</xs:documentation>
+ <xs:documentation>Tax basis of 1035 exchange from a different
insurer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ExtraCompensationOnAssets" type="xs:string">
@@ -514,11 +520,6 @@
<xs:documentation>Annual flat extra per thousand of specified
amount.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Franchise" type="xs:string">
- <xs:annotation>
- <xs:documentation>Agency or brokerage code.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="FundAllocations" type="xs:string">
<xs:annotation>
<xs:documentation>As yet unused: cf.
'fund_input_method'.</xs:documentation>
@@ -600,6 +601,13 @@
<xs:documentation>[obsolete]</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="Inforce7702AAmountsPaidHistory" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>7702A "amounts paid" for each "contract year" since
beginning
+of most recent seven-pay period; zero if not in a seven-pay
+period.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="InforceAnnualTargetPremium" type="nonnegative_double">
<xs:annotation>
<xs:documentation>Inforce annual target premium.</xs:documentation>
@@ -640,6 +648,14 @@
<xs:documentation>Inforce cumulative 7702(f)(1) 'premiums
paid'.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="InforceCumulativeNoLapsePayments"
type="nonnegative_double">
+ <xs:annotation>
+ <xs:documentation>Inforce cumulative payments for no-lapse guarantee:
sum of all
+gross premiums, including dump-ins and 1035 exchange proceeds,
+minus rider charges, withdrawals, and premiums refunded or
+forced out.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="InforceCumulativeNoLapsePremium" type="nonnegative_double">
<xs:annotation>
<xs:documentation>Inforce cumulative no-lapse premium, for contracts
that offer
@@ -647,14 +663,6 @@
is paid.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="InforceCumulativePayments" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>Inforce cumulative payments for no-lapse guarantee:
sum of all
-gross premiums, including dump-ins and 1035 exchange proceeds,
-minus rider charges, withdrawals, and premiums refunded or
-forced out.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="InforceCumulativeRopPayments" type="nonnegative_double">
<xs:annotation>
<xs:documentation>Inforce cumulative payments for return of premium death
@@ -813,14 +821,14 @@
subject to premium tax.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Internal1035ExchangeBasis" type="xs:double">
+ <xs:element name="Internal1035ExchangeFromMec" type="yes_or_no">
<xs:annotation>
- <xs:documentation>Tax basis of 1035 exchange from the same
insurer.</xs:documentation>
+ <xs:documentation>MEC status of 1035 exchange from the same
insurer.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="Internal1035ExchangeFromMec" type="yes_or_no">
+ <xs:element name="Internal1035ExchangeTaxBasis" type="xs:double">
<xs:annotation>
- <xs:documentation>MEC status of 1035 exchange from the same
insurer.</xs:documentation>
+ <xs:documentation>Tax basis of 1035 exchange from the same
insurer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="IssueAge" type="age_int">
@@ -890,6 +898,11 @@
<xs:documentation>Proportion of males when rates are custom-blended by
gender.</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="MasterContractNumber" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Group master contract number.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="MaximumNaar" type="nonnegative_double">
<xs:annotation>
<xs:documentation>Maximum net amount at risk, as constrained by
reinsurance.
@@ -946,12 +959,6 @@
<xs:documentation>Insured's premium mode.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="PolicyNumber" type="xs:string">
- <xs:annotation>
- <xs:documentation>Policy number: a unique identifier, which, despite its
-commonly-used name, is often not purely numeric.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="PostHoneymoonSpread" type="proportion_double">
<xs:annotation>
<xs:documentation>Interest decrement applied to crediting rate after the
@@ -959,13 +966,6 @@
the honeymoon.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="PremiumHistory" type="xs:string">
- <xs:annotation>
- <xs:documentation>7702A "amounts paid" for each "contract year" since
beginning
-of most recent seven-pay period; zero if not in a seven-pay
-period.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="PremiumTaxState" type="state">
<xs:annotation>
<xs:documentation>State to which premium tax is paid.</xs:documentation>
@@ -1030,12 +1030,6 @@
<xs:documentation>Insured's smoking or tobacco use.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="SolveBasis" type="gen_basis">
- <xs:annotation>
- <xs:documentation>Expense and general-account basis for a solve: lmi
permits
-solves on guaranteed and midpoint bases as well as current.</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="SolveBeginTime" type="duration_int">
<xs:annotation>
<xs:documentation>Age at which a solve begins
(inclusive).</xs:documentation>
@@ -1056,6 +1050,12 @@
<xs:documentation>Policy year at which a solve ends
(exclusive).</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="SolveExpenseGeneralAccountBasis" type="gen_basis">
+ <xs:annotation>
+ <xs:documentation>Expense and general-account basis for a solve: lmi
permits
+solves on guaranteed and midpoint bases as well as current.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
<xs:element name="SolveFromWhich" type="from_point">
<xs:annotation>
<xs:documentation>Point at which a solve begins.</xs:documentation>
Modified: lmi/trunk/custom_io_0.cpp
===================================================================
--- lmi/trunk/custom_io_0.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/custom_io_0.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -227,7 +227,7 @@
z["InforceRegularLoanValue"] =
n_v_pairs.string_numeric_value("InforceAVRegLn");
z["InforcePreferredLoanValue"] =
n_v_pairs.string_numeric_value("InforceAVPrfLn");
z["InforceCumulativeNoLapsePremium"] =
n_v_pairs.string_numeric_value("InforceCumNoLapsePrem");
- z["InforceCumulativePayments"] =
n_v_pairs.string_numeric_value("InforceCumPmts");
+ z["InforceCumulativeNoLapsePayments"]=
n_v_pairs.string_numeric_value("InforceCumPmts");
// TRICKY !! Other input methods distinguish the insured's first, middle,
// and last names. This method uses a single field to meet customer
Modified: lmi/trunk/fo_common.xsl
===================================================================
--- lmi/trunk/fo_common.xsl 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/fo_common.xsl 2012-08-08 21:30:25 UTC (rev 5538)
@@ -907,27 +907,27 @@
<xsl:template name="print-franchise-and-policynumber">
<xsl:param name="omit_policynumber" select="$is_composite"/>
<!--
- This monstrosity truncates 'Franchise' and 'PolicyNumber' to:
+ This monstrosity truncates 'MasterContractNumber' and 'ContractNumber' to:
* 30 characters if both are present;
* 15 characters if only one is present.
-->
- <xsl:variable name="has_franchise"
select="number($scalars/Franchise!='')"/>
- <xsl:variable name="has_polnumber"
select="number($scalars/PolicyNumber!='' and not($omit_policynumber))"/>
- <xsl:variable name="contracts" select="$has_franchise + $has_polnumber"/>
+ <xsl:variable name="has_master_contract"
select="number($scalars/MasterContractNumber!='')"/>
+ <xsl:variable name="has_polnumber"
select="number($scalars/ContractNumber!='' and not($omit_policynumber))"/>
+ <xsl:variable name="contracts" select="$has_master_contract +
$has_polnumber"/>
<xsl:if test="$contracts">
<xsl:variable name="number_length" select="floor(30 div $contracts)"/>
<fo:block>
- <xsl:if test="$has_franchise">
+ <xsl:if test="$has_master_contract">
Master contract:
<xsl:call-template name="limitstring">
- <xsl:with-param name="passString" select="$scalars/Franchise"/>
+ <xsl:with-param name="passString"
select="$scalars/MasterContractNumber"/>
<xsl:with-param name="length" select="$number_length"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="$has_polnumber">
Contract number:
<xsl:call-template name="limitstring">
- <xsl:with-param name="passString" select="$scalars/PolicyNumber"/>
+ <xsl:with-param name="passString"
select="$scalars/ContractNumber"/>
<xsl:with-param name="length" select="$number_length"/>
</xsl:call-template>
</xsl:if>
Modified: lmi/trunk/ihs_acctval.cpp
===================================================================
--- lmi/trunk/ihs_acctval.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ihs_acctval.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -254,7 +254,7 @@
// Apparently this should never be done because Solve() is called in
// RunAllApplicableBases() .
// TODO ?? Isn't this unreachable?
-// LMI_ASSERT(a_Basis corresponds to yare_input_.SolveBasis);
+// LMI_ASSERT(a_Basis corresponds to
yare_input_.SolveExpenseGeneralAccountBasis);
// z = Solve();
}
else
@@ -306,7 +306,7 @@
,yare_input_.SolveTarget
,yare_input_.SolveTargetCashSurrenderValue
,yare_input_.SolveTargetYear
- ,yare_input_.SolveBasis
+ ,yare_input_.SolveExpenseGeneralAccountBasis
,yare_input_.SolveSeparateAccountBasis
);
Solving = false;
@@ -523,7 +523,7 @@
int length_7702a = std::min(7, BasicValues::GetLength());
// Premium history starts at contract year zero.
nonstd::copy_n
- (yare_input_.PremiumHistory.begin()
+ (yare_input_.Inforce7702AAmountsPaidHistory.begin()
,length_7702a
,std::back_inserter(pmts_7702a)
);
@@ -599,17 +599,17 @@
//============================================================================
void AccountValue::SetInitialValues()
{
- InforceYear = yare_input_.InforceYear ;
- InforceMonth = yare_input_.InforceMonth ;
- InforceAVGenAcct = yare_input_.InforceGeneralAccountValue ;
- InforceAVSepAcct = yare_input_.InforceSeparateAccountValue ;
- InforceAVRegLn = yare_input_.InforceRegularLoanValue ;
- InforceAVPrfLn = yare_input_.InforcePreferredLoanValue ;
- InforceRegLnBal = yare_input_.InforceRegularLoanBalance ;
- InforcePrfLnBal = yare_input_.InforcePreferredLoanBalance ;
- InforceCumNoLapsePrem = yare_input_.InforceCumulativeNoLapsePremium;
- InforceCumPmts = yare_input_.InforceCumulativePayments ;
- InforceTaxBasis = yare_input_.InforceTaxBasis ;
+ InforceYear = yare_input_.InforceYear ;
+ InforceMonth = yare_input_.InforceMonth ;
+ InforceAVGenAcct = yare_input_.InforceGeneralAccountValue ;
+ InforceAVSepAcct = yare_input_.InforceSeparateAccountValue ;
+ InforceAVRegLn = yare_input_.InforceRegularLoanValue ;
+ InforceAVPrfLn = yare_input_.InforcePreferredLoanValue ;
+ InforceRegLnBal = yare_input_.InforceRegularLoanBalance ;
+ InforcePrfLnBal = yare_input_.InforcePreferredLoanBalance ;
+ InforceCumNoLapsePrem = yare_input_.InforceCumulativeNoLapsePremium ;
+ InforceCumPmts = yare_input_.InforceCumulativeNoLapsePayments;
+ InforceTaxBasis = yare_input_.InforceTaxBasis ;
Year = InforceYear;
Month = InforceMonth;
Modified: lmi/trunk/ihs_avmly.cpp
===================================================================
--- lmi/trunk/ihs_avmly.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ihs_avmly.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -630,8 +630,8 @@
CumPmts += GrossPmts[Month];
TaxBasis +=
- yare_input_.External1035ExchangeBasis
- + yare_input_.Internal1035ExchangeBasis
+ yare_input_.External1035ExchangeTaxBasis
+ + yare_input_.Internal1035ExchangeTaxBasis
;
if(mce_run_gen_curr_sep_full == RunBasis_)
Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ihs_basicval.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -661,7 +661,7 @@
,yare_input_.InforceGlp
,yare_input_.InforceCumulativeGlp
,yare_input_.InforceGsp
- ,yare_input_.InforceCumulativePayments // TAXATION !! INPUT !!
Wrong--this is not 7702 "premiums paid".
+ ,yare_input_.InforceCumulativeNoLapsePayments // TAXATION !! INPUT
!! Wrong--this is not 7702 "premiums paid".
)
);
}
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/input.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -55,10 +55,10 @@
// ,ProductName ("")
// ,Dumpin ("")
// ,External1035ExchangeAmount ("")
-// ,External1035ExchangeBasis ("")
+// ,External1035ExchangeTaxBasis ("")
// ,External1035ExchangeFromMec ("")
// ,Internal1035ExchangeAmount ("")
-// ,Internal1035ExchangeBasis ("")
+// ,Internal1035ExchangeTaxBasis ("")
// ,Internal1035ExchangeFromMec ("")
// ,SolveTargetTime ("95")
// ,SolveBeginTime ("")
@@ -69,7 +69,7 @@
// ,SolveTarget ("")
// ,SolveTargetCashSurrenderValue ("")
// ,SolveTargetYear ("50")
-// ,SolveBasis ("")
+// ,SolveExpenseGeneralAccountBasis ("")
// ,SolveSeparateAccountBasis ("")
,UseCurrentDeclaredRate ("Yes")
// ,GeneralAccountRateType ("Credited rate")
@@ -127,8 +127,8 @@
// ,Comments ("")
// ,AmortizePremiumLoad ("")
,InforceDataSource ("lmi")
-// ,PolicyNumber ("")
-// ,Franchise ("")
+// ,ContractNumber ("")
+// ,MasterContractNumber ("")
// ,InforceAsOfDate ("")
// ,InforceYear ("")
// ,InforceMonth ("")
@@ -143,7 +143,7 @@
// ,InforceNoLapseActive ("")
// ,InforceMonthlyNoLapsePremium ("")
// ,InforceCumulativeNoLapsePremium ("")
-// ,InforceCumulativePayments ("")
+// ,InforceCumulativeNoLapsePayments ("")
// ,InforceCumulativeRopPayments ("")
// ,InforceYtdTaxablePremium ("")
// ,InforceCumulativeSalesLoad ("")
@@ -164,7 +164,7 @@
// ,InforceAvBeforeLastMc ("")
// ,InforceDcv ("")
// ,InforceLeastDeathBenefit ("")
- ,PremiumHistory ("0")
+ ,Inforce7702AAmountsPaidHistory ("0")
,SpecamtHistory ("0")
,Country ("US")
// ,OverrideCoiMultiplier ("")
@@ -313,10 +313,10 @@
ascribe("ProductName" , &Input::ProductName
);
ascribe("Dumpin" , &Input::Dumpin
);
ascribe("External1035ExchangeAmount" ,
&Input::External1035ExchangeAmount );
- ascribe("External1035ExchangeBasis" ,
&Input::External1035ExchangeBasis );
+ ascribe("External1035ExchangeTaxBasis" ,
&Input::External1035ExchangeTaxBasis );
ascribe("External1035ExchangeFromMec" ,
&Input::External1035ExchangeFromMec );
ascribe("Internal1035ExchangeAmount" ,
&Input::Internal1035ExchangeAmount );
- ascribe("Internal1035ExchangeBasis" ,
&Input::Internal1035ExchangeBasis );
+ ascribe("Internal1035ExchangeTaxBasis" ,
&Input::Internal1035ExchangeTaxBasis );
ascribe("Internal1035ExchangeFromMec" ,
&Input::Internal1035ExchangeFromMec );
ascribe("SolveTargetTime" , &Input::SolveTargetTime
);
ascribe("SolveBeginTime" , &Input::SolveBeginTime
);
@@ -327,7 +327,7 @@
ascribe("SolveTarget" , &Input::SolveTarget
);
ascribe("SolveTargetCashSurrenderValue" ,
&Input::SolveTargetCashSurrenderValue );
ascribe("SolveTargetYear" , &Input::SolveTargetYear
);
- ascribe("SolveBasis" , &Input::SolveBasis
);
+ ascribe("SolveExpenseGeneralAccountBasis" ,
&Input::SolveExpenseGeneralAccountBasis );
ascribe("SolveSeparateAccountBasis" ,
&Input::SolveSeparateAccountBasis );
ascribe("UseCurrentDeclaredRate" ,
&Input::UseCurrentDeclaredRate );
ascribe("GeneralAccountRateType" ,
&Input::GeneralAccountRateType );
@@ -385,8 +385,8 @@
ascribe("Comments" , &Input::Comments
);
ascribe("AmortizePremiumLoad" ,
&Input::AmortizePremiumLoad );
ascribe("InforceDataSource" ,
&Input::InforceDataSource );
- ascribe("PolicyNumber" , &Input::PolicyNumber
);
- ascribe("Franchise" , &Input::Franchise
);
+ ascribe("ContractNumber" , &Input::ContractNumber
);
+ ascribe("MasterContractNumber" ,
&Input::MasterContractNumber );
ascribe("InforceAsOfDate" , &Input::InforceAsOfDate
);
ascribe("InforceYear" , &Input::InforceYear
);
ascribe("InforceMonth" , &Input::InforceMonth
);
@@ -401,7 +401,7 @@
ascribe("InforceNoLapseActive" ,
&Input::InforceNoLapseActive );
ascribe("InforceMonthlyNoLapsePremium" ,
&Input::InforceMonthlyNoLapsePremium );
ascribe("InforceCumulativeNoLapsePremium" ,
&Input::InforceCumulativeNoLapsePremium );
- ascribe("InforceCumulativePayments" ,
&Input::InforceCumulativePayments );
+ ascribe("InforceCumulativeNoLapsePayments" ,
&Input::InforceCumulativeNoLapsePayments );
ascribe("InforceCumulativeRopPayments" ,
&Input::InforceCumulativeRopPayments );
ascribe("InforceYtdTaxablePremium" ,
&Input::InforceYtdTaxablePremium );
ascribe("InforceCumulativeSalesLoad" ,
&Input::InforceCumulativeSalesLoad );
@@ -422,7 +422,7 @@
ascribe("InforceAvBeforeLastMc" ,
&Input::InforceAvBeforeLastMc );
ascribe("InforceDcv" , &Input::InforceDcv
);
ascribe("InforceLeastDeathBenefit" ,
&Input::InforceLeastDeathBenefit );
- ascribe("PremiumHistory" , &Input::PremiumHistory
);
+ ascribe("Inforce7702AAmountsPaidHistory" ,
&Input::Inforce7702AAmountsPaidHistory );
ascribe("SpecamtHistory" , &Input::SpecamtHistory
);
ascribe("Country" , &Input::Country
);
ascribe("OverrideCoiMultiplier" ,
&Input::OverrideCoiMultiplier );
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/input.hpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -209,7 +209,7 @@
std::string RealizeWithdrawal ();
std::string RealizeFlatExtra ();
std::string RealizeHoneymoonValueSpread ();
- std::string RealizePremiumHistory ();
+ std::string RealizeAmountsPaidHistory ();
std::string RealizeSpecamtHistory ();
void make_term_rider_consistent(bool aggressively = true);
@@ -247,10 +247,10 @@
ce_product_name ProductName ;
tnr_nonnegative_double Dumpin ;
tnr_nonnegative_double External1035ExchangeAmount ;
- tnr_unrestricted_double External1035ExchangeBasis ;
+ tnr_unrestricted_double External1035ExchangeTaxBasis ;
mce_yes_or_no External1035ExchangeFromMec ;
tnr_nonnegative_double Internal1035ExchangeAmount ;
- tnr_unrestricted_double Internal1035ExchangeBasis ;
+ tnr_unrestricted_double Internal1035ExchangeTaxBasis ;
mce_yes_or_no Internal1035ExchangeFromMec ;
tnr_duration SolveTargetTime ;
tnr_duration SolveBeginTime ;
@@ -261,7 +261,7 @@
mce_solve_target SolveTarget ;
tnr_nonnegative_double SolveTargetCashSurrenderValue ;
tnr_duration SolveTargetYear ;
- mce_gen_basis SolveBasis ; // TODO ?? Poor
name, but enumerators are correct.
+ mce_gen_basis SolveExpenseGeneralAccountBasis ;
mce_sep_basis SolveSeparateAccountBasis ;
mce_yes_or_no UseCurrentDeclaredRate ;
mce_gen_acct_rate_type GeneralAccountRateType ;
@@ -319,8 +319,8 @@
datum_string Comments ;
mce_yes_or_no AmortizePremiumLoad ;
datum_string InforceDataSource ;
- datum_string PolicyNumber ;
- datum_string Franchise ;
+ datum_string ContractNumber ;
+ datum_string MasterContractNumber ;
tnr_date InforceAsOfDate ;
tnr_duration InforceYear ;
tnr_month InforceMonth ;
@@ -335,7 +335,7 @@
mce_yes_or_no InforceNoLapseActive ;
tnr_nonnegative_double InforceMonthlyNoLapsePremium ;
tnr_nonnegative_double InforceCumulativeNoLapsePremium ;
- tnr_nonnegative_double InforceCumulativePayments ;
+ tnr_nonnegative_double InforceCumulativeNoLapsePayments;
tnr_nonnegative_double InforceCumulativeRopPayments ;
tnr_nonnegative_double InforceYtdTaxablePremium ;
tnr_nonnegative_double InforceCumulativeSalesLoad ;
@@ -356,7 +356,7 @@
tnr_nonnegative_double InforceAvBeforeLastMc ;
tnr_nonnegative_double InforceDcv ;
tnr_nonnegative_double InforceLeastDeathBenefit ;
- numeric_sequence PremiumHistory ;
+ numeric_sequence Inforce7702AAmountsPaidHistory ;
numeric_sequence SpecamtHistory ;
mce_country Country ;
mce_yes_or_no OverrideCoiMultiplier ;
@@ -477,7 +477,7 @@
std::vector<tnr_unrestricted_double> WithdrawalRealized_ ;
// tnr_nonnegative_double
std::vector<tnr_unrestricted_double> FlatExtraRealized_ ;
// tnr_nonnegative_double
std::vector<tnr_unrestricted_double> HoneymoonValueSpreadRealized_ ;
// tnr_interest_rate (new)
- std::vector<tnr_unrestricted_double> PremiumHistoryRealized_ ;
// tnr_unrestricted_double
+ std::vector<tnr_unrestricted_double> AmountsPaidHistoryRealized_ ;
// tnr_unrestricted_double
std::vector<tnr_unrestricted_double> SpecamtHistoryRealized_ ;
// tnr_nonnegative_double
};
Modified: lmi/trunk/input_harmonization.cpp
===================================================================
--- lmi/trunk/input_harmonization.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/input_harmonization.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -315,7 +315,7 @@
InforceNoLapseActive .enable(no_lapse_offered);
InforceMonthlyNoLapsePremium .enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
InforceCumulativeNoLapsePremium .enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
- InforceCumulativePayments .enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
+ InforceCumulativeNoLapsePayments.enable(no_lapse_offered && mce_yes ==
InforceNoLapseActive);
InforceCumulativeRopPayments.enable(database_->Query(DB_AllowDbo3));
@@ -904,10 +904,10 @@
SolveTarget.allow(mce_solve_for_tax_basis, actually_solving);
SolveTarget.allow(mce_solve_for_non_mec , actually_solving &&
mce_solve_loan != SolveType);
- SolveBasis .enable(actually_solving && mce_solve_for_non_mec !=
SolveTarget);
- SolveBasis .allow(mce_gen_curr, actually_solving);
- SolveBasis .allow(mce_gen_guar, actually_solving);
- SolveBasis .allow(mce_gen_mdpt, actually_solving &&
is_subject_to_ill_reg(GleanedLedgerType_));
+ SolveExpenseGeneralAccountBasis.enable(actually_solving &&
mce_solve_for_non_mec != SolveTarget);
+ SolveExpenseGeneralAccountBasis.allow(mce_gen_curr, actually_solving);
+ SolveExpenseGeneralAccountBasis.allow(mce_gen_guar, actually_solving);
+ SolveExpenseGeneralAccountBasis.allow(mce_gen_mdpt, actually_solving &&
is_subject_to_ill_reg(GleanedLedgerType_));
SolveSeparateAccountBasis.enable(actually_solving && mce_solve_for_non_mec
!= SolveTarget);
SolveSeparateAccountBasis.allow(mce_sep_full, actually_solving);
Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/input_realization.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -232,7 +232,7 @@
s.push_back(RealizeWithdrawal ());
s.push_back(RealizeFlatExtra ());
s.push_back(RealizeHoneymoonValueSpread ());
- s.push_back(RealizePremiumHistory ());
+ s.push_back(RealizeAmountsPaidHistory ());
s.push_back(RealizeSpecamtHistory ());
if(report_errors)
@@ -886,12 +886,12 @@
}
//============================================================================
-std::string Input::RealizePremiumHistory()
+std::string Input::RealizeAmountsPaidHistory()
{
return realize_sequence_string
(*this
- ,PremiumHistoryRealized_
- ,PremiumHistory
+ ,AmountsPaidHistoryRealized_
+ ,Inforce7702AAmountsPaidHistory
);
}
Modified: lmi/trunk/input_xml_io.cpp
===================================================================
--- lmi/trunk/input_xml_io.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/input_xml_io.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -75,6 +75,7 @@
/// version 4: 20090330T0137Z
/// version 5: 20090526T1331Z
/// version 6: 20100719T1349Z
+/// version 7: 20120808T2130Z
///
/// Important note concerning version 3. On or about 20090311, some
/// end users were given an off-cycle release that should have used
@@ -83,7 +84,7 @@
int Input::class_version() const
{
- return 6;
+ return 7;
}
std::string const& Input::xml_root_name() const
@@ -116,11 +117,15 @@
,"DeprecatedSolveToWhich" // Renamed (without 'Deprecated'-).
,"DeprecatedUseDOB" // Renamed (without 'Deprecated'-).
,"DeprecatedUseDOR" // Withdrawn.
+ ,"External1035ExchangeBasis" // Renamed to
'External1035ExchangeTaxBasis'.
,"FilingApprovalState" // Alias for 'StateOfJurisdiction'.
,"FirstName" // Single name instead.
+ ,"Franchise" // Renamed to 'MasterContractNumber'.
+ ,"InforceCumulativePayments" // Renamed to
'InforceCumulativeNoLapsePayments'.
,"InforceDcvDeathBenefit" // Misbegotten.
,"InforceExperienceReserve" // Renamed before implementation.
,"InsuredPremiumTableNumber" // Never implemented.
+ ,"Internal1035ExchangeBasis" // Renamed to
'Internal1035ExchangeTaxBasis'.
,"LastName" // Single name instead.
,"MiddleName" // Single name instead.
,"NetMortalityChargeHistory" // Renamed before implementation.
@@ -129,8 +134,11 @@
,"PayLoanInterestInCash" // Never implemented.
,"PolicyDate" // Never implemented.
,"PolicyLevelFlatExtra" // Never implemented; poor name.
+ ,"PolicyNumber" // Renamed to 'ContractNumber'.
+ ,"PremiumHistory" // Renamed to
'Inforce7702AAmountsPaidHistory'.
,"SocialSecurityNumber" // Withdrawn: would violate privacy.
- ,"TermProportion" // 'TermRiderProportion' instead.
+ ,"SolveBasis" // Renamed to
'SolveExpenseGeneralAccountBasis'.
+ ,"TermProportion" // Disused: cf. 'TermRiderProportion'.
,"UseOffshoreCorridorFactor" // Withdrawn.
,"YearsOfZeroDeaths" // Withdrawn.
};
@@ -484,6 +492,33 @@
SolveToWhich = map_lookup(detritus_map, "DeprecatedSolveToWhich");
UseDOB = map_lookup(detritus_map, "DeprecatedUseDOB");
}
+
+ if(file_version < 7)
+ {
+ // Version 7 renamed these elements.
+ LMI_ASSERT(contains(residuary_names, "ContractNumber"));
+ LMI_ASSERT(contains(residuary_names, "External1035ExchangeTaxBasis"));
+ LMI_ASSERT(contains(residuary_names,
"Inforce7702AAmountsPaidHistory"));
+ LMI_ASSERT(contains(residuary_names,
"InforceCumulativeNoLapsePayments"));
+ LMI_ASSERT(contains(residuary_names, "Internal1035ExchangeTaxBasis"));
+ LMI_ASSERT(contains(residuary_names, "MasterContractNumber"));
+ LMI_ASSERT(contains(residuary_names,
"SolveExpenseGeneralAccountBasis"));
+ ContractNumber = map_lookup(detritus_map,
"PolicyNumber");
+ External1035ExchangeTaxBasis = map_lookup(detritus_map,
"External1035ExchangeBasis");
+ InforceCumulativeNoLapsePayments = map_lookup(detritus_map,
"InforceCumulativePayments");
+ Internal1035ExchangeTaxBasis = map_lookup(detritus_map,
"Internal1035ExchangeBasis");
+ MasterContractNumber = map_lookup(detritus_map,
"Franchise");
+ // Version 0 lacked 'PremiumHistory', as do "deficient" extracts.
+ if(0 < file_version && !deficient_extract)
+ {
+ Inforce7702AAmountsPaidHistory = map_lookup(detritus_map,
"PremiumHistory");
+ }
+ // "Deficient" extracts also lack 'SolveBasis'.
+ if(!deficient_extract)
+ {
+ SolveExpenseGeneralAccountBasis = map_lookup(detritus_map,
"SolveBasis");
+ }
+ }
}
void Input::redintegrate_ad_terminum()
Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ledger_invariant.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -272,8 +272,8 @@
Strings ["ProducerStreet" ] = &ProducerStreet ;
Strings ["ProducerCity" ] = &ProducerCity ;
Strings ["CorpName" ] = &CorpName ;
- Strings ["Franchise" ] = &Franchise ;
- Strings ["PolicyNumber" ] = &PolicyNumber ;
+ Strings ["MasterContractNumber" ] = &MasterContractNumber ;
+ Strings ["ContractNumber" ] = &ContractNumber ;
Strings ["Insured1" ] = &Insured1 ;
Strings ["Gender" ] = &Gender ;
Strings ["UWType" ] = &UWType ;
@@ -686,8 +686,8 @@
ProducerCity = agent_city_etc;
CorpName = (*b->Input_)["CorporationName"].str();
- Franchise = (*b->Input_)["Franchise"].str();
- PolicyNumber = (*b->Input_)["PolicyNumber"].str();
+ MasterContractNumber = (*b->Input_)["MasterContractNumber"].str();
+ ContractNumber = (*b->Input_)["ContractNumber"].str();
Insured1 = (*b->Input_)["InsuredName"].str();
Gender = (*b->Input_)["Gender"].str();
@@ -841,13 +841,15 @@
// TODO ?? Probably we should assert that these don't vary by life.
CorpName = a_Addend.CorpName;
- Franchise = a_Addend.Franchise;
+ MasterContractNumber = a_Addend.MasterContractNumber;
ProducerName = a_Addend.ProducerName;
ProducerStreet = a_Addend.ProducerStreet;
ProducerCity = a_Addend.ProducerCity;
DefnLifeIns = a_Addend.DefnLifeIns;
DefnMaterialChange = a_Addend.DefnMaterialChange;
AvoidMec = a_Addend.AvoidMec;
+ // This would necessarily vary by life:
+// ContractNumber = "";
PolicyForm = a_Addend.PolicyForm;
PolicyMktgName = a_Addend.PolicyMktgName;
Modified: lmi/trunk/ledger_invariant.hpp
===================================================================
--- lmi/trunk/ledger_invariant.hpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ledger_invariant.hpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -288,8 +288,8 @@
std::string ProducerStreet;
std::string ProducerCity;
std::string CorpName;
- std::string Franchise; // 'MasterContractNumber' would be a better
name.
- std::string PolicyNumber; // 'ContractNumber' would be a better name.
+ std::string MasterContractNumber;
+ std::string ContractNumber;
std::string Insured1;
std::string Gender;
std::string UWType;
Modified: lmi/trunk/ledger_text_formats.cpp
===================================================================
--- lmi/trunk/ledger_text_formats.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/ledger_text_formats.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -484,7 +484,7 @@
os << "\n\nFOR BROKER-DEALER USE ONLY. NOT TO BE SHARED WITH CLIENTS.\n\n";
- os << "PolicyNumber\t\t" << Invar.value_str("PolicyNumber" ) <<
'\n';
+ os << "ContractNumber\t\t" << Invar.value_str("ContractNumber" ) <<
'\n';
os << "ProducerName\t\t" << Invar.value_str("ProducerName" ) <<
'\n';
os << "ProducerStreet\t\t" << Invar.value_str("ProducerStreet" ) <<
'\n';
os << "ProducerCity\t\t" << Invar.value_str("ProducerCity" ) <<
'\n';
Modified: lmi/trunk/main_cgi.cpp
===================================================================
--- lmi/trunk/main_cgi.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/main_cgi.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -128,7 +128,7 @@
"&SolveTarget=Target CSV"
"&SolveTargetCashSurrenderValue=1000000"
"&SolveTargetYear=20"
- "&SolveBasis=Current"
+ "&SolveExpenseGeneralAccountBasis=Current"
"&SpecifiedAmount=1000000"
"&DeathBenefitOption=a"
// "&sRetDBOpt=A"
@@ -505,7 +505,7 @@
input["SolveTarget"] = GetValue(data, "SolveTarget" );
input["SolveTargetCashSurrenderValue"] = GetValue(data,
"SolveTargetCashSurrenderValue" );
input["SolveTargetYear"] = GetValue(data, "SolveTargetYear");
- input["SolveBasis"] = GetValue(data, "SolveBasis" );
+ input["SolveExpenseGeneralAccountBasis"] = GetValue(data,
"SolveExpenseGeneralAccountBasis" );
input["SpecifiedAmount"] = GetValue(data, "SpecifiedAmount"
); // rename
input["DeathBenefitOption"] = GetValue(data,
"DeathBenefitOption" ); // rename
input["Payment"] = GetValue(data, "Payment" );
@@ -513,7 +513,7 @@
input["Dumpin"] = GetValue(data, "Dumpin" );
input["Internal1035ExchangeAmount"] = GetValue(data,
"1035ExchangeAmount" );
input["Internal1035ExchangeFromMec"] = GetValue(data,
"1035ExchangeIsMec");
- input["Internal1035ExchangeBasis"] = GetValue(data,
"1035ExchangeBasis" );
+ input["Internal1035ExchangeTaxBasis"] = GetValue(data,
"1035ExchangeBasis" );
input["GeneralAccountRate"] = GetValue(data,
"GeneralAccountRate"); // rename
input["GeneralAccountRateType"] = GetValue(data,
"GeneralAccountRateType");
// input["SeparateAccountRateType"] = GetValue(data,
"SeparateAccountRateType"); // not used yet
Modified: lmi/trunk/sample.cns
===================================================================
--- lmi/trunk/sample.cns 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/sample.cns 2012-08-08 21:30:25 UTC (rev 5538)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<multiple_cell_document version="1">
<case_default>
- <cell version="6">
+ <cell version="7">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -20,6 +20,7 @@
<ChildRiderAmount>0</ChildRiderAmount>
<City/>
<Comments/>
+ <ContractNumber/>
<CorporationAddress/>
<CorporationCity/>
<CorporationName/>
@@ -46,13 +47,12 @@
<ExperienceRatingInitialKFactor>1</ExperienceRatingInitialKFactor>
<ExperienceReserveRate>0.02</ExperienceReserveRate>
<External1035ExchangeAmount>0</External1035ExchangeAmount>
- <External1035ExchangeBasis>0</External1035ExchangeBasis>
<External1035ExchangeFromMec>No</External1035ExchangeFromMec>
+ <External1035ExchangeTaxBasis>0</External1035ExchangeTaxBasis>
<ExtraCompensationOnAssets>0</ExtraCompensationOnAssets>
<ExtraCompensationOnPremium>0</ExtraCompensationOnPremium>
<ExtraMonthlyCustodialFee>0</ExtraMonthlyCustodialFee>
<FlatExtra>0</FlatExtra>
- <Franchise/>
<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 </FundAllocations>
<FundChoiceType>Choose funds</FundChoiceType>
<Gender>Male</Gender>
@@ -68,6 +68,7 @@
<IndividualPaymentToAge>95</IndividualPaymentToAge>
<IndividualPaymentToAlternative>Maturity</IndividualPaymentToAlternative>
<IndividualPaymentToDuration>50</IndividualPaymentToDuration>
+ <Inforce7702AAmountsPaidHistory>0</Inforce7702AAmountsPaidHistory>
<InforceAnnualTargetPremium>0</InforceAnnualTargetPremium>
<InforceAsOfDate>2454040</InforceAsOfDate>
<InforceAvBeforeLastMc>0</InforceAvBeforeLastMc>
@@ -75,8 +76,8 @@
<InforceContractYear>0</InforceContractYear>
<InforceCumulativeGlp>0</InforceCumulativeGlp>
<InforceCumulativeGptPremiumsPaid>0</InforceCumulativeGptPremiumsPaid>
+ <InforceCumulativeNoLapsePayments>0</InforceCumulativeNoLapsePayments>
<InforceCumulativeNoLapsePremium>0</InforceCumulativeNoLapsePremium>
- <InforceCumulativePayments>0</InforceCumulativePayments>
<InforceCumulativeRopPayments>0</InforceCumulativeRopPayments>
<InforceCumulativeSalesLoad>0</InforceCumulativeSalesLoad>
<InforceDataSource>lmi</InforceDataSource>
@@ -107,8 +108,8 @@
<InsuredName/>
<InsuredPremiumTableFactor>1</InsuredPremiumTableFactor>
<Internal1035ExchangeAmount>0</Internal1035ExchangeAmount>
- <Internal1035ExchangeBasis>0</Internal1035ExchangeBasis>
<Internal1035ExchangeFromMec>No</Internal1035ExchangeFromMec>
+ <Internal1035ExchangeTaxBasis>0</Internal1035ExchangeTaxBasis>
<IssueAge>45</IssueAge>
<LastCoiReentryDate>2454040</LastCoiReentryDate>
<LastMaterialChangeDate>2454040</LastMaterialChangeDate>
@@ -122,6 +123,7 @@
<LoanToAlternative>Maturity</LoanToAlternative>
<LoanToDuration>50</LoanToDuration>
<MaleProportion>1</MaleProportion>
+ <MasterContractNumber/>
<MaximumNaar>10000000</MaximumNaar>
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
@@ -132,9 +134,7 @@
<PartialMortalityMultiplier>1</PartialMortalityMultiplier>
<Payment>20000</Payment>
<PaymentMode>annual</PaymentMode>
- <PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
- <PremiumHistory>0</PremiumHistory>
<PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
@@ -147,11 +147,11 @@
<SeparateAccountRate>.08</SeparateAccountRate>
<SeparateAccountRateType>Gross rate</SeparateAccountRateType>
<Smoking>Nonsmoker</Smoking>
- <SolveBasis>Current</SolveBasis>
<SolveBeginTime>45</SolveBeginTime>
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+
<SolveExpenseGeneralAccountBasis>Current</SolveExpenseGeneralAccountBasis>
<SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
@@ -214,7 +214,7 @@
</cell>
</case_default>
<class_defaults>
- <cell version="6">
+ <cell version="7">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -233,6 +233,7 @@
<ChildRiderAmount>0</ChildRiderAmount>
<City/>
<Comments/>
+ <ContractNumber/>
<CorporationAddress/>
<CorporationCity/>
<CorporationName/>
@@ -259,13 +260,12 @@
<ExperienceRatingInitialKFactor>1</ExperienceRatingInitialKFactor>
<ExperienceReserveRate>0.02</ExperienceReserveRate>
<External1035ExchangeAmount>0</External1035ExchangeAmount>
- <External1035ExchangeBasis>0</External1035ExchangeBasis>
<External1035ExchangeFromMec>No</External1035ExchangeFromMec>
+ <External1035ExchangeTaxBasis>0</External1035ExchangeTaxBasis>
<ExtraCompensationOnAssets>0</ExtraCompensationOnAssets>
<ExtraCompensationOnPremium>0</ExtraCompensationOnPremium>
<ExtraMonthlyCustodialFee>0</ExtraMonthlyCustodialFee>
<FlatExtra>0</FlatExtra>
- <Franchise/>
<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 </FundAllocations>
<FundChoiceType>Choose funds</FundChoiceType>
<Gender>Male</Gender>
@@ -281,6 +281,7 @@
<IndividualPaymentToAge>95</IndividualPaymentToAge>
<IndividualPaymentToAlternative>Maturity</IndividualPaymentToAlternative>
<IndividualPaymentToDuration>50</IndividualPaymentToDuration>
+ <Inforce7702AAmountsPaidHistory>0</Inforce7702AAmountsPaidHistory>
<InforceAnnualTargetPremium>0</InforceAnnualTargetPremium>
<InforceAsOfDate>2454040</InforceAsOfDate>
<InforceAvBeforeLastMc>0</InforceAvBeforeLastMc>
@@ -288,8 +289,8 @@
<InforceContractYear>0</InforceContractYear>
<InforceCumulativeGlp>0</InforceCumulativeGlp>
<InforceCumulativeGptPremiumsPaid>0</InforceCumulativeGptPremiumsPaid>
+ <InforceCumulativeNoLapsePayments>0</InforceCumulativeNoLapsePayments>
<InforceCumulativeNoLapsePremium>0</InforceCumulativeNoLapsePremium>
- <InforceCumulativePayments>0</InforceCumulativePayments>
<InforceCumulativeRopPayments>0</InforceCumulativeRopPayments>
<InforceCumulativeSalesLoad>0</InforceCumulativeSalesLoad>
<InforceDataSource>lmi</InforceDataSource>
@@ -320,8 +321,8 @@
<InsuredName/>
<InsuredPremiumTableFactor>1</InsuredPremiumTableFactor>
<Internal1035ExchangeAmount>0</Internal1035ExchangeAmount>
- <Internal1035ExchangeBasis>0</Internal1035ExchangeBasis>
<Internal1035ExchangeFromMec>No</Internal1035ExchangeFromMec>
+ <Internal1035ExchangeTaxBasis>0</Internal1035ExchangeTaxBasis>
<IssueAge>45</IssueAge>
<LastCoiReentryDate>2454040</LastCoiReentryDate>
<LastMaterialChangeDate>2454040</LastMaterialChangeDate>
@@ -335,6 +336,7 @@
<LoanToAlternative>Maturity</LoanToAlternative>
<LoanToDuration>50</LoanToDuration>
<MaleProportion>1</MaleProportion>
+ <MasterContractNumber/>
<MaximumNaar>10000000</MaximumNaar>
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
@@ -345,9 +347,7 @@
<PartialMortalityMultiplier>1</PartialMortalityMultiplier>
<Payment>20000</Payment>
<PaymentMode>annual</PaymentMode>
- <PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
- <PremiumHistory>0</PremiumHistory>
<PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
@@ -360,11 +360,11 @@
<SeparateAccountRate>.08</SeparateAccountRate>
<SeparateAccountRateType>Gross rate</SeparateAccountRateType>
<Smoking>Nonsmoker</Smoking>
- <SolveBasis>Current</SolveBasis>
<SolveBeginTime>45</SolveBeginTime>
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+
<SolveExpenseGeneralAccountBasis>Current</SolveExpenseGeneralAccountBasis>
<SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
@@ -427,7 +427,7 @@
</cell>
</class_defaults>
<particular_cells>
- <cell version="6">
+ <cell version="7">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -446,6 +446,7 @@
<ChildRiderAmount>0</ChildRiderAmount>
<City/>
<Comments/>
+ <ContractNumber/>
<CorporationAddress/>
<CorporationCity/>
<CorporationName/>
@@ -472,13 +473,12 @@
<ExperienceRatingInitialKFactor>1</ExperienceRatingInitialKFactor>
<ExperienceReserveRate>0.02</ExperienceReserveRate>
<External1035ExchangeAmount>0</External1035ExchangeAmount>
- <External1035ExchangeBasis>0</External1035ExchangeBasis>
<External1035ExchangeFromMec>No</External1035ExchangeFromMec>
+ <External1035ExchangeTaxBasis>0</External1035ExchangeTaxBasis>
<ExtraCompensationOnAssets>0</ExtraCompensationOnAssets>
<ExtraCompensationOnPremium>0</ExtraCompensationOnPremium>
<ExtraMonthlyCustodialFee>0</ExtraMonthlyCustodialFee>
<FlatExtra>0</FlatExtra>
- <Franchise/>
<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 </FundAllocations>
<FundChoiceType>Choose funds</FundChoiceType>
<Gender>Male</Gender>
@@ -494,6 +494,7 @@
<IndividualPaymentToAge>95</IndividualPaymentToAge>
<IndividualPaymentToAlternative>Maturity</IndividualPaymentToAlternative>
<IndividualPaymentToDuration>50</IndividualPaymentToDuration>
+ <Inforce7702AAmountsPaidHistory>0</Inforce7702AAmountsPaidHistory>
<InforceAnnualTargetPremium>0</InforceAnnualTargetPremium>
<InforceAsOfDate>2454040</InforceAsOfDate>
<InforceAvBeforeLastMc>0</InforceAvBeforeLastMc>
@@ -501,8 +502,8 @@
<InforceContractYear>0</InforceContractYear>
<InforceCumulativeGlp>0</InforceCumulativeGlp>
<InforceCumulativeGptPremiumsPaid>0</InforceCumulativeGptPremiumsPaid>
+ <InforceCumulativeNoLapsePayments>0</InforceCumulativeNoLapsePayments>
<InforceCumulativeNoLapsePremium>0</InforceCumulativeNoLapsePremium>
- <InforceCumulativePayments>0</InforceCumulativePayments>
<InforceCumulativeRopPayments>0</InforceCumulativeRopPayments>
<InforceCumulativeSalesLoad>0</InforceCumulativeSalesLoad>
<InforceDataSource>lmi</InforceDataSource>
@@ -533,8 +534,8 @@
<InsuredName/>
<InsuredPremiumTableFactor>1</InsuredPremiumTableFactor>
<Internal1035ExchangeAmount>0</Internal1035ExchangeAmount>
- <Internal1035ExchangeBasis>0</Internal1035ExchangeBasis>
<Internal1035ExchangeFromMec>No</Internal1035ExchangeFromMec>
+ <Internal1035ExchangeTaxBasis>0</Internal1035ExchangeTaxBasis>
<IssueAge>45</IssueAge>
<LastCoiReentryDate>2454040</LastCoiReentryDate>
<LastMaterialChangeDate>2454040</LastMaterialChangeDate>
@@ -548,6 +549,7 @@
<LoanToAlternative>Maturity</LoanToAlternative>
<LoanToDuration>50</LoanToDuration>
<MaleProportion>1</MaleProportion>
+ <MasterContractNumber/>
<MaximumNaar>10000000</MaximumNaar>
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
@@ -558,9 +560,7 @@
<PartialMortalityMultiplier>1</PartialMortalityMultiplier>
<Payment>20000</Payment>
<PaymentMode>annual</PaymentMode>
- <PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
- <PremiumHistory>0</PremiumHistory>
<PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
@@ -573,11 +573,11 @@
<SeparateAccountRate>.08</SeparateAccountRate>
<SeparateAccountRateType>Gross rate</SeparateAccountRateType>
<Smoking>Nonsmoker</Smoking>
- <SolveBasis>Current</SolveBasis>
<SolveBeginTime>45</SolveBeginTime>
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+
<SolveExpenseGeneralAccountBasis>Current</SolveExpenseGeneralAccountBasis>
<SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
Modified: lmi/trunk/sample.ill
===================================================================
--- lmi/trunk/sample.ill 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/sample.ill 2012-08-08 21:30:25 UTC (rev 5538)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<single_cell_document>
- <cell version="6">
+ <cell version="7">
<AccidentalDeathBenefit>No</AccidentalDeathBenefit>
<Address/>
<AgentAddress>*** REQUIRED FIELD MISSING ***</AgentAddress>
@@ -19,6 +19,7 @@
<ChildRiderAmount>0</ChildRiderAmount>
<City/>
<Comments/>
+ <ContractNumber/>
<CorporationAddress/>
<CorporationCity/>
<CorporationName/>
@@ -45,13 +46,12 @@
<ExperienceRatingInitialKFactor>1</ExperienceRatingInitialKFactor>
<ExperienceReserveRate>0.02</ExperienceReserveRate>
<External1035ExchangeAmount>0</External1035ExchangeAmount>
- <External1035ExchangeBasis>0</External1035ExchangeBasis>
<External1035ExchangeFromMec>No</External1035ExchangeFromMec>
+ <External1035ExchangeTaxBasis>0</External1035ExchangeTaxBasis>
<ExtraCompensationOnAssets>0</ExtraCompensationOnAssets>
<ExtraCompensationOnPremium>0</ExtraCompensationOnPremium>
<ExtraMonthlyCustodialFee>0</ExtraMonthlyCustodialFee>
<FlatExtra>0</FlatExtra>
- <Franchise/>
<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 </FundAllocations>
<FundChoiceType>Choose funds</FundChoiceType>
<Gender>Male</Gender>
@@ -67,6 +67,7 @@
<IndividualPaymentToAge>95</IndividualPaymentToAge>
<IndividualPaymentToAlternative>Maturity</IndividualPaymentToAlternative>
<IndividualPaymentToDuration>50</IndividualPaymentToDuration>
+ <Inforce7702AAmountsPaidHistory>0</Inforce7702AAmountsPaidHistory>
<InforceAnnualTargetPremium>0</InforceAnnualTargetPremium>
<InforceAsOfDate>2454040</InforceAsOfDate>
<InforceAvBeforeLastMc>0</InforceAvBeforeLastMc>
@@ -74,8 +75,8 @@
<InforceContractYear>0</InforceContractYear>
<InforceCumulativeGlp>0</InforceCumulativeGlp>
<InforceCumulativeGptPremiumsPaid>0</InforceCumulativeGptPremiumsPaid>
+ <InforceCumulativeNoLapsePayments>0</InforceCumulativeNoLapsePayments>
<InforceCumulativeNoLapsePremium>0</InforceCumulativeNoLapsePremium>
- <InforceCumulativePayments>0</InforceCumulativePayments>
<InforceCumulativeRopPayments>0</InforceCumulativeRopPayments>
<InforceCumulativeSalesLoad>0</InforceCumulativeSalesLoad>
<InforceDataSource>lmi</InforceDataSource>
@@ -106,8 +107,8 @@
<InsuredName/>
<InsuredPremiumTableFactor>1</InsuredPremiumTableFactor>
<Internal1035ExchangeAmount>0</Internal1035ExchangeAmount>
- <Internal1035ExchangeBasis>0</Internal1035ExchangeBasis>
<Internal1035ExchangeFromMec>No</Internal1035ExchangeFromMec>
+ <Internal1035ExchangeTaxBasis>0</Internal1035ExchangeTaxBasis>
<IssueAge>45</IssueAge>
<LastCoiReentryDate>2454040</LastCoiReentryDate>
<LastMaterialChangeDate>2454040</LastMaterialChangeDate>
@@ -121,6 +122,7 @@
<LoanToAlternative>Maturity</LoanToAlternative>
<LoanToDuration>50</LoanToDuration>
<MaleProportion>1</MaleProportion>
+ <MasterContractNumber/>
<MaximumNaar>10000000</MaximumNaar>
<NewLoan>0</NewLoan>
<NonsmokerProportion>1</NonsmokerProportion>
@@ -131,9 +133,7 @@
<PartialMortalityMultiplier>1</PartialMortalityMultiplier>
<Payment>20000</Payment>
<PaymentMode>annual</PaymentMode>
- <PolicyNumber/>
<PostHoneymoonSpread>0</PostHoneymoonSpread>
- <PremiumHistory>0</PremiumHistory>
<PremiumTaxState>CT</PremiumTaxState>
<ProductName>sample</ProductName>
<ProjectedSalary>100000</ProjectedSalary>
@@ -146,11 +146,11 @@
<SeparateAccountRate>.08</SeparateAccountRate>
<SeparateAccountRateType>Gross rate</SeparateAccountRateType>
<Smoking>Nonsmoker</Smoking>
- <SolveBasis>Current</SolveBasis>
<SolveBeginTime>45</SolveBeginTime>
<SolveBeginYear>0</SolveBeginYear>
<SolveEndTime>65</SolveEndTime>
<SolveEndYear>20</SolveEndYear>
+ <SolveExpenseGeneralAccountBasis>Current</SolveExpenseGeneralAccountBasis>
<SolveFromWhich>Issue</SolveFromWhich>
<SolveSeparateAccountBasis>Hypothetical</SolveSeparateAccountBasis>
<SolveTarget>Endowment</SolveTarget>
Modified: lmi/trunk/skin.xrc
===================================================================
--- lmi/trunk/skin.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -1278,7 +1278,7 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxTextCtrl"
name="PolicyNumber">
+ <object class="wxTextCtrl"
name="ContractNumber">
<help>Contract number</help>
<size>80,-1</size>
<value>0</value>
@@ -1293,8 +1293,8 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxTextCtrl"
name="Franchise">
- <help>Producer franchise
identifier</help>
+ <object class="wxTextCtrl"
name="MasterContractNumber">
+ <help>Group master contract
number</help>
<size>80,-1</size>
<value>0</value>
</object>
@@ -1416,10 +1416,7 @@
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
- <object class="wxTextCtrl"
name="InforceCumulativePayments">
-<!-- Soon to be renamed:
<object class="wxTextCtrl"
name="InforceCumulativeNoLapsePayments">
--->
<help>Cumulative payments for no-lapse
guarantee</help>
<size>80,-1</size>
<value>0</value>
@@ -1835,7 +1832,7 @@
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
- <object class="InputSequenceEntry"
name="PremiumHistory">
+ <object class="InputSequenceEntry"
name="Inforce7702AAmountsPaidHistory">
<title>7702A(e)(1) 'amounts paid' history for
current seven-pay period</title>
<help>7702A(e)(1) 'amounts paid' by
7702A(e)(2) 'contract year' since beginning of last seven-pay period--zero if
not in a seven-pay period</help>
<size>180,-1</size>
@@ -2139,7 +2136,7 @@
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
- <object class="wxRadioBox"
name="SolveBasis">
+ <object class="wxRadioBox"
name="SolveExpenseGeneralAccountBasis">
<help>Expense, mortality, and
general-account basis for solve</help>
<style>wxRA_SPECIFY_COLS</style>
<label>Deductions and general
account</label>
@@ -2466,7 +2463,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
<border>4</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -2474,7 +2471,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
<border>4</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/skin_coli_boli.xrc
===================================================================
--- lmi/trunk/skin_coli_boli.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_coli_boli.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -1372,13 +1372,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Franchise</label>
+ <label>Master contract</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM</flag>
- <object class="wxTextCtrl" name="Franchise">
- <help>Producer franchise identifier</help>
+ <object class="wxTextCtrl"
name="MasterContractNumber">
+ <help>Group master contract number</help>
<size>50,-1</size>
</object>
</object>
@@ -1386,13 +1386,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Policy number</label>
+ <label>Contract number</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM</flag>
<border>2</border>
- <object class="wxTextCtrl" name="PolicyNumber">
+ <object class="wxTextCtrl" name="ContractNumber">
<help>Contract number</help>
<size>50,-1</size>
</object>
@@ -1527,7 +1527,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="InforceCumulativePayments">
+ <object class="wxTextCtrl"
name="InforceCumulativeNoLapsePayments">
<help>Cumulative payments since issue for
no-lapse test</help>
<size>50,-1</size>
</object>
@@ -1787,7 +1787,7 @@
<object class="sizeritem">
<flag>wxGROW|wxBOTTOM</flag>
<border>2</border>
- <object class="InputSequenceEntry" name="PremiumHistory">
+ <object class="InputSequenceEntry"
name="Inforce7702AAmountsPaidHistory">
<title>"Amounts paid" history</title>
<help>"Amounts paid" for each year since beginning of
last seven-pay period--zero if not in a seven-pay period</help>
</object>
@@ -2143,7 +2143,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxRIGHT</flag>
<border>2</border>
- <object class="wxRadioBox"
name="SolveBasis">
+ <object class="wxRadioBox"
name="SolveExpenseGeneralAccountBasis">
<help>Expense and mortality basis for
solve</help>
<label>Basis</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -2319,7 +2319,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -2327,7 +2327,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/skin_group_carveout.xrc
===================================================================
--- lmi/trunk/skin_group_carveout.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_group_carveout.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -505,13 +505,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Franchise</label>
+ <label>Master contract</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM</flag>
- <object class="wxTextCtrl" name="Franchise">
- <help>Producer franchise identifier</help>
+ <object class="wxTextCtrl"
name="MasterContractNumber">
+ <help>Group master contract number</help>
<size>50,-1</size>
</object>
</object>
@@ -519,13 +519,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Policy number</label>
+ <label>Contract number</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM</flag>
<border>2</border>
- <object class="wxTextCtrl" name="PolicyNumber">
+ <object class="wxTextCtrl" name="ContractNumber">
<help>Contract number</help>
<size>50,-1</size>
</object>
@@ -660,7 +660,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="InforceCumulativePayments">
+ <object class="wxTextCtrl"
name="InforceCumulativeNoLapsePayments">
<help>Cumulative payments since issue for
no-lapse test</help>
<size>50,-1</size>
</object>
@@ -890,7 +890,7 @@
<object class="sizeritem">
<flag>wxGROW|wxBOTTOM</flag>
<border>2</border>
- <object class="InputSequenceEntry" name="PremiumHistory">
+ <object class="InputSequenceEntry"
name="Inforce7702AAmountsPaidHistory">
<title>"Amounts paid" history</title>
<help>"Amounts paid" for each year since beginning of
last seven-pay period--zero if not in a seven-pay period</help>
</object>
@@ -1252,7 +1252,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox" name="SolveBasis">
+ <object class="wxRadioBox"
name="SolveExpenseGeneralAccountBasis">
<help>Expense and mortality basis for
solve</help>
<label>Basis</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1502,7 +1502,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -1510,7 +1510,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/skin_group_carveout2.xrc
===================================================================
--- lmi/trunk/skin_group_carveout2.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_group_carveout2.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -802,7 +802,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
<border>4</border>
- <object class="wxRadioBox" name="SolveBasis">
+ <object class="wxRadioBox"
name="SolveExpenseGeneralAccountBasis">
<help>Expense and mortality basis for
solve</help>
<label>Basis</label>
<style>wxRA_SPECIFY_COLS</style>
@@ -1052,7 +1052,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -1060,7 +1060,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/skin_reg_d.xrc
===================================================================
--- lmi/trunk/skin_reg_d.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_reg_d.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -938,7 +938,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -946,7 +946,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
@@ -1486,13 +1486,13 @@
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxStaticText">
- <label>Policy number</label>
+ <label>Contract number</label>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW|wxRIGHT</flag>
<border>19</border>
- <object class="wxTextCtrl"
name="PolicyNumber">
+ <object class="wxTextCtrl"
name="ContractNumber">
<help>Contract number</help>
<size>50,-1</size>
</object>
@@ -1644,7 +1644,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="InforceCumulativePayments">
+ <object class="wxTextCtrl"
name="InforceCumulativeNoLapsePayments">
<help>Cumulative payments
since issue for no-lapse test</help>
<size>50,-1</size>
</object>
@@ -1913,7 +1913,7 @@
<object class="sizeritem">
<flag>wxGROW|wxBOTTOM</flag>
<border>2</border>
- <object class="InputSequenceEntry" name="PremiumHistory">
+ <object class="InputSequenceEntry"
name="Inforce7702AAmountsPaidHistory">
<title>"Amounts paid" history</title>
<help>"Amounts paid" for each year since beginning of
last seven-pay period--zero if not in a seven-pay period</help>
</object>
Modified: lmi/trunk/skin_single_premium.xrc
===================================================================
--- lmi/trunk/skin_single_premium.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_single_premium.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -933,14 +933,14 @@
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external 1035
exchange</help>
<size>10,-1</size>
</object>
</object>
<object class="sizeritem">
<flag>wxGROW</flag>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal 1035
exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/skin_variable_annuity.xrc
===================================================================
--- lmi/trunk/skin_variable_annuity.xrc 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/skin_variable_annuity.xrc 2012-08-08 21:30:25 UTC (rev 5538)
@@ -319,7 +319,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="External1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="External1035ExchangeTaxBasis">
<help>Tax basis for external
1035 exchange</help>
<size>10,-1</size>
</object>
@@ -327,7 +327,7 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
- <object class="wxTextCtrl"
name="Internal1035ExchangeBasis">
+ <object class="wxTextCtrl"
name="Internal1035ExchangeTaxBasis">
<help>Tax basis for internal
1035 exchange</help>
<size>10,-1</size>
</object>
Modified: lmi/trunk/solve.cpp
===================================================================
--- lmi/trunk/solve.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/solve.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -241,7 +241,7 @@
That = this;
ThatSolveTargetCSV = yare_input_.SolveTargetCashSurrenderValue;
ThatSolveTarget = yare_input_.SolveTarget;
- ThatSolveBasis = yare_input_.SolveBasis;
+ ThatSolveBasis = yare_input_.SolveExpenseGeneralAccountBasis;
only_set_values = !Solving;
// We mustn't solve for a target at a duration beyond the end.
Modified: lmi/trunk/yare_input.cpp
===================================================================
--- lmi/trunk/yare_input.cpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/yare_input.cpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -55,10 +55,10 @@
ProductName = z.ProductName
.value();
Dumpin = z.Dumpin
.value();
External1035ExchangeAmount = z.External1035ExchangeAmount
.value();
- External1035ExchangeBasis = z.External1035ExchangeBasis
.value();
+ External1035ExchangeTaxBasis = z.External1035ExchangeTaxBasis
.value();
External1035ExchangeFromMec = z.External1035ExchangeFromMec
.value();
Internal1035ExchangeAmount = z.Internal1035ExchangeAmount
.value();
- Internal1035ExchangeBasis = z.Internal1035ExchangeBasis
.value();
+ Internal1035ExchangeTaxBasis = z.Internal1035ExchangeTaxBasis
.value();
Internal1035ExchangeFromMec = z.Internal1035ExchangeFromMec
.value();
SolveType = z.SolveType
.value();
SolveBeginYear = z.SolveBeginYear
.value();
@@ -66,7 +66,7 @@
SolveTarget = z.SolveTarget
.value();
SolveTargetCashSurrenderValue = z.SolveTargetCashSurrenderValue
.value();
SolveTargetYear = z.SolveTargetYear
.value();
- SolveBasis = z.SolveBasis
.value();
+ SolveExpenseGeneralAccountBasis = z.SolveExpenseGeneralAccountBasis
.value();
SolveSeparateAccountBasis = z.SolveSeparateAccountBasis
.value();
GeneralAccountRateType = z.GeneralAccountRateType
.value();
SeparateAccountRateType = z.SeparateAccountRateType
.value();
@@ -113,7 +113,7 @@
InforceNoLapseActive = z.InforceNoLapseActive
.value();
InforceMonthlyNoLapsePremium = z.InforceMonthlyNoLapsePremium
.value();
InforceCumulativeNoLapsePremium = z.InforceCumulativeNoLapsePremium
.value();
- InforceCumulativePayments = z.InforceCumulativePayments
.value();
+ InforceCumulativeNoLapsePayments =
z.InforceCumulativeNoLapsePayments.value();
InforceCumulativeRopPayments = z.InforceCumulativeRopPayments
.value();
InforceYtdTaxablePremium = z.InforceYtdTaxablePremium
.value();
InforceCumulativeSalesLoad = z.InforceCumulativeSalesLoad
.value();
@@ -134,7 +134,7 @@
InforceAvBeforeLastMc = z.InforceAvBeforeLastMc
.value();
InforceDcv = z.InforceDcv
.value();
InforceLeastDeathBenefit = z.InforceLeastDeathBenefit
.value();
- PremiumHistory = convert_vector_type<double
>(z.PremiumHistoryRealized_ );
+ Inforce7702AAmountsPaidHistory = convert_vector_type<double
>(z.AmountsPaidHistoryRealized_ );
SpecamtHistory = convert_vector_type<double
>(z.SpecamtHistoryRealized_ );
CountryCoiMultiplier = z.CountryCoiMultiplier
.value();
SurviveToType = z.SurviveToType
.value();
Modified: lmi/trunk/yare_input.hpp
===================================================================
--- lmi/trunk/yare_input.hpp 2012-08-06 10:59:19 UTC (rev 5537)
+++ lmi/trunk/yare_input.hpp 2012-08-08 21:30:25 UTC (rev 5538)
@@ -79,10 +79,10 @@
std::string ProductName ;
double Dumpin ;
double External1035ExchangeAmount ;
- double External1035ExchangeBasis ;
+ double External1035ExchangeTaxBasis ;
bool External1035ExchangeFromMec ;
double Internal1035ExchangeAmount ;
- double Internal1035ExchangeBasis ;
+ double Internal1035ExchangeTaxBasis ;
bool Internal1035ExchangeFromMec ;
// int SolveTargetTime ;
// int SolveBeginTime ;
@@ -93,7 +93,7 @@
mcenum_solve_target SolveTarget ;
double SolveTargetCashSurrenderValue ;
int SolveTargetYear ;
- mcenum_gen_basis SolveBasis ;
+ mcenum_gen_basis SolveExpenseGeneralAccountBasis ;
mcenum_sep_basis SolveSeparateAccountBasis ;
// bool UseCurrentDeclaredRate ;
mcenum_gen_acct_rate_type GeneralAccountRateType ;
@@ -151,8 +151,8 @@
std::string Comments ;
bool AmortizePremiumLoad ;
// std::string InforceDataSource ;
-// std::string PolicyNumber ;
-// std::string Franchise ;
+// std::string ContractNumber ;
+// std::string MasterContractNumber ;
// calendar_date InforceAsOfDate ;
int InforceYear ;
int InforceMonth ;
@@ -167,7 +167,7 @@
bool InforceNoLapseActive ;
double InforceMonthlyNoLapsePremium ;
double InforceCumulativeNoLapsePremium ;
- double InforceCumulativePayments ;
+ double InforceCumulativeNoLapsePayments;
double InforceCumulativeRopPayments ;
double InforceYtdTaxablePremium ;
double InforceCumulativeSalesLoad ;
@@ -188,7 +188,7 @@
double InforceAvBeforeLastMc ;
double InforceDcv ;
double InforceLeastDeathBenefit ;
- std::vector<double> PremiumHistory ;
+ std::vector<double> Inforce7702AAmountsPaidHistory ;
std::vector<double> SpecamtHistory ;
// mcenum_country Country ;
// bool OverrideCoiMultiplier ;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5538] Rename various input fields,
Greg Chicares <=