corrections for build

be.uantwerpen.msdl.vafl.ontology/build.gradle

@@ -34,7 +34,7 @@ buildscript {
  */
 ext.dataset = [
     // Name of dataset (matches one used in .fuseki.ttl file)
-    name: 'be.ua.msdl.vafl',
+    name: 'vafl',
     // Root ontology IRI of the dataset
     rootOntologyIri: 'http://msdl.uantwerpen.be/vafl/description/bundle',
 ]

be.uantwerpen.msdl.vafl.ontology/representations.aird

@@ -77,7 +77,7 @@
     <semanticResources>src/oml/qudt.org/2.1/schema/qudt.oml</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_mGKn8OqhEe2TztGgS5kHFw">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oGjLUOqhEe2TztGgS5kHFw" name="Actor Viewer" repPath="#_oGEDIOqhEe2TztGgS5kHFw" changeId="d6924369-9615-49c9-a015-b6a91907e10d">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oGjLUOqhEe2TztGgS5kHFw" name="Actor Viewer" repPath="#_oGEDIOqhEe2TztGgS5kHFw" changeId="55a4fd29-a2c0-450b-89a7-55f33c8a6545">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']/@ownedRepresentations[name='Vocabulary%20Diagram']"/>
         <target xmi:type="oml:Vocabulary" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/actor.oml#/"/>
       </ownedRepresentationDescriptors>
@@ -85,11 +85,11 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']/@ownedRepresentations[name='Vocabulary%20Diagram']"/>
         <target xmi:type="oml:Vocabulary" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/system.oml#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CkH6sOrAEe2zH6BzxD2E9g" name="Resource Viewer" repPath="#_CkGFgOrAEe2zH6BzxD2E9g" changeId="0a68d5c7-c9a0-4835-858e-39546cc932d6">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CkH6sOrAEe2zH6BzxD2E9g" name="Resource Viewer" repPath="#_CkGFgOrAEe2zH6BzxD2E9g" changeId="9c5de8f3-9b3b-4f6d-a39c-82825bb76c4f">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']/@ownedRepresentations[name='Vocabulary%20Diagram']"/>
         <target xmi:type="oml:Vocabulary" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/resource.oml#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZU8nIOrAEe2zH6BzxD2E9g" name="Human Viewer" repPath="#_ZU2ggOrAEe2zH6BzxD2E9g" changeId="5209ddd6-5996-439e-b554-4fbf9f6e4ee8">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_ZU8nIOrAEe2zH6BzxD2E9g" name="Human Viewer" repPath="#_ZU2ggOrAEe2zH6BzxD2E9g" changeId="c07f44a3-6023-4f76-abde-be39fb27d65e">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']/@ownedRepresentations[name='Vocabulary%20Diagram']"/>
         <target xmi:type="oml:Vocabulary" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/human.oml#/"/>
       </ownedRepresentationDescriptors>
@@ -121,7 +121,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_oKl90uqhEe2TztGgS5kHFw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_oKcM0eqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKcM0uqhEe2TztGgS5kHFw" x="925" y="255" width="92" height="46"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKcM0uqhEe2TztGgS5kHFw" x="868" y="255" width="148" height="46"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_oKt5oOqhEe2TztGgS5kHFw" type="2003" element="_oIynAOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oKt5o-qhEe2TztGgS5kHFw" type="5007"/>
@@ -130,7 +130,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_oKt5puqhEe2TztGgS5kHFw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_oKt5oeqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKt5ouqhEe2TztGgS5kHFw" x="830" y="405" width="60" height="46"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKt5ouqhEe2TztGgS5kHFw" x="830" y="405" width="104" height="46"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_oKugsOqhEe2TztGgS5kHFw" type="2003" element="_oIz1IeqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oKugs-qhEe2TztGgS5kHFw" type="5007"/>
@@ -139,7 +139,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_oKugtuqhEe2TztGgS5kHFw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_oKugseqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKugsuqhEe2TztGgS5kHFw" x="778" y="110" width="150" height="46"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKugsuqhEe2TztGgS5kHFw" x="700" y="110" width="226" height="46"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_oKvHwOqhEe2TztGgS5kHFw" type="2003" element="_oI24ceqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oKvHw-qhEe2TztGgS5kHFw" type="5007"/>
@@ -148,7 +148,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_oKvHxuqhEe2TztGgS5kHFw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_oKvHweqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKvHwuqhEe2TztGgS5kHFw" x="624" y="255" width="193" height="46"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKvHwuqhEe2TztGgS5kHFw" x="525" y="255" width="292" height="46"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_oKyLE-qhEe2TztGgS5kHFw" type="2003" element="_oJVZkOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oKyLFuqhEe2TztGgS5kHFw" type="5007"/>
@@ -169,7 +169,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_oKyyIuqhEe2TztGgS5kHFw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_oKyLFOqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKyLFeqhEe2TztGgS5kHFw" x="1180" y="265" width="101" height="99"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKyLFeqhEe2TztGgS5kHFw" x="1180" y="265" width="195" height="158"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_7howYO0lEe2oz--8ilL13Q" type="2003" element="_7ge50u0lEe2oz--8ilL13Q">
           <children xmi:type="notation:Node" xmi:id="_7hwsMO0lEe2oz--8ilL13Q" type="5007"/>
@@ -178,7 +178,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_7hx6Uu0lEe2oz--8ilL13Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_7howYe0lEe2oz--8ilL13Q" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7howYu0lEe2oz--8ilL13Q" x="570" y="405"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7howYu0lEe2oz--8ilL13Q" x="570" y="405" width="77"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_oHSLIuqhEe2TztGgS5kHFw"/>
         <edges xmi:type="notation:Edge" xmi:id="_oLPeEOqhEe2TztGgS5kHFw" type="4001" element="_oJhm0OqhEe2TztGgS5kHFw" source="_oKugsOqhEe2TztGgS5kHFw" target="_oKugsOqhEe2TztGgS5kHFw">
@@ -194,12 +194,12 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_oLPeEeqhEe2TztGgS5kHFw" routing="Tree" smoothness="More"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_oLPeEuqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLPeE-qhEe2TztGgS5kHFw" points="[0, -6, 70, -5]$[0, -106, 70, -105]$[-89, -106, -19, -105]$[-89, -6, -19, -5]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLgj0OqhEe2TztGgS5kHFw" id="(0.7837837837837838,0.13636363636363635)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhK4OqhEe2TztGgS5kHFw" id="(0.3108108108108108,0.11363636363636363)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLgj0OqhEe2TztGgS5kHFw" id="(0.8581042494821118,0.13636363636363635)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhK4OqhEe2TztGgS5kHFw" id="(0.5477072952242317,0.11363636363636363)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_oLhK4eqhEe2TztGgS5kHFw" type="4001" element="_oJo7kOqhEe2TztGgS5kHFw" source="_oKt5oOqhEe2TztGgS5kHFw" target="_oKcM0OqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oLhK5eqhEe2TztGgS5kHFw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeWrYOq5Ee2zH6BzxD2E9g" x="36" y="-4"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeWrYOq5Ee2zH6BzxD2E9g" x="13" y="19"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_oLhK5-qhEe2TztGgS5kHFw" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeWrYeq5Ee2zH6BzxD2E9g" x="23" y="10"/>
@@ -210,8 +210,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_oLhK4uqhEe2TztGgS5kHFw" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_oLhK4-qhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLhK5OqhEe2TztGgS5kHFw" points="[28, 23, -83, 129]$[115, 23, 4, 129]$[115, -106, 4, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhx8OqhEe2TztGgS5kHFw" id="(0.5172413793103449,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhx8eqhEe2TztGgS5kHFw" id="(0.5111111111111111,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhx8OqhEe2TztGgS5kHFw" id="(0.29411764705882354,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLhx8eqhEe2TztGgS5kHFw" id="(0.7,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_oLkOMuqhEe2TztGgS5kHFw" type="4001" element="_oJrX0OqhEe2TztGgS5kHFw" source="_oKcM0OqhEe2TztGgS5kHFw" target="_oKugsOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oLk1QOqhEe2TztGgS5kHFw" type="6001">
@@ -226,8 +226,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_oLkOM-qhEe2TztGgS5kHFw" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_oLkONOqhEe2TztGgS5kHFw" fontName="Segoe UI" fontHeight="12"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLkONeqhEe2TztGgS5kHFw" points="[0, 0, 118, 101]$[0, -124, 118, -23]$[-45, -124, 73, -23]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLlcUOqhEe2TztGgS5kHFw" id="(0.5111111111111111,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLlcUeqhEe2TztGgS5kHFw" id="(0.5067567567567568,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLlcUOqhEe2TztGgS5kHFw" id="(0.7,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLlcUeqhEe2TztGgS5kHFw" id="(0.6763003191310677,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_oLmqdOqhEe2TztGgS5kHFw" type="4001" element="_oJ72gOqhEe2TztGgS5kHFw" source="_oKt5oOqhEe2TztGgS5kHFw" target="_oKvHwOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_oLnRgOqhEe2TztGgS5kHFw" type="6001">
@@ -242,8 +242,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_oLmqdeqhEe2TztGgS5kHFw" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_oLmqduqhEe2TztGgS5kHFw" fontName="Segoe UI"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oLmqd-qhEe2TztGgS5kHFw" points="[-20, 0, 120, 106]$[-20, -35, 120, 71]$[-100, -35, 40, 71]$[-100, -106, 40, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLn4kOqhEe2TztGgS5kHFw" id="(0.5172413793103449,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLn4keqhEe2TztGgS5kHFw" id="(0.5026178010471204,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLn4kOqhEe2TztGgS5kHFw" id="(0.29411764705882354,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oLn4keqhEe2TztGgS5kHFw" id="(0.6728300398720589,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_9q5ewOq7Ee2zH6BzxD2E9g" type="4001" element="_9q0mR-q7Ee2zH6BzxD2E9g" source="_oKcM0OqhEe2TztGgS5kHFw" target="_oKugsOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_9q5exOq7Ee2zH6BzxD2E9g" type="6001">
@@ -258,8 +258,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_9q5eweq7Ee2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_9q5ewuq7Ee2zH6BzxD2E9g" fontName="Segoe UI"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9q5ew-q7Ee2zH6BzxD2E9g" points="[-45, 0, 73, 145]$[-119, 0, -1, 145]$[-119, -123, -1, 22]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q6F0Oq7Ee2zH6BzxD2E9g" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q6F0eq7Ee2zH6BzxD2E9g" id="(0.5,0.5)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q6F0Oq7Ee2zH6BzxD2E9g" id="(0.6931818181818181,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q6F0eq7Ee2zH6BzxD2E9g" id="(0.6718660769273838,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_9q6F0uq7Ee2zH6BzxD2E9g" type="4001" element="_9q1NUeq7Ee2zH6BzxD2E9g" source="_oLhK4eqhEe2TztGgS5kHFw" target="_oLPeEOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_9q6F1uq7Ee2zH6BzxD2E9g" type="6001">
@@ -279,51 +279,51 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_9q6s4uq7Ee2zH6BzxD2E9g" type="4001" element="_9q10YOq7Ee2zH6BzxD2E9g" source="_oLkOMuqhEe2TztGgS5kHFw" target="_oLPeEOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_9q6s5uq7Ee2zH6BzxD2E9g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s5-q7Ee2zH6BzxD2E9g" x="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s5-q7Ee2zH6BzxD2E9g" x="22"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_9q6s6Oq7Ee2zH6BzxD2E9g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s6eq7Ee2zH6BzxD2E9g" x="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s6eq7Ee2zH6BzxD2E9g" x="-13"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_9q6s6uq7Ee2zH6BzxD2E9g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s6-q7Ee2zH6BzxD2E9g" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9q6s6-q7Ee2zH6BzxD2E9g" x="3" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_9q6s4-q7Ee2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_9q6s5Oq7Ee2zH6BzxD2E9g" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9q6s5eq7Ee2zH6BzxD2E9g" points="[22, -49, 121, 74]$[52, -49, 151, 74]$[52, -135, 151, -12]$[-55, -135, 44, -12]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9q6s5eq7Ee2zH6BzxD2E9g" points="[22, -30, 121, 105]$[52, -30, 151, 105]$[52, -144, 151, -9]$[-55, -144, 44, -9]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q7T8Oq7Ee2zH6BzxD2E9g" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9q7T8eq7Ee2zH6BzxD2E9g" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_7iMKAO0lEe2oz--8ilL13Q" type="4001" element="_7g5JgO0lEe2oz--8ilL13Q" source="_oKt5oOqhEe2TztGgS5kHFw" target="_7howYO0lEe2oz--8ilL13Q">
           <children xmi:type="notation:Node" xmi:id="_7iNYIO0lEe2oz--8ilL13Q" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iNYIe0lEe2oz--8ilL13Q" x="-10" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iNYIe0lEe2oz--8ilL13Q" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7iQbcO0lEe2oz--8ilL13Q" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iQbce0lEe2oz--8ilL13Q" x="-17" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iQbce0lEe2oz--8ilL13Q" x="-11" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7iRCgO0lEe2oz--8ilL13Q" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iRCge0lEe2oz--8ilL13Q" x="-3" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iRCge0lEe2oz--8ilL13Q" x="-9" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_7iMKAe0lEe2oz--8ilL13Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_7iMKAu0lEe2oz--8ilL13Q" fontName="Segoe UI" fontHeight="12"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7iMKA-0lEe2oz--8ilL13Q" points="[-30, 21, 233, -23]$[-238, 21, 25, -23]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ilLkO0lEe2oz--8ilL13Q" id="(0.5172413793103449,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ilLke0lEe2oz--8ilL13Q" id="(0.5192307692307693,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7iMKA-0lEe2oz--8ilL13Q" points="[-30, 27, 226, -28]$[-215, 27, 41, -28]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ilLkO0lEe2oz--8ilL13Q" id="(0.29411764705882354,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ilLke0lEe2oz--8ilL13Q" id="(0.46384615384615385,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_7ilyoO0lEe2oz--8ilL13Q" type="4001" element="_7g6-sO0lEe2oz--8ilL13Q" source="_7howYO0lEe2oz--8ilL13Q" target="_oKugsOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_7ilypO0lEe2oz--8ilL13Q" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ilype0lEe2oz--8ilL13Q" x="-93" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ilype0lEe2oz--8ilL13Q" x="-126" y="17"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7ilypu0lEe2oz--8ilL13Q" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ilyp-0lEe2oz--8ilL13Q" x="-51" y="31"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ilyp-0lEe2oz--8ilL13Q" x="-25" y="67"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7imZsO0lEe2oz--8ilL13Q" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7imZse0lEe2oz--8ilL13Q" x="-43" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7imZse0lEe2oz--8ilL13Q" x="-33" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_7ilyoe0lEe2oz--8ilL13Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_7ilyou0lEe2oz--8ilL13Q" fontName="Segoe UI" fontHeight="12"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ilyo-0lEe2oz--8ilL13Q" points="[-27, 15, -283, 266]$[-72, 15, -328, 266]$[-72, -265, -328, -14]$[181, -265, -75, -14]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7inAwO0lEe2oz--8ilL13Q" id="(0.5192307692307693,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7inAwe0lEe2oz--8ilL13Q" id="(0.5067567567567568,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7ilyo-0lEe2oz--8ilL13Q" points="[-34, 18, -281, 258]$[-114, 18, -361, 258]$[-114, -258, -361, -18]$[96, -258, -151, -18]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7inAwO0lEe2oz--8ilL13Q" id="(0.46384615384615385,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7inAwe0lEe2oz--8ilL13Q" id="(0.6763003191310677,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_7inAwu0lEe2oz--8ilL13Q" type="4001" element="_7haG5-0lEe2oz--8ilL13Q" source="_7howYO0lEe2oz--8ilL13Q" target="_oKvHwOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_7inAxu0lEe2oz--8ilL13Q" type="6001">
@@ -338,22 +338,22 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_7inAw-0lEe2oz--8ilL13Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_7inAxO0lEe2oz--8ilL13Q" fontName="Segoe UI"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7inAxe0lEe2oz--8ilL13Q" points="[3, 0, -120, 106]$[3, -30, -120, 76]$[73, -30, -50, 76]$[73, -106, -50, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7io18O0lEe2oz--8ilL13Q" id="(0.5192307692307693,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7io18e0lEe2oz--8ilL13Q" id="(0.5026178010471204,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7io18O0lEe2oz--8ilL13Q" id="(0.46384615384615385,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7io18e0lEe2oz--8ilL13Q" id="(0.6728300398720589,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_7io18u0lEe2oz--8ilL13Q" type="4001" element="_7hat8u0lEe2oz--8ilL13Q" source="_7iMKAO0lEe2oz--8ilL13Q" target="_oLPeEOqhEe2TztGgS5kHFw">
           <children xmi:type="notation:Node" xmi:id="_7ipdAO0lEe2oz--8ilL13Q" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ipdAe0lEe2oz--8ilL13Q" x="-230" y="270"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ipdAe0lEe2oz--8ilL13Q" x="-230" y="338"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7ipdAu0lEe2oz--8ilL13Q" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ipdA-0lEe2oz--8ilL13Q" x="-133" y="28"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7ipdA-0lEe2oz--8ilL13Q" x="-154" y="28"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_7iqEEO0lEe2oz--8ilL13Q" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iqEEe0lEe2oz--8ilL13Q" x="5" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iqEEe0lEe2oz--8ilL13Q" x="25" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_7io18-0lEe2oz--8ilL13Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_7io19O0lEe2oz--8ilL13Q" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7io19e0lEe2oz--8ilL13Q" points="[-7, 0, -131, 366]$[-7, 47, -131, 413]$[-287, 47, -411, 413]$[-287, -398, -411, -32]$[79, -398, -45, -32]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7io19e0lEe2oz--8ilL13Q" points="[-11, 0, -121, 371]$[-11, 46, -121, 417]$[-366, 46, -476, 417]$[-366, -402, -476, -31]$[65, -402, -45, -31]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ir5QO0lEe2oz--8ilL13Q" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7ir5Qe0lEe2oz--8ilL13Q" id="(0.5,0.5)"/>
         </edges>
@@ -1189,7 +1189,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_CkhjVurAEe2zH6BzxD2E9g"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_CkhjUerAEe2zH6BzxD2E9g" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkhjUurAEe2zH6BzxD2E9g" x="53"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkhjUurAEe2zH6BzxD2E9g" x="66"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_CkiKYOrAEe2zH6BzxD2E9g" type="2003" element="_CkLlEerAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_CkiKY-rAEe2zH6BzxD2E9g" type="5007"/>
@@ -1202,7 +1202,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_CkiKZurAEe2zH6BzxD2E9g"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_CkiKYerAEe2zH6BzxD2E9g" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkiKYurAEe2zH6BzxD2E9g" x="10" y="225"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkiKYurAEe2zH6BzxD2E9g" x="15" y="228"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_CkiKZ-rAEe2zH6BzxD2E9g" type="2003" element="_CkOBUerAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_CkiKaurAEe2zH6BzxD2E9g" type="5007"/>
@@ -1220,7 +1220,7 @@
         <styles xmi:type="notation:DiagramStyle" xmi:id="_CkIhwurAEe2zH6BzxD2E9g"/>
         <edges xmi:type="notation:Edge" xmi:id="_CkixeerAEe2zH6BzxD2E9g" type="4001" element="_CkQdkOrAEe2zH6BzxD2E9g" source="_CkhjUOrAEe2zH6BzxD2E9g" target="_CkhjUOrAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_CkjYgOrAEe2zH6BzxD2E9g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkjYgerAEe2zH6BzxD2E9g" x="-16" y="-21"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkjYgerAEe2zH6BzxD2E9g" x="-98" y="17"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_CkjYgurAEe2zH6BzxD2E9g" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkjYg-rAEe2zH6BzxD2E9g" x="3" y="10"/>
@@ -1236,33 +1236,33 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Ckj_kurAEe2zH6BzxD2E9g" type="4001" element="_CkfuIOrAEe2zH6BzxD2E9g" source="_CkiKZ-rAEe2zH6BzxD2E9g" target="_CkhjUOrAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_Ckj_lurAEe2zH6BzxD2E9g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_l-rAEe2zH6BzxD2E9g" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_l-rAEe2zH6BzxD2E9g" x="-10" y="-5"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Ckj_mOrAEe2zH6BzxD2E9g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_merAEe2zH6BzxD2E9g" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_merAEe2zH6BzxD2E9g" x="2" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Ckj_murAEe2zH6BzxD2E9g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_m-rAEe2zH6BzxD2E9g" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckj_m-rAEe2zH6BzxD2E9g" x="-1" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ckj_k-rAEe2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Ckj_lOrAEe2zH6BzxD2E9g" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ckj_lerAEe2zH6BzxD2E9g" points="[0, -28, 0, 83]$[0, -88, 0, 23]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ckj_lerAEe2zH6BzxD2E9g" points="[-9, -38, 3, 78]$[-9, -88, 3, 28]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CkkmoOrAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CkkmoerAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_CkkmourAEe2zH6BzxD2E9g" type="4001" element="_CkgVMerAEe2zH6BzxD2E9g" source="_CkiKYOrAEe2zH6BzxD2E9g" target="_CkiKZ-rAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_CkkmpurAEe2zH6BzxD2E9g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckkmp-rAEe2zH6BzxD2E9g" x="11" y="-6"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckkmp-rAEe2zH6BzxD2E9g" x="8" y="8"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_CkkmqOrAEe2zH6BzxD2E9g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkkmqerAEe2zH6BzxD2E9g" x="2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkkmqerAEe2zH6BzxD2E9g" x="6" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_CkkmqurAEe2zH6BzxD2E9g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckkmq-rAEe2zH6BzxD2E9g" x="-2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ckkmq-rAEe2zH6BzxD2E9g" x="-3" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ckkmo-rAEe2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_CkkmpOrAEe2zH6BzxD2E9g" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CkkmperAEe2zH6BzxD2E9g" points="[4, -27, -6, 93]$[4, -92, -6, 28]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CkkmperAEe2zH6BzxD2E9g" points="[4, -38, -3, 85]$[4, -84, -3, 39]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CklNsOrAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CklNserAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
         </edges>
@@ -1274,6 +1274,9 @@
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_CkK-AOrAEe2zH6BzxD2E9g" name="Resource" tooltipText="Resource" outgoingEdges="_CkQdkOrAEe2zH6BzxD2E9g" incomingEdges="_CkQdkOrAEe2zH6BzxD2E9g _CkfuIOrAEe2zH6BzxD2E9g">
       <target xmi:type="oml:Aspect" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/resource.oml#Resource"/>
       <semanticElements xmi:type="oml:Aspect" href="src/oml/msdl.uantwerpen.be/vafl/vocabulary/resource.oml#Resource"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
       <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_CkK-AerAEe2zH6BzxD2E9g" labelSize="12" iconPath="/io.opencaesar.rosetta.sirius.viewpoint/icons/a-icon.png" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" foregroundColor="255,255,255">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']/@ownedRepresentations[name='Vocabulary%20Diagram']/@defaultLayer/@containerMappings[name='Aspect']/@style"/>
       </ownedStyle>
@@ -1365,7 +1368,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ZVYsBurAEe2zH6BzxD2E9g"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ZVYsAerAEe2zH6BzxD2E9g" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVYsAurAEe2zH6BzxD2E9g" x="34" y="270"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVYsAurAEe2zH6BzxD2E9g" x="9" y="270"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_ZVYsB-rAEe2zH6BzxD2E9g" type="2003" element="_ZVCGsOrAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_ZVYsCurAEe2zH6BzxD2E9g" type="5007"/>
@@ -1392,7 +1395,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ZVZ6KerAEe2zH6BzxD2E9g"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ZVZ6JOrAEe2zH6BzxD2E9g" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVZ6JerAEe2zH6BzxD2E9g" x="288" y="390"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVZ6JerAEe2zH6BzxD2E9g" x="307" y="390"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_ZVZ6KurAEe2zH6BzxD2E9g" type="2003" element="_ZVDU0urAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_ZVZ6LerAEe2zH6BzxD2E9g" type="5007"/>
@@ -1401,7 +1404,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ZVahMurAEe2zH6BzxD2E9g"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ZVZ6K-rAEe2zH6BzxD2E9g" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVZ6LOrAEe2zH6BzxD2E9g" x="166" y="25"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVZ6LOrAEe2zH6BzxD2E9g" x="172" y="21" width="143"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_potRcO2dEe22yc8VZmglXA" type="2003" element="_pnYbwO2dEe22yc8VZmglXA">
           <children xmi:type="notation:Node" xmi:id="_po10UO2dEe22yc8VZmglXA" type="5007"/>
@@ -1428,7 +1431,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_po9wI-2dEe22yc8VZmglXA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_po9JFe2dEe22yc8VZmglXA" fontName="Segoe UI" fontHeight="12"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_po9JFu2dEe22yc8VZmglXA" x="285" y="270"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_po9JFu2dEe22yc8VZmglXA" x="301" y="270"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_po-XMO2dEe22yc8VZmglXA" type="2003" element="_pnlQEe2dEe22yc8VZmglXA">
           <children xmi:type="notation:Node" xmi:id="_po-XM-2dEe22yc8VZmglXA" type="5007"/>
@@ -1448,43 +1451,43 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVeyq-rAEe2zH6BzxD2E9g" x="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ZVeyrOrAEe2zH6BzxD2E9g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVeyrerAEe2zH6BzxD2E9g" x="3"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVeyrerAEe2zH6BzxD2E9g" x="-1"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_ZVeyperAEe2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_ZVeypurAEe2zH6BzxD2E9g" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZVeyp-rAEe2zH6BzxD2E9g" points="[-1, -22, 3, 53]$[-1, -53, 3, 22]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZVeyp-rAEe2zH6BzxD2E9g" points="[-5, -27, 3, 52]$[-5, -51, 3, 28]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZVfZsOrAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZVfZserAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZVfZserAEe2zH6BzxD2E9g" id="(0.4787234042553192,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_ZVfZsurAEe2zH6BzxD2E9g" type="4001" element="_ZVTzgOrAEe2zH6BzxD2E9g" source="_ZVYsB-rAEe2zH6BzxD2E9g" target="_ZVZTEOrAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_ZVgAwOrAEe2zH6BzxD2E9g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAwerAEe2zH6BzxD2E9g" x="12"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAwerAEe2zH6BzxD2E9g" x="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ZVgAwurAEe2zH6BzxD2E9g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAw-rAEe2zH6BzxD2E9g" x="-8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAw-rAEe2zH6BzxD2E9g" x="-4"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ZVgAxOrAEe2zH6BzxD2E9g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAxerAEe2zH6BzxD2E9g" x="-23"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZVgAxerAEe2zH6BzxD2E9g" x="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_ZVfZs-rAEe2zH6BzxD2E9g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_ZVfZtOrAEe2zH6BzxD2E9g" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZVfZterAEe2zH6BzxD2E9g" points="[47, -30, 1, 58]$[47, -66, 1, 22]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZVfZterAEe2zH6BzxD2E9g" points="[64, -37, -9, 53]$[64, -62, -9, 28]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZVgn0OrAEe2zH6BzxD2E9g" id="(0.05825242718446602,0.6818181818181818)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZVgn0erAEe2zH6BzxD2E9g" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_ppSgQO2dEe22yc8VZmglXA" type="4001" element="_poNiM-2dEe22yc8VZmglXA" source="_ZVYsAOrAEe2zH6BzxD2E9g" target="_ZVYsB-rAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_ppTHUO2dEe22yc8VZmglXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppTHUe2dEe22yc8VZmglXA" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppTHUe2dEe22yc8VZmglXA" x="27" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ppVjkO2dEe22yc8VZmglXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppVjke2dEe22yc8VZmglXA" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppVjke2dEe22yc8VZmglXA" x="61" y="6"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ppWKoO2dEe22yc8VZmglXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppWKoe2dEe22yc8VZmglXA" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppWKoe2dEe22yc8VZmglXA" x="14" y="-4"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_ppSgQe2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_ppSgQu2dEe22yc8VZmglXA" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ppSgQ-2dEe22yc8VZmglXA" points="[0, 0, -132, 90]$[132, -90, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ppSgQ-2dEe22yc8VZmglXA" points="[10, -27, -141, 63]$[10, -45, -141, 45]$[112, -45, -39, 45]$[112, -62, -39, 28]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ppwaUO2dEe22yc8VZmglXA" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ppwaUe2dEe22yc8VZmglXA" id="(0.5,0.5)"/>
         </edges>
@@ -1506,17 +1509,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_ppyPgu2dEe22yc8VZmglXA" type="4001" element="_poPXYO2dEe22yc8VZmglXA" source="_po9JFO2dEe22yc8VZmglXA" target="_ZVYsB-rAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_ppyPhu2dEe22yc8VZmglXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppyPh-2dEe22yc8VZmglXA" x="16" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppyPh-2dEe22yc8VZmglXA" x="24" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ppy2kO2dEe22yc8VZmglXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppy2ke2dEe22yc8VZmglXA" x="-7" y="-2"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppy2ke2dEe22yc8VZmglXA" x="-9" y="-2"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ppy2ku2dEe22yc8VZmglXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppy2k-2dEe22yc8VZmglXA" x="-13"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ppy2k-2dEe22yc8VZmglXA" x="-11"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_ppyPg-2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_ppyPhO2dEe22yc8VZmglXA" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ppyPhe2dEe22yc8VZmglXA" points="[-2, 0, 103, 46]$[-2, -20, 103, 26]$[-72, -20, 33, 26]$[-72, -46, 33, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ppyPhe2dEe22yc8VZmglXA" points="[1, 0, 114, 35]$[1, -13, 114, 22]$[-83, -13, 30, 22]$[-83, -35, 30, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp0rwO2dEe22yc8VZmglXA" id="(0.5135135135135135,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp0rwe2dEe22yc8VZmglXA" id="(0.5048543689320388,1.0)"/>
         </edges>
@@ -1548,7 +1551,7 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_pp154-2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_pp155O2dEe22yc8VZmglXA" fontName="Segoe UI"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp155e2dEe22yc8VZmglXA" points="[0, 0, 0, 76]$[0, -120, 0, -44]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp155e2dEe22yc8VZmglXA" points="[-1, 0, -1, 65]$[-1, -65, -1, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp3IAO2dEe22yc8VZmglXA" id="(0.5147058823529411,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp3IAe2dEe22yc8VZmglXA" id="(0.5135135135135135,1.0)"/>
         </edges>
@@ -1570,49 +1573,49 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_pp49Mu2dEe22yc8VZmglXA" type="4001" element="_poUP4O2dEe22yc8VZmglXA" source="_potRcO2dEe22yc8VZmglXA" target="_ZVYsAOrAEe2zH6BzxD2E9g">
           <children xmi:type="notation:Node" xmi:id="_pp49Nu2dEe22yc8VZmglXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49N-2dEe22yc8VZmglXA" x="114" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49N-2dEe22yc8VZmglXA" x="101" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp49OO2dEe22yc8VZmglXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49Oe2dEe22yc8VZmglXA" x="139" y="427"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49Oe2dEe22yc8VZmglXA" x="135" y="427"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp49Ou2dEe22yc8VZmglXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49O-2dEe22yc8VZmglXA" x="24"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp49O-2dEe22yc8VZmglXA" x="28"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_pp49M-2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_pp49NO2dEe22yc8VZmglXA" fontName="Segoe UI" fontHeight="12"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp49Ne2dEe22yc8VZmglXA" points="[43, 23, 539, -21]$[80, 23, 576, -21]$[80, 280, 576, 236]$[-496, 280, 0, 236]$[-496, 44, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp49Ne2dEe22yc8VZmglXA" points="[61, 25, 577, -30]$[81, 25, 597, -30]$[81, 288, 597, 233]$[-517, 288, -1, 233]$[-517, 55, -1, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp6LUO2dEe22yc8VZmglXA" id="(0.5113636363636364,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp6LUe2dEe22yc8VZmglXA" id="(0.5045045045045045,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_pp6LUu2dEe22yc8VZmglXA" type="4001" element="_poVeAO2dEe22yc8VZmglXA" source="_po9JFO2dEe22yc8VZmglXA" target="_potRcO2dEe22yc8VZmglXA">
           <children xmi:type="notation:Node" xmi:id="_pp6yYO2dEe22yc8VZmglXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yYe2dEe22yc8VZmglXA" x="-3" y="-13" width="129" height="21"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yYe2dEe22yc8VZmglXA" x="-11" y="-13" width="129" height="21"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp6yYu2dEe22yc8VZmglXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yY-2dEe22yc8VZmglXA" x="-14" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yY-2dEe22yc8VZmglXA" x="-13" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp6yZO2dEe22yc8VZmglXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yZe2dEe22yc8VZmglXA" x="-72" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp6yZe2dEe22yc8VZmglXA" x="-74" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_pp6LU-2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_pp6LVO2dEe22yc8VZmglXA" fontName="Segoe UI" fontHeight="12"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp6LVe2dEe22yc8VZmglXA" points="[37, 1, -226, 1]$[219, 1, -44, 1]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp6LVe2dEe22yc8VZmglXA" points="[52, 1, -199, 1]$[189, 1, -62, 1]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp7ZcO2dEe22yc8VZmglXA" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp7Zce2dEe22yc8VZmglXA" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_pp7Zcu2dEe22yc8VZmglXA" type="4001" element="_poWFEO2dEe22yc8VZmglXA" source="_ZVZ6I-rAEe2zH6BzxD2E9g" target="_po768O2dEe22yc8VZmglXA">
           <children xmi:type="notation:Node" xmi:id="_pp8AgO2dEe22yc8VZmglXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Age2dEe22yc8VZmglXA" x="-3" y="-13" width="134" height="21"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Age2dEe22yc8VZmglXA" y="-10" width="134" height="21"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp8Agu2dEe22yc8VZmglXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Ag-2dEe22yc8VZmglXA" x="30" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Ag-2dEe22yc8VZmglXA" x="19" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_pp8AhO2dEe22yc8VZmglXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Ahe2dEe22yc8VZmglXA" x="-77" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pp8Ahe2dEe22yc8VZmglXA" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_pp7Zc-2dEe22yc8VZmglXA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_pp7ZdO2dEe22yc8VZmglXA" fontName="Segoe UI" fontHeight="12"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp7Zde2dEe22yc8VZmglXA" points="[33, 23, -229, -21]$[213, 23, -49, -21]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pp7Zde2dEe22yc8VZmglXA" points="[45, 41, -206, -14]$[183, 41, -68, -14]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp9OoO2dEe22yc8VZmglXA" id="(0.5147058823529411,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pp9Ooe2dEe22yc8VZmglXA" id="(0.5051546391752577,1.0)"/>
         </edges>

be.uantwerpen.msdl.vafl.ontology/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'vafl'

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/system.oml

@@ -10,8 +10,6 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system {
 	extends <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requirement
 	extends <http://msdl.uantwerpen.be/vafl/vocabulary/frame#> as frame
     extends <http://purl.org/dc/elements/1.1/> as dc
-//    extends <http://www.w3.org/ns/ssn#> as ssn
-//    extends <http://www.w3.org/ns/sosa#> as sosa
     
     // Systems