mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 196
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Fri 2011-09-30 09:01:28 -0500
message:
  completed datatypes.
modified:
  mlhim2-emf/org.mlhim2/mlhim2.ecore


--
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 'mlhim2-emf/org.mlhim2/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-30 03:07:57 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-30 14:01:28 +0000
@@ -72,14 +72,38 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="hash_function" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="alt_txt" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//datatypes/DvOrdered"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//datatypes/DvOrdered"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvQuantity" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvRate" eSuperTypes="#//datatypes/DvRatio"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//datatypes/DvRatio"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="normal_range" eType="#//datatypes/ReferenceRange"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="other_reference_ranges"
+          upperBound="-1" eType="#//datatypes/ReferenceRange"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="normal_status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//datatypes/DvOrdered">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//datatypes/DvOrdered">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude_status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="accuracy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="units" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantity" eSuperTypes="#//datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="units" eType="#//datatypes/DvCodedString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" eSuperTypes="#//datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="numerator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="denominator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRate" eSuperTypes="#//datatypes/DvRatio">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="rate_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//datatypes/DvRatio">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportion_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvInterval" eSuperTypes="#//datatypes/DvAny">
       <eStructuralFeatures xsi:type="ecore:EReference" name="lower" eType="#//datatypes/DvAny"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="upper" eType="#//datatypes/DvAny"/>
@@ -92,10 +116,14 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="data_range" eType="#//datatypes/DvInterval"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvAny">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvQuantified">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvDateTime"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvDateTime"/>
   </eSubpackages>
   <eSubpackages name="support">
     <eClassifiers xsi:type="ecore:EClass" name="ExceptionalValue" abstract="true"/>