[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 72addff 4/4: Expunge optional schema elements
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 72addff 4/4: Expunge optional schema elements and types |
|
Date: |
Fri, 29 Jun 2018 19:39:42 -0400 (EDT) |
branch: master
commit 72addff20ade80a763d2183e5b79cfdff08f3d8a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Expunge optional schema elements and types
---
cell.rnc | 46 ---------------------
cell.xsd | 138 --------------------------------------------------------------
types.rnc | 13 ------
types.xsd | 21 ----------
4 files changed, 218 deletions(-)
diff --git a/cell.rnc b/cell.rnc
index 095a21d..703563f 100644
--- a/cell.rnc
+++ b/cell.rnc
@@ -98,10 +98,6 @@ cell_element = element cell
element DateOfBirth {calendar_date_int}
,## Death benefit option. Default: 'a'.
element DeathBenefitOption {dbo_sequence}
- ,## * [obsolete]
- element DeathBenefitOptionFromIssue {dbopt}?
- ,## * [obsolete]
- element DeathBenefitOptionFromRetirement {dbopt}?
,## 7702 definitional test.
element DefinitionOfLifeInsurance {defn_life_ins}
,## * 7702A definition of material change. Default:
@@ -171,17 +167,7 @@ cell_element = element cell
## Default: 'Yes'.
element IncludeInComposite {yes_or_no}
,## * [obsolete]
- element IndividualPaymentAmount {nonnegative_double}?
- ,## * [obsolete]
- element IndividualPaymentMode {mode}?
- ,## * [obsolete]
element IndividualPaymentStrategy {pmt_strategy}
- ,## * [obsolete]
- element IndividualPaymentToAge {age_int}?
- ,## * [obsolete]
- element IndividualPaymentToAlternative {to_point}?
- ,## * [obsolete]
- element IndividualPaymentToDuration {duration_int}?
,## 7702A "amounts paid" for each "contract year" since beginning
## of most recent seven-pay period. Default: '0' if not in a
## seven-pay period.
@@ -311,24 +297,10 @@ cell_element = element cell
,## Date of a list bill generated by the illustration system.
## Default: the value of 'InforceAsOfDate'.
element ListBillDate {calendar_date_int}
- ,## * [obsolete]
- element LoanAmount {nonnegative_double}?
- ,## * [obsolete]
- element LoanFromAge {age_int}?
- ,## * [obsolete]
- element LoanFromAlternative {from_point}?
- ,## * [obsolete]
- element LoanFromDuration {duration_int}?
,## Loan interest rate, if it is variable. Default: '0' otherwise.
element LoanRate {proportion_double}
,## Loan rate: fixed or variable.
element LoanRateType {loan_rate_type}
- ,## * [obsolete]
- element LoanToAge {age_int}?
- ,## * [obsolete]
- element LoanToAlternative {to_point}?
- ,## * [obsolete]
- element LoanToDuration {duration_int}?
,## Proportion of males when rates are custom-blended by gender.
## Default: '0' otherwise.
element MaleProportion {proportion_double}
@@ -429,10 +401,6 @@ cell_element = element cell
## extracts require only the current scalar value. Default: '0'.
element SpecifiedAmount {specamt_sequence}
,## * [obsolete]
- element SpecifiedAmountFromIssue {nonnegative_double}?
- ,## * [obsolete]
- element SpecifiedAmountFromRetirement {nonnegative_double}?
- ,## * [obsolete]
element SpecifiedAmountStrategyFromIssue {sa_strategy}
,## * Accumulate interest at demand-loan rate for split dollar,
## rather than paying it in cash.
@@ -532,20 +500,6 @@ cell_element = element cell
element WithdrawToBasisThenLoan {yes_or_no}
,## * Partial surrender. Default: '0'.
element Withdrawal {numeric_sequence}
- ,## * [obsolete]
- element WithdrawalAmount {nonnegative_double}?
- ,## * [obsolete]
- element WithdrawalFromAge {age_int}?
- ,## * [obsolete]
- element WithdrawalFromAlternative {from_point}?
- ,## * [obsolete]
- element WithdrawalFromDuration {duration_int}?
- ,## * [obsolete]
- element WithdrawalToAge {age_int}?
- ,## * [obsolete]
- element WithdrawalToAlternative {to_point}?
- ,## * [obsolete]
- element WithdrawalToDuration {duration_int}?
,## Insured's address: zip code.
element ZipCode {text}
}
diff --git a/cell.xsd b/cell.xsd
index bc34494..9a297cf 100644
--- a/cell.xsd
+++ b/cell.xsd
@@ -73,8 +73,6 @@
<xs:element ref="CurrentCoiMultiplier"/>
<xs:element ref="DateOfBirth"/>
<xs:element ref="DeathBenefitOption"/>
- <xs:element minOccurs="0" ref="DeathBenefitOptionFromIssue"/>
- <xs:element minOccurs="0" ref="DeathBenefitOptionFromRetirement"/>
<xs:element ref="DefinitionOfLifeInsurance"/>
<xs:element ref="DefinitionOfMaterialChange"/>
<xs:element ref="Dumpin"/>
@@ -99,12 +97,7 @@
<xs:element ref="HoneymoonEndorsement"/>
<xs:element ref="HoneymoonValueSpread"/>
<xs:element ref="IncludeInComposite"/>
- <xs:element minOccurs="0" ref="IndividualPaymentAmount"/>
- <xs:element minOccurs="0" ref="IndividualPaymentMode"/>
<xs:element ref="IndividualPaymentStrategy"/>
- <xs:element minOccurs="0" ref="IndividualPaymentToAge"/>
- <xs:element minOccurs="0" ref="IndividualPaymentToAlternative"/>
- <xs:element minOccurs="0" ref="IndividualPaymentToDuration"/>
<xs:element ref="Inforce7702AAmountsPaidHistory"/>
<xs:element ref="InforceAnnualTargetPremium"/>
<xs:element ref="InforceAsOfDate"/>
@@ -152,15 +145,8 @@
<xs:element ref="LastCoiReentryDate"/>
<xs:element ref="LastMaterialChangeDate"/>
<xs:element ref="ListBillDate"/>
- <xs:element minOccurs="0" ref="LoanAmount"/>
- <xs:element minOccurs="0" ref="LoanFromAge"/>
- <xs:element minOccurs="0" ref="LoanFromAlternative"/>
- <xs:element minOccurs="0" ref="LoanFromDuration"/>
<xs:element ref="LoanRate"/>
<xs:element ref="LoanRateType"/>
- <xs:element minOccurs="0" ref="LoanToAge"/>
- <xs:element minOccurs="0" ref="LoanToAlternative"/>
- <xs:element minOccurs="0" ref="LoanToDuration"/>
<xs:element ref="MaleProportion"/>
<xs:element ref="MasterContractNumber"/>
<xs:element ref="MaximumNaar"/>
@@ -201,8 +187,6 @@
<xs:element ref="SolveToWhich"/>
<xs:element ref="SolveType"/>
<xs:element ref="SpecifiedAmount"/>
- <xs:element minOccurs="0" ref="SpecifiedAmountFromIssue"/>
- <xs:element minOccurs="0" ref="SpecifiedAmountFromRetirement"/>
<xs:element ref="SpecifiedAmountStrategyFromIssue"/>
<xs:element ref="SplitDollarAccumulateInterest"/>
<xs:element ref="SplitDollarLoanRate"/>
@@ -248,13 +232,6 @@
<xs:element ref="WaiverOfPremiumBenefit"/>
<xs:element ref="WithdrawToBasisThenLoan"/>
<xs:element ref="Withdrawal"/>
- <xs:element minOccurs="0" ref="WithdrawalAmount"/>
- <xs:element minOccurs="0" ref="WithdrawalFromAge"/>
- <xs:element minOccurs="0" ref="WithdrawalFromAlternative"/>
- <xs:element minOccurs="0" ref="WithdrawalFromDuration"/>
- <xs:element minOccurs="0" ref="WithdrawalToAge"/>
- <xs:element minOccurs="0" ref="WithdrawalToAlternative"/>
- <xs:element minOccurs="0" ref="WithdrawalToDuration"/>
<xs:element ref="ZipCode"/>
</xs:sequence>
<xs:attribute name="version" use="required">
@@ -438,16 +415,6 @@ called a "number", is often not purely
numeric.</xs:documentation>
<xs:documentation>Death benefit option. Default: 'a'.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="DeathBenefitOptionFromIssue" type="dbopt">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="DeathBenefitOptionFromRetirement" type="dbopt">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="DefinitionOfLifeInsurance" type="defn_life_ins">
<xs:annotation>
<xs:documentation>7702 definitional test.</xs:documentation>
@@ -588,36 +555,11 @@ lives from a composite without deleting them from a
census.
Default: 'Yes'.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="IndividualPaymentAmount" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IndividualPaymentMode" type="mode">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="IndividualPaymentStrategy" type="pmt_strategy">
<xs:annotation>
<xs:documentation>* [obsolete]</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="IndividualPaymentToAge" type="age_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IndividualPaymentToAlternative" type="to_point">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="IndividualPaymentToDuration" type="duration_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="Inforce7702AAmountsPaidHistory" type="numeric_sequence">
<xs:annotation>
<xs:documentation>7702A "amounts paid" for each "contract year" since
beginning
@@ -888,26 +830,6 @@ date, for contracts that have never had a material
change.</xs:documentation>
Default: the value of 'InforceAsOfDate'.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="LoanAmount" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LoanFromAge" type="age_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LoanFromAlternative" type="from_point">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LoanFromDuration" type="duration_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="LoanRate" type="proportion_double">
<xs:annotation>
<xs:documentation>Loan interest rate, if it is variable. Default: '0'
otherwise.</xs:documentation>
@@ -918,21 +840,6 @@ Default: the value of 'InforceAsOfDate'.</xs:documentation>
<xs:documentation>Loan rate: fixed or variable.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="LoanToAge" type="age_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LoanToAlternative" type="to_point">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="LoanToDuration" type="duration_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="MaleProportion" type="proportion_double">
<xs:annotation>
<xs:documentation>Proportion of males when rates are custom-blended by
gender.
@@ -1152,16 +1059,6 @@ the basis of the hypothetical rate, half that rate, or
zero.</xs:documentation>
extracts require only the current scalar value. Default:
'0'.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="SpecifiedAmountFromIssue" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="SpecifiedAmountFromRetirement" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="SpecifiedAmountStrategyFromIssue" type="sa_strategy">
<xs:annotation>
<xs:documentation>* [obsolete]</xs:documentation>
@@ -1397,41 +1294,6 @@ in a composite illustration.</xs:documentation>
<xs:documentation>* Partial surrender. Default: '0'.</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="WithdrawalAmount" type="nonnegative_double">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalFromAge" type="age_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalFromAlternative" type="from_point">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalFromDuration" type="duration_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalToAge" type="age_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalToAlternative" type="to_point">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="WithdrawalToDuration" type="duration_int">
- <xs:annotation>
- <xs:documentation>* [obsolete]</xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="ZipCode" type="xs:string">
<xs:annotation>
<xs:documentation>Insured's address: zip code.</xs:documentation>
diff --git a/types.rnc b/types.rnc
index 037c483..b1f37ba 100644
--- a/types.rnc
+++ b/types.rnc
@@ -90,19 +90,6 @@ class =
| "Rated"
| "Ultra"
-## Death benefit option: 'A' = level; 'B' = increasing; 'ROP' = return of
premium.
-dbopt =
- "A"
- | "B"
- | "ROP"
-
-## Payment mode.
-mode =
- "Annual"
- | "Semiannual"
- | "Quarterly"
- | "Monthly"
-
## Basis for expense and general-account rates.
gen_basis =
"Current"
diff --git a/types.xsd b/types.xsd
index f5c7241..d0f6d01 100644
--- a/types.xsd
+++ b/types.xsd
@@ -162,27 +162,6 @@ but none use both, so a single set of enumerators
suffices.</xs:documentation>
<xs:enumeration value="Ultra"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="dbopt">
- <xs:annotation>
- <xs:documentation>Death benefit option: 'A' = level; 'B' = increasing;
'ROP' = return of premium.</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:enumeration value="A"/>
- <xs:enumeration value="B"/>
- <xs:enumeration value="ROP"/>
- </xs:restriction>
- </xs:simpleType>
- <xs:simpleType name="mode">
- <xs:annotation>
- <xs:documentation>Payment mode.</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:enumeration value="Annual"/>
- <xs:enumeration value="Semiannual"/>
- <xs:enumeration value="Quarterly"/>
- <xs:enumeration value="Monthly"/>
- </xs:restriction>
- </xs:simpleType>
<xs:simpleType name="gen_basis">
<xs:annotation>
<xs:documentation>Basis for expense and general-account
rates.</xs:documentation>