Added forgotten 'ritz' method category

Cleanup in typesAttributes
misdoro · May 17, 2011 · 4748b70 · 4748b70
1 parent 2ce6044
commit 4748b70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/methods.xsd b/methods.xsd
@@ -40,6 +40,7 @@
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="experiment"/>
 			<xs:enumeration value="theory"/>
+			<xs:enumeration value="ritz"/>
 			<xs:enumeration value="recommended"/>
 			<xs:enumeration value="evaluated"/>
 			<xs:enumeration value="empirical"/>

diff --git a/typesAttributes.xsd b/typesAttributes.xsd
@@ -833,13 +833,13 @@
 			<xs:extension base="PrimaryType">
 				<xs:sequence>
 					<xs:choice>
-						<xs:element name="DataList" type="DataListType" minOccurs="0" maxOccurs="1"/>
+						<xs:element name="DataList" type="DataListType"/>
 						<xs:element name="LinearSequence" type="LinearSequenceType"/>
 						<xs:element name="DataFile" type="xs:string"/>
 					</xs:choice>
-					<xs:choice>
-						<xs:element name="ErrorList" type="DataListType" minOccurs="0" maxOccurs="1"/>
-						<xs:element name="Error" type="xs:double" minOccurs="0" maxOccurs="1"/>
+					<xs:choice minOccurs="0">
+						<xs:element name="ErrorList" type="DataListType"/>
+						<xs:element name="Error" type="xs:double"/>
 					</xs:choice>
 				</xs:sequence>
 				<xs:attribute name="parameter" type="xs:string"/>