← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 301: Corrected the *_type elements in DvProportionType and DvRateType.

 

------------------------------------------------------------
revno: 301
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Fri 2012-09-07 05:10:35 -0300
message:
  Corrected the *_type elements in DvProportionType and DvRateType.
modified:
  schemas/mlhim2.xsd


--
lp:mlhim-specs
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main

Your team MLHIM Specifications Developers is subscribed to branch lp:mlhim-specs.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main/+edit-subscription
=== modified file 'schemas/mlhim2.xsd'
--- schemas/mlhim2.xsd	2012-09-06 15:17:56 +0000
+++ schemas/mlhim2.xsd	2012-09-07 08:10:35 +0000
@@ -107,40 +107,41 @@
       </xs:documentation>
     </xs:annotation>
     <xs:complexContent>
-      <xs:restriction base="xs:anyType" >
-        
-    <xs:sequence>
-      <xs:element name="data_name" type="xs:string" maxOccurs="1" minOccurs="1">
-        <xs:annotation>
-          <xs:documentation>Descriptive name of this fragment.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-
-      <xs:element maxOccurs="1" minOccurs="0" name="ev" nillable="true"        type="mlhim2:ExceptionalValueType">
-        <xs:annotation>
-          <xs:documentation>The exceptional value. Often referred to as Null Flavour.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element maxOccurs="1" minOccurs="0" name="valid_time_begin" nillable="true"
-        type="xs:dateTime">
-        <xs:annotation>
-          <xs:documentation>If present this must be a valid datetime including
-            timezone</xs:documentation>
-        </xs:annotation>
-
-      </xs:element>
-      <xs:element maxOccurs="1" minOccurs="0" name="valid_time_end" nillable="true"
-        type="xs:dateTime">
-        <xs:annotation>
-          <xs:documentation>If present this must be a valid datetime including
-            timezone</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
+      <xs:restriction base="xs:anyType">
+
+        <xs:sequence>
+          <xs:element name="data_name" type="xs:string" maxOccurs="1" minOccurs="1">
+            <xs:annotation>
+              <xs:documentation>Descriptive name of this fragment.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+
+          <xs:element maxOccurs="1" minOccurs="0" name="ev" nillable="true"
+            type="mlhim2:ExceptionalValueType">
+            <xs:annotation>
+              <xs:documentation>The exceptional value. Often referred to as Null Flavour.
+              </xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element maxOccurs="1" minOccurs="0" name="valid_time_begin" nillable="true"
+            type="xs:dateTime">
+            <xs:annotation>
+              <xs:documentation>If present this must be a valid datetime including
+                timezone</xs:documentation>
+            </xs:annotation>
+
+          </xs:element>
+          <xs:element maxOccurs="1" minOccurs="0" name="valid_time_end" nillable="true"
+            type="xs:dateTime">
+            <xs:annotation>
+              <xs:documentation>If present this must be a valid datetime including
+                timezone</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
       </xs:restriction>
     </xs:complexContent>
-    
+
   </xs:complexType>
 
   <xs:complexType name="DvBooleanType">
@@ -626,24 +627,24 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvQuantifiedType">
         <xs:sequence>
-          <xs:element name="numerator" type="xs:decimal">
+          <xs:element maxOccurs="1" minOccurs="1" name="numerator" type="xs:decimal">
             <xs:annotation>
               <xs:documentation> numerator of ratio </xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element name="denominator" type="xs:decimal">
+          <xs:element maxOccurs="1" minOccurs="1" name="denominator" type="xs:decimal">
             <xs:annotation>
               <xs:documentation> denominator of ratio </xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element maxOccurs="1" minOccurs="0" name="numerator_units" type="xs:string">
+          <xs:element maxOccurs="1" minOccurs="1" name="numerator_units" type="xs:string">
             <xs:annotation>
               <xs:documentation>Used to convey the meaning of the numerator. Typically countable
                 units such as; cigarettes, drinks, exercise periods, etc. May or may not come from a
                 terminology such as UCUM. </xs:documentation>
             </xs:annotation>
           </xs:element>
-          <xs:element maxOccurs="1" minOccurs="0" name="denominator_units" type="xs:string">
+          <xs:element maxOccurs="1" minOccurs="1" name="denominator_units" type="xs:string">
             <xs:annotation>
               <xs:documentation> Used to convey the meaning of the denominator. Typically units such
                 as; days, years, months, etc. May or may not come from a standard terminology.
@@ -673,16 +674,39 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatioType">
         <xs:sequence>
-          <xs:element maxOccurs="1" minOccurs="0" name="rate_type" type="xs:string">
+          <xs:element maxOccurs="1" minOccurs="1" name="rate_type">
             <xs:annotation>
-              <xs:documentation> Indicates semantic type of coefficient: pk_coefficient =
-                coefficient type. Numerator and denominator may be any value. pk_unitary =
-                Denominator must be 1. pk_per10^n = Denominator is 10^2, numerator is understood as
-                a real number divided by an exponent of 10 (10^n). pk_fraction = Numerator and
-                denominator are real numbers, allowing rational and irrational fractions, and the
-                presentation method uses a slash, e.g. “1/2”; if the numerator is greater than the
-                denominator, e.g. n=3, d=2, the presentation is “1 1/2”.</xs:documentation>
+              <xs:documentation> Indicates semantic type of coefficient.</xs:documentation>
             </xs:annotation>
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="coefficient">
+                  <xs:annotation>
+                    <xs:documentation>coefficient = coefficient type. Numerator and denominator may be
+                      any value.</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="unitary">
+                  <xs:annotation>
+                    <xs:documentation>unitary = Denominator must be 1. </xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="per10^n">
+                  <xs:annotation>
+                    <xs:documentation>per10^n = Denominator is 10^2, numerator is understood as a
+                      real number divided by an exponent of 10 (10^n).</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="fraction">
+                  <xs:annotation>
+                    <xs:documentation>fraction = Numerator and denominator are real numbers,
+                      allowing rational and irrational fractions, and the presentation method uses a
+                      slash, e.g. “1/2”; if the numerator is greater than the denominator, e.g. n=3,
+                      d=2, the presentation is “1 1/2”.</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+              </xs:restriction>
+            </xs:simpleType>
           </xs:element>
         </xs:sequence>
       </xs:extension>
@@ -692,29 +716,51 @@
   <xs:complexType name="DvProportionType">
     <xs:annotation>
       <xs:documentation> Models a ratio of values, i.e. where the numerator and denominator are both
-        pure numbers. The valid_proportion_kind property of the PROPORTION_KIND class is used to
-        control the type attribute to be one of a defined set. Used for recording titers (e.g.
-        1:128), concentration ratios, e.g. Na:K (unitary denominator), albumin:creatinine ratio, and
-        percentages, e.g. red cell distirbution width (RDW). Should not be used to represent things
-        like blood pressure which are often written using a ‘/’ character, giving the misleading
-        impression that the item is a ratio, when in fact it is a structured value. Similarly,
-        visual acuity, often written as (e.g.) “6/24” in clinical notes is not a ratio but an
-        ordinal (which includes non-numeric symbols like CF = count fingers etc). Should not be used
-        for formulations. </xs:documentation>
+        pure numbers, and the numerator is contained (it is a subset of the denominator). Example 1:
+        Proportion of women submitted to hysterectomy; Example 2 = Cumulative Incidence. Should not
+        be used to represent things like blood pressure which are often written using a ‘/’
+        character, giving the misleading impression that the item is a ratio, when in fact it is a
+        structured value. Similarly, visual acuity, often written as (e.g.) “6/24” in clinical notes
+        is not a ratio but an ordinal (which includes non-numeric symbols like CF = count fingers
+        etc). Should not be used for formulations. Should not be used for generic Ratios (see
+        DvRatio) or for Rates (see DvRate) </xs:documentation>
     </xs:annotation>
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatioType">
         <xs:sequence>
-          <xs:element maxOccurs="1" minOccurs="0" name="proportion_type" type="xs:string">
+          <xs:element maxOccurs="1" minOccurs="1" name="proportion_type">
             <xs:annotation>
-              <xs:documentation> Indicates semantic type of proportion: pk_proportion = proportion
-                type. Numerator and denominator may be any value. pk_unitary = Denominator must be
-                1. pk_per10^n = Denominator is 10^2, numerator is understood as a real number
-                divided by an exponent of 10 (10^n). pk_fraction = Numerator and denominator are
-                real numbers, allowing rational and irrational fractions, and the presentation
-                method uses a slash, e.g. “1/2”; if the numerator is greater than the denominator,
-                e.g. n=3, d=2, the presentation is “1 1/2”.</xs:documentation>
+              <xs:documentation> Indicates semantic type of proportion.</xs:documentation>
             </xs:annotation>
+            <xs:simpleType>
+              <xs:restriction base="xs:string">
+                <xs:enumeration value="proportion">
+                  <xs:annotation>
+                    <xs:documentation>proportion = proportion type. Numerator and denominator may be
+                      any value.</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="unitary">
+                  <xs:annotation>
+                    <xs:documentation>unitary = Denominator must be 1. </xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="per10^n">
+                  <xs:annotation>
+                    <xs:documentation>per10^n = Denominator is 10^2, numerator is understood as a
+                      real number divided by an exponent of 10 (10^n).</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+                <xs:enumeration value="fraction">
+                  <xs:annotation>
+                    <xs:documentation>fraction = Numerator and denominator are real numbers,
+                      allowing rational and irrational fractions, and the presentation method uses a
+                      slash, e.g. “1/2”; if the numerator is greater than the denominator, e.g. n=3,
+                      d=2, the presentation is “1 1/2”.</xs:documentation>
+                  </xs:annotation>
+                </xs:enumeration>
+              </xs:restriction>
+            </xs:simpleType>
           </xs:element>
         </xs:sequence>
       </xs:extension>
@@ -1067,26 +1113,26 @@
         constraint model. </xs:documentation>
     </xs:annotation>
     <xs:complexContent>
-      <xs:restriction base="xs:anyType" >
-        
-    <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="links" type="mlhim2:DvURIType">
-        <xs:annotation>
-          <xs:documentation> Optional link(s) to other Locatable structures or external
-            entities.</xs:documentation>
-        </xs:annotation>
-      </xs:element>
-      <xs:element minOccurs="0" name="feeder_audit" type="mlhim2:FeederAuditType">
-        <xs:annotation>
-          <xs:documentation> Audit trail from the system of original commit of information forming
-            the content of this node, or from a conversion gateway which has synthesised this node.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:element>
-    </xs:sequence>
+      <xs:restriction base="xs:anyType">
+
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="links" type="mlhim2:DvURIType">
+            <xs:annotation>
+              <xs:documentation> Optional link(s) to other Locatable structures or external
+                entities.</xs:documentation>
+            </xs:annotation>
+          </xs:element>
+          <xs:element minOccurs="0" name="feeder_audit" type="mlhim2:FeederAuditType">
+            <xs:annotation>
+              <xs:documentation> Audit trail from the system of original commit of information
+                forming the content of this node, or from a conversion gateway which has synthesised
+                this node. </xs:documentation>
+            </xs:annotation>
+          </xs:element>
+        </xs:sequence>
       </xs:restriction>
     </xs:complexContent>
-    
+
   </xs:complexType>
 
   <xs:complexType abstract="true" name="DefinitionType">