← Back to team overview

mlhim-owners team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/mlhim-emf] Rev 22: Datatypes package classes added.

 

------------------------------------------------------------
revno: 22
committer: Tim Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-emf
timestamp: Thu 2011-03-03 17:31:13 -0300
message:
  Datatypes package classes added.
modified:
  org.mlhim.rm/model/mlhim2.ecore
  org.mlhim.rm/model/mlhim2.ecorediag


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

Your team Multi-level Healthcare Information Modelling Owners is subscribed to branch lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf/+edit-subscription
=== modified file 'org.mlhim.rm/model/mlhim2.ecore'
--- org.mlhim.rm/model/mlhim2.ecore	2011-03-03 20:14:37 +0000
+++ org.mlhim.rm/model/mlhim2.ecore	2011-03-03 20:31:13 +0000
@@ -39,6 +39,21 @@
     <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//Datatypes/DvEncapsulated"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvMultimedia" eSuperTypes="#//Datatypes/DvEncapsulated"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInterval" eSuperTypes="#//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//Datatypes/DvOrdered"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvNumeric" abstract="true" eSuperTypes="#//Datatypes/DvOrdered"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvReal" eSuperTypes="#//Datatypes/DvNumeric"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInt" eSuperTypes="#//Datatypes/DvReal"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantified" abstract="true"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvRatio" abstract="true" eSuperTypes="#//Datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//Datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvQuantity" eSuperTypes="#//Datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCount" eSuperTypes="#//Datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//Datatypes/DvQuantified"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCoefficient" eSuperTypes="#//Datatypes/DvRatio"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//Datatypes/DvRatio"/>
   </eSubpackages>
   <eSubpackages name="Structures"/>
   <eSubpackages name="Content"/>

=== modified file 'org.mlhim.rm/model/mlhim2.ecorediag'
--- org.mlhim.rm/model/mlhim2.ecorediag	2011-03-03 20:14:37 +0000
+++ org.mlhim.rm/model/mlhim2.ecorediag	2011-03-03 20:31:13 +0000
@@ -333,7 +333,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_tHj-UEXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvURI"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHj-UUXPEeCTG6Rypkx8FQ" x="35" y="100"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHj-UUXPEeCTG6Rypkx8FQ" x="19" y="3"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_u-Wg0EXPEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_u-Xu8EXPEeCTG6Rypkx8FQ" type="4002"/>
@@ -349,7 +349,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_u-Wg0UXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvBoolean"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-Wg0kXPEeCTG6Rypkx8FQ" x="199" y="100"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-Wg0kXPEeCTG6Rypkx8FQ" x="139" y="27"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_we8J0EXPEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_we9X8EXPEeCTG6Rypkx8FQ" type="4002"/>
@@ -381,7 +381,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_ysjQ4UXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvEncapsulated"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ysjQ4kXPEeCTG6Rypkx8FQ" x="511" y="99" width="147" height="39"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ysjQ4kXPEeCTG6Rypkx8FQ" x="595" y="63" width="147" height="39"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_3E38AEXPEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_3E5KIEXPEeCTG6Rypkx8FQ" type="4002"/>
@@ -397,7 +397,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_3E38AUXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvParagraph"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E38AkXPEeCTG6Rypkx8FQ" x="715" y="99" width="123" height="39"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E38AkXPEeCTG6Rypkx8FQ" x="787" y="63" width="123" height="39"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_EWFTYEXQEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_EWIWsEXQEeCTG6Rypkx8FQ" type="4002"/>
@@ -413,7 +413,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_EWF6cEXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvIdentifier"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWF6cUXQEeCTG6Rypkx8FQ" x="177" y="266"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWF6cUXQEeCTG6Rypkx8FQ" x="271" y="195"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_GgiYwEXQEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_Ggjm4EXQEeCTG6Rypkx8FQ" type="4002"/>
@@ -429,7 +429,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_GgiYwUXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvCodedText"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GgiYwkXQEeCTG6Rypkx8FQ" x="343" y="267"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GgiYwkXQEeCTG6Rypkx8FQ" x="403" y="195"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_e2wVsEXQEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_e2yK4EXQEeCTG6Rypkx8FQ" type="4002"/>
@@ -445,7 +445,7 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_e2wVsUXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvParsable"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2wVskXQEeCTG6Rypkx8FQ" x="515" y="269"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2wVskXQEeCTG6Rypkx8FQ" x="559" y="195"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_hgTK0EXQEeCTG6Rypkx8FQ" type="2003">
         <children xmi:type="notation:Node" xmi:id="_hgUY8EXQEeCTG6Rypkx8FQ" type="4002"/>
@@ -461,7 +461,247 @@
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_hgTK0UXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
         <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvMultimedia"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgTK0kXQEeCTG6Rypkx8FQ" x="681" y="274"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgTK0kXQEeCTG6Rypkx8FQ" x="679" y="195"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_Iy4HcEXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_Iy6jsEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_Iy7KwEXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_Iy7KwUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Iy7KwkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Iy7Kw0XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Iy7KxEXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_Iy7KxUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Iy7KxkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Iy7x0EXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_Iy4HcUXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvInterval"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Iy4HckXTEeCTG6Rypkx8FQ" x="979" y="63"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_X9MVgEXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_X9NjoEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_X9NjoUXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_X9NjokXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_X9Njo0XTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_X9NjpEXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_X9OKsEXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_X9OKsUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_X9OKskXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_X9OKs0XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_X9MVgUXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvOrdered"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X9MVgkXTEeCTG6Rypkx8FQ" x="85" y="143"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_k0KA4EXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_k0MdIEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_k0MdIUXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_k0MdIkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_k0NEMEXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_k0NEMUXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_k0NEMkXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_k0NEM0XTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_k0NENEXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_k0NENUXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_k0KA4UXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/ReferenceRange"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k0KA4kXTEeCTG6Rypkx8FQ" x="848" y="145"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_rBBy0EXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_rBDA8EXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_rBDoAEXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_rBDoAUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_rBDoAkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_rBDoA0XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_rBDoBEXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_rBDoBUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_rBEPEEXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_rBEPEUXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_rBBy0UXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvOrdinal"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rBBy0kXTEeCTG6Rypkx8FQ" x="19" y="75"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_26LyIEXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_26OOYEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_26O1cEXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_26O1cUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_26O1ckXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_26O1c0XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_26PcgEXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_26PcgUXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_26PcgkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_26Pcg0XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_26MZMEXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvNumeric"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_26MZMUXTEeCTG6Rypkx8FQ" x="28" y="233"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_8avQoEXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_8awewEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_8awewUXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_8awewkXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_8awew0XTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_8awexEXTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8axF0EXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_8axF0UXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_8axF0kXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_8axF00XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_8avQoUXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvReal"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8avQokXTEeCTG6Rypkx8FQ" x="31" y="303"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_9gn6oEXTEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_9gpIwEXTEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_9gpv0EXTEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_9gpv0UXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_9gpv0kXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_9gpv00XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_9gqW4EXTEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_9gqW4UXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_9gqW4kXTEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_9gqW40XTEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_9gn6oUXTEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvInt"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gn6okXTEeCTG6Rypkx8FQ" x="31" y="387"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_E3QJ8EXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_E3SmMEXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_E3SmMUXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_E3SmMkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_E3SmM0XUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_E3SmNEXUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_E3TNQEXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_E3TNQUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_E3TNQkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_E3TNQ0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_E3QJ8UXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvQuantified"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3QJ8kXUEeCTG6Rypkx8FQ" x="201" y="269"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_QjfuoEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_Qjhj0EXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_QjiK4EXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_QjiK4UXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QjiK4kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QjiK40XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Qjix8EXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_Qjix8UXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Qjix8kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Qjix80XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_QjfuoUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvRatio"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QjfuokXUEeCTG6Rypkx8FQ" x="883" y="255"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_XtNjUEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_XtPYgEXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_XtP_kEXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_XtP_kUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_XtP_kkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_XtP_k0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_XtQmoEXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_XtQmoUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_XtQmokXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_XtQmo0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_XtNjUUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvDateTime"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XtNjUkXUEeCTG6Rypkx8FQ" x="151" y="375"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_aNP3IEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_aNRFQEXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_aNRsUEXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_aNRsUUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_aNRsUkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_aNRsU0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_aNSTYEXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_aNSTYUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_aNSTYkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_aNSTY0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_aNP3IUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvQuantity"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aNP3IkXUEeCTG6Rypkx8FQ" x="271" y="375"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_cYaHIEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_cYb8UEXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_cYb8UUXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_cYb8UkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cYb8U0XUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cYb8VEXUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_cYcjYEXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_cYcjYUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cYcjYkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cYcjY0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_cYaHIUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvCount"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cYauMEXUEeCTG6Rypkx8FQ" x="487" y="375"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_e5x3sEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_e5zF0EXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_e5zs4EXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_e5zs4UXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e5zs4kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e5zs40XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_e50T8EXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_e50T8UXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_e50T8kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_e50T80XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_e5x3sUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvDuration"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e5x3skXUEeCTG6Rypkx8FQ" x="667" y="375"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_2YYQIEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_2YZeQEXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_2YaFUEXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_2YaFUUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2YaFUkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2YaFU0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_2YasYEXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_2YasYUXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_2YasYkXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_2YasY0XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_2YYQIUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvCoefficient"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2YYQIkXUEeCTG6Rypkx8FQ" x="811" y="375"/>
+      </children>
+      <children xmi:type="notation:Node" xmi:id="_46NTsEXUEeCTG6Rypkx8FQ" type="2003">
+        <children xmi:type="notation:Node" xmi:id="_46Oh0EXUEeCTG6Rypkx8FQ" type="4002"/>
+        <children xmi:type="notation:Node" xmi:id="_46Oh0UXUEeCTG6Rypkx8FQ" type="5004">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_46Oh0kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_46Oh00XUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_46Oh1EXUEeCTG6Rypkx8FQ"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_46PI4EXUEeCTG6Rypkx8FQ" type="5005">
+          <styles xmi:type="notation:DrawerStyle" xmi:id="_46PI4UXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_46PI4kXUEeCTG6Rypkx8FQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_46PI40XUEeCTG6Rypkx8FQ"/>
+        </children>
+        <styles xmi:type="notation:ShapeStyle" xmi:id="_46NTsUXUEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvProportion"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_46NTskXUEeCTG6Rypkx8FQ" x="955" y="375"/>
       </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_u1IQMUXLEeCTG6Rypkx8FQ"/>
       <styles xmi:type="notation:SortingStyle" xmi:id="_u1IQMkXLEeCTG6Rypkx8FQ"/>
@@ -655,14 +895,14 @@
     <styles xmi:type="notation:FontStyle" xmi:id="_sJ6N0kXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sJ6N00XQEeCTG6Rypkx8FQ" points="[6, -5, -142, 135]$[149, -131, 1, 9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sJ94MEXQEeCTG6Rypkx8FQ" id="(0.47058823529411764,0.13953488372093023)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sJ94MUXQEeCTG6Rypkx8FQ" id="(0.17647058823529413,0.7906976744186046)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sJ94MEXQEeCTG6Rypkx8FQ" id="(0.9117647058823529,0.023255813953488372)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sJ94MUXQEeCTG6Rypkx8FQ" id="(0.08823529411764706,0.9767441860465116)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_tdc5UEXQEeCTG6Rypkx8FQ" type="3003" source="_GgiYwEXQEeCTG6Rypkx8FQ" target="_we8J0EXPEeCTG6Rypkx8FQ">
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_tdc5UUXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_tdc5UkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tdc5U0XQEeCTG6Rypkx8FQ" points="[0, -6, -3, 136]$[5, -133, 2, 9]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tdc5U0XQEeCTG6Rypkx8FQ" points="[-50, -6, 7, 64]$[-50, -61, 7, 9]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tdgjsEXQEeCTG6Rypkx8FQ" id="(0.6822429906542056,0.16279069767441862)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tdgjsUXQEeCTG6Rypkx8FQ" id="(0.6274509803921569,0.7906976744186046)"/>
   </edges>
@@ -671,7 +911,7 @@
     <styles xmi:type="notation:FontStyle" xmi:id="_uZ890kXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uZ8900XQEeCTG6Rypkx8FQ" points="[1, -2, 1, 143]$[1, -135, 1, 10]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uaBPQEXQEeCTG6Rypkx8FQ" id="(0.23529411764705882,0.06976744186046512)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uaBPQEXQEeCTG6Rypkx8FQ" id="(0.6470588235294118,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uaBPQUXQEeCTG6Rypkx8FQ" id="(0.19047619047619047,0.7435897435897436)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="_vbfTUEXQEeCTG6Rypkx8FQ" type="3003" source="_hgTK0EXQEeCTG6Rypkx8FQ" target="_ysjQ4EXPEeCTG6Rypkx8FQ">
@@ -679,7 +919,7 @@
     <styles xmi:type="notation:FontStyle" xmi:id="_vbfTUkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
     <element xsi:nil="true"/>
     <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vbfTU0XQEeCTG6Rypkx8FQ" points="[-3, -5, 68, 150]$[-69, -143, 2, 12]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vbjkwEXQEeCTG6Rypkx8FQ" id="(0.22123893805309736,0.13953488372093023)"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vbjkwEXQEeCTG6Rypkx8FQ" id="(0.36283185840707965,0.0)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vbjkwUXQEeCTG6Rypkx8FQ" id="(0.8503401360544217,0.6923076923076923)"/>
   </edges>
   <edges xmi:type="notation:Edge" xmi:id="__DH6EEXREeCTG6Rypkx8FQ" type="3003" source="_tHjXQEXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
@@ -717,8 +957,112 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_CbY2YUXSEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_CbY2YkXSEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
     <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CbZdcEXSEeCTG6Rypkx8FQ" points="[-16, -4, 265, 78]$[-279, -88, 2, -6]"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CbZdcEXSEeCTG6Rypkx8FQ" points="[-37, -4, 316, 42]$[-37, -28, 316, 18]$[-338, -28, 15, 18]"/>
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbdH0EXSEeCTG6Rypkx8FQ" id="(0.34959349593495936,0.1282051282051282)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbdH0UXSEeCTG6Rypkx8FQ" id="(0.8529411764705882,0.16279069767441862)"/>
   </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_LoUDgEXTEeCTG6Rypkx8FQ" type="3003" source="_Iy4HcEXTEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_LoUDgUXTEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_LoUDgkXTEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LoUDg0XTEeCTG6Rypkx8FQ" points="[-2, -4, 544, 32]$[-2, -40, 544, -4]$[-290, -40, 256, -4]$[-290, -35, 256, 1]$[-538, -35, 8, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LoYU8EXTEeCTG6Rypkx8FQ" id="(0.5,0.11627906976744186)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LoYU8UXTEeCTG6Rypkx8FQ" id="(0.9215686274509803,0.11627906976744186)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Zx4mQEXTEeCTG6Rypkx8FQ" type="3003" source="_X9MVgEXTEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Zx4mQUXTEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Zx4mQkXTEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Zx4mQ0XTEeCTG6Rypkx8FQ" points="[9, -9, -233, 99]$[9, -65, -233, 43]$[249, -65, 7, 43]$[249, -96, 7, 12]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zx83sEXTEeCTG6Rypkx8FQ" id="(0.696078431372549,0.23255813953488372)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Zx83sUXTEeCTG6Rypkx8FQ" id="(0.058823529411764705,0.7209302325581395)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_tmPhkEXTEeCTG6Rypkx8FQ" type="3003" source="_rBBy0EXTEeCTG6Rypkx8FQ" target="_X9MVgEXTEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_tmPhkUXTEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_tmPhkkXTEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tmPhk0XTEeCTG6Rypkx8FQ" points="[2, 12, 1, -32]$[2, 39, 1, -5]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tmTzAEXTEeCTG6Rypkx8FQ" id="(0.7843137254901961,0.7209302325581395)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tmTzAUXTEeCTG6Rypkx8FQ" id="(0.13725490196078433,0.13953488372093023)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_6wul4EXTEeCTG6Rypkx8FQ" type="3003" source="_26LyIEXTEeCTG6Rypkx8FQ" target="_X9MVgEXTEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_6wul4UXTEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6wul4kXTEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6wul40XTEeCTG6Rypkx8FQ" points="[3, -3, -47, 75]$[51, -93, 1, -15]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wyQQEXTEeCTG6Rypkx8FQ" id="(0.12745098039215685,0.09302325581395349)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wyQQUXTEeCTG6Rypkx8FQ" id="(0.058823529411764705,0.37209302325581395)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_AID28EXUEeCTG6Rypkx8FQ" type="3003" source="_8avQoEXTEeCTG6Rypkx8FQ" target="_26LyIEXTEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AID28UXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AID28kXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AID280XUEeCTG6Rypkx8FQ" points="[0, -6, 1, 39]$[0, -35, 1, 10]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AIHhUEXUEeCTG6Rypkx8FQ" id="(0.47058823529411764,0.16279069767441862)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AIHhUUXUEeCTG6Rypkx8FQ" id="(0.49019607843137253,0.7674418604651163)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_BAcQcEXUEeCTG6Rypkx8FQ" type="3003" source="_9gn6oEXTEeCTG6Rypkx8FQ" target="_8avQoEXTEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_BAcQcUXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_BAcQckXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BAcQc0XUEeCTG6Rypkx8FQ" points="[1, -8, 1, 53]$[1, -51, 1, 10]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BAf60EXUEeCTG6Rypkx8FQ" id="(0.45098039215686275,0.20930232558139536)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BAf60UXUEeCTG6Rypkx8FQ" id="(0.45098039215686275,0.7674418604651163)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_U2Ch4EXUEeCTG6Rypkx8FQ" type="3003" source="_QjfuoEXUEeCTG6Rypkx8FQ" target="_E3QJ8EXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_U2Ch4UXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_U2Ch4kXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U2Ch40XUEeCTG6Rypkx8FQ" points="[-24, 1, 716, 1]$[-738, -2, 2, -2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U2GzUEXUEeCTG6Rypkx8FQ" id="(0.00980392156862745,0.37209302325581395)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U2GzUUXUEeCTG6Rypkx8FQ" id="(0.5818181818181818,0.06976744186046512)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_h54ysEXUEeCTG6Rypkx8FQ" type="3003" source="_e5x3sEXUEeCTG6Rypkx8FQ" target="_E3QJ8EXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_h54ysUXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_h54yskXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h54ys0XUEeCTG6Rypkx8FQ" points="[-16, -2, 483, 86]$[-497, -105, 2, -17]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h59rMEXUEeCTG6Rypkx8FQ" id="(0.5098039215686274,0.06976744186046512)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h59rMUXUEeCTG6Rypkx8FQ" id="(0.9,0.4186046511627907)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_jN28AEXUEeCTG6Rypkx8FQ" type="3003" source="_XtNjUEXUEeCTG6Rypkx8FQ" target="_E3QJ8EXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_jN3jEEXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_jN3jEUXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jN3jEkXUEeCTG6Rypkx8FQ" points="[1, -5, -5, 83]$[7, -67, 1, 21]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jN7NcEXUEeCTG6Rypkx8FQ" id="(0.019417475728155338,0.13953488372093023)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jN7NcUXUEeCTG6Rypkx8FQ" id="(0.00909090909090909,0.4883720930232558)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_nNEjkEXUEeCTG6Rypkx8FQ" type="3003" source="_cYaHIEXUEeCTG6Rypkx8FQ" target="_E3QJ8EXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_nNFKoEXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_nNFKoUXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nNFKokXUEeCTG6Rypkx8FQ" points="[-17, -5, 214, 73]$[-229, -70, 2, 8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nNI1AEXUEeCTG6Rypkx8FQ" id="(0.3627450980392157,0.13953488372093023)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nNI1AUXUEeCTG6Rypkx8FQ" id="(0.8454545454545455,0.813953488372093)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_oxpUsEXUEeCTG6Rypkx8FQ" type="3003" source="_aNP3IEXUEeCTG6Rypkx8FQ" target="_E3QJ8EXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oxpUsUXUEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_oxpUskXUEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oxpUs0XUEeCTG6Rypkx8FQ" points="[-2, -5, 32, 86]$[-2, -38, 32, 53]$[6, -38, 40, 53]$[6, -70, 40, 21]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oxs_EEXUEeCTG6Rypkx8FQ" id="(0.18627450980392157,0.13953488372093023)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sPmpUEXUEeCTG6Rypkx8FQ" id="(0.9,0.9069767441860465)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_Aof1EEXVEeCTG6Rypkx8FQ" type="3003" source="_2YYQIEXUEeCTG6Rypkx8FQ" target="_QjfuoEXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_Aof1EUXVEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Aof1EkXVEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Aof1E0XVEeCTG6Rypkx8FQ" points="[-2, -2, 1, 89]$[-2, -81, 1, 10]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AojfcEXVEeCTG6Rypkx8FQ" id="(0.8348623853211009,0.06976744186046512)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AojfcUXVEeCTG6Rypkx8FQ" id="(0.16666666666666666,0.9767441860465116)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_DLnSEEXVEeCTG6Rypkx8FQ" type="3003" source="_46NTsEXUEeCTG6Rypkx8FQ" target="_QjfuoEXUEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_DLnSEUXVEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_DLnSEkXVEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DLnSE0XVEeCTG6Rypkx8FQ" points="[-2, -6, 2, 86]$[-2, -85, 2, 7]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DLrjgEXVEeCTG6Rypkx8FQ" id="(0.14150943396226415,0.16279069767441862)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DLrjgUXVEeCTG6Rypkx8FQ" id="(0.8529411764705882,0.9767441860465116)"/>
+  </edges>
 </notation:Diagram>