mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00488
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 244: Removed Demographic module and added DemographicEntry.
------------------------------------------------------------
revno: 244
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2012-05-24 16:46:36 -0300
message:
Removed Demographic module and added DemographicEntry.
modified:
mlhim2-emf/org.mlhim2/model/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/model/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/model/mlhim2.ecore 2012-04-30 01:10:02 +0000
+++ mlhim2-emf/org.mlhim2/model/mlhim2.ecore 2012-05-24 19:46:36 +0000
@@ -20,26 +20,13 @@
<eClassifiers xsi:type="ecore:EClass" name="DvString" eSuperTypes="#//datatypes/DvAny">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="string_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Language"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumeration" upperBound="-1"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"
- defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pattern" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="whitespace" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"
- defaultValueLiteral="preserve"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="min_length" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="max_length" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DvNormalizedString" eSuperTypes="#//datatypes/DvString">
- <eOperations name="normalize" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//NormalizedString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DvToken" eSuperTypes="#//datatypes/DvString">
- <eOperations name="tokenize" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Token"/>
- </eClassifiers>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="DvNormalizedString" eSuperTypes="#//datatypes/DvString"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DvToken" eSuperTypes="#//datatypes/DvString"/>
<eClassifiers xsi:type="ecore:EClass" name="DvCodedString" eSuperTypes="#//datatypes/DvString">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_abbrev" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="terminology_code" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//datatypes/DvString">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="id_name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
@@ -80,12 +67,13 @@
<eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true" eSuperTypes="#//datatypes/DvOrdered">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude" lowerBound="1"
eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="min_magnitude" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="max_magnitude" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="magnitude_status" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="error" lowerBound="1"
eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="accuracy" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="max_magnitude" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="min_magnitude" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="accuracy" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"
+ defaultValueLiteral="0"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//datatypes/DvQuantified">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="units" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
@@ -97,6 +85,8 @@
<eClassifiers xsi:type="ecore:EClass" name="DvRatio" eSuperTypes="#//datatypes/DvQuantified">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="numerator" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="denominator" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Decimal"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="numerator_units" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="denominator_units" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DvRate" eSuperTypes="#//datatypes/DvRatio">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="rate_type" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
@@ -116,85 +106,17 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="data_range" eType="#//datatypes/DvInterval"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DvTemporal" eSuperTypes="#//datatypes/DvOrdered">
+ <eClassifiers xsi:type="ecore:EClass" name="DvTemporal" abstract="true" eSuperTypes="#//datatypes/DvOrdered">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="allow_partial" lowerBound="1"
eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Boolean"
- defaultValueLiteral="true"/>
+ defaultValueLiteral="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvTemporal"/>
<eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvTemporal"/>
<eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvTemporal"/>
<eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvTemporal"/>
</eSubpackages>
- <eSubpackages name="demographic" nsURI="http://www.mlhim.org/mlhim2/demographic";
- nsPrefix="mlhim2">
- <eClassifiers xsi:type="ecore:EClass" name="Party" abstract="true" eSuperTypes="#//common/Locatable">
- <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//common/ExceptionalValue"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//DateTime"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//DateTime"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" upperBound="-1"
- eType="#//demographic/Relationship"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="locations" upperBound="-1"
- eType="#//demographic/GeographicLocation"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="roles" upperBound="-1"
- eType="#//demographic/Role"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" upperBound="-1"
- eType="#//datatypes/DvIdentifier"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Agent" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Relationship" eSuperTypes="#//common/Locatable">
- <eStructuralFeatures xsi:type="ecore:EReference" name="targets" lowerBound="1"
- upperBound="-1" eType="#//datatypes/DvToken"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="is_local" eType="#//datatypes/DvBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="relationship_type" lowerBound="1"
- eType="#//datatypes/DvString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GeographicLocation" eSuperTypes="#//common/Locatable">
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//common/Locatable">
- <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
- eType="#//datatypes/DvString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
- eType="#//structures/Item"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="is_primary" lowerBound="1"
- eType="#//datatypes/DvBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartyProxy" abstract="true" eSuperTypes="#//demographic/Party">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="external_ref" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartyIdentified" eSuperTypes="#//demographic/PartyProxy">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="party_name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="identities" upperBound="-1"
- eType="#//datatypes/DvIdentifier"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartyRelated" eSuperTypes="#//demographic/PartyIdentified">
- <eStructuralFeatures xsi:type="ecore:EReference" name="relationship" lowerBound="1"
- eType="#//demographic/Relationship"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PartySelf" eSuperTypes="#//demographic/PartyProxy"/>
- </eSubpackages>
<eSubpackages name="common" nsURI="http://www.mlhim.org/mlhim2/common"; nsPrefix="mlhim2">
<eClassifiers xsi:type="ecore:EClass" name="Locatable" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
@@ -209,14 +131,14 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="proof" eType="#//datatypes/DvParsable"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="reason" eType="#//datatypes/DvCodedString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="committer" lowerBound="1"
- eType="#//demographic/PartyProxy"/>
+ eType="#//common/PartyProxy"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="time_commmitted" lowerBound="1"
eType="#//datatypes/DvDateTime"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="is_pending" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Boolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Participation" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
<eStructuralFeatures xsi:type="ecore:EReference" name="performer" lowerBound="1"
- eType="#//demographic/PartyProxy"/>
+ eType="#//common/PartyProxy"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="function" lowerBound="1"
eType="#//datatypes/DvCodedString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mode" lowerBound="1"
@@ -238,12 +160,21 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeederAuditDetails" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
<eStructuralFeatures xsi:type="ecore:EReference" name="system_id" eType="#//datatypes/DvIdentifier"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="provider" eType="#//demographic/PartyIdentified"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//demographic/GeographicLocation"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="provider" eType="#//common/PartyIdentified"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="location"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="time" eType="#//datatypes/DvDateTime"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="subject" eType="#//demographic/PartyProxy"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="subject" eType="#//common/PartyProxy"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="version_id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartyProxy" abstract="true" eSuperTypes="#//common/Locatable">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="external_ref" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartyIdentified" eSuperTypes="#//common/PartyProxy">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="party_name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="identities" upperBound="-1"
+ eType="#//datatypes/DvIdentifier"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartySelf" eSuperTypes="#//common/PartyProxy"/>
<eClassifiers xsi:type="ecore:EClass" name="ExceptionalValue" abstract="true"
eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ev_name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
@@ -287,8 +218,6 @@
<eClassifiers xsi:type="ecore:EClass" name="CCD" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
<eStructuralFeatures xsi:type="ecore:EReference" name="definition" lowerBound="1"
eType="#//common/Locatable"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="metadata" lowerBound="1"
- eType="#//metadata/Metadata"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="structures" nsURI="http://www.mlhim.org/mlhim2/structures"; nsPrefix="mlhim2">
@@ -312,23 +241,20 @@
eType="#//datatypes/DvCodedString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="encoding" eType="#//datatypes/DvCodedString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="subject" lowerBound="1"
- eType="#//demographic/PartyProxy"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="provider" eType="#//demographic/PartyProxy"/>
+ eType="#//common/PartyProxy"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="provider" eType="#//common/PartyProxy"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="other_participations"
upperBound="-1" eType="#//common/Participation"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="workflow_id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="protocol_id" eType="#//datatypes/DvIdentifier"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="current_state" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="workflow_id" eType="#//datatypes/DvURI"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
- eType="#//demographic/Relationship"/>
+ eType="#//datatypes/DvURI"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="attestation" eType="#//common/Attestation"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CareEntry" eSuperTypes="#//content/Entry">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="guideline_id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="data" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AdminEntry" eSuperTypes="#//content/Entry">
- <eStructuralFeatures xsi:type="ecore:EReference" name="data" lowerBound="1"
- eType="#//structures/Item"/>
- </eClassifiers>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="data" eType="#//structures/Item"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CareEntry" eSuperTypes="#//content/Entry"/>
+ <eClassifiers xsi:type="ecore:EClass" name="AdminEntry" eSuperTypes="#//content/Entry"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DemographicEntry" eSuperTypes="#//content/Entry"/>
</eSubpackages>
</ecore:EPackage>
