From 71fc54a96bf33dde7895ade0bd280887553125b0 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Thu, 29 Feb 2024 02:24:06 +0100
Subject: refactor(language): assignment and cast expression

Also reorganizes operator names for easier future extension.
---
 subprojects/language-model/problem.aird            | 431 +++++++++++++++------
 .../src/main/resources/model/problem.ecore         |  15 +-
 .../src/main/resources/model/problem.genmodel      |  15 +-
 3 files changed, 329 insertions(+), 132 deletions(-)

(limited to 'subprojects/language-model')

diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird
index 37516af1..c253facb 100644
--- a/subprojects/language-model/problem.aird
+++ b/subprojects/language-model/problem.aird
@@ -11,7 +11,7 @@
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_z1bOYF3lEe2LuOZzJ_LhLg" name="expressions" repPath="#_z1YyIF3lEe2LuOZzJ_LhLg" changeId="1706657349781">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_z1bOYF3lEe2LuOZzJ_LhLg" name="expressions" repPath="#_z1YyIF3lEe2LuOZzJ_LhLg" changeId="1709214207759">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -2699,7 +2699,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_8bUtNl3lEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_8bUtMV3lEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8bUtMl3lEe2LuOZzJ_LhLg" x="548" y="168"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8bUtMl3lEe2LuOZzJ_LhLg" x="540" y="168"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_9ZUmgF3lEe2LuOZzJ_LhLg" type="2003" element="_9Ys7cF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_9ZVNkF3lEe2LuOZzJ_LhLg" type="5007"/>
@@ -2708,7 +2708,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_9ZVNk13lEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_9ZUmgV3lEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ZUmgl3lEe2LuOZzJ_LhLg" x="360" y="168" width="135" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ZUmgl3lEe2LuOZzJ_LhLg" x="352" y="168" width="135" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_bTgeJl3tEe2LuOZzJ_LhLg" type="2003" element="_bTLuAF3tEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_bTgeKV3tEe2LuOZzJ_LhLg" type="5007"/>
@@ -2717,7 +2717,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_bTgeLF3tEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_bTgeJ13tEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTgeKF3tEe2LuOZzJ_LhLg" x="1956" y="168" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTgeKF3tEe2LuOZzJ_LhLg" x="2127" y="168" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_meWJcF3uEe2LuOZzJ_LhLg" type="2003" element="_mdrbEF3uEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_meWwgF3uEe2LuOZzJ_LhLg" type="5007"/>
@@ -2768,19 +2768,11 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_n5Y5MV3wEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_n5Y5Ml3wEe2LuOZzJ_LhLg"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_SoEXkGgrEe24RpwpWgpkFQ" type="3010" element="_Sn1HAGgrEe24RpwpWgpkFQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_SoEXkWgrEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_SoEXkmgrEe24RpwpWgpkFQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_TrvbEGgrEe24RpwpWgpkFQ" type="3010" element="_TrhYoGgrEe24RpwpWgpkFQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_TrvbEWgrEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_TrvbEmgrEe24RpwpWgpkFQ"/>
-            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_ccRVpV3wEe2LuOZzJ_LhLg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ccRVpl3wEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ccRVoV3wEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccRVol3wEe2LuOZzJ_LhLg" x="1788" y="450" width="120" height="153"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccRVol3wEe2LuOZzJ_LhLg" x="1788" y="450" width="120" height="117"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_R7b9sF38Ee2LuOZzJ_LhLg" type="2003" element="_R7XFMF38Ee2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_R7b9s138Ee2LuOZzJ_LhLg" type="5007"/>
@@ -2798,7 +2790,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_WGzK5l38Ee2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_WGzK4V38Ee2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzK4l38Ee2LuOZzJ_LhLg" x="548" y="452"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzK4l38Ee2LuOZzJ_LhLg" x="540" y="452"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_fx_SQF4GEe2LuOZzJ_LhLg" type="2003" element="_fxsXUF4GEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_fx_SQ14GEe2LuOZzJ_LhLg" type="5007"/>
@@ -2858,7 +2850,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_87Ju5l4IEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_87Ju4V4IEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87Ju4l4IEe2LuOZzJ_LhLg" x="2628" y="168"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87Ju4l4IEe2LuOZzJ_LhLg" x="2880" y="168"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_JYXdgF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIwF4JEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_JYXdg14JEe2LuOZzJ_LhLg" type="5007"/>
@@ -2871,7 +2863,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_JYXdhl4JEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JYXdgV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYXdgl4JEe2LuOZzJ_LhLg" x="2292" y="312"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYXdgl4JEe2LuOZzJ_LhLg" x="2628" y="312"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_JYYEkF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIw14JEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_JYYEk14JEe2LuOZzJ_LhLg" type="5007"/>
@@ -2884,7 +2876,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEll4JEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEkV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEkl4JEe2LuOZzJ_LhLg" x="2441" y="312"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEkl4JEe2LuOZzJ_LhLg" x="2777" y="312"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_JYYEl14JEe2LuOZzJ_LhLg" type="2003" element="_JYQv0l4JEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_JYYEml4JEe2LuOZzJ_LhLg" type="5007"/>
@@ -2897,7 +2889,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEnV4JEe2LuOZzJ_LhLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEmF4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEmV4JEe2LuOZzJ_LhLg" x="2784" y="312"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEmV4JEe2LuOZzJ_LhLg" x="2964" y="312"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_9AqPEF4KEe2m7IaHDkh2Xg" type="2003" element="_9AeB0F4KEe2m7IaHDkh2Xg">
           <children xmi:type="notation:Node" xmi:id="_9ArdMF4KEe2m7IaHDkh2Xg" type="5007"/>
@@ -2915,7 +2907,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_4qq0Vl4MEe2m7IaHDkh2Xg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_4qq0UV4MEe2m7IaHDkh2Xg" fontName="Noto Sans" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4qq0Ul4MEe2m7IaHDkh2Xg" x="548" y="312"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4qq0Ul4MEe2m7IaHDkh2Xg" x="540" y="312"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_GNwrgGTUEe2qdtyPWAtoxA" type="2003" element="_GNovsGTUEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_GNwrg2TUEe2qdtyPWAtoxA" type="5007"/>
@@ -2928,7 +2920,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_GNwrhmTUEe2qdtyPWAtoxA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_GNwrgWTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNwrgmTUEe2qdtyPWAtoxA" x="1956" y="312" width="123"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNwrgmTUEe2qdtyPWAtoxA" x="2124" y="312" width="123"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_M-upAGTUEe2qdtyPWAtoxA" type="2003" element="_M-ZR0GTUEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_M-upA2TUEe2qdtyPWAtoxA" type="5007"/>
@@ -2994,7 +2986,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_QkXS9mTUEe2qdtyPWAtoxA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_QkXS8WTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkXS8mTUEe2qdtyPWAtoxA" x="1958" y="448" height="215"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkXS8mTUEe2qdtyPWAtoxA" x="2126" y="448" height="215"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_36XqIGTuEe2qdtyPWAtoxA" type="2003" element="_36CS8GTuEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_36YRMGTuEe2qdtyPWAtoxA" type="5007"/>
@@ -3025,7 +3017,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_LC6oVmTvEe2qdtyPWAtoxA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_LC6oUWTvEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC6oUmTvEe2qdtyPWAtoxA" x="168" y="168" width="124"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC6oUmTvEe2qdtyPWAtoxA" x="180" y="168" width="124"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_Z0bU0GTvEe2qdtyPWAtoxA" type="2003" element="_Z0MrUGTvEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_Z0bU02TvEe2qdtyPWAtoxA" type="5007"/>
@@ -3034,7 +3026,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Z0bU1mTvEe2qdtyPWAtoxA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Z0bU0WTvEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0bU0mTvEe2qdtyPWAtoxA" x="170" y="312" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0bU0mTvEe2qdtyPWAtoxA" x="182" y="312" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_DNRsUGTwEe2qdtyPWAtoxA" type="2003" element="_DM_YcGTwEe2qdtyPWAtoxA">
           <children xmi:type="notation:Node" xmi:id="_DNRsU2TwEe2qdtyPWAtoxA" type="5007"/>
@@ -3081,16 +3073,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_3ahdpmgpEe24RpwpWgpkFQ"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_3ahdoWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ahdomgpEe24RpwpWgpkFQ" x="2124" y="312" width="120" height="100"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_zs6moGgtEe24RpwpWgpkFQ" type="2003" element="_zsr9IGgtEe24RpwpWgpkFQ">
-          <children xmi:type="notation:Node" xmi:id="_zs7NsGgtEe24RpwpWgpkFQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_zs7NsWgtEe24RpwpWgpkFQ" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_zs7NsmgtEe24RpwpWgpkFQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_zs7Ns2gtEe24RpwpWgpkFQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_zs6moWgtEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zs6momgtEe24RpwpWgpkFQ" x="2628" y="312" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ahdomgpEe24RpwpWgpkFQ" x="2292" y="312" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_ZjfaEGkGEe24rIYSlCjKHA" type="2003" element="_Zi8AcGkGEe24rIYSlCjKHA">
           <children xmi:type="notation:Node" xmi:id="_ZjkSkGkGEe24rIYSlCjKHA" type="5007"/>
@@ -3103,7 +3086,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ZjkSk2kGEe24rIYSlCjKHA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ZjfaEWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZjfaEmkGEe24rIYSlCjKHA" x="2952" y="312" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZjfaEmkGEe24rIYSlCjKHA" x="3132" y="312" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_fdU7QGkGEe24rIYSlCjKHA" type="2003" element="_fdLKQGkGEe24rIYSlCjKHA">
           <children xmi:type="notation:Node" xmi:id="_fdViUGkGEe24rIYSlCjKHA" type="5007"/>
@@ -3128,7 +3111,55 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_fdViU2kGEe24rIYSlCjKHA"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_fdU7QWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fdU7QmkGEe24rIYSlCjKHA" x="2952" y="446"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fdU7QmkGEe24rIYSlCjKHA" x="3132" y="449"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_IYGPgNZUEe69IbObpvsypA" type="2003" element="_IXrYwNZUEe69IbObpvsypA">
+          <children xmi:type="notation:Node" xmi:id="_IYGPg9ZUEe69IbObpvsypA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IYGPhNZUEe69IbObpvsypA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_W0tqENZUEe69IbObpvsypA" type="3010" element="_W0CUoNZUEe69IbObpvsypA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_W0tqEdZUEe69IbObpvsypA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_W0tqEtZUEe69IbObpvsypA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IYGPhdZUEe69IbObpvsypA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IYGPhtZUEe69IbObpvsypA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IYGPgdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IYGPgtZUEe69IbObpvsypA" x="1956" y="312" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Nm2zYNZUEe69IbObpvsypA" type="2003" element="_Nmg1INZUEe69IbObpvsypA">
+          <children xmi:type="notation:Node" xmi:id="_Nm2zY9ZUEe69IbObpvsypA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Nm3acNZUEe69IbObpvsypA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_TQ7aQNZUEe69IbObpvsypA" type="3010" element="_TQOPoNZUEe69IbObpvsypA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_TQ7aQdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TQ7aQtZUEe69IbObpvsypA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UGDrcNZUEe69IbObpvsypA" type="3010" element="_UFttMNZUEe69IbObpvsypA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_UGDrcdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UGDrctZUEe69IbObpvsypA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Nm3acdZUEe69IbObpvsypA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Nm3actZUEe69IbObpvsypA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Nm2zYdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nm2zYtZUEe69IbObpvsypA" x="1956" y="449" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_FTa2MNZXEe69IbObpvsypA" type="2003" element="_FTH7QNZXEe69IbObpvsypA">
+          <children xmi:type="notation:Node" xmi:id="_FTbdQNZXEe69IbObpvsypA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_FTbdQdZXEe69IbObpvsypA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_FTbdQtZXEe69IbObpvsypA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_FTbdQ9ZXEe69IbObpvsypA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_FTa2MdZXEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FTa2MtZXEe69IbObpvsypA" x="12" y="168" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_c0t34NcIEe6pjNxdSs0E0Q" type="2003" element="_c0BUUNcIEe6pjNxdSs0E0Q">
+          <children xmi:type="notation:Node" xmi:id="_c0ywYNcIEe6pjNxdSs0E0Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_c0zXcNcIEe6pjNxdSs0E0Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_c0zXcdcIEe6pjNxdSs0E0Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_c0zXctcIEe6pjNxdSs0E0Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_c0ue8NcIEe6pjNxdSs0E0Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c0ue8dcIEe6pjNxdSs0E0Q" x="2460" y="312" width="120" height="100"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_z1ff0l3lEe2LuOZzJ_LhLg"/>
         <edges xmi:type="notation:Edge" xmi:id="_C-b04F3mEe2LuOZzJ_LhLg" type="4001" element="_C9_I8F3mEe2LuOZzJ_LhLg" source="_9ZUmgF3lEe2LuOZzJ_LhLg" target="_8bUtMF3lEe2LuOZzJ_LhLg">
@@ -3165,33 +3196,33 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_oAifgF3vEe2LuOZzJ_LhLg" type="4001" element="_oARZ0l3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_oAifhF3vEe2LuOZzJ_LhLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifhV3vEe2LuOZzJ_LhLg" x="-281" y="-38"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifhV3vEe2LuOZzJ_LhLg" x="-367" y="-38"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_oAifhl3vEe2LuOZzJ_LhLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifh13vEe2LuOZzJ_LhLg" x="-26" y="-68"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifh13vEe2LuOZzJ_LhLg" x="-52" y="-68"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_oAifiF3vEe2LuOZzJ_LhLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifiV3vEe2LuOZzJ_LhLg" x="-324" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifiV3vEe2LuOZzJ_LhLg" x="-298" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_oAifgV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_oAifgl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oAifg13vEe2LuOZzJ_LhLg" points="[6, 0, 803, 50]$[6, -96, 803, -46]$[-715, -96, 82, -46]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oAifg13vEe2LuOZzJ_LhLg" points="[6, 0, 974, 50]$[6, -96, 974, -46]$[-886, -96, 82, -46]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifil3vEe2LuOZzJ_LhLg" id="(0.3050847457627119,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifi13vEe2LuOZzJ_LhLg" id="(0.3050847457627119,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_qyMHwF3vEe2LuOZzJ_LhLg" type="4001" element="_qx9eWF3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_qyMHxF3vEe2LuOZzJ_LhLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHxV3vEe2LuOZzJ_LhLg" x="-354" y="-62"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHxV3vEe2LuOZzJ_LhLg" x="-440" y="-62"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_qyMHxl3vEe2LuOZzJ_LhLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHx13vEe2LuOZzJ_LhLg" x="-10" y="-83"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHx13vEe2LuOZzJ_LhLg" x="-36" y="-83"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_qyMHyF3vEe2LuOZzJ_LhLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHyV3vEe2LuOZzJ_LhLg" x="-330" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHyV3vEe2LuOZzJ_LhLg" x="-304" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_qyMHwV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_qyMHwl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyMHw13vEe2LuOZzJ_LhLg" points="[0, 0, 797, 50]$[0, -120, 797, -70]$[-751, -120, 46, -70]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyMHw13vEe2LuOZzJ_LhLg" points="[0, 0, 968, 50]$[0, -120, 968, -70]$[-922, -120, 46, -70]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHyl3vEe2LuOZzJ_LhLg" id="(0.6101694915254238,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHy13vEe2LuOZzJ_LhLg" id="(0.6101694915254238,1.0)"/>
         </edges>
@@ -3213,33 +3244,33 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_v0nf0F3vEe2LuOZzJ_LhLg" type="4001" element="_v0WaHF3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_v0nf1F3vEe2LuOZzJ_LhLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf1V3vEe2LuOZzJ_LhLg" x="5" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf1V3vEe2LuOZzJ_LhLg" x="-7" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_v0nf1l3vEe2LuOZzJ_LhLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf113vEe2LuOZzJ_LhLg" x="-6" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf113vEe2LuOZzJ_LhLg" x="-18" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_v0nf2F3vEe2LuOZzJ_LhLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf2V3vEe2LuOZzJ_LhLg" x="18" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v0nf2V3vEe2LuOZzJ_LhLg" x="6" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_v0nf0V3vEe2LuOZzJ_LhLg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_v0nf0l3vEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_v0nf013vEe2LuOZzJ_LhLg" points="[0, -2, 758, 99]$[0, -38, 758, 63]$[-764, -38, -6, 63]$[-764, -52, -6, 49]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_v0nf013vEe2LuOZzJ_LhLg" points="[0, -2, 758, 99]$[0, -26, 758, 75]$[-764, -26, -6, 75]$[-764, -52, -6, 49]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v0nf2l3vEe2LuOZzJ_LhLg" id="(0.1694915254237288,0.02040816326530612)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v0nf213vEe2LuOZzJ_LhLg" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_WGzx8F38Ee2LuOZzJ_LhLg" type="4001" element="_WGxVyF38Ee2LuOZzJ_LhLg" source="_R7b9sF38Ee2LuOZzJ_LhLg" target="_WGzK4F38Ee2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_WGzx9F38Ee2LuOZzJ_LhLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx9V38Ee2LuOZzJ_LhLg" x="80" y="45"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx9V38Ee2LuOZzJ_LhLg" x="76" y="45"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_WGzx9l38Ee2LuOZzJ_LhLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx9138Ee2LuOZzJ_LhLg" x="-27" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx9138Ee2LuOZzJ_LhLg" x="-28" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_WGzx-F38Ee2LuOZzJ_LhLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx-V38Ee2LuOZzJ_LhLg" x="-44" y="158"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WGzx-V38Ee2LuOZzJ_LhLg" x="-51" y="158"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_WGzx8V38Ee2LuOZzJ_LhLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_WGzx8l38Ee2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WGzx8138Ee2LuOZzJ_LhLg" points="[-1, 49, 166, -235]$[-1, 291, 166, 7]$[-108, 291, 59, 7]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WGzx8138Ee2LuOZzJ_LhLg" points="[-1, 49, 174, -235]$[-1, 291, 174, 7]$[-116, 291, 59, 7]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WG0ZAF38Ee2LuOZzJ_LhLg" id="(0.472,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WG0ZAV38Ee2LuOZzJ_LhLg" id="(0.5,0.5)"/>
         </edges>
@@ -3261,17 +3292,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_ObvisF4HEe2LuOZzJ_LhLg" type="4001" element="_ObhgTF4HEe2LuOZzJ_LhLg" source="_3BISYF4GEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_ObvitF4HEe2LuOZzJ_LhLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ObvitV4HEe2LuOZzJ_LhLg" x="-187" y="-37"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ObvitV4HEe2LuOZzJ_LhLg" x="-181" y="-37"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Obvitl4HEe2LuOZzJ_LhLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Obvit14HEe2LuOZzJ_LhLg" x="111" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Obvit14HEe2LuOZzJ_LhLg" x="113" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_ObviuF4HEe2LuOZzJ_LhLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ObviuV4HEe2LuOZzJ_LhLg" x="20" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ObviuV4HEe2LuOZzJ_LhLg" x="18" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_ObvisV4HEe2LuOZzJ_LhLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Obvisl4HEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Obvis14HEe2LuOZzJ_LhLg" points="[29, 0, -247, 194]$[29, -240, -247, -46]$[204, -240, -72, -46]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Obvis14HEe2LuOZzJ_LhLg" points="[29, 0, -247, 194]$[29, -228, -247, -34]$[204, -228, -72, -34]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Obviul4HEe2LuOZzJ_LhLg" id="(0.2482758620689655,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Obviu14HEe2LuOZzJ_LhLg" id="(0.6101694915254238,1.0)"/>
         </edges>
@@ -3341,17 +3372,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_q0sN4F4KEe2m7IaHDkh2Xg" type="4001" element="_q0dkhF4KEe2m7IaHDkh2Xg" source="_3BISYF4GEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_q0sN5F4KEe2m7IaHDkh2Xg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q0sN5V4KEe2m7IaHDkh2Xg" x="-14" y="25"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q0sN5V4KEe2m7IaHDkh2Xg" x="-26" y="13"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_q0sN5l4KEe2m7IaHDkh2Xg" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q0sN514KEe2m7IaHDkh2Xg" x="-9" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_q0s08F4KEe2m7IaHDkh2Xg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q0s08V4KEe2m7IaHDkh2Xg" x="-42" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q0s08V4KEe2m7IaHDkh2Xg" x="-54" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_q0sN4V4KEe2m7IaHDkh2Xg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_q0sN4l4KEe2m7IaHDkh2Xg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q0sN414KEe2m7IaHDkh2Xg" points="[0, -27, -155, 202]$[0, -207, -155, 22]$[174, -207, 19, 22]$[174, -221, 19, 8]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q0sN414KEe2m7IaHDkh2Xg" points="[0, -27, -155, 202]$[0, -195, -155, 34]$[174, -195, 19, 34]$[174, -221, 19, 8]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q0s08l4KEe2m7IaHDkh2Xg" id="(0.8206896551724138,0.2755102040816326)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q0s0814KEe2m7IaHDkh2Xg" id="(0.288135593220339,0.9183673469387755)"/>
         </edges>
@@ -3389,17 +3420,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Y-UMwF4LEe2m7IaHDkh2Xg" type="4001" element="_Y-E8MF4LEe2m7IaHDkh2Xg" source="_3BISYF4GEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_Y-UMxF4LEe2m7IaHDkh2Xg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMxV4LEe2m7IaHDkh2Xg" x="-160" y="47"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMxV4LEe2m7IaHDkh2Xg" x="-154" y="47"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Y-UMxl4LEe2m7IaHDkh2Xg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMx14LEe2m7IaHDkh2Xg" x="152" y="88"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMx14LEe2m7IaHDkh2Xg" x="142" y="88"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Y-UMyF4LEe2m7IaHDkh2Xg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMyV4LEe2m7IaHDkh2Xg" x="28" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-UMyV4LEe2m7IaHDkh2Xg" x="27" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Y-UMwV4LEe2m7IaHDkh2Xg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Y-UMwl4LEe2m7IaHDkh2Xg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y-UMw14LEe2m7IaHDkh2Xg" points="[-49, -16, -144, 240]$[-49, -232, -144, 24]$[95, -232, 0, 24]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y-UMw14LEe2m7IaHDkh2Xg" points="[-49, -16, -144, 240]$[-49, -220, -144, 36]$[95, -220, 0, 36]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y-UMyl4LEe2m7IaHDkh2Xg" id="(1.0,0.16326530612244897)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y-UMy14LEe2m7IaHDkh2Xg" id="(0.0,0.5306122448979592)"/>
         </edges>
@@ -3464,7 +3495,7 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_mZrI4V9vEe2rXNsIDUvqhw" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_mZrI4l9vEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mZrI419vEe2rXNsIDUvqhw" points="[36, 0, 214, 95]$[36, -28, 214, 67]$[-156, -28, 22, 67]$[-156, -46, 22, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mZrv8F9vEe2rXNsIDUvqhw" id="(0.2482758620689655,0.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mZrv8F9vEe2rXNsIDUvqhw" id="(0.2,0.08163265306122448)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mZrv8V9vEe2rXNsIDUvqhw" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Us6csGTUEe2qdtyPWAtoxA" type="4001" element="_UstBaGTUEe2qdtyPWAtoxA" source="_M-upAGTUEe2qdtyPWAtoxA" target="_bTgeJl3tEe2LuOZzJ_LhLg">
@@ -3533,17 +3564,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_LC7PYGTvEe2qdtyPWAtoxA" type="4001" element="_LC4MOmTvEe2qdtyPWAtoxA" source="_LC6oUGTvEe2qdtyPWAtoxA" target="_3xZUsF3lEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_LC7PZGTvEe2qdtyPWAtoxA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PZWTvEe2qdtyPWAtoxA" x="10" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PZWTvEe2qdtyPWAtoxA" x="-365" y="36"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_LC7PZmTvEe2qdtyPWAtoxA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PZ2TvEe2qdtyPWAtoxA" x="17" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PZ2TvEe2qdtyPWAtoxA" x="-10" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_LC7PaGTvEe2qdtyPWAtoxA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PaWTvEe2qdtyPWAtoxA" x="3" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LC7PaWTvEe2qdtyPWAtoxA" x="-2" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_LC7PYWTvEe2qdtyPWAtoxA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_LC7PYmTvEe2qdtyPWAtoxA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LC7PY2TvEe2qdtyPWAtoxA" points="[43, -49, -988, 99]$[43, -169, -988, -21]$[972, -169, -59, -21]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LC7PY2TvEe2qdtyPWAtoxA" points="[43, -49, -976, 99]$[43, -149, -976, -1]$[960, -149, -59, -1]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LC7PamTvEe2qdtyPWAtoxA" id="(0.1557377049180328,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LC7Pa2TvEe2qdtyPWAtoxA" id="(0.5,0.5)"/>
         </edges>
@@ -3627,22 +3658,6 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_syrYYGgtEe24RpwpWgpkFQ" id="(0.5,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qYvsm2gtEe24RpwpWgpkFQ" id="(0.0,0.6122448979591837)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_3zjE0GgtEe24RpwpWgpkFQ" type="4001" element="_3zQKBGgtEe24RpwpWgpkFQ" source="_zs6moGgtEe24RpwpWgpkFQ" target="_87Ju4F4IEe2LuOZzJ_LhLg">
-          <children xmi:type="notation:Node" xmi:id="_3zjr4GgtEe24RpwpWgpkFQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3zjr4WgtEe24RpwpWgpkFQ" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_3zjr4mgtEe24RpwpWgpkFQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3zjr42gtEe24RpwpWgpkFQ" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_3zjr5GgtEe24RpwpWgpkFQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3zjr5WgtEe24RpwpWgpkFQ" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_3zjE0WgtEe24RpwpWgpkFQ" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_3zjE0mgtEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3zjE02gtEe24RpwpWgpkFQ" points="[0, 0, 86, 120]$[-86, -120, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3zjr5mgtEe24RpwpWgpkFQ" id="(0.8135593220338984,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3zjr52gtEe24RpwpWgpkFQ" id="(0.5,0.5)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_dTGfYGkGEe24rIYSlCjKHA" type="4001" element="_dSnXTmkGEe24rIYSlCjKHA" source="_ZjfaEGkGEe24rIYSlCjKHA" target="_87Ju4F4IEe2LuOZzJ_LhLg">
           <children xmi:type="notation:Node" xmi:id="_dTHGcGkGEe24rIYSlCjKHA" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dTHGcWkGEe24rIYSlCjKHA" y="-10"/>
@@ -3659,6 +3674,86 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dTKJwGkGEe24rIYSlCjKHA" id="(0.6101694915254238,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dTKJwWkGEe24rIYSlCjKHA" id="(0.5,0.5)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_LPzccNZUEe69IbObpvsypA" type="4001" element="_LPX-3NZUEe69IbObpvsypA" source="_IYGPgNZUEe69IbObpvsypA" target="_bTgeJl3tEe2LuOZzJ_LhLg">
+          <children xmi:type="notation:Node" xmi:id="_LPzcdNZUEe69IbObpvsypA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPzcddZUEe69IbObpvsypA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LPzcdtZUEe69IbObpvsypA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPzcd9ZUEe69IbObpvsypA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LPzceNZUEe69IbObpvsypA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPzcedZUEe69IbObpvsypA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_LPzccdZUEe69IbObpvsypA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_LPzcctZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LPzcc9ZUEe69IbObpvsypA" points="[0, 0, -84, 46]$[84, -46, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LPzcetZUEe69IbObpvsypA" id="(0.711864406779661,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LPzce9ZUEe69IbObpvsypA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_JiwkcNZXEe69IbObpvsypA" type="4001" element="_JicbhNZXEe69IbObpvsypA" source="_FTa2MNZXEe69IbObpvsypA" target="_3xZUsF3lEe2LuOZzJ_LhLg">
+          <children xmi:type="notation:Node" xmi:id="_JixLgNZXEe69IbObpvsypA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JixLgdZXEe69IbObpvsypA" x="-457" y="56"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_JixLgtZXEe69IbObpvsypA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JixLg9ZXEe69IbObpvsypA" x="51" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_JixLhNZXEe69IbObpvsypA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JixLhdZXEe69IbObpvsypA" x="-17" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_JiwkcdZXEe69IbObpvsypA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_JiwkctZXEe69IbObpvsypA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Jiwkc9ZXEe69IbObpvsypA" points="[-82, -49, -1111, 99]$[-82, -169, -1111, -21]$[1029, -169, 0, -21]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JixLhtZXEe69IbObpvsypA" id="(1.0,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JixLh9ZXEe69IbObpvsypA" id="(0.0,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_NggzcNZXEe69IbObpvsypA" type="4001" element="_NgNRjtZXEe69IbObpvsypA" source="_FTa2MNZXEe69IbObpvsypA" target="_Z0bU0GTvEe2qdtyPWAtoxA">
+          <children xmi:type="notation:Node" xmi:id="_NggzdNZXEe69IbObpvsypA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NggzddZXEe69IbObpvsypA" x="14" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NggzdtZXEe69IbObpvsypA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nggzd9ZXEe69IbObpvsypA" x="4" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_NggzeNZXEe69IbObpvsypA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NggzedZXEe69IbObpvsypA" x="-46" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_NggzcdZXEe69IbObpvsypA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_NggzctZXEe69IbObpvsypA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Nggzc9ZXEe69IbObpvsypA" points="[0, 0, -98, -118]$[0, 94, -98, -24]$[98, 94, 0, -24]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NghagNZXEe69IbObpvsypA" id="(0.6101694915254238,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NghagdZXEe69IbObpvsypA" id="(0.0,0.7346938775510204)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Pu3hYNZXEe69IbObpvsypA" type="4001" element="_PulNvNZXEe69IbObpvsypA" source="_FTa2MNZXEe69IbObpvsypA" target="_3xZUsF3lEe2LuOZzJ_LhLg">
+          <children xmi:type="notation:Node" xmi:id="_Pu4Ic9ZXEe69IbObpvsypA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pu4IdNZXEe69IbObpvsypA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Pu4IddZXEe69IbObpvsypA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pu4IdtZXEe69IbObpvsypA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Pu4Id9ZXEe69IbObpvsypA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pu4IeNZXEe69IbObpvsypA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Pu4IcNZXEe69IbObpvsypA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Pu4IcdZXEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Pu4IctZXEe69IbObpvsypA" points="[0, -24, -1197, 88]$[0, -48, -1197, 64]$[1250, -48, 53, 64]$[1250, -74, 53, 38]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Pu4IedZXEe69IbObpvsypA" id="(0.6949152542372882,0.24489795918367346)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Pu4IetZXEe69IbObpvsypA" id="(0.0,0.6122448979591837)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_fkQnUNcIEe6pjNxdSs0E0Q" type="4001" element="_fj2Xo9cIEe6pjNxdSs0E0Q" source="_c0t34NcIEe6pjNxdSs0E0Q" target="_bTgeJl3tEe2LuOZzJ_LhLg">
+          <children xmi:type="notation:Node" xmi:id="_fkR1cNcIEe6pjNxdSs0E0Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkR1cdcIEe6pjNxdSs0E0Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_fkWG4NcIEe6pjNxdSs0E0Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkWG4dcIEe6pjNxdSs0E0Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_fkWt8NcIEe6pjNxdSs0E0Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fkWt8dcIEe6pjNxdSs0E0Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_fkROYNcIEe6pjNxdSs0E0Q" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_fkROYdcIEe6pjNxdSs0E0Q" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fkROYtcIEe6pjNxdSs0E0Q" points="[0, 0, 373, 120]$[-373, -120, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fkYjINcIEe6pjNxdSs0E0Q" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fkYjIdcIEe6pjNxdSs0E0Q" id="(0.5,0.5)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_z1k_YV3lEe2LuOZzJ_LhLg" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -3674,7 +3769,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3wvNYF3lEe2LuOZzJ_LhLg" name="Expr" tooltipText="" incomingEdges="_FMB-xl3vEe2LuOZzJ_LhLg _oARZ0l3vEe2LuOZzJ_LhLg _qx9eWF3vEe2LuOZzJ_LhLg _uSiCAF3vEe2LuOZzJ_LhLg _v0WaHF3vEe2LuOZzJ_LhLg _ObhgTF4HEe2LuOZzJ_LhLg _q0dkhF4KEe2m7IaHDkh2Xg _Y-E8MF4LEe2m7IaHDkh2Xg _Y-qe-F63Ee2rXNsIDUvqhw _LC4MOmTvEe2qdtyPWAtoxA _MW7_mGTwEe2qdtyPWAtoxA _qYZuyGgtEe24RpwpWgpkFQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3wvNYF3lEe2LuOZzJ_LhLg" name="Expr" tooltipText="" incomingEdges="_FMB-xl3vEe2LuOZzJ_LhLg _oARZ0l3vEe2LuOZzJ_LhLg _qx9eWF3vEe2LuOZzJ_LhLg _uSiCAF3vEe2LuOZzJ_LhLg _v0WaHF3vEe2LuOZzJ_LhLg _ObhgTF4HEe2LuOZzJ_LhLg _q0dkhF4KEe2m7IaHDkh2Xg _Y-E8MF4LEe2m7IaHDkh2Xg _Y-qe-F63Ee2rXNsIDUvqhw _LC4MOmTvEe2qdtyPWAtoxA _MW7_mGTwEe2qdtyPWAtoxA _qYZuyGgtEe24RpwpWgpkFQ _JicbhNZXEe69IbObpvsypA _PulNvNZXEe69IbObpvsypA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -3723,7 +3818,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bTLuAF3tEe2LuOZzJ_LhLg" name="BinaryExpr" tooltipText="" outgoingEdges="_oARZ0l3vEe2LuOZzJ_LhLg _qx9eWF3vEe2LuOZzJ_LhLg _v0WaHF3vEe2LuOZzJ_LhLg" incomingEdges="_UstBaGTUEe2qdtyPWAtoxA _Vb3NYGTUEe2qdtyPWAtoxA _45D4QmgpEe24RpwpWgpkFQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bTLuAF3tEe2LuOZzJ_LhLg" name="BinaryExpr" tooltipText="" outgoingEdges="_oARZ0l3vEe2LuOZzJ_LhLg _qx9eWF3vEe2LuOZzJ_LhLg _v0WaHF3vEe2LuOZzJ_LhLg" incomingEdges="_UstBaGTUEe2qdtyPWAtoxA _Vb3NYGTUEe2qdtyPWAtoxA _45D4QmgpEe24RpwpWgpkFQ _LPX-3NZUEe69IbObpvsypA _fj2Xo9cIEe6pjNxdSs0E0Q" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//BinaryExpr"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//BinaryExpr"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -3887,22 +3982,6 @@
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_Sn1HAGgrEe24RpwpWgpkFQ" name="MEET" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//BinaryOp/MEET"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//BinaryOp/MEET"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_Sn1HAWgrEe24RpwpWgpkFQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TrhYoGgrEe24RpwpWgpkFQ" name="JOIN" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//BinaryOp/JOIN"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//BinaryOp/JOIN"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_TrhYoWgrEe24RpwpWgpkFQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_R7XFMF38Ee2LuOZzJ_LhLg" name="ExistentialQuantifier" tooltipText="" outgoingEdges="_WGxVyF38Ee2LuOZzJ_LhLg" incomingEdges="_C0JQzV4LEe2m7IaHDkh2Xg _ZLAvTl9vEe2rXNsIDUvqhw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ExistentialQuantifier"/>
@@ -4059,7 +4138,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_86zJkF4IEe2LuOZzJ_LhLg" name="Constant" tooltipText="" outgoingEdges="_qYZuyGgtEe24RpwpWgpkFQ" incomingEdges="_JYWPtF4JEe2LuOZzJ_LhLg _JYW2c14JEe2LuOZzJ_LhLg _JYW2el4JEe2LuOZzJ_LhLg _3zQKBGgtEe24RpwpWgpkFQ _dSnXTmkGEe24rIYSlCjKHA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_86zJkF4IEe2LuOZzJ_LhLg" name="Constant" tooltipText="" outgoingEdges="_qYZuyGgtEe24RpwpWgpkFQ" incomingEdges="_JYWPtF4JEe2LuOZzJ_LhLg _JYW2c14JEe2LuOZzJ_LhLg _JYW2el4JEe2LuOZzJ_LhLg _dSnXTmkGEe24rIYSlCjKHA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -4524,7 +4603,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z0MrUGTvEe2qdtyPWAtoxA" name="Relation" tooltipText="" incomingEdges="_cBUqNmTvEe2qdtyPWAtoxA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z0MrUGTvEe2qdtyPWAtoxA" name="Relation" tooltipText="" incomingEdges="_cBUqNmTvEe2qdtyPWAtoxA _NgNRjtZXEe69IbObpvsypA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -4671,29 +4750,6 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_zsr9IGgtEe24RpwpWgpkFQ" name="InfConstant" tooltipText="" outgoingEdges="_3zQKBGgtEe24RpwpWgpkFQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//InfConstant"/>
-      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//InfConstant"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_zsr9IWgtEe24RpwpWgpkFQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3zQKBGgtEe24RpwpWgpkFQ" sourceNode="_zsr9IGgtEe24RpwpWgpkFQ" targetNode="_86zJkF4IEe2LuOZzJ_LhLg">
-      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//InfConstant"/>
-      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//InfConstant"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3zQKBWgtEe24RpwpWgpkFQ" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_3zQKBmgtEe24RpwpWgpkFQ" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3zQKB2gtEe24RpwpWgpkFQ" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Zi8AcGkGEe24rIYSlCjKHA" name="LogicConstant" tooltipText="" outgoingEdges="_dSnXTmkGEe24rIYSlCjKHA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LogicConstant"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LogicConstant"/>
@@ -4768,6 +4824,129 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
       </ownedElements>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_IXrYwNZUEe69IbObpvsypA" name="LatticeBinaryExpr" tooltipText="" outgoingEdges="_LPX-3NZUEe69IbObpvsypA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Xu1JDdZUEe69IbObpvsypA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_W0CUoNZUEe69IbObpvsypA" name="op : LatticeBinaryOp = MEET" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr/op"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr/op"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_Xu2XFNZUEe69IbObpvsypA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_LPX-3NZUEe69IbObpvsypA" sourceNode="_IXrYwNZUEe69IbObpvsypA" targetNode="_bTLuAF3tEe2LuOZzJ_LhLg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//LatticeBinaryExpr"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Xu6BstZUEe69IbObpvsypA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Xu6Bs9ZUEe69IbObpvsypA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Xu6BtNZUEe69IbObpvsypA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Nmg1INZUEe69IbObpvsypA" name="LatticeBinaryOp" tooltipText="" width="12" height="10">
+      <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp"/>
+      <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Nmg1IdZUEe69IbObpvsypA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_TQOPoNZUEe69IbObpvsypA" name="MEET" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp/MEET"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp/MEET"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_TQO2sNZUEe69IbObpvsypA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_UFttMNZUEe69IbObpvsypA" name="JOIN" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp/JOIN"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LatticeBinaryOp/JOIN"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_UFttMdZUEe69IbObpvsypA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FTH7QNZXEe69IbObpvsypA" name="CastExpr" tooltipText="" outgoingEdges="_JicbhNZXEe69IbObpvsypA _NgNRjtZXEe69IbObpvsypA _PulNvNZXEe69IbObpvsypA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CastExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CastExpr"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FTH7QdZXEe69IbObpvsypA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_JicbhNZXEe69IbObpvsypA" name="[0..1] body" sourceNode="_FTH7QNZXEe69IbObpvsypA" targetNode="_3wvNYF3lEe2LuOZzJ_LhLg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CastExpr/body"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CastExpr/body"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_JidCcNZXEe69IbObpvsypA" description="_FMCl0F3vEe2LuOZzJ_LhLg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_JidCctZXEe69IbObpvsypA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_JidCcdZXEe69IbObpvsypA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_NgNRjtZXEe69IbObpvsypA" name="[0..1] targetType" sourceNode="_FTH7QNZXEe69IbObpvsypA" targetNode="_Z0MrUGTvEe2qdtyPWAtoxA">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CastExpr/targetType"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//CastExpr/targetType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_NgNRj9ZXEe69IbObpvsypA" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NgNRkdZXEe69IbObpvsypA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_NgNRkNZXEe69IbObpvsypA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_PulNvNZXEe69IbObpvsypA" sourceNode="_FTH7QNZXEe69IbObpvsypA" targetNode="_3wvNYF3lEe2LuOZzJ_LhLg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CastExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//CastExpr"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_PulNvdZXEe69IbObpvsypA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_PulNvtZXEe69IbObpvsypA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_PulNv9ZXEe69IbObpvsypA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c0BUUNcIEe6pjNxdSs0E0Q" name="AssignmentExpr" tooltipText="" outgoingEdges="_fj2Xo9cIEe6pjNxdSs0E0Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssignmentExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssignmentExpr"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_eWkFJtcIEe6pjNxdSs0E0Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_fj2Xo9cIEe6pjNxdSs0E0Q" sourceNode="_c0BUUNcIEe6pjNxdSs0E0Q" targetNode="_bTLuAF3tEe2LuOZzJ_LhLg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssignmentExpr"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssignmentExpr"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_fj2XpNcIEe6pjNxdSs0E0Q" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_fj2XpdcIEe6pjNxdSs0E0Q" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_fj2XptcIEe6pjNxdSs0E0Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_z1aAQF3lEe2LuOZzJ_LhLg"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
index bac409f9..eed134fd 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -199,8 +199,6 @@
     <eLiterals name="MUL" value="2"/>
     <eLiterals name="DIV" value="3"/>
     <eLiterals name="POW" value="4"/>
-    <eLiterals name="MEET" value="5"/>
-    <eLiterals name="JOIN" value="6"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ArithmeticUnaryExpr" eSuperTypes="#//UnaryExpr">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="#//UnaryOp"/>
@@ -249,7 +247,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RangeExpr" eSuperTypes="#//BinaryExpr"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InfConstant" eSuperTypes="#//Constant"/>
   <eClassifiers xsi:type="ecore:EClass" name="LogicConstant" eSuperTypes="#//Constant">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="logicValue" eType="#//LogicValue"/>
   </eClassifiers>
@@ -267,4 +264,16 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DatatypeDeclaration" eSuperTypes="#//Relation #//Statement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="LatticeBinaryExpr" eSuperTypes="#//BinaryExpr">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="op" eType="#//LatticeBinaryOp"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="LatticeBinaryOp">
+    <eLiterals name="MEET"/>
+    <eLiterals name="JOIN" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CastExpr" eSuperTypes="#//Expr">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expr" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="#//Relation"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AssignmentExpr" eSuperTypes="#//BinaryExpr"/>
 </ecore:EPackage>
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel
index 29df79cf..927ec609 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -51,8 +51,6 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//BinaryOp/MUL"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//BinaryOp/DIV"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//BinaryOp/POW"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//BinaryOp/MEET"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//BinaryOp/JOIN"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//AggregationOp">
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//AggregationOp/SUM"/>
@@ -69,6 +67,10 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//NodeKind/ATOM"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//NodeKind/MULTI"/>
     </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//LatticeBinaryOp">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/MEET"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/JOIN"/>
+    </genEnums>
     <genClasses ecoreClass="problem.ecore#//Problem">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/>
@@ -226,7 +228,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/modality"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//RangeExpr"/>
-    <genClasses ecoreClass="problem.ecore#//InfConstant"/>
     <genClasses ecoreClass="problem.ecore#//LogicConstant">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/>
     </genClasses>
@@ -235,5 +236,13 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ImportStatement/alias"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//DatatypeDeclaration"/>
+    <genClasses ecoreClass="problem.ecore#//LatticeBinaryExpr">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LatticeBinaryExpr/op"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//CastExpr">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//CastExpr/body"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//CastExpr/targetType"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//AssignmentExpr"/>
   </genPackages>
 </genmodel:GenModel>
-- 
cgit v1.2.3-54-g00ecf