← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 195: working on quant. datatypes.

 

------------------------------------------------------------
revno: 195
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2011-09-29 22:07:57 -0500
message:
  working on quant. 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 02:01:17 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-09-30 03:07:57 +0000
@@ -75,13 +75,23 @@
     <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="DvInteger" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvReal" eSuperTypes="#//datatypes/DvQuantified"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" abstract="true" eSuperTypes="#//datatypes/DvQuantified"/>
+    <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="DvInterval" eSuperTypes="#//datatypes/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange" eSuperTypes="#//datatypes/DvAny"/>
+    <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"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower_included" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper_included" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower_unbounded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper_unbounded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange" eSuperTypes="#//datatypes/DvAny">
+      <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"/>