← Back to team overview

mlhim-specs-dev team mailing list archive

  1. mlhim-specs-dev team
  2. Mailing list archive
  3. Message #00409

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 204: Added Sergios Demographic UML

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 204
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Fri 2011-10-07 10:15:20 -0500
message:
  Added Sergios Demographic UML
added:
  graphics/new_demographics.zargo
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

=== added file 'graphics/new_demographics.zargo'
Binary files graphics/new_demographics.zargo	1970-01-01 00:00:00 +0000 and graphics/new_demographics.zargo	2011-10-07 15:15:20 +0000 differ
=== modified file 'mlhim2-emf/org.mlhim2/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-04 00:01:52 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-07 15:15:20 +0000
@@ -5,7 +5,7 @@
     nsURI="http://mlhim2/1.0"; nsPrefix="mlhim2">
   <eSubpackages name="datatypes" nsURI="" nsPrefix="mlhim2">
     <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//support/ExceptionalValue"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//common/ExceptionalValue"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
     </eClassifiers>
@@ -79,20 +79,24 @@
       <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"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" lowerBound="1"
+          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" lowerBound="1"
+          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="error" lowerBound="1"
+          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"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="units" lowerBound="1"
+          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"/>
@@ -116,10 +120,10 @@
       <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/DvAny">
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvOrdered">
       <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">
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvOrdered">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="allow_partial" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean";
@@ -128,25 +132,6 @@
     <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"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NI" eSuperTypes="#//support/ExceptionalValue"/>
-    <eClassifiers xsi:type="ecore:EClass" name="MSK" eSuperTypes="#//support/NI"/>
-    <eClassifiers xsi:type="ecore:EClass" name="INV" eSuperTypes="#//support/NI"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DER" eSuperTypes="#//support/INV"/>
-    <eClassifiers xsi:type="ecore:EClass" name="UNC" eSuperTypes="#//support/INV"/>
-    <eClassifiers xsi:type="ecore:EClass" name="OTH" eSuperTypes="#//support/INV"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NINF" eSuperTypes="#//support/OTH"/>
-    <eClassifiers xsi:type="ecore:EClass" name="PINF" eSuperTypes="#//support/OTH"/>
-    <eClassifiers xsi:type="ecore:EClass" name="UNK" eSuperTypes="#//support/NI"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ASKR" eSuperTypes="#//support/UNK"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NASK" eSuperTypes="#//support/UNK"/>
-    <eClassifiers xsi:type="ecore:EClass" name="QS" eSuperTypes="#//support/UNK"/>
-    <eClassifiers xsi:type="ecore:EClass" name="TRC" eSuperTypes="#//support/UNK"/>
-    <eClassifiers xsi:type="ecore:EClass" name="ASKU" eSuperTypes="#//support/UNK"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NAV" eSuperTypes="#//support/ASKU"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NA" eSuperTypes="#//support/NI"/>
-  </eSubpackages>
   <eSubpackages name="entity">
     <eClassifiers xsi:type="ecore:EClass" name="Party" abstract="true" eSuperTypes="#//common/Locatable"/>
     <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//entity/Party"/>
@@ -190,7 +175,6 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="relationship" lowerBound="1"
           eType="#//entity/Relationship"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PartySelf" eSuperTypes="#//common/PartyProxy"/>
     <eClassifiers xsi:type="ecore:EClass" name="Participation">
       <eStructuralFeatures xsi:type="ecore:EReference" name="performer" lowerBound="1"
           eType="#//common/PartyProxy"/>
@@ -221,23 +205,39 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="subject" eType="#//common/PartyProxy"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="version_id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ExceptionalValue" abstract="true"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NI" eSuperTypes="#//common/ExceptionalValue"/>
+    <eClassifiers xsi:type="ecore:EClass" name="MSK" eSuperTypes="#//common/NI"/>
+    <eClassifiers xsi:type="ecore:EClass" name="INV" eSuperTypes="#//common/NI"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DER" eSuperTypes="#//common/INV"/>
+    <eClassifiers xsi:type="ecore:EClass" name="UNC" eSuperTypes="#//common/INV"/>
+    <eClassifiers xsi:type="ecore:EClass" name="OTH" eSuperTypes="#//common/INV"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NINF" eSuperTypes="#//common/OTH"/>
+    <eClassifiers xsi:type="ecore:EClass" name="PINF" eSuperTypes="#//common/OTH"/>
+    <eClassifiers xsi:type="ecore:EClass" name="UNK" eSuperTypes="#//common/NI"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ASKR" eSuperTypes="#//common/UNK"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NASK" eSuperTypes="#//common/UNK"/>
+    <eClassifiers xsi:type="ecore:EClass" name="QS" eSuperTypes="#//common/UNK"/>
+    <eClassifiers xsi:type="ecore:EClass" name="TRC" eSuperTypes="#//common/UNK"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ASKU" eSuperTypes="#//common/UNK"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NAV" eSuperTypes="#//common/ASKU"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NA" eSuperTypes="#//common/NI"/>
   </eSubpackages>
   <eSubpackages name="metadata">
-    <eClassifiers xsi:type="ecore:EClass" name="MetaDataSet">
+    <eClassifiers xsi:type="ecore:EClass" name="MetadataSet">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="entries" lowerBound="1"
-          upperBound="-1" eType="#//metadata/MetaDataEntry"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="MetaDataEntry">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="contents" lowerBound="1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="MetaData">
+          upperBound="-1" eType="#//metadata/MetadataEntry"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="MetadataEntry">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="contents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Metadata">
       <eStructuralFeatures xsi:type="ecore:EReference" name="content" lowerBound="2"
-          upperBound="-1" eType="#//metadata/MetaDataSet"/>
+          upperBound="-1" eType="#//metadata/MetadataSet"/>
     </eClassifiers>
   </eSubpackages>
   <eSubpackages name="ccd">
@@ -245,7 +245,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="definition" lowerBound="1"
           eType="#//common/Locatable"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="metadata" lowerBound="1"
-          eType="#//metadata/MetaData"/>
+          eType="#//metadata/Metadata"/>
     </eClassifiers>
   </eSubpackages>
   <eSubpackages name="structures">
  Thread Previous • Date Previous • • Thread Next